jsonapionify 0.12.2 → 0.12.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmQ3YjE5OTkyNWI2NmNhMGYxNzUzMGI0ZjRiMGYyYzM4M2QzYzE1Nw==
+    MWNlMTA2NTM0YmE2ODY1NjgxYzZkZDdkZWI1YTI5NTA5ZjA4YmM0OA==
   data.tar.gz: !binary |-
-    NWJlZmI1N2Q5ZmY4MTk0ZmFlOTE5MGZjYzQwYjA1OWZhNDc1NDA0Mg==
+    MjllZmNlOGU1NmU1Nzk1YjZlZDYxODMxNThiZWQyYzA5NTVhMDc2Yg==
 SHA512:
   metadata.gz: !binary |-
-    MDc2YjgxMjIwZDQ5YTI4ZDdhNjAwZGM3NDdiODA0NDk4YTM5MjI0NDM0YzVl
-    MjZmNjdlNTkwYzIzY2VhZjVjNDdhN2I5NDE5ZmYzYWZmZGI3NDJlZDQxOWQ2
-    ZGUxN2QwNWExZDdhNThlNmRiNTcyNTE5MGU2NjJiMzBiY2Q1NmY=
+    Y2RlOTA5MDI3MGQ5M2U2MjAwZGJjMTNiOGNjMjFiOTU2ZmM5YzFlOTRiMDc0
+    MGRjMGJiN2NhZDkyODI2Y2VmNmUxNzE2MThmNjcxOWIzZDE0YjllZTFkYTFj
+    N2Q0YTQ3NTQyY2FkMDQxN2Y2YTE3NTI2OTIwNThhNGVjNjk1YjE=
   data.tar.gz: !binary |-
-    YWRjZTIwNTYyNjk5ZGMzMjRiZDM1OGNkZTgzMmVmOWFlZjE5NTQwYTM0NmJj
-    NTVmM2U1NjNhZDAwNmI0ZGJlYzZlZGY1NDU1ODk3MTczZDFhMjQ1NDZlOWQx
-    YjkzN2ViYzEzZDRlMjA1NTFmZDc1OTM3ZmQwZTQ1N2RkNjk2YzU=
+    Y2FmODhmNzdhOTAwNjVmNWMzNDU4MDdlNDZiNzQ3YzlkNDY2NjQyYzRjNmE0
+    NDEyNTU1MzRiN2FkMzZkNGE2NzAyODVkZjNlMDJmNDlmMzg4ODA2ZDUzYWRm
+    OTZkMmYxZjVmOTVkYjliYWZlOWMwNmEyZGYwNzRmODgxZjA4N2I=

data/lib/jsonapionify/api/action/documentation.rb

@@ -61,11 +61,11 @@ module JSONAPIonify::Api
         collection_context          = proc do |context|
           3.times.map { resource.example_instance_for_action(action.name, context) }
         end
-        defs[:_is_example_]         = Context.new(readonly: true) { true }
-        defs[:collection]           = Context.new(&collection_context)
-        defs[:paginated_collection] = Context.new { |collection:| collection }
-        defs[:instance]             = Context.new(readonly: true) { |collection:| collection.first }
-        defs[:owner_context]        = Context.new(readonly: true) { ContextDelegate::Mock.new } if defs.has_key? :owner_context
+        defs[:_is_example_]         = Context.new(:_is_example_, readonly: true) { true }
+        defs[:collection]           = Context.new(:collection, &collection_context)
+        defs[:paginated_collection] = Context.new(:paginated_collection) { |collection:| collection }
+        defs[:instance]             = Context.new(:instance, readonly: true) { |collection:| collection.first }
+        defs[:owner_context]        = Context.new(:owner_context, readonly: true) { ContextDelegate::Mock.new } if defs.has_key? :owner_context
       end
     end
 

data/lib/jsonapionify/api/base.rb

@@ -3,6 +3,7 @@ require 'active_support/core_ext/module/delegation'
 
 module JSONAPIonify::Api
   class Base
+    extend ActiveSupport::DescendantsTracker
     extend JSONAPIonify::Autoload
     autoload_all
     extend AppBuilder

data/lib/jsonapionify/api/base/app_builder.rb

@@ -38,7 +38,7 @@ module JSONAPIonify::Api
         map "/" do
           use Rack::MethodOverride
           api.middleware.each do |args, block|
-            use *args, &block
+            use(*args, &block)
           end
           run JSONAPIonify::Api::Server.new(api)
         end

data/lib/jsonapionify/api/context.rb

@@ -2,7 +2,8 @@ module JSONAPIonify::Api
   class Context
     using JSONAPIonify::DestructuredProc
 
-    def initialize(readonly: false, persisted: false, existing_context: nil, &block)
+    def initialize(name, readonly: false, persisted: false, existing_context: nil, &block)
+      @name             = name.to_sym
       @readonly         = readonly
       @persisted        = persisted
       @existing_context = existing_context
@@ -12,11 +13,8 @@ module JSONAPIonify::Api
     def call(instance, delegate)
       existing_context = @existing_context || proc {}
       existing_block   = proc { existing_context.call(instance, delegate) }
-      begin
+      JSONAPIonify::CustomRescue.perform(remove: __FILE__, source: @block, formatter: ->(meta) { meta.source_location.join(':') + ":in context: `#{@name}''" }) do
         instance.instance_exec(delegate, existing_block, &@block.destructure(0))
-      rescue => e
-        e.backtrace.unshift @block.source_location.join(':') + ":in (context)"
-        raise e
       end
     end
 

data/lib/jsonapionify/api/relationship/many.rb

@@ -100,6 +100,7 @@ module JSONAPIonify::Api
         end
       end
 
+      list
       show
     end
   end

data/lib/jsonapionify/api/resource/callbacks.rb

@@ -5,56 +5,11 @@ module JSONAPIonify::Api
     extend ActiveSupport::Concern
     using JSONAPIonify::DestructuredProc
     included do
+      include JSONAPIonify::Callbacks
 
-      def self.define_callbacks(*names)
-        names.each do |name|
-          chains = {
-            main:   "__#{name}_callback_chain",
-            before: "__#{name}_before_callback_chain",
-            after:  "__#{name}_after_callback_chain"
-          }
-          define_method chains[:main] do |*args, &block|
-            block ||= proc {}
-            if send(chains[:before], *args) != false
-              value = begin
-                instance_exec(*args, @__context, &block&.destructure)
-              rescue => e
-                e.backtrace.unshift block.source_location.join(':') + ":in `(callback)`"
-                raise e
-              end
-              value if send(chains[:after], *args) != false
-            end
-          end unless method_defined? chains[:main]
-
-          # Define before and after chains
-          %i{after before}.each do |timing|
-            define_method chains[timing] { |*| } unless method_defined? chains[timing]
-            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|
-                begin
-                  if prev_chain.bind(self).call(*args, @__context, &block&.destructure) != false
-                    instance_exec(*args, @__context, &outer_block&.destructure)
-                  end
-                rescue => e
-                  e.backtrace.unshift outer_block.source_location.join(':') + ":in `(callback) #{callback_name}`"
-                  raise e
-                end
-              end
-            end
-          end
-
-          private(*chains.values)
-
-        end
+      define_callback_strategy do |*args, &block|
+        instance_exec(*args, @__context, &block.destructure)
       end
     end
-
-    def run_callbacks(name, *args, &block)
-      send("__#{name}_callback_chain", *args, &block)
-    end
-
   end
 end

data/lib/jsonapionify/api/resource/caller.rb

@@ -19,9 +19,15 @@ module JSONAPIonify::Api
     end
 
     def response_definition
-      action.responses.find { |response| response.accept_with_matcher? @__context } ||
-        action.responses.find { |response| response.accept_with_header? @__context } ||
-        error_now(:not_acceptable)
+      extension = @__context.request.extension
+      responses = action.responses
+      response = nil
+      @__context.request.accept.each do |accept|
+        response = responses.find { |r| r.accept_with_matcher? @__context } ||
+          responses.find { |r| r.accept_with_header? accept: accept, extension: extension }
+        break if response
+      end
+      response || error_now(:not_acceptable)
     end
 
     private

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

@@ -10,6 +10,7 @@ module JSONAPIonify::Api
 
     def context(name, **opts, &block)
       self.context_definitions[name.to_sym] = Context.new(
+        name,
         **opts,
         existing_context: self.context_definitions[name.to_sym],
         &block

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

@@ -1,12 +1,13 @@
 module JSONAPIonify::Api
   module Resource::Definitions::Scopes
+    using JSONAPIonify::DestructuredProc
 
     def scope(&block)
       define_singleton_method(:current_scope) do
-        instance_exec(OpenStruct.new, &block)
+        instance_exec(OpenStruct.new, &block.destructure)
       end
       context :scope do |context|
-        instance_exec(context, &block)
+        instance_exec(context, &block.destructure)
       end
     end
 
@@ -14,16 +15,16 @@ module JSONAPIonify::Api
 
     def instance(&block)
       define_singleton_method(:find_instance) do |id|
-        instance_exec(current_scope, id, OpenStruct.new, &block)
+        instance_exec(current_scope, id, OpenStruct.new, &block.destructure)
       end
       context :instance, persisted: true do |context, scope:, id:|
-        instance_exec(scope, id, context, &block)
+        instance_exec(scope, id, context, &block.destructure)
       end
     end
 
     def collection(&block)
       context :collection do |context, scope:, includes:|
-        collection = Object.new.instance_exec(scope, context, &block)
+        collection = instance_exec(scope, context, &block.destructure)
 
         # Compute includes manipulations
         self.class.include_definitions.select do |relationship, _|
@@ -40,10 +41,10 @@ module JSONAPIonify::Api
 
     def new_instance(&block)
       define_singleton_method(:build_instance) do
-        Object.new.instance_exec(current_scope, &block)
+        Object.new.instance_exec(current_scope, &block.destructure)
       end
       context :new_instance, persisted: true, readonly: true do |context, scope:|
-        Object.new.instance_exec(scope, context, &block)
+        Object.new.instance_exec(scope, context, &block.destructure)
       end
     end
   end

data/lib/jsonapionify/api/resource/error_handling.rb

@@ -79,7 +79,7 @@ module JSONAPIonify::Api
           klass = self.class.const_get(klass_name) rescue nil
           klass ||= klass_name.constantize rescue nil
           klass
-        end
+        end.compact
 
         # Loop until things are ordered
         while (result = out_of_order_class[klasses])

data/lib/jsonapionify/api/response.rb

@@ -65,12 +65,8 @@ module JSONAPIonify::Api
       end
     end
 
-    def accept_with_header?(context)
-      context.request.accept.any? do |accept|
-        self.accept == accept ||
-          (self.accept == '*/*' && !context.request.extension) ||
-          (accept == '*/*' && !context.request.extension)
-      end
+    def accept_with_header?(accept:, extension:)
+      self.accept == accept || (self.accept == '*/*' && !extension) || (accept == '*/*' && !extension)
     end
 
     def accept_with_matcher?(context)

data/lib/jsonapionify/callbacks.rb

@@ -1,11 +1,16 @@
 require 'active_support/concern'
+require 'unstrict_proc'
 
 module JSONAPIonify
   module Callbacks
     extend ActiveSupport::Concern
-    included do
 
-      def self.define_callbacks(*names)
+    module ClassMethods
+      def define_callback_strategy(&strategy)
+        define_method(:__callback_strategy, &strategy)
+      end
+
+      def define_callbacks(*names)
         names.each do |name|
           chains = {
             main:   "__#{name}_callback_chain",
@@ -14,10 +19,12 @@ module JSONAPIonify
           }
           define_method chains[:main] do |*args, **, &block|
             block ||= proc {}
-            if send(chains[:before], *args) != false
-              value = instance_exec(*args, &block)
-              value if send(chains[:after], *args) != false
-            end
+            false != send(chains[:before], *args) &&
+              (value = JSONAPIonify::CustomRescue.perform(remove: __FILE__, source: block, formatter: ->(meta) { meta.source_location.join(':') + ":in callback: `run'" }) do
+                __callback_strategy(*args, &block) || true
+              end) &&
+              false != send(chains[:after], *args) &&
+              value
           end unless method_defined? chains[:main]
 
           # Define before and after chains
@@ -27,13 +34,11 @@ module JSONAPIonify
             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|
-                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
+              define_method chains[timing] do |*args, &block|
+                false != prev_chain.bind(self).call(*args, &block) &&
+                  JSONAPIonify::CustomRescue.perform(remove: __FILE__, source: outer_block, formatter: ->(meta) { meta.source_location.join(':') + ":in callback: `#{timing}_#{name}'" }) do
+                    __callback_strategy(*args, &outer_block)
+                  end
               end
             end
           end
@@ -44,6 +49,12 @@ module JSONAPIonify
       end
     end
 
+    included do
+      define_callback_strategy do |*args, &block|
+        instance_exec(*args, &block)
+      end
+    end
+
     def run_callbacks(name, *args, &block)
       send("__#{name}_callback_chain", *args, &block)
     end

data/lib/jsonapionify/custom_rescue.rb

@@ -0,0 +1,38 @@
+require 'unstrict_proc'
+
+class JSONAPIonify::CustomRescue
+  using UnstrictProc
+
+  def self.perform(**opts, &block)
+    new(**opts, &block).perform
+  end
+
+  def initialize(remove: [], source: nil, formatter:, &block)
+    @block = block
+    @formatter = formatter
+    @source = source || block
+    @locs = Array.wrap remove
+    f, l = self.class.method(:perform).source_location
+    @locs << [f, l+1].join(':')
+  end
+
+  def source_location
+    source.source_location
+  end
+
+  def perform
+    @block.call
+  rescue => e
+    loc = [__FILE__, __LINE__-2].join(':')
+    formatted_value = @formatter.unstrict.call(Error.new(e, @source))
+    index = e.backtrace.index { |l| l.include? loc }
+    e.backtrace[index] = formatted_value if index && formatted_value
+    e.backtrace.delete_if { |l| @locs.any? { |rl| l.include? rl } }
+    raise e
+  end
+
+  class Error < Struct.new :error, :source
+    delegate :source_location, to: :source
+  end
+
+end

data/lib/jsonapionify/destructured_proc.rb

@@ -5,16 +5,18 @@ module JSONAPIonify::DestructuredProc
       original = self
       Proc.new do |*args|
         kwargs = original.kwargs_destructured(args[at_index])
-        instance_exec(*args, **kwargs, &original)
+        JSONAPIonify::CustomRescue.perform(remove: __FILE__, source: original, formatter: ->(meta) { meta.source_location.join(':') + ":in `block (destructured)'" }) do
+          instance_exec(*args, **kwargs, &original)
+        end
       end
     end
 
     def kwargs
-      parameters.select { |t, k| t.to_s.start_with? 'key' }
+      parameters.select { |t, k| t.to_s.start_with?('key') && !t.to_s.end_with?('rest') }
     end
 
     def arguments
-      parameters.reject { |t, k| t.to_s.start_with? 'key' }
+      parameters.reject { |t, k| t.to_s.start_with?('key') || t.to_s.end_with?('rest') }
     end
 
     def kwargs_destructured(target)

data/lib/jsonapionify/version.rb

@@ -1,3 +1,3 @@
 module JSONAPIonify
-  VERSION = "0.12.2"
+  VERSION = "0.12.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonapionify
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.12.3
 platform: ruby
 authors:
 - Jason Waldrip
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -608,6 +608,7 @@ files:
 - lib/jsonapionify/callbacks.rb
 - lib/jsonapionify/character_range.rb
 - lib/jsonapionify/continuation.rb
+- lib/jsonapionify/custom_rescue.rb
 - lib/jsonapionify/deep_sort_collection.rb
 - lib/jsonapionify/destructured_proc.rb
 - lib/jsonapionify/documentation.rb