jsonapi_compliable 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ac1ea02274ee52a60910c86b28d7acde7849763
-  data.tar.gz: c9355a34cc97a996f5f4ebb3c1006ce01eb092db
+  metadata.gz: c1a466dbd616c05cad9dd31c7c57904056e86e7a
+  data.tar.gz: ed4007bed09c929be5a54b1e65d8da25721b8b61
 SHA512:
-  metadata.gz: 13eee8dc46e114513fcfabff4004ad16a96cad84e093f2c085ef6d1c71b63fc2615f124f76ba25825f454985ae6da2c17b25e101491ebec9deff7b42de16e930
-  data.tar.gz: 6eeadb16744a3564c68f78a420bf9f3267e2cc308e470e29763de1b4936ead081c34dfbac45743f7b2022efed20b0267519d331a68ebc4e4dd4f344ba9b3d09f
+  metadata.gz: fd5d8efef4d85afae6f027f89ac1082e28041b6c78cd24a7da33a5e2474132f392b0c97048877fc1ed505ecb943d5a9a587486fc7b87087b34d42a7c9e874f7f
+  data.tar.gz: 56ceebd8d57413fd798fabe9bb3940f8c73a5bc7c8e3bb9f0d709a77e75f62e261c344a23536c317cd1e214454a1dc5ced7cd55e4829cca9b3d46d315b305e7c

data/gemfiles/rails_4.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    jsonapi_compliable (0.5.2)
+    jsonapi_compliable (0.5.5)
       jsonapi-serializable (~> 0.1)
 
 GEM

data/gemfiles/rails_5.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    jsonapi_compliable (0.5.2)
+    jsonapi_compliable (0.5.5)
       jsonapi-serializable (~> 0.1)
 
 GEM

data/lib/jsonapi_compliable/adapters/abstract.rb

@@ -17,6 +17,10 @@ module JsonapiCompliable
         raise 'you must override #sideload in an adapter subclass'
       end
 
+      def resolve(scope)
+        scope
+      end
+
       def sideloading_module
         Module.new
       end

data/lib/jsonapi_compliable/adapters/active_record.rb

@@ -35,6 +35,10 @@ module JsonapiCompliable
         scope.minimum(attr)
       end
 
+      def resolve(scope)
+        scope.to_a
+      end
+
       def sideloading_module
         JsonapiCompliable::Adapters::ActiveRecordSideloading
       end

data/lib/jsonapi_compliable/resource.rb

@@ -193,5 +193,9 @@ module JsonapiCompliable
     def adapter
       self.class.config[:adapter]
     end
+
+    def resolve(scope)
+      adapter.resolve(scope)
+    end
   end
 end

data/lib/jsonapi_compliable/scope.rb

@@ -22,9 +22,7 @@ module JsonapiCompliable
       if @query.zero_results?
         []
       else
-        resolved = @object
-        # TODO - configurable resolve function
-        resolved = @object.to_a if defined?(ActiveRecord) && @object.is_a?(ActiveRecord::Relation)
+        resolved = @resource.resolve(@object)
         sideload(resolved, query_hash[:include]) if query_hash[:include]
         resolved
       end

data/lib/jsonapi_compliable/version.rb

@@ -1,3 +1,3 @@
 module JsonapiCompliable
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

metadata

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