jsonapi-resources 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccc95678a9008bcac7b1b375cd19e684c626effb
-  data.tar.gz: e7b641e7055f1a88f9673082617812ffe4b8ae25
+  metadata.gz: ee2eb1bf17d93331630573c19708775eb1bb5379
+  data.tar.gz: 0e230d825047eebc973ad2b3c16a10d47c0ee54a
 SHA512:
-  metadata.gz: 77b1fa60f243eb0fe5d62d9a28f6336d613def402e5d933a3e5157be520eb789c8f073630dbe69982c7e2bc8a1f1203a500c74764c46e0c37ce963ef5e86897c
-  data.tar.gz: af564dac990b904cc6bb4ad8b38fe928043c988d6d7d83619a1f538be8522fa1d72b4c7e2aa4ab01e34e96d3742174c8c70495ef054315b51d195fffab369b42
+  metadata.gz: 7ef3d97d1b89d5ceb0e585eddc32c7b69dfd6e3b60b96f4eb401634d4a1f32e65e7f75d11baa3f1a5adc1c66e2aa4a729b18f014bb084a775e9300a9e3ae933f
+  data.tar.gz: 7328baee52874231838085886f9d5280932c0f3950a93a9f001d9bdaf341c4a68000a1ae05700b60c7b429f283e53d6863f9bf7d811c9065aa4941a347f36197

data/lib/jsonapi/active_record_operations_processor.rb

@@ -16,7 +16,7 @@ class ActiveRecordOperationsProcessor < JSONAPI::OperationsProcessor
   end
 
   def process_operation(operation)
-    operation.apply(@context)
+    operation.apply
   rescue ActiveRecord::DeleteRestrictionError => e
     record_locked_error = JSONAPI::Exceptions::RecordLocked.new(e.message)
     return JSONAPI::ErrorsOperationResult.new(record_locked_error.errors[0].code, record_locked_error.errors)

data/lib/jsonapi/operation.rb

@@ -3,12 +3,13 @@ module JSONAPI
     attr_reader :resource_klass, :options, :transactional
 
     def initialize(resource_klass, options = {})
+      @context = options[:context]
       @resource_klass = resource_klass
       @options = options
       @transactional = true
     end
 
-    def apply(context)
+    def apply
     end
   end
 
@@ -20,7 +21,8 @@ module JSONAPI
       @include_directives = options[:include_directives]
       @sort_criteria = options.fetch(:sort_criteria, [])
       @paginator = options[:paginator]
-      super(resource_klass, false)
+      @transactional = false
+      super(resource_klass, options)
     end
 
     def record_count
@@ -39,9 +41,9 @@ module JSONAPI
       end
     end
 
