jsonapionify 0.9.2 → 0.9.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGU3ZWE5YTE4YTNiNjE1NTdiYzI2NTM2Y2UyYTA1ZTllNjVhZGQ3Ng==
+    ZGM2MDNiNjEzZTljODYzYWNlYWI3M2ViNmFkNGQ4NTU5OTU1NmZhYg==
   data.tar.gz: !binary |-
-    OWViOTNhOGFmYmE2YmNhNGZhNDMzM2FhMzUzMmZmYTY2ZjY0NTNjZQ==
+    NDlmZjlkYWU2MzA0YTkwNTBmNGUwZGRlZDE5NjliYjExNjYzMTc2YQ==
 SHA512:
   metadata.gz: !binary |-
-    MjhkNTFiZmZjNzc2ZjRmOTc2ZWQ2M2Y5ZGRkOWIyZTQzOTAxNTA5MDk0Yzg0
-    YjgxYjJhYWNmOTg5M2E5MDZhZjc4ZTE4ODI5YTVjZjM0YTg1YzEzMjYyYjBh
-    NmY2ZGRlMzAzY2Q5NTJkZGMwNGM1NjA2NzNhNmYxM2RmNGM1NGE=
+    Mzg3Y2I0NTk3ZTYxMmIxZDQxMmI2MzgzZWU5ZjQxZTZhYjRhYjA3ZGE3YWVh
+    NGIzZjBhMWNmNWVhZGUxZWEwNmMxN2YxZjcxMDI5N2RlYTI5NjU5ZDlkZmZi
+    MmFlNGZkN2ExN2JkODllNjI3ZGYxNGE5ZjQyMjRlNzUxM2U3YjI=
   data.tar.gz: !binary |-
-    OWI4OWNkMWIyNTI3MDgzZGYyYzkxODZmMDNmNDI3MDYyYmZjYjZlZjI3YTFj
-    NjRlNzQ0ODJkNGU4OTU1NGNhZTc4YmVhOTdlZTZjNDY0ZGVlMjZjODI3MDUw
-    YzhkOTExMjViZTBiNjRlMmVkZTVjMjZlNWJmOGVkZTZhMjBhYjE=
+    OWM0ZmNhMmIxYmQzNTQ2ZTJmY2YzMWM4NThhZTYwOTMxOWQ3YzdhMDg5NTYy
+    MWQ3ODA3M2I5MmExMTc3YmM1ZjAyZWI2MGQ5ZmQ4ZWI5NmY3NDgzMjM2NDVm
+    ZDU4YmYyZDIyNzY1ZGE2OTBlMGZiZDc2YmQyNmEwYTk0NGMyZWE=

data/lib/jsonapionify/api/action.rb

@@ -33,7 +33,6 @@ module JSONAPIonify::Api
     end
 
     def initialize_copy(new_instance)
-      puts "DUPED!"
       super
       %i{@responses}.each do |ivar|
         value = instance_variable_get(ivar)

data/lib/jsonapionify/api/context_delegate.rb

@@ -12,47 +12,52 @@ module JSONAPIonify::Api
       end
     end
 
-    def initialize(request, instance, definitions, **overrides)
-      memo           = {}
-      persisted_memo = {}
-      delegate       = self
-      @definitions   = definitions
-
-      define_singleton_method :request do
-        request
-      end
+    attr_reader :request
+
+    def initialize(request, resource_instance, definitions, **overrides)
+      @memo              = {}
+      @request           = request
+      @persisted_memo    = {}
+      @definitions       = definitions
+      @overrides         = overrides
+      @resource_instance = resource_instance
+      delegate           = self
 
       %i{initialize_dup initialize_clone}.each do |method|
         define_singleton_method method do |copy|
-          memo.each do |k, v|
+          @memo.each do |k, v|
             copy.public_send "#{k}=", v
           end
         end
       end
 
-      define_singleton_method(:reset) do |key|
-        memo.delete(key)
-      end
-
-      define_singleton_method(:clear) do
-        memo.clear
-      end
-
       definitions.each do |name, context|
+        raise Errors::ReservedContextName if respond_to? name
         define_singleton_method name do
-          return persisted_memo[name] if persisted_memo.has_key? name
-          (context.persisted? ? persisted_memo : memo)[name] ||=
-            if overrides.has_key?(name)
-              overrides[name]
-            else
-              context.call(instance, delegate)
-            end
+          return @overrides[name] if @overrides.has_key? name
+          return @persisted_memo[name] if @persisted_memo.has_key? name
+          return @memo[name] if @memo.has_key? name
+          write_memo = (context.persisted? ? @persisted_memo : @memo)
+          write_memo[name] = context.call(@resource_instance, delegate)
         end
 
         define_singleton_method "#{name}=" do |value|
-          persisted_memo[name] = value
+          @persisted_memo[name] = value
         end unless context.readonly?
       end
+      freeze
+    end
+
+    def reset key
+      @memo.delete(key)
+    end
+
+    def clear
+      @memo.clear
+    end
+
+    def inspect
+      to_s.chomp('>') << " memoed: #{@memo.keys.inspect}, persisted: #{@persisted_memo.keys.inspect}, overridden: #{@overrides.keys}" << '>'
     end
 
   end

data/lib/jsonapionify/api/errors.rb

@@ -9,5 +9,6 @@ module JSONAPIonify::Api
     DoubleRespondError   = Class.new JSONAPIonifyError
     InvalidCursor        = Class.new JSONAPIonifyError
     MissingContentType   = Class.new JSONAPIonifyError
+    ReservedContextName  = Class.new JSONAPIonifyError
   end
 end

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

@@ -30,8 +30,6 @@ module JSONAPIonify::Api
           example_input: :resource_identifier
         }
         define_action(:replace, 'PATCH', **options, &block).response status: 200 do |context|
-          context.owner_context.reset(:instance)
-          context.reset(:collection)
           context.response_object[:data] = build_identifier_collection(context.collection)
           context.response_object.to_json
         end
@@ -46,8 +44,6 @@ module JSONAPIonify::Api
           example_input: :resource_identifier
         }
         define_action(:add, 'POST', **options, &block).response status: 200 do |context|
-          context.owner_context.reset(:instance)
-          context.reset(:collection)
           context.response_object[:data] = build_identifier_collection(context.collection)
           context.response_object.to_json
         end
@@ -63,15 +59,13 @@ module JSONAPIonify::Api
         }
         options[:prepend] = 'relationships'
         define_action(:remove, 'DELETE', **options, &block).response status: 200 do |context|
-          context.owner_context.reset(:instance)
-          context.reset(:collection)
           context.response_object[:data] = build_identifier_collection(context.collection)
           context.response_object.to_json
         end
       end
 
       context :scope do |context|
-        instance_exec rel.name, context.owner, context, &rel.resolve
+        instance_exec(rel.name, context.owner, context, &rel.resolve).dup
       end
 
       show

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

@@ -30,8 +30,6 @@ module JSONAPIonify::Api
           prepend:      'relationships'
         }
         define_action(:replace, 'PATCH', **options, &block).response status: 200 do |context|
-          context.owner_context.reset(:instance)
-          context.reset(:instance)
           context.response_object[:data] = build_resource_identifier(context.instance)
           context.response_object.to_json
         end

data/lib/jsonapionify/api/resource/defaults/response_contexts.rb

@@ -3,8 +3,6 @@ module JSONAPIonify::Api
     extend ActiveSupport::Concern
 
     included do
-      before(:response) { |context| context.clear }
-
       context(:invalidate_cache?, readonly: true, persisted: true) { |c| c.includes.present? }
 
       # Response Objects

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

@@ -12,8 +12,7 @@ module JSONAPIonify::Api
       define_relationship(name, Relationship::Many, **opts, &block).tap do
         define_relationship_counter(
           name,
-          count_attribute === true ? "#{name.to_s.singularize}_count" : count_attribute.to_s,
-          include: include_count
+          count_attribute === true ? "#{name.to_s.singularize}_count" : count_attribute.to_s
         ) if count_attribute
       end
     end
@@ -24,11 +23,6 @@ module JSONAPIonify::Api
     end
 
     def define_relationship_counter(rel_name, name, include: true)
-      before :response do |context|
-        if (context.scope.is_a?(ActiveRecord::Relation) || context.scope.is_a?(ActiveRecord::Base)) && context.scope._reflect_on_association(rel_name)
-          context.scope = context.scope.includes(rel_name)
-        end if context.fields[type&.to_sym].include? name.to_sym
-      end if include
       attribute name.to_sym, types.Integer, "The number of #{rel_name}.", write: false do |_, instance, context|
         rel          = context.resource.class.relationship(rel_name)
         blank_fields = context.fields.map { |k, _| [k, {}] }.to_h

data/lib/jsonapionify/version.rb

@@ -1,3 +1,3 @@
 module JSONAPIonify
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

metadata

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