json-api-vanilla 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0d265b20f67d08ed43d7400a31c9967a8d889d28
-  data.tar.gz: 35615f3284b5251ddaa6f938a12a81233a6455da
+SHA256:
+  metadata.gz: 5d5c4ce7ba0c6ce976f23618d9611dd1eb015b3f063e07b5821865a77aa14aba
+  data.tar.gz: 75d8c20b9c83073b2673d6bbff1ccc0251a65eeda5d92978a58500845019791a
 SHA512:
-  metadata.gz: 5d5c43003af1b69ad6765b133413db6f34788c153e49ed733e951d84121b4b652326dd22d7ed5a3c7df710efb15dead48f10b76d5629b3336ba2a639315bdfb4
-  data.tar.gz: 52d80f203986990a057bece26ffee84eaa0df3a1036de155b325c37ce68c2c023a6c91542e15a4a4db033e85c8b46d51c8c0ddf4563c1a1efad35d42ce1967fa
+  metadata.gz: ad7299a1a5481f9a2bdfe2c5bb42b01aa5fd6e1a015d2ab426f90ae67a9ceda40894ab9fa147fbea5fed8c411a9947652acdac1e5d46ca2600d42e9c1b1c167f
+  data.tar.gz: c5a6e7aebb023f9fa25eb1e1d374549096687abeff8a2f7b1c36351df4a3003dae4668bff732f2726380e6fb46b8e7f34ad34cf57ab5e7c166ed47ba4bc788ac

data/.github/workflows/ruby.yml

@@ -0,0 +1,20 @@
+name: Ruby
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Ruby 2.6
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+    - name: Build and test with Rake
+      run: |
+        gem install bundler
+        bundle install --jobs 4 --retry 3
+        make test

data/.gitignore

@@ -1,4 +1,5 @@
 Gemfile.lock
 .ruby-version
 .rvmrc
+.idea
 *.gem

data/Gemfile

@@ -2,5 +2,6 @@ source "http://rubygems.org"
 gemspec
 
 group :test do
+  gem 'rspec'
   gem 'rake'
 end

data/Makefile

@@ -2,4 +2,7 @@
 install:
 	gem build json-api-vanilla.gemspec && gem install ./json-api-vanilla-*.gem
 
-.PHONY: install
+test:
+	rspec
+
+.PHONY: install test

data/lib/json-api-vanilla/parser.rb

@@ -58,23 +58,17 @@ module JSON::Api::Vanilla
 
     obj_hashes.each do |o_hash|
       klass = prepare_class(o_hash, superclass, container)
-      obj = klass.new
-      obj.type = o_hash['type']
-      obj.id = o_hash['id']
-      if o_hash['attributes']
-        o_hash['attributes'].each do |key, value|
-          set_key(obj, key, value, original_keys)
-        end
-      end
+      obj = prepare_object(o_hash, klass, original_keys)
+
       if o_hash['links']
         links[obj] = o_hash['links']
       end
+
       objects[[obj.type, obj.id]] = obj
     end
 
     # Now that all objects have been created, we can link everything together.
     obj_hashes.each do |o_hash|
-      klass = container.const_get(ruby_class_name(o_hash['type']).to_sym)
       obj = objects[[o_hash['type'], o_hash['id']]]
       if o_hash['relationships']
         o_hash['relationships'].each do |key, value|
@@ -83,10 +77,22 @@ module JSON::Api::Vanilla
             if data.is_a?(Array)
               # One-to-many relationship.
               ref = data.map do |ref_hash|
-                objects[[ref_hash['type'], ref_hash['id']]]
+                _ref = objects[[ref_hash['type'], ref_hash['id']]]
+
+                if _ref.nil?
+                  klass = prepare_class(ref_hash, superclass, container)
+                  _ref = prepare_object(ref_hash, klass)
+                end
+
+                _ref
               end
             else
               ref = objects[[data['type'], data['id']]]
+
+              if ref.nil?
+                klass = prepare_class(data, superclass, container)
+                ref = prepare_object(data, klass)
+              end
             end
           end
 
@@ -116,7 +122,7 @@ module JSON::Api::Vanilla
 
   def self.prepare_class(hash, superclass, container)
     name = ruby_class_name(hash['type']).to_sym
-    if container.const_defined?(name)
+    if container.constants.include?(name)
       klass = container.const_get(name)
     else
       klass = generate_object(name, superclass, container)
@@ -131,6 +137,18 @@ module JSON::Api::Vanilla
     klass
   end
 
+  def self.prepare_object(hash, klass, original_keys = {})
+    (klass.new).tap do |obj|
+      obj.type = hash['type']
+      obj.id = hash['id']
+      if hash['attributes']
+        hash['attributes'].each do |key, value|
+          set_key(obj, key, value, original_keys)
+        end
+      end
+    end
+  end
+
   def self.generate_object(ruby_name, superclass, container)
     klass = Class.new(superclass)
     container.const_set(ruby_name, klass)

data/lib/json-api-vanilla/version.rb

@@ -2,7 +2,7 @@
 module JSON
   module Api
     module Vanilla
-      VERSION = '1.0.1'
+      VERSION = '1.0.2'
     end
   end
 end

data/spec/json-api-vanilla/diff_spec.rb

@@ -20,6 +20,14 @@ describe JSON::Api::Vanilla do
     expect(doc.links[doc.data]['self']).to eql("http://example.com/articles")
   end
 
+  it "should read objects that are only in relationships of included" do
+    expect(doc.data.first.comments.first.post.id).to eql("42")
+  end
+
+  it "should read objects that are only in relationships of included when it is an array" do
+    expect(doc.data.first.comments.first.tags[0].id).to eql("42")
+  end
+
   it "should find objects by type and id" do
     expect(doc.find('comments', '5').body).to eql("First!")
   end
@@ -97,4 +105,41 @@ describe JSON::Api::Vanilla do
       JSON::Api::Vanilla.naive_validate(data: [])
     end.to_not raise_error
   end
+
+  describe '.prepare_class' do
+    let(:container) {Module.new}
+    let(:superclass) {Class.new}
+    let(:hash) {{'type' => 'test-classes'}}
+    subject {described_class.prepare_class(hash, superclass, container)}
+
+    context 'when same name class in global scope' do
+      class TestClasses
+      end
+
+      it 'should create dynamic class in container' do
+        subject
+        expect(container.constants).to include(:TestClasses)
+      end
+    end
+  end
+
+  describe '.prepare_object' do
+    let(:data) do
+      {
+        'type' => 'example',
+        'id' => '1',
+        'attributes' => {
+          'name' => 'example name'
+        }
+      }
+    end
+    let(:klass) { described_class.prepare_class(data, Class.new, Module.new) }
+    subject { described_class.prepare_object(data, klass) }
+
+    it 'creates an object with the attributes mapped' do
+      expect(subject.type).to eql(data['type'])
+      expect(subject.id).to eql(data['id'])
+      expect(subject.name).to eql(data['attributes']['name'])
+    end
+  end
 end

data/spec/json-api-vanilla/example.json

@@ -56,6 +56,17 @@
     "relationships": {
       "author": {
         "data": { "type": "people", "id": "2" }
+      },
+      "tags": {
+        "data": [
+          { "type": "tag", "id": "42" }
+        ]
+      },
+      "post": {
+        "data": {
+          "type": "post",
+          "id": "42"
+        }
       }
     },
     "links": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-api-vanilla
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Thaddée Tyl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-05 00:00:00.000000000 Z
+date: 2020-01-23 00:00:00.000000000 Z
 dependencies: []
 description: Given a JSON API string, we parse it and return a document that can be
   browsed — as if the objects defined in the file were plain old Ruby objects.
@@ -18,6 +18,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ContributorAgreement.txt
 - Gemfile
@@ -54,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Deserialize JSON API formats into vanilla Ruby objects.