-    def apply(context)
-      resource_records = @resource_klass.find(@resource_klass.verify_filters(@filters, context),
-                                             context: context,
+    def apply
+      resource_records = @resource_klass.find(@resource_klass.verify_filters(@filters, @context),
+                                             context: @context,
                                              include_directives: @include_directives,
                                              sort_criteria: @sort_criteria,
                                              paginator: @paginator)
@@ -74,11 +76,11 @@ module JSONAPI
       super(resource_klass, options)
     end
 
-    def apply(context)
-      key = @resource_klass.verify_key(@id, context)
+    def apply
+      key = @resource_klass.verify_key(@id, @context)
 
       resource_record = resource_klass.find_by_key(key,
-                                                   context: context,
+                                                   context: @context,
                                                    include_directives: @include_directives)
 
       return JSONAPI::ResourceOperationResult.new(:ok, resource_record)
@@ -98,8 +100,8 @@ module JSONAPI
       super(resource_klass, options)
     end
 
-    def apply(context)
-      parent_resource = resource_klass.find_by_key(@parent_key, context: context)
+    def apply
+      parent_resource = resource_klass.find_by_key(@parent_key, context: @context)
 
       return JSONAPI::LinksObjectOperationResult.new(:ok,
                                                      parent_resource,
@@ -121,8 +123,8 @@ module JSONAPI
       super(resource_klass, options)
     end
 
-    def apply(context)
-      source_resource = @source_klass.find_by_key(@source_id, context: context)
+    def apply
+      source_resource = @source_klass.find_by_key(@source_id, context: @context)
 
       related_resource = source_resource.send(@association_type)
 
@@ -147,8 +149,8 @@ module JSONAPI
       super(resource_klass, options)
     end
 
-    def apply(context)
-      source_resource = @source_klass.find_by_key(@source_id, context: context)
+    def apply
+      source_resource = @source_klass.find_by_key(@source_id, context: @context)
 
       related_resource = source_resource.send(@association_type,
                                               {
@@ -172,8 +174,8 @@ module JSONAPI
       super(resource_klass, options)
     end
 
-    def apply(context)
-      resource = @resource_klass.create(context)
+    def apply
+      resource = @resource_klass.create(@context)
       result = resource.replace_fields(@data)
 
       return JSONAPI::ResourceOperationResult.new((result == :completed ? :created : :accepted), resource)
@@ -190,8 +192,8 @@ module JSONAPI
       super(resource_klass, options)
     end
 
-    def apply(context)
-      resource = @resource_klass.find_by_key(@resource_id, context: context)
+    def apply
+      resource = @resource_klass.find_by_key(@resource_id, context: @context)
       result = resource.remove
 
       return JSONAPI::OperationResult.new(result == :completed ? :no_content : :accepted)
@@ -210,8 +212,8 @@ module JSONAPI
       super(resource_klass, options)
     end
 
-    def apply(context)
-      resource = @resource_klass.find_by_key(@resource_id, context: context)
+    def apply
+      resource = @resource_klass.find_by_key(@resource_id, context: @context)
       result = resource.replace_fields(data)
 
       return JSONAPI::ResourceOperationResult.new(result == :completed ? :ok : :accepted, resource)
@@ -228,8 +230,8 @@ module JSONAPI
       super(resource_klass, options)
     end
 
-    def apply(context)
-      resource = @resource_klass.find_by_key(@resource_id, context: context)
+    def apply
+      resource = @resource_klass.find_by_key(@resource_id, context: @context)
       result = resource.replace_has_one_link(@association_type, @key_value)
 
       return JSONAPI::OperationResult.new(result == :completed ? :no_content : :accepted)
@@ -246,8 +248,8 @@ module JSONAPI
       super(resource_klass, options)
     end
 
-    def apply(context)
-      resource = @resource_klass.find_by_key(@resource_id, context: context)
+    def apply
+      resource = @resource_klass.find_by_key(@resource_id, context: @context)
       result = resource.create_has_many_links(@association_type, @data)
 
       return JSONAPI::OperationResult.new(result == :completed ? :no_content : :accepted)
@@ -264,8 +266,8 @@ module JSONAPI
       super(resource_klass, options)
     end
 
-    def apply(context)
-      resource = @resource_klass.find_by_key(@resource_id, context: context)
+    def apply
+      resource = @resource_klass.find_by_key(@resource_id, context: @context)
       result = resource.replace_has_many_links(@association_type, @data)
 
       return JSONAPI::OperationResult.new(result == :completed ? :no_content : :accepted)
@@ -282,8 +284,8 @@ module JSONAPI
       super(resource_klass, options)
     end
 
-    def apply(context)
-      resource = @resource_klass.find_by_key(@resource_id, context: context)
+    def apply
+      resource = @resource_klass.find_by_key(@resource_id, context: @context)
       result = resource.remove_has_many_link(@association_type, @associated_key)
 
       return JSONAPI::OperationResult.new(result == :completed ? :no_content : :accepted)
@@ -299,8 +301,8 @@ module JSONAPI
       super(resource_klass, options)
     end
 
-    def apply(context)
-      resource = @resource_klass.find_by_key(@resource_id, context: context)
+    def apply
+      resource = @resource_klass.find_by_key(@resource_id, context: @context)
       result = resource.remove_has_one_link(@association_type)
 
       return JSONAPI::OperationResult.new(result == :completed ? :no_content : :accepted)

data/lib/jsonapi/operations_processor.rb

@@ -27,7 +27,6 @@ module JSONAPI
     def process(request)
       @results = JSONAPI::OperationResults.new
       @request = request
-      @context = request.context
       @operations = request.operations
 
       # Use transactions if more than one operation and if one of the operations can be transactional
@@ -82,7 +81,7 @@ module JSONAPI
     end
 
     def process_operation(operation)
-      operation.apply(@context)
+      operation.apply
     end
   end
 end

data/lib/jsonapi/request.rb

@@ -264,6 +264,7 @@ module JSONAPI
       @operations.push JSONAPI::FindOperation.new(
                          @resource_klass,
                          {
+                           context: @context,
                            filters: @filters,
                            include_directives: @include_directives,
                            sort_criteria: @sort_criteria,
@@ -276,6 +277,7 @@ module JSONAPI
       @operations.push JSONAPI::ShowOperation.new(
                          @resource_klass,
                          {
+                           context: @context,
                            id: @id,
                            include_directives: @include_directives
                          }
@@ -286,6 +288,7 @@ module JSONAPI
       @operations.push JSONAPI::ShowAssociationOperation.new(
                          @resource_klass,
                          {
+                           context: @context,
                            association_type: association_type,
                            parent_key: @resource_klass.verify_key(parent_key)
                          }
@@ -296,6 +299,7 @@ module JSONAPI
       @operations.push JSONAPI::ShowRelatedResourceOperation.new(
                          @resource_klass,
                          {
+                           context: @context,
                            association_type: association_type,
                            source_klass: @source_klass,
                            source_id: @source_id
@@ -307,6 +311,7 @@ module JSONAPI
       @operations.push JSONAPI::ShowRelatedResourcesOperation.new(
                          @resource_klass,
                          {
+                           context: @context,
                            association_type: association_type,
                            source_klass: @source_klass,
                            source_id: @source_id,
@@ -336,6 +341,7 @@ module JSONAPI
         @operations.push JSONAPI::CreateResourceOperation.new(
                            @resource_klass,
                            {
+                             context: @context,
                              data: data
                            }
                          )
@@ -519,6 +525,7 @@ module JSONAPI
         @operations.push JSONAPI::CreateHasManyAssociationOperation.new(
                            resource_klass,
                            {
+                             context: @context,
                              resource_id: parent_key,
                              association_type: association_type,
                              data: verified_param_set[:has_many].values[0]
@@ -537,6 +544,7 @@ module JSONAPI
         @operations.push JSONAPI::ReplaceHasOneAssociationOperation.new(
                            resource_klass,
                            {
+                             context: @context,
                              resource_id: parent_key,
                              association_type: association_type,
                              key_value: verified_param_set[:has_one].values[0]
@@ -553,6 +561,7 @@ module JSONAPI
         @operations.push JSONAPI::ReplaceHasManyAssociationOperation.new(
                            resource_klass,
                            {
+                             context: @context,
                              resource_id: parent_key,
                              association_type: association_type,
                              data: verified_param_set[:has_many].values[0]
@@ -585,6 +594,7 @@ module JSONAPI
       @operations.push JSONAPI::ReplaceFieldsOperation.new(
                          @resource_klass,
                          {
+                           context: @context,
                            resource_id: key,
                            data: parse_params(data, updatable_fields)
                          }
@@ -615,6 +625,7 @@ module JSONAPI
         @operations.push JSONAPI::RemoveResourceOperation.new(
                            @resource_klass,
                            {
+                             context: @context,
                              resource_id: key
                            }
                          )
@@ -637,6 +648,7 @@ module JSONAPI
           @operations.push JSONAPI::RemoveHasManyAssociationOperation.new(
                              resource_klass,
                              {
+                               context: @context,
                                resource_id: parent_key,
                                association_type: association_type,
                                associated_key: key
@@ -647,6 +659,7 @@ module JSONAPI
         @operations.push JSONAPI::RemoveHasOneAssociationOperation.new(
                            resource_klass,
                            {
+                             context: @context,
                              resource_id: parent_key,
                              association_type: association_type
                            }

data/lib/jsonapi/resource.rb

@@ -278,8 +278,9 @@ module JSONAPI
 
       # Methods used in defining a resource class
       def attributes(*attrs)
+        options = attrs.extract_options!.dup
         attrs.each do |attr|
-          attribute(attr)
+          attribute(attr, options)
         end
       end
 

data/lib/jsonapi/resources/version.rb

@@ -1,5 +1,5 @@
 module JSONAPI
   module Resources
-    VERSION = "0.4.1"
+    VERSION = "0.4.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-resources
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Dan Gebhardt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler