jsonapi_compliable 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f46b94a397759f05cd7537d79b05e67ca9fd20c
-  data.tar.gz: a35204dce94ff15fee19a052f95e12c6c44ad414
+  metadata.gz: 62ef8f2928ce29e36d96ed0eb6b79513a8e2966e
+  data.tar.gz: 0a480dfac6e92b1c4e9491b46078c0a95bc15627
 SHA512:
-  metadata.gz: 351229549de82a6e3e1e448018adf10135c603200a9ff14a859d6fc3bf2a5a0b117a5d488abfc757a353c6aa719d4b286e0d6c6c06c4a4813ab44730598acd3b
-  data.tar.gz: 446f344728c8ec9fe881dd84db1e017b8c7cc51c91cf9730192111a8e9d8c768fcbf83a535892be69c878a9aafece275f1a6a7d6fb09e533c77d028bed4faf08
+  metadata.gz: 8bed61f5bc597f389a838ab43bfe411689b878aa12d2dc0395b58e8d66fb1ab39bc6cc3329872b5a77ecef5f73ffcdb9eaae90f135b685ea9237fc04d42c26c3
+  data.tar.gz: 5ccffb4f60669279d560efe15ba667414f761fc0cfdb1b0cfe6f60eeb83fa07c9be69727e4f36e820a2c15a134b348f60935664a6ca58835f9110e7b5decfe60

data/lib/jsonapi_compliable/base.rb

@@ -63,8 +63,8 @@ module JsonapiCompliable
     # This returns MyResource.new
     #
     # @return [Resource] the configured Resource for this controller
-    def resource
-      @resource ||= self.class._jsonapi_compliable.new
+    def jsonapi_resource
+      @jsonapi_resource ||= self.class._jsonapi_compliable.new
     end
 
     # Instantiates the relevant Query object
@@ -72,13 +72,13 @@ module JsonapiCompliable
     # @see Query
     # @return [Query] the Query object for this resource/params
     def query
-      @query ||= Query.new(resource, params)
+      @query ||= Query.new(jsonapi_resource, params)
     end
 
     # @see Query#to_hash
     # @return [Hash] the normalized query hash for only the *current* resource
     def query_hash
-      @query_hash ||= query.to_hash[resource.type]
+      @query_hash ||= query.to_hash[jsonapi_resource.type]
     end
 
     # Tracks the current context so we can refer to it within any
@@ -89,7 +89,7 @@ module JsonapiCompliable
     # @yieldreturn Code to run within the current context
     def wrap_context
       if self.class._jsonapi_compliable
-        resource.with_context(self, action_name.to_sym) do
+        jsonapi_resource.with_context(self, action_name.to_sym) do
           yield
         end
       end
@@ -113,7 +113,7 @@ module JsonapiCompliable
     # @see Resource#build_scope
     # @return [Scope] the configured scope
     def jsonapi_scope(scope, opts = {})
-      resource.build_scope(scope, query, opts)
+      jsonapi_resource.build_scope(scope, query, opts)
     end
 
     # @see Deserializer#initialize
@@ -148,7 +148,7 @@ module JsonapiCompliable
     # @return [Util::ValidationResponse]
     def jsonapi_create
       _persist do
-        resource.persist_with_relationships \
+        jsonapi_resource.persist_with_relationships \
           deserialized_params.meta,
           deserialized_params.attributes,
           deserialized_params.relationships
@@ -179,7 +179,7 @@ module JsonapiCompliable
     # @return [Util::ValidationResponse]
     def jsonapi_update
       _persist do
-        resource.persist_with_relationships \
+        jsonapi_resource.persist_with_relationships \
           deserialized_params.meta,
           deserialized_params.attributes,
           deserialized_params.relationships
@@ -254,7 +254,7 @@ module JsonapiCompliable
 
     def _persist
       validation_response = nil
-      resource.transaction do
+      jsonapi_resource.transaction do
         object = yield
         validation_response = Util::ValidationResponse.new \
           object, deserialized_params

data/lib/jsonapi_compliable/version.rb

@@ -1,3 +1,3 @@
 module JsonapiCompliable
-  VERSION = "0.6.7"
+  VERSION = "0.6.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi_compliable
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - Lee Richmond
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable