jsonapi 0.1.1.beta1 → 0.1.1.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9684f22cfc478709e3961ccde7d5c528293587c
-  data.tar.gz: 62b48f99bb23746b67fc0e5e42f864d3df8d4116
+  metadata.gz: ced99ef009aee2a4a5473acbc9ee8dc8c53d14b0
+  data.tar.gz: a9b87f7ef84013e382df467138ebc723790d27d9
 SHA512:
-  metadata.gz: f77d8cb69325b8186786e181515c0ce7a30fd6f63fcf5ae22c65ac4e5167c87128a8124e87f63ef4115275f36bd9d79151198c200ec31230917aa2da51b2cd97
-  data.tar.gz: fad6e70f1a1efedea35600adb16784de57c100cfcaab3d18f26ce80c1eb3d06a3cbb22fae5c7cf5da4429ed98a5cbf1576f4812923b64172e13ea566d830a611
+  metadata.gz: 1b0c8e23de976228e9a08d350d23459d49159422b329c72487261785490f548fa70a14556985d06cb2070c184bbebd1aad0a45505bd482e6ff3710111298f343
+  data.tar.gz: 6f85d5fe158aa995aa4059166e1143dd7826ddce93d0968aea9e1b7c8f289f4cfc24ab9c9a9c0733d44293d4a5d7df2242ab173e21bc16b0c7552d77493e3876

data/Gemfile.lock

@@ -1,23 +1,14 @@
 PATH
   remote: .
   specs:
-    jsonapi (0.1.1.beta1)
-      activesupport (>= 3.0)
+    jsonapi (0.1.1.beta2)
       json (~> 1.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.6)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
     diff-lcs (1.2.5)
-    i18n (0.7.0)
     json (1.8.3)
-    minitest (5.8.4)
     rake (11.1.2)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
@@ -32,9 +23,6 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -40,14 +40,6 @@ include_directive = JSONAPI::IncludeDirective.new(include_args)
   # Should the document be invalid, the parse method would fail with an
   #   InvalidDocument error.
 
-  document.data.to_activerecord_hash
-  # => {
-  #      id: '1',
-  #      title: 'JSON API paints my bikeshed!',
-  #      author_id: '9',
-  #      comment_ids: ['5', '12']
-  #    }
-
   document.data.links.defined?(:self)
   # => true
   document.data.links.self.value
@@ -135,7 +127,7 @@ Notes:
 
 ## License
 
-jsonapi_parser is Copyright © 2016 Lucas Hosseini.
+jsonapi is Copyright © 2016 Lucas Hosseini.
 
 It is free software, and may be redistributed under the terms specified in the
 [LICENSE](LICENSE) file.

data/jsonapi_parser.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'json', '~>1.8'
-  spec.add_dependency 'activesupport', '>=3.0'
 
   spec.add_development_dependency 'rake', '>=0.9'
   spec.add_development_dependency 'rspec', '~>3.4'

data/lib/jsonapi/include_directive/parser.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext/hash/deep_merge'
-
 module JSONAPI
   class IncludeDirective
     # Utilities to create an IncludeDirective hash from various types of
@@ -28,7 +26,7 @@ module JSONAPI
         include_string.split(',')
           .map(&:strip)
           .each_with_object({}) do |path, hash|
-          hash.deep_merge!(parse_path_string(path))
+            deep_merge!(hash, parse_path_string(path))
         end
       end
 
@@ -49,7 +47,18 @@ module JSONAPI
       # @api private
       def parse_array(include_array)
         include_array.each_with_object({}) do |x, hash|
-          hash.deep_merge!(parse_include_args(x))
+          deep_merge!(hash, parse_include_args(x))
+        end
+      end
+
+      # @api private
+      def deep_merge!(src, ext)
+        ext.each do |k, v|
+          if src[k].is_a?(Hash) && v.is_a?(Hash)
+            deep_merge!(src[k], v)
+          else
+            src[k] = v
+          end
         end
       end
     end

data/lib/jsonapi/resource.rb

@@ -1,5 +1,3 @@
-require 'jsonapi/resource/active_record'
-
 module JSONAPI
   # c.f. http://jsonapi.org/format/#document-resource-objects
   class Resource

data/lib/jsonapi/version.rb

@@ -1,3 +1,3 @@
 module JSONAPI
-  VERSION = '0.1.1.beta1'.freeze
+  VERSION = '0.1.1.beta2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi
 version: !ruby/object:Gem::Version
-  version: 0.1.1.beta1
+  version: 0.1.1.beta2
 platform: ruby
 authors:
 - Lucas Hosseini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +81,6 @@ files:
 - lib/jsonapi/relationship.rb
 - lib/jsonapi/relationships.rb
 - lib/jsonapi/resource.rb
-- lib/jsonapi/resource/active_record.rb
 - lib/jsonapi/resource_identifier.rb
 - lib/jsonapi/version.rb
 - spec/duplicates_spec.rb
@@ -103,7 +88,6 @@ files:
 - spec/include_directive/parser_spec.rb
 - spec/include_directive_spec.rb
 - spec/parser_spec.rb
-- spec/resource/to_activerecord_hash_spec.rb
 homepage: https://github.com/beauby/jsonapi
 licenses:
 - MIT
@@ -134,4 +118,3 @@ test_files:
 - spec/include_directive/parser_spec.rb
 - spec/include_directive_spec.rb
 - spec/parser_spec.rb
-- spec/resource/to_activerecord_hash_spec.rb

data/lib/jsonapi/resource/active_record.rb

@@ -1,151 +0,0 @@
-require 'active_support/core_ext/string/inflections'
-
-module JSONAPI
-  class Resource
-    # Transform the resource object into a hash ready for ActiveRecord's
-    # new/create/update.
-    #
-    # @example
-    #   payload = {
-    #     'data' => {
-    #       'type' => 'articles',
-    #       'id' => '1',
-    #       'attributes' => {
-    #         'title' => 'JSON API paints my bikeshed!',
-    #         'rating' => '5 stars'
-    #       },
-    #       'relationships' => {
-    #         'author' => {
-    #           'data' => { 'type' => 'people', 'id' => '9' }
-    #         },
-    #         'referree' => {
-    #           'data' => nil
-    #         },
-    #         'publishing-journal' => {
-    #           'data' => nil
-    #         },
-    #         'comments' => {
-    #           'data' => [
-    #             { 'type' => 'comments', 'id' => '5' },
-    #             { 'type' => 'comments', 'id' => '12' }
-    #           ]
-    #         }
-    #       }
-    #     }
-    #   }
-    #   document = JSON::API.parse(payload)
-    #   options = {
-    #     attributes: {
-    #       except: [:rating]
-    #     },
-    #     relationships: {
-    #       only: [:author, :'publishing-journal', :comments],
-    #       polymorphic: [:author]
-    #     },
-    #     key_formatter: ->(x) { x.underscore }
-    #   }
-    #   document.data.to_activerecord_hash(options)
-    #   # => {
-    #          id: '1',
-    #          title: 'JSON API paints my bikeshed!',
-    #          author_id: '9',
-    #          author_type: 'people',
-    #          publishing_journal_id: nil,
-    #          comment_ids: ['5', '12']
-    #        }
-    #
-    # @param options [Hash]
-    #   * :attributes (Hash)
-    #     * :only (Array<Symbol,String>)
-    #     * :except (Array<Symbol,String>)
-    #   * :relationships (Hash)
-    #     * :only (Array<Symbol,String>)
-    #     * :except (Array<Symbol,String>)
-    #     * :polymorphic (Array<Symbol,String>)
-    #   * :key_formatter (lambda)
-    # @return [Hash]
-    def to_activerecord_hash(options = {})
-      options[:attributes] ||= {}
-      options[:relationships] ||= {}
-      hash = {}
-      hash[:id] = id unless id.nil?
-      hash.merge!(attributes_for_activerecord_hash(options))
-      hash.merge!(relationships_for_activerecord_hash(options))
-
-      hash
-    end
-
-    private
-
-    def attributes_for_activerecord_hash(options)
-      attributes_hashes =
-        filter_keys(attributes.keys, options[:attributes]).map do |key|
-        attribute_for_activerecord_hash(key, options[:key_formatter])
-      end
-
-      attributes_hashes.reduce({}, :merge)
-    end
-
-    def attribute_for_activerecord_hash(key, key_formatter)
-      { format_key(key, key_formatter).to_sym => attributes[key] }
-    end
-
-    def relationships_for_activerecord_hash(options)
-      relationship_hashes =
-        filter_keys(relationships.keys, options[:relationships]).map do |key|
-        polymorphic = (options[:relationships][:polymorphic] || [])
-                      .include?(key.to_sym)
-        relationship_for_activerecord_hash(key,
-                                           options[:key_formatter],
-                                           polymorphic)
-      end
-
-      relationship_hashes.reduce({}, :merge)
-    end
-
-    def relationship_for_activerecord_hash(rel_name,
-                                           key_formatter,
-                                           polymorphic)
-      rel = relationships[rel_name]
-      key = format_key(rel_name, key_formatter)
-
-      if rel.collection?
-        to_many_relationship_for_activerecord_hash(key, rel)
-      else
-        to_one_relationship_for_activerecord_hash(key, rel, polymorphic)
-      end
-    end
-
-    def to_many_relationship_for_activerecord_hash(key, rel)
-      { "#{key.singularize}_ids".to_sym => rel.data.map(&:id) }
-    end
-
-    def to_one_relationship_for_activerecord_hash(key, rel, polymorphic)
-      value = rel.data ? rel.data.id : nil
-      hash = { "#{key}_id".to_sym => value }
-      if polymorphic && !rel.data.nil?
-        hash["#{key}_type".to_sym] = rel.data.type.singularize.capitalize
-      end
-
-      hash
-    end
-
-    def format_key(key, key_formatter)
-      if key_formatter
-        key_formatter.call(key)
-      else
-        key
-      end
-    end
-
-    def filter_keys(keys, filter)
-      if filter[:only]
-        keys & filter[:only].map(&:to_s)
-      elsif filter[:except]
-        keys - filter[:except].map(&:to_s)
-      else
-        keys
-      end
-    end
-  end
-end

data/spec/resource/to_activerecord_hash_spec.rb

@@ -1,76 +0,0 @@
-require 'jsonapi'
-
-describe JSONAPI::Resource, '.to_activerecord_hash' do
-  before(:all) do
-    @payload = {
-      'data' => {
-        'type' => 'articles',
-        'id' => '1',
-        'attributes' => {
-          'title' => 'JSON API paints my bikeshed!',
-          'rating' => '5 stars'
-        },
-        'relationships' => {
-          'author' => {
-            'data' => { 'type' => 'people', 'id' => '9' }
-          },
-          'referree' => {
-            'data' => nil
-          },
-          'publishing-journal' => {
-            'data' => nil
-          },
-          'comments' => {
-            'data' => [
-              { 'type' => 'comments', 'id' => '5' },
-              { 'type' => 'comments', 'id' => '12' }
-            ]
-          }
-        }
-      }
-    }
-  end
-
-  it 'works' do
-    document = JSONAPI.parse(@payload)
-
-    options = {
-      attributes: {
-        except: [:rating]
-      },
-      relationships: {
-        only: [:author, :'publishing-journal', :comments],
-        polymorphic: [:author]
-      },
-      key_formatter: ->(x) { x.underscore }
-    }
-    actual = document.data.to_activerecord_hash(options)
-    expected = {
-      id: '1',
-      title: 'JSON API paints my bikeshed!',
-      author_id: '9',
-      author_type: 'Person',
-      publishing_journal_id: nil,
-      comment_ids: ['5', '12']
-    }
-
-    expect(actual).to eq expected
-  end
-
-  it 'whitelists all attributes/relationships by default' do
-    document = JSONAPI.parse(@payload)
-
-    actual = document.data.to_activerecord_hash
-    expected = {
-      id: '1',
-      title: 'JSON API paints my bikeshed!',
-      rating: '5 stars',
-      author_id: '9',
-      referree_id: nil,
-      :'publishing-journal_id' => nil,
-      comment_ids: ['5', '12']
-    }
-
-    expect(actual).to eq expected
-  end
-end