jsonapi_mapper 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8da746332e94869adf5d9637999866f05c4b2c0a
-  data.tar.gz: ef0dd97cc32c359b48d62e5f6de88ca36e95f630
+  metadata.gz: 46a0f72ab5eea90edcef9d6851bb26627dcb5af1
+  data.tar.gz: 74101764b455c9fb85a96894288b15f4046f9120
 SHA512:
-  metadata.gz: 6401a0a6a12a03c4874fcac5ef69aa9b89a3449b31265448e5092b2b75c2d912ff87d672155c426e38ec300b6af784279db7e2e7e9b3948a4b1a2dde90098730
-  data.tar.gz: a6d2495852c6ce11489138bc779a1eab3b67741b05981ff58328f1e5d7c41be94f218a950a4b3a3e2c664c484cf5b36a5efb41046d19b4d44bf2df473d13d4f6
+  metadata.gz: 23be03d8e041f8b2f034e0f33dfff5c76f053bc99e78e1a88c4ed23d34826db9a38262869653d21a984521d8fa923b824f016f19e031959714b97d8f76b58940
+  data.tar.gz: 66493bd24c24da648b0d21c701a3fd5c18653c2769af2d6621bf91c579e06b643e2cf128a4a491a64ace29950a3449b978c05c82d6ae8a2c3d47e49a4b2d4ad9

data/lib/jsonapi_mapper/version.rb

@@ -1,3 +1,3 @@
 module JsonapiMapper
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/jsonapi_mapper.rb

@@ -18,21 +18,20 @@ module JsonapiMapper
 
   class DocumentMapper
     attr_accessor :document, :unscoped, :types, :renames, :resources,
-      :data, :included
+      :included, :data_mappable
 
     def initialize(document, unscoped, rules, renames)
       self.document = document.deep_symbolize_keys
       self.renames = renames.deep_symbolize_keys
       self.unscoped = unscoped.map(&:to_sym)
       self.resources = {}
-
       setup_types(rules)
-
-      main = if data = self.document[:data]
-        if data.is_a?(Array)
-          data.map{|r| build_resource(r) }.compact
+      
+      main = if data_mappable = self.document[:data]
+        if data_mappable.is_a?(Array)
+          data_mappable.map{|r| build_resource(r) }.compact
         else
-          [ build_resource(data) ].compact
+          [ build_resource(data_mappable) ].compact
         end
       end
 
@@ -42,7 +41,7 @@ module JsonapiMapper
 
       resources.each{|_,r| assign_relationships(r) }
 
-      self.data = main.try(:map, &:object) || []
+      self.data_mappable = main.try(:map, &:object) || []
       self.included = rest.try(:map, &:object) || []
     end
 
@@ -155,7 +154,7 @@ module JsonapiMapper
     end
 
     def all
-      (data + included)
+      (data_mappable + included)
     end
 
     def save_all
@@ -165,7 +164,7 @@ module JsonapiMapper
     end
 
     def collection?
-      data.size > 1
+      data_mappable.size > 1
     end
 
     def single?
@@ -173,11 +172,15 @@ module JsonapiMapper
     end
 
     def map_data(cls, &blk)
-      data.select{|o| o.is_a?(cls)}.map(&blk)
+      data_mappable.select{|o| o.is_a?(cls)}.map(&blk)
     end
 
     def map_all(cls, &blk)
       all.select{|o| o.is_a?(cls)}.map(&blk)
     end
+
+    def data
+      collection? ? data_mappable : data_mappable.first
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi_mapper
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - nubis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-28 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport