jsonapionify 0.12.5 → 0.12.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGY2OTE5ZTU3YzNiYzVhNDNmZWFjZjBjNGE3NWVkMTUxNGE4ZjllNg==
+    MjlkODUyNGRkMjM2ZWE0ZDY1OGJjZTQ3ZjY5M2JhZDhjZGM5ZjQ1NQ==
   data.tar.gz: !binary |-
-    NWEyMmQ0NjMxZjM0NWY4Y2U0NjRkNGVlZjQ2ZGMzOThlOTA3M2E1YQ==
+    NTE4Y2U4NzhhZDQ0NmNmZjBlYzY1NDk0OWU0MmIwMDczMzAzNjI3NA==
 SHA512:
   metadata.gz: !binary |-
-    MWVhOWY4NjY3OWM2NzhmOGNhOGJhYTEwZTU5YjU4ZDI2ODk2M2UwOWQ2MDM1
-    ZDIwMWVlNmQ1MjMzOWZiZmRmNTNjYWM4NmU0YTI3NmVlM2ZlMTE5ODFiNjRm
-    OTQ1YTQ5YmE1MTg2NGRmMDUxMTk4ZTdiZDZkYjVlMzBiN2Y4YzQ=
+    MmNjOWFlNTdmYzg0OWJiYTY3MWRjNWJiMjQyOWUyYmY0OTUzZmRhNDEzMjBh
+    NzdkNjMyYjE5ZTk1MjhlZGYzZGVmYmRlMWE0MDU0M2Y2MTRmZTQ2ZDVhMDEz
+    OGIzODUyZjA2YWEwZDMyMDRhMmZkN2JiNzVjYjUwZGRjYThmNWI=
   data.tar.gz: !binary |-
-    NzNhNmI0Zjc5NjZlZGY0N2YyZmMxNmRiYTRkZTk2N2Y3YTk2M2RhODRjYTFm
-    ZjlmMjI5YWRhYmUwOWFjZGQ1YzIwNDBlNDRmMzU0YjNhM2M0MmZkOGEwZjEw
-    ZTAzNjk5YmYwY2I0MjgwNTIyYjQ4MzU5MTZhZjRiN2E1YzE4MzI=
+    N2UxMDM5NTBjNzE2N2FkYTBhOTE2MjhlNzY3M2ZiOTcwZjM0YjUwYzMxNWM1
+    YTAyZWNiZjMzZTAzMTM0NDU4Yjg0YzIxMTc5Nzc1MzlmZmI0NzZhYzNhZjdj
+    NzUxOGI0ZjQwYzZiMTQ5NTFiMzkyZWE4ZmY1YzlhMzQwZGM2OGQ=

data/lib/jsonapionify/api/resource/definitions/scopes.rb

@@ -15,16 +15,17 @@ module JSONAPIonify::Api
 
     def instance(&block)
       define_singleton_method(:find_instance) do |id|
-        instance_exec(current_scope, id, OpenStruct.new, &block.destructure)
+        instance_exec(current_scope, id, OpenStruct.new, &block.destructure(object: OpenStruct.new))
       end
       context :instance, persisted: true do |context, scope:, id:|
-        instance_exec(scope, id, context, &block.destructure)
+        $pry = true
+        instance_exec(scope, id, context, &block.destructure(object: context))
       end
     end
 
     def collection(&block)
       context :collection do |context, scope:, includes:|
-        collection = instance_exec(scope, context, &block.destructure)
+        collection = instance_exec(scope, context, &block.destructure(object: context))
 
         # Compute includes manipulations
         self.class.include_definitions.select do |relationship, _|
@@ -41,10 +42,10 @@ module JSONAPIonify::Api
 
     def new_instance(&block)
       define_singleton_method(:build_instance) do
-        Object.new.instance_exec(current_scope, &block.destructure)
+        Object.new.instance_exec(current_scope, &block.destructure(object: OpenStruct.new))
       end
       context :new_instance, persisted: true, readonly: true do |context, scope:|
-        Object.new.instance_exec(scope, context, &block.destructure)
+        Object.new.instance_exec(scope, context, &block.destructure(object: context))
       end
     end
   end

data/lib/jsonapionify/destructured_proc.rb

@@ -1,10 +1,10 @@
 module JSONAPIonify::DestructuredProc
   refine Proc do
-    def destructure(at_index = arguments.length-1)
+    def destructure(at_index = -1, object: nil)
       return self unless kwargs.present?
       original = self
       Proc.new do |*args|
-        kwargs = original.kwargs_destructured(args[at_index])
+        kwargs = original.kwargs_destructured(object || args[at_index])
         JSONAPIonify::CustomRescue.perform(remove: __FILE__, source: original, formatter: ->(meta) { meta.source_location.join(':') + ":in `block (destructured)'" }) do
           instance_exec(*args, **kwargs, &original)
         end

data/lib/jsonapionify/version.rb

@@ -1,3 +1,3 @@
 module JSONAPIonify
-  VERSION = "0.12.5"
+  VERSION = "0.12.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonapionify
 version: !ruby/object:Gem::Version
-  version: 0.12.5
+  version: 0.12.7
 platform: ruby
 authors:
 - Jason Waldrip
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2016-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport