jsonapi_deserializer 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5d114171139c779e27ebf9e75c9c1f9c099af98e
-  data.tar.gz: 0eab51a21e34a602cfa9ce3acf9ed5ec8d48ebe4
+SHA256:
+  metadata.gz: 2e893a9e49dd289acebe86c9f18af0450650659ef36297dfacc219564d6e62e2
+  data.tar.gz: 1cfd8dd28ff6515fa64db6a96dabf1734f4910cccbab1a331c8f790f5be98ba6
 SHA512:
-  metadata.gz: ced938bbb209c7e52692f6123efc9b9ab71acd7dcd9913a1f8d50f4a594d6c08300f17c584c9e3b7d1634af656019630e951fcddcef81a5f2997c589f053ba5d
-  data.tar.gz: 707d4f4aa7d0b878c9f57c8cdb3e6f5011a77f5ef06e6fd7b476a1159fc27d0f3dcf537f03387657fcb843b8a0474a527f16f76a319141ad6ffa19f5e8f5e423
+  metadata.gz: 20ca6743e1ba0412da7c16a493b0046555cd6bc8065982d912fa682be548e76729d0ae2a983f389c05e752a3345f2deb396023df5cf94ee4ca36059021f9586a
+  data.tar.gz: 11cfd77060188941556ca17b62e93e7d05055f746900be994683c773b6099524b59c7edc3ad7f35eb79f4b5296f82760c83766c17ab65bd70e21d286702a0940

data/jsonapi_deserializer.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "jsonapi_deserializer"
   spec.version       = JSONApi::Deserializer::VERSION
   spec.authors       = ["Trek Glowacki"]
-  spec.email         = ["trek@popularpays.com"]
+  spec.email         = ["trek.glowacki@gmail.com"]
 
   spec.summary       = "Deserialize your json-api payloads into easy-to-use hashes with attribute properties."
   spec.homepage      = "https://github.com/PopularPays/jsonapi_deserializer"
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "bundler", ">= 1.10", "< 3.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
 

data/lib/jsonapi_deserializer.rb

@@ -9,7 +9,14 @@ module JSONApi
       include Hashie::Extensions::IndifferentAccess
 
       def initialize(source_hash = nil, default = nil, &blk)
-        source_hash[:id] = source_hash[:id].to_s
+
+        if source_hash[:id]
+          source_hash[:id] = source_hash[:id].to_s
+        end
+
+        if source_hash[:lid]
+          source_hash[:lid] = source_hash[:lid].to_s
+        end
         super
       end
     end
@@ -18,11 +25,43 @@ module JSONApi
       include Hashie::Extensions::MethodAccess
       include Hashie::Extensions::IndifferentAccess
       include Hashie::Extensions::DeepFetch
+
+      def initialize(source_hash = nil, default = nil, &blk)
+        if source_hash[:id]
+          source_hash[:id] = source_hash[:id].to_s
+        end
+
+        if source_hash[:lid]
+          source_hash[:lid] = source_hash[:lid].to_s
+        end
+        super
+      end
+    end
+
+    class Store
+      def initialize
+        @db = {}
+      end
+
+      def set(type, id, lid, record)
+        per_type = @db[type] ||= {}
+        identifier = id || lid
+
+        per_type[identifier.to_s] = record
+      end
+
+      def get(type, id, lid)
+        per_type = @db[type]
+        return nil unless per_type
+
+        identifier = id || lid
+        per_type[identifier.to_s]
+      end
     end
 
     def initialize(response)
       @response = response.is_a?(Hash) ? response.with_indifferent_access : response
-      @store = {}
+      @store = Store.new
 
       all_data = ([] << @response[:data] << @response[:included]).flatten.compact
       store_records(all_data)
@@ -32,9 +71,9 @@ module JSONApi
     def deserialized_hash
       data = @response[:data]
       if data.is_a? Array
-        data.map { |datum| @store[datum[:type]][datum[:id].to_s] }
+        data.map { |datum| @store.get(datum[:type], datum[:id], datum[:lid]) }
       else
-        @store[data[:type]][data[:id].to_s]
+        @store.get(data[:type], data[:id], data[:lid])
       end
     end
 
@@ -42,26 +81,19 @@ module JSONApi
 
     def store_records(data)
       data.each do |datum|
-        type = datum[:type]
-        per_type = @store[type] ||= {}
-        record = Record.new(id: datum[:id].to_s).merge(datum[:attributes] || {})
-
-        per_type[record.id] = record
+        record = Record.new(id: datum[:id], lid: datum[:lid]).merge(datum[:attributes] || {})
+        @store.set(datum[:type], datum[:id], datum[:lid], record)
       end
     end
 
     def find_association(association)
       return nil unless association
-      if @store[association[:type]] && @store[association[:type]][association[:id].to_s]
-        @store[association[:type]][association[:id].to_s]
-      else
-        Assocation.new(association)
-      end
+      @store.get(association[:type], association[:id], association[:lid]) || Assocation.new(association)
     end
 
     def build_associations(data)
       data.each do |datum|
-        record = @store[datum[:type]][datum[:id].to_s]
+        record = @store.get(datum[:type], datum[:id], datum[:lid])
 
         relationships = datum[:relationships] || {}
         relationships.each do |relationship_name, relationship|

data/lib/jsonapi_deserializer/version.rb

@@ -1,5 +1,5 @@
 module JSONApi
   class Deserializer
-    VERSION = "1.1.1"
+    VERSION = "1.2.0"
   end
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi_deserializer
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Trek Glowacki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-09 00:00:00.000000000 Z
+date: 2021-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +88,7 @@ dependencies:
         version: '0'
 description: 
 email:
-- trek@popularpays.com
+- trek.glowacki@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -119,8 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Deserialize your json-api payloads into easy-to-use hashes with attribute