jsonapionify 0.11.11 → 0.12.0

data/lib/jsonapionify/api/response.rb

@@ -1,5 +1,7 @@
 module JSONAPIonify::Api
   class Response
+    using JSONAPIonify::DestructuredProc
+
     attr_reader :action, :accept, :response_block, :status,
                 :matcher, :content_type, :extension, :example_accept
 
@@ -39,7 +41,7 @@ module JSONAPIonify::Api
       status   ||= self.status
       response = self
       instance.instance_eval do
-        body = instance_exec(context, &response.response_block)
+        body = instance_exec(context, &response.response_block.destructure)
         Rack::Response.new.tap do |rack_response|
           rack_response.status = status
           response_headers.each do |k, v|

data/lib/jsonapionify/callbacks.rb

@@ -12,7 +12,7 @@ module JSONAPIonify
             before: "__#{name}_before_callback_chain",
             after:  "__#{name}_after_callback_chain"
           }
-          define_method chains[:main] do |*args, &block|
+          define_method chains[:main] do |*args, **, &block|
             block ||= proc {}
             if send(chains[:before], *args) != false
               value = instance_exec(*args, &block)
@@ -23,19 +23,22 @@ module JSONAPIonify
           # Define before and after chains
           %i{after before}.each do |timing|
             define_method chains[timing] { |*| } unless method_defined? chains[timing]
-
-            define_singleton_method "#{timing}_#{name}" do |sym = nil, &outer_block|
+            callback_name = "#{timing}_#{name}"
+            define_singleton_method callback_name do |sym = nil, &outer_block|
               outer_block = (outer_block || sym).to_proc
               prev_chain  = instance_method(chains[timing])
-              define_method chains[timing] do |*args, &block|
-                if prev_chain.bind(self).call(*args, &block) != false
-                  instance_exec(*args, &outer_block)
+              define_method chains[timing] do |*args, **, &block|
+                begin
+                  instance_exec(*args, &outer_block) if prev_chain.bind(self).call(*args, &block) != false
+                rescue => e
+                  e.backtrace.unshift outer_block.source_location.join(':') + ":in `(callback) #{callback_name}`"
+                  raise e
                 end
               end
             end
           end
 
-          private *chains.values
+          private(*chains.values)
 
         end
       end

data/lib/jsonapionify/destructured_proc.rb

@@ -0,0 +1,27 @@
+module JSONAPIonify::DestructuredProc
+  refine Proc do
+    def destructure(at_index = arguments.length-1)
+      return self unless kwargs.present?
+      original = self
+      Proc.new do |*args|
+        kwargs = original.kwargs_destructured(args[at_index])
+        instance_exec(*args, **kwargs, &original)
+      end
+    end
+
+    def kwargs
+      parameters.select { |t, k| t.to_s.start_with? 'key' }
+    end
+
+    def arguments
+      parameters.reject { |t, k| t.to_s.start_with? 'key' }
+    end
+
+    def kwargs_destructured(target)
+      kwargs.each_with_object({}) do |(_, key), kw|
+        next unless target.respond_to? key
+        kw[key] = target.public_send(key)
+      end
+    end
+  end
+end

data/lib/jsonapionify/structure/collections/base.rb

@@ -4,8 +4,7 @@ require 'concurrent'
 
 module JSONAPIonify::Structure
   module Collections
-    class Base < Concurrent::Array
-      include EnumerableObserver
+    class Base < Array
       include Helpers::InheritsOrigin
       attr_reader :parent
 
@@ -20,11 +19,6 @@ module JSONAPIonify::Structure
       value_is Objects::Base
 
       def initialize(array = [])
-        observe.added do |items|
-          items.each do |item|
-            item.instance_variable_set(:@parent, self) unless item.frozen?
-          end
-        end
         array.each do |instance|
           self << instance
         end
@@ -82,7 +76,25 @@ module JSONAPIonify::Structure
               )
             end
           end
-        super new_instance
+        self[length] = new_instance
+      end
+
+      def [] k
+        v = super
+        v.nil? || v.instance_variable_get(:@parent) == self ? v : self[k] = v
+      end
+
+      def []= k, v
+        unless v.nil? || v.instance_variable_get(:@parent) == self
+          v = v.dup.tap { |obj| obj.instance_variable_set :@parent, self}
+        end
+        super(k, v)
+      end
+
+      def each
+        length.times do |i|
+          yield self[i]
+        end
       end
 
       def errors

data/lib/jsonapionify/structure/objects/base.rb

@@ -54,7 +54,7 @@ module JSONAPIonify::Structure
 
       # Initialize the object
       def initialize(**attributes)
-        @object = Concurrent::Hash.new
+        @object = Hash.new
         run_callbacks :initialize do
           attributes.each do |k, v|
             self[k] = v
@@ -90,7 +90,7 @@ module JSONAPIonify::Structure
       end
 
       def to_json(**opts)
-        Oj.dump(as_json **opts)
+        Oj.dump as_json(**opts)
       end
 
       def signature
@@ -155,6 +155,15 @@ module JSONAPIonify::Structure
         JSON.pretty_generate as_json
       end
 
+      def inspect
+        hash_inspect = to_h.to_s.gsub(
+          /\:([a-zA-Z_-]+)=>/, '\\1: '
+        )[1..-2].gsub(
+          /\{([^\s])/, '{ \\1').gsub(/([^\s])\}/, '\\1 }'
+        )
+        to_s.sub(/>$/, " #{hash_inspect}>")
+      end
+
       private
 
       def collect_child_errors

data/lib/jsonapionify/structure/objects/resource_identifier.rb

@@ -1,7 +1,8 @@
 module JSONAPIonify::Structure
   module Objects
     class ResourceIdentifier < Base
-      define_order *%i{type id}
+
+      define_order :type, :id
 
       # A resource object **MUST** contain at least the following top-level members:
       must_contain! :id, :type # Describes ResourceObjects that share common attributes and relationships.
@@ -22,25 +23,19 @@ module JSONAPIonify::Structure
 
       def duplicate_exists?
         return false unless parent.is_a?(Array)
-        peers = parent - [self]
-        !!peers.index(self)
-      end
-
-      def ==(other)
-        same_as? other
+        parent.select { |peer| peer.eql? self }.length > 1
       end
 
       def duplicate_does_not_exist?
         !duplicate_exists?
       end
 
-      def same_as?(other)
-        return false unless other.is_a? ResourceIdentifier
-        other_type, other_id = other.values_at :type, :id
-        local_type, local_id = values_at :type, :id
-        other_type == local_type &&
-          !(other_id || local_id).nil? &&
-          other_id == local_id
+      def hash
+        { type: self[:type], id: self[:id] }.hash
+      end
+
+      def eql?(other)
+        other.hash == self.hash
       end
 
     end

data/lib/jsonapionify/version.rb

@@ -1,3 +1,3 @@
 module JSONAPIonify
-  VERSION = "0.11.11"
+  VERSION = "0.12.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonapionify
 version: !ruby/object:Gem::Version
-  version: 0.11.11
+  version: 0.12.0
 platform: ruby
 authors:
 - Jason Waldrip
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -206,6 +206,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -511,6 +525,7 @@ files:
 - bin/console
 - bin/setup
 - config.ru
+- examples/example_api.rb
 - index.html
 - jsonapionify.gemspec
 - lib/core_ext/boolean.rb
@@ -552,6 +567,7 @@ files:
 - lib/jsonapionify/api/resource/builders/resource_builder.rb
 - lib/jsonapionify/api/resource/builders/resource_identifer_builder.rb
 - lib/jsonapionify/api/resource/caching.rb
+- lib/jsonapionify/api/resource/callbacks.rb
 - lib/jsonapionify/api/resource/caller.rb
 - lib/jsonapionify/api/resource/class_methods.rb
 - lib/jsonapionify/api/resource/defaults.rb
@@ -567,6 +583,7 @@ files:
 - lib/jsonapionify/api/resource/definitions/attributes.rb
 - lib/jsonapionify/api/resource/definitions/contexts.rb
 - lib/jsonapionify/api/resource/definitions/helpers.rb
+- lib/jsonapionify/api/resource/definitions/includes.rb
 - lib/jsonapionify/api/resource/definitions/pagination.rb
 - lib/jsonapionify/api/resource/definitions/params.rb
 - lib/jsonapionify/api/resource/definitions/relationships.rb
@@ -591,6 +608,7 @@ files:
 - lib/jsonapionify/character_range.rb
 - lib/jsonapionify/continuation.rb
 - lib/jsonapionify/deep_sort_collection.rb
+- lib/jsonapionify/destructured_proc.rb
 - lib/jsonapionify/documentation.rb
 - lib/jsonapionify/documentation/template.erb
 - lib/jsonapionify/indented_string.rb