pluck_map 1.0.0.rc1 → 1.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5a889fad3cf9ac653fb2140beb4b9e11c3a74686564dbdac7cee79d0c0cb0f6
-  data.tar.gz: 7d544995a42e94eae52ad59ecb6357abedcac9396a26fb801ed4998abdc48445
+  metadata.gz: 83dba25350831a0d7be00ac7b2682113c512eccc6197265aa32033b7a5df70ff
+  data.tar.gz: faaf95d3df9d484497fed6e260fcef0bccac91d13f92a29cb9616771becb5ee6
 SHA512:
-  metadata.gz: 83c0063cd6bbac89d8fa4b9d4efab07c43f20dc6a5d0a7216e04b4c127d9e93175e737a0ea37b929f318641255935992ac7160e650fa7675d4a9d9780a150003
-  data.tar.gz: 6a9a3780212e568dd7b5ab56dadb79914e3bebc956fb6d591a054040f9c1819997d6c2a706d1ea7936d62a6a48eefb5b8d85b9335d20f15deeab1940b56784cc
+  metadata.gz: de5ad2aed4440bd810880f6200db09b2e97550c73c39716bf18d3afb060f44e4b95bd7da8b3a1fdc74ac6e022be1ea59518bc79f51113351952a7e9cedf9f979
+  data.tar.gz: 0ee7091b52d833d4da0bf3588549857ec371f81731a269ae51d52879c2f74a163b07cd89cec866dd22f5acec0c05b30fbeebebc5dab558cabc2da65b53975026

data/CHANGELOG.md

@@ -1,9 +1,17 @@
+## v1.0.0.rc2 (2019 Jun 17)
+
+* FEATURE: Add structured attributes to allow nesting attributes as a hash (@kobsy)
+
 ## v1.0.0.rc1 (2019 May 12)
 
 * BREAKING: Remove deprecated features/methods (@boblail)
 * FEATURE: Optimize `to_json` when a presenter doesn't need to process values in Ruby (@boblail)
 * FEATURE: Add `has_many` and `has_one` DSL for presenting nested resources (@boblail)
 
+## v0.6.2 (2019 Jun 13)
+
+* FIX: Allow presenting a subclass of the presenter's model (@kobsy)
+
 ## v0.6.1 (2019 May 12)
 
 * FIX: Aliased SQL expressions to work-around a bug with Rails Postgres adapter (@kobsy)

data/README.md

@@ -208,6 +208,19 @@ presenter = PluckMap[Person].define do
 end
 ```
 
+### Structured attributes
+
+You can also nest attributes by passing a block to the attribute method:
+
+```ruby
+presenter = PluckMap[Person].define do
+  parent do
+    id select: :parent_id
+    type "Parent"
+  end
+end
+```
+
 ### Relationships
 
 PluckMap can also describe nested data. There are two special methods in the `define` block that introduce child resources:

data/lib/pluck_map/attribute_builder.rb

@@ -1,4 +1,5 @@
 require "pluck_map/attribute"
+require "pluck_map/structured_attribute"
 require "pluck_map/attributes"
 require "pluck_map/relationships"
 
@@ -21,10 +22,11 @@ module PluckMap
       @model = model
     end
 
-    def method_missing(attribute_name, *args)
+    def method_missing(attribute_name, *args, &block)
       options = args.extract_options!
       options[:value] = args.first unless args.empty?
-      @attributes.push Attribute.new(attribute_name, @model, options)
+      @attributes.push block.nil? ? Attribute.new(attribute_name, @model, options) :
+        StructuredAttribute.new(attribute_name, @model, block, options)
       :attribute_added
     end
 

data/lib/pluck_map/presenter.rb

@@ -19,7 +19,7 @@ module PluckMap
   protected
 
     def pluck(query)
-      if query.model != model
+      unless query.model <= model
         raise ArgumentError, "Query for #{query.model} but #{model} expected"
       end
 

data/lib/pluck_map/presenters/to_json.rb

@@ -51,6 +51,10 @@ module PluckMap
       arg
     end
 
+    def prepare_PluckMap_StructuredAttribute(attribute)
+      to_json_object(attribute.attributes)
+    end
+
     def prepare_PluckMap_Relationships_Many(attribute)
       PluckMap::JsonSubqueryAggregate.new(attribute.scope, to_json_object(attribute.attributes))
     end

data/lib/pluck_map/relationships/base.rb

@@ -1,27 +1,14 @@
-require "pluck_map/attribute"
+require "pluck_map/structured_attribute"
 
 module PluckMap
   module Relationships
-    class Base < Attribute
-      attr_reader :attributes, :scope
+    class Base < StructuredAttribute
+      attr_reader :scope
 
       def initialize(attribute_name, scope, block, options)
         @scope = scope
-        @attributes = AttributeBuilder.build(model: scope.klass, &block)
         @scope = @scope.instance_exec(&options[:scope_block]) if options[:scope_block]
-        options = options.slice(:as).merge(
-          select: build_select,
-          map: build_map)
-
-        super(attribute_name, scope.klass, options)
-      end
-
-      def will_map?
-        attributes.any?(&:will_map?)
-      end
-
-      def nested?
-        true
+        super(attribute_name, scope.klass, block, options)
       end
 
     protected

data/lib/pluck_map/structured_attribute.rb

@@ -0,0 +1,37 @@
+require "pluck_map/attribute"
+
+module PluckMap
+  class StructuredAttribute < Attribute
+    attr_reader :attributes
+
+    def initialize(attribute_name, model, block, options={})
+      @attributes = AttributeBuilder.build(model: model, &block)
+      options = options.slice(:as).merge(select: build_select, map: build_map)
+      super(attribute_name, model, options)
+    end
+
+    def will_map?
+      attributes.any?(&:will_map?)
+    end
+
+    def nested?
+      true
+    end
+
+  protected
+
+    def build_select
+      attributes.selects
+    end
+
+    def build_map
+      lambda do |*values|
+        return nil if values.none?
+        attributes.each_with_object({}) do |attribute, hash|
+          hash[attribute.name] = attribute.exec(values)
+        end
+      end
+    end
+
+  end
+end

data/lib/pluck_map/version.rb

@@ -1,3 +1,3 @@
 module PluckMapPresenter
-  VERSION = "1.0.0.rc1"
+  VERSION = "1.0.0.rc2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pluck_map
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-13 00:00:00.000000000 Z
+date: 2019-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -275,6 +275,7 @@ files:
 - lib/pluck_map/relationships/many.rb
 - lib/pluck_map/relationships/one.rb
 - lib/pluck_map/relationships/polymorphic_one.rb
+- lib/pluck_map/structured_attribute.rb
 - lib/pluck_map/version.rb
 - lib/pluck_map/visitors.rb
 - lib/pluck_map/visitors/mysql.rb