json_api_client 1.0.0.beta6 → 1.0.0.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c39c70dd7ca6c162a658718790120555ac010083
-  data.tar.gz: 83eaa82464904a5761933f4b2f41576f280a281a
+  metadata.gz: 5100ace657cbe5030d9b34777b0afd41a8f5a734
+  data.tar.gz: 04ee78102f48525c3655be0cbcf5a1fd325b93c1
 SHA512:
-  metadata.gz: 36612db285d7249f01b5cfbff6594297ed3c838faee90b5d646ad9c51767b6cbd1bc4511063416691f19db92e06fecf54d60aa47c1d0fa23701ca43eaced2b92
-  data.tar.gz: ad590905aa3c8921ccd199525ad367465acfd048e3516da9722f364c39bdcbd0dbf01d5f4c84a12b9e43c3e9e68cebee16eb73c67436c69ac7ea014d7d270e42
+  metadata.gz: 286d424f711a4ba8a8aaa104b3ee331dd9519bdba4e2f2ff99099454ab4a83970d0d435ceac34665d32a71390b419f1499191e910863ac4a128cade13cd25e46
+  data.tar.gz: 38fae6bbffb734965cf1e0153d6426fb8998e2dc076000d7f798f00c8f5d1786d3d19def4352645b2bbb7dced029934a4f98a52a5ca6e5cd4df8bae8860abc12

data/README.md

@@ -311,6 +311,8 @@ The basic types that we allow are:
 
 Also, we consider `nil` to be an acceptable value and will not cast the value.
 
+Note : Do not map the primary key as int.
+
 ## Customizing
 
 ### Paths

data/lib/json_api_client/associations/base_association.rb

@@ -13,6 +13,14 @@ module JsonApiClient
           attr_name.to_s.classify
         end)
       end
+
+      def data(url)
+        from_result_set(association_class.requestor.linked(url))
+      end
+
+      def from_result_set(result_set)
+        result_set.to_a
+      end
     end
   end
 end

data/lib/json_api_client/associations/belongs_to.rb

@@ -11,10 +11,6 @@ module JsonApiClient
       end
 
       class Association < BaseAssociation
-        def parse(params)
-          params ? association_class.new(params) : nil
-        end
-
         def param
           :"#{attr_name}_id"
         end

data/lib/json_api_client/associations/has_many.rb

@@ -10,9 +10,6 @@ module JsonApiClient
       end
 
       class Association < BaseAssociation
-        def parse(param)
-          [param].flatten.map{|data| association_class.new(data) }
-        end
       end
     end
   end

data/lib/json_api_client/associations/has_one.rb

@@ -5,14 +5,13 @@ module JsonApiClient
 
       module ClassMethods
         def has_one(attr_name, options = {})
-          # self.associations = self.associations + [HasOne::Association.new(attr_name, self, options)]
           self.associations += [HasOne::Association.new(attr_name, self, options)]
         end
       end
 
       class Association < BaseAssociation
-        def parse(params)
-          params ? association_class.new(params) : nil
+        def from_result_set(result_set)
+          result_set.first
         end
       end
     end

data/lib/json_api_client/helpers/dirty.rb

@@ -62,7 +62,7 @@ module JsonApiClient
       end
 
       def set_attribute(name, value)
-        attribute_will_change!(name) if value != attributes[name]
+        attribute_will_change!(name) if value != attributes[name] || !attributes.has_key?(name)
         super
       end
 

data/lib/json_api_client/included_data.rb

@@ -19,24 +19,21 @@ module JsonApiClient
 
     def data_for(method_name, definition)
       # If data is defined, pull the record from the included data
-      if data = definition["data"]
-        if data.is_a?(Array)
-          # has_many link
-          data.map do |link_def|
-            record_for(link_def)
-          end
-        else
-          # has_one link
-          record_for(data)
+      return nil unless data = definition["data"]
+
+      if data.is_a?(Array)
+        # has_many link
+        data.map do |link_def|
+          record_for(link_def)
         end
       else
-        # TODO: if "related" URI is defined, fetch the delated object and stuff it in data
-        nil
+        # has_one link
+        record_for(data)
       end
     end
 
     def has_link?(name)
-      data.has_key?(name)
+      data.has_key?(name.to_s)
     end
 
     private

data/lib/json_api_client/relationships/relations.rb

@@ -20,6 +20,12 @@ module JsonApiClient
              end.compact]
       end
 
+      def as_json
+        Hash[attributes.map do |k, v|
+               [k, v.slice("data")]  if v.has_key?("data")
+             end.compact]
+      end
+
       def attributes_for_serialization
         attributes.slice(*changed)
       end

data/lib/json_api_client/resource.rb

@@ -319,6 +319,15 @@ module JsonApiClient
       end
     end
 
+    def as_json(*)
+      attributes.slice(:id, :type).tap do |h|
+        relationships.as_json.tap do |r|
+          h[:relationships] = r unless r.empty?
+        end
+        h[:attributes] = attributes.except(:id, :type).as_json
+      end
+    end
+
     # Mark all attributes for this record as dirty
     def set_all_dirty!
       set_all_attributes_dirty
@@ -354,6 +363,7 @@ module JsonApiClient
         mark_as_persisted!
         if updated = last_result_set.first
           self.attributes = updated.attributes
+          clear_changes_information
         end
         true
       end
@@ -379,12 +389,28 @@ module JsonApiClient
     protected
 
     def method_missing(method, *args)
-      return super unless relationships && relationships.has_attribute?(method) && last_result_set.included
-      last_result_set.included.data_for(method, relationships[method])
+      association = association_for(method)
+
+      return super unless association || (relationships && relationships.has_attribute?(method))
+
+      return nil unless relationship_definitions = relationships[method]
+
+      # look in included data
+      data = last_result_set.included.data_for(method, relationship_definitions)
+      return data if data
+
+      if association = association_for(method)
+        # look for a defined relationship url
+        if relationship_definitions["links"] && url = relationship_definitions["links"]["related"]
+          return association.data(url)
+        end
+      end
+      nil
     end
 
     def respond_to_missing?(symbol, include_all = false)
       return true if relationships && relationships.has_attribute?(symbol)
+      return true if association_for(symbol)
       super
     end
 
@@ -402,6 +428,10 @@ module JsonApiClient
       self.class.schema.find(name)
     end
 
+    def association_for(name)
+      self.class.associations.detect{|association| association.attr_name == name}
+    end
+
     def attributes_for_serialization
       attributes.except(*self.class.read_only_attributes).slice(*changed)
     end

data/lib/json_api_client/version.rb

@@ -1,3 +1,3 @@
 module JsonApiClient
-  VERSION = "1.0.0.beta6"
+  VERSION = "1.0.0.beta7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_api_client
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta6
+  version: 1.0.0.beta7
 platform: ruby
 authors:
 - Jeff Ching
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Build client libraries compliant with specification defined by jsonapi.org