Release v0.6.1 (bugfix release)

CHANGELOG.md

@@ -1,12 +1,17 @@
 # Changelog
 
+## v0.6.1 (2024-06-14)
+
+`v0.6.1` is a patch release that fixes a bug in the `scope` argument of the `many` method.
+
 ## v0.6.0 (2024-06-14)
+
 ### ✨New features
 - Added the `context` argument to the serializer's `initialize` method. This allows you to pass a context hash to the serializer, which can be used to pass arguments to the serializer, that can be used with a `context` object within the serializer definition.
     ```ruby
     class UserSerializer < Barley::Serializer
         attributes :id, :name
-    
+
         def name
         if context[:upcase]
             object.name.upcase
@@ -15,7 +20,7 @@
         end
         end
     end
-    
+
     Serializer.new(User.last, context: {upcase: true}).serializable_hash
     # => { id: 1, name: "JOHN DOE" }
     ```
@@ -27,7 +32,7 @@
         many :posts, scope: :published do
             attributes :id, :title
         end
-   
+
         many :posts, key: :popular, scope: -> { where("views > 10_000").order(views: :desc).limit(5) } do
             attributes :id, :title
         end
@@ -47,7 +52,7 @@
     ```ruby
     class UserSerializer < Barley::Serializer
         attributes :id, :name
-    
+
         def name
         if context[:upcase]
             object.name.upcase
@@ -56,7 +61,7 @@
         end
         end
     end
-    
+
     Serializer.new(User.last).with_context(upcase: true).serializable_hash
     # => { id: 1, name: "JOHN DOE" }
     ```
@@ -110,10 +115,10 @@ User.last.as_json(root: true)
   ```ruby
   many :posts do
     attributes :id, :title, :body
-  
+
     one :author do
       attributes :name, :email
- 
+
       one :profile, key_name: :author_profile do
         attributes :id, :bio
       end

README.md

@@ -6,7 +6,7 @@
 
 Barley is a fast and efficient ActiveModel serializer.
 
-Cerealize your ActiveModel objects into flat hashes with a dead simple, yet versatile DSL, and caching and type-checking baked in. Our daily bread is to make your API faster. 
+Cerealize your ActiveModel objects into flat hashes with a dead simple, yet versatile DSL, and caching and type-checking baked in. Our daily bread is to make your API faster.
 
 You don't believe us? Check out the [benchmarks](#benchmarks). 😎
 
@@ -28,30 +28,30 @@ Then define your attributes and associations in a serializer class.
 ```ruby
 # /app/serializers/user_serializer.rb
 class UserSerializer < Barley::Serializer
-  
+
   attributes id: Types::Strict::Integer, :name
-  
+
   attribute :email
   attribute :value, type: Types::Coercible::Integer
 
   many :posts
-  
+
   many :posts, key_name: :featured, scope: :featured
-  
+
   many :posts, key_name: :popular, scope: -> { where("views > 10_000").limit(3) }
-  
+
   one :group, serializer: CustomGroupSerializer
-  
+
   many :related_users, key: :friends, cache: true
-  
+
   one :profile, cache: { expires_in: 1.day } do
     attributes :avatar, :social_url
-    
+
     attribute :badges do
       object.badges.map(&:display_name)
     end
   end
-    
+
 end
 ```
 
@@ -89,7 +89,7 @@ You can also define the serializer class with the `serializer` macro.
 # /app/models/user.rb
 class User < ApplicationRecord
   include Barley::Serializable
-  
+
   serializer UserSerializer
 end
 ```
@@ -143,12 +143,12 @@ You can define a custom serializer for the association with the `serializer` opt
 
 You can of course define serializers with inner classes for simple needs.
 
-```ruby 
+```ruby
 class UserSerializer < Barley::Serializer
   attributes :id, :name, :email, :created_at, :updated_at
 
   one :group, serializer: LocalGroupSerializer
-  
+
     class LocalGroupSerializer < Barley::Serializer
         attributes :id, :name
     end
@@ -208,7 +208,7 @@ Feel like using a block to define your associations? You can do that too.
 ```ruby
   many :posts do
     attributes :id, :title, :body
-  
+
     one :author do
       attributes :name, :email
     end
@@ -240,7 +240,7 @@ class PostSerializer < Barley::Serializer
   attribute :is_owner do
     object.user == context.current_user
   end
-  
+
   many :comments do
     many :likes do
       attribute :is_owner do
@@ -264,7 +264,7 @@ serializer = PostSerializer.new(Post.last, context: my_context)
 You have two generators available. One to generate the serializer class:
 
 ```shell
-rails generate barley:serializer User 
+rails generate barley:serializer User
 # or
 rails generate barley:serializer User --name=CustomUserSerializer
 ```
@@ -318,7 +318,7 @@ end
 ```
 
 ## Type checking
-Barley can check the type of the object you are serializing with the [dry-types](https://dry-rb.org/gems/dry-types/main/) gem. 
+Barley can check the type of the object you are serializing with the [dry-types](https://dry-rb.org/gems/dry-types/main/) gem.
 
 It will raise an error if the object is not of the expected type, or coerce it to the correct type and perform constraints checks.
 
@@ -345,7 +345,7 @@ You will soon be able to replace all occurrences of `Serializer` with `Cerealize
 # /app/models/user.rb
 class User < ApplicationRecord
   include Barley::Cerealizable
-  
+
   cerealizer UserCerealizer
 end
 

lib/barley/serializer.rb

@@ -172,7 +172,7 @@ def one(key, key_name: nil, serializer: nil, cache: false, &block)
       # @param key_name [Symbol] the key name in the hash
       # @param serializer [Class] the serializer to use
       # @param cache [Boolean, Hash<Symbol, ActiveSupport::Duration>] whether to cache the result, or a hash with options for the cache
-      # @param scope [Symbol] the scope to use to fetch the elements
+      # @param scope [Symbol, Proc] the scope to use to fetch the elements
       # @param block [Proc] a block to use to define the serializer inline
       def many(key, key_name: nil, serializer: nil, cache: false, scope: nil, &block)
         key_name ||= key
@@ -183,6 +183,11 @@ def many(key, key_name: nil, serializer: nil, cache: false, scope: nil, &block)
         end
         define_method(key_name) do
           elements = object.send(key)
+          if scope.is_a?(Symbol)
+            elements = elements.send(scope)
+          elsif scope.is_a?(Proc)
+            elements = elements.instance_exec(&scope)
+          end
           return [] if elements.empty?
 
           el_serializer = serializer || elements.first.serializer.class

lib/barley/version.rb

@@ -1,3 +1,3 @@
 module Barley
-  VERSION = "0.6"
+  VERSION = "0.6.1"
 end