jsonapi_mapper 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46a0f72ab5eea90edcef9d6851bb26627dcb5af1
-  data.tar.gz: 74101764b455c9fb85a96894288b15f4046f9120
+  metadata.gz: 47223d6620e9fc3fff6740ffc29ab2667b18e2b8
+  data.tar.gz: a8453219e94d3fb0f412f4c64256ce8e563fb399
 SHA512:
-  metadata.gz: 23be03d8e041f8b2f034e0f33dfff5c76f053bc99e78e1a88c4ed23d34826db9a38262869653d21a984521d8fa923b824f016f19e031959714b97d8f76b58940
-  data.tar.gz: 66493bd24c24da648b0d21c701a3fd5c18653c2769af2d6621bf91c579e06b643e2cf128a4a491a64ace29950a3449b978c05c82d6ae8a2c3d47e49a4b2d4ad9
+  metadata.gz: 54fe745ec69e3012480a44b5a05eb67b764727a3c19be1beb45632962dcb4cf2e1ed4329dbc13e130e6d582bdd1d69775ca029600c9ea06cc23f7e2043ce69ae
+  data.tar.gz: 3b11530b50b1159e272e7b4d6957acef70c539a3a37390bccfb5ea5f80b2ef6217adc6e39300b02da68fbed33ab4639112458e15867a56acbf5e0730a43ade72

data/README.md

@@ -71,13 +71,12 @@ See the specs directory for more examples.
       )
 
       # The document data lives in mapper.data
-      # It's always an array, even if the document had a single resource.
+      # It could be a simple or multiple resource response.
       # If you want to check wether the document had a single resource
       # or a collection as its primary data you can use the following methods.
       mapper.collection? # Was primary document data a collection?
       mapper.single? # Was primary document data a single resource?
 
-      person = mapper.data.first
 
       # The rest of the included resources live in mapper.included
       others = mapper.included 

data/lib/jsonapi_mapper/version.rb

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

data/lib/jsonapi_mapper.rb

@@ -18,7 +18,7 @@ module JsonapiMapper
 
   class DocumentMapper
     attr_accessor :document, :unscoped, :types, :renames, :resources,
-      :included, :data_mappable
+      :included, :data
 
     def initialize(document, unscoped, rules, renames)
       self.document = document.deep_symbolize_keys
@@ -27,11 +27,11 @@ module JsonapiMapper
       self.resources = {}
       setup_types(rules)
       
-      main = if data_mappable = self.document[:data]
-        if data_mappable.is_a?(Array)
-          data_mappable.map{|r| build_resource(r) }.compact
+      main = if data = self.document[:data]
+        if data.is_a?(Array)
+          data.map{|r| build_resource(r) }.compact.collect(&:object)
         else
-          [ build_resource(data_mappable) ].compact
+          build_resource(data).try(:object)
         end
       end
 
@@ -41,7 +41,7 @@ module JsonapiMapper
 
       resources.each{|_,r| assign_relationships(r) }
 
-      self.data_mappable = main.try(:map, &:object) || []
+      self.data = main
       self.included = rest.try(:map, &:object) || []
     end
 
@@ -164,7 +164,7 @@ module JsonapiMapper
     end
 
     def collection?
-      data_mappable.size > 1
+      data.is_a?(Array)
     end
 
     def single?
@@ -179,8 +179,8 @@ module JsonapiMapper
       all.select{|o| o.is_a?(cls)}.map(&blk)
     end
 
-    def data
-      collection? ? data_mappable : data_mappable.first
+    def data_mappable
+      collection? ? data : [data].compact
     end
   end
 end

metadata

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