json_api_client 1.0.0.beta3 → 1.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1af573eac7e606a57e398c563b46b41ed2f4aea0
-  data.tar.gz: 0c6b27e6af8fd78b449a253226c1a37e9c83c81b
+  metadata.gz: 6a4cf7888d664d4668f98705059cdffcead9c2b7
+  data.tar.gz: 454e3c488bbcfe07799ecdbb7bb721a6c62801e7
 SHA512:
-  metadata.gz: 5cefa69d519d148e9298e36a0bba1e11605a59b841e34d9eb5c213ed7e56eecfe6e6a86914584b84777e513d707c6b4cebd597b701406cdfc9d33a89454e19e3
-  data.tar.gz: 7ee4e4c5e432f24f232349ce0ee4565fdec370c00de50b5ba1f27291dee3bc9aa9095608a9ad48e6ea0b35b971128248dbfa94dd3b5bc9526f0a386092d9163d
+  metadata.gz: cb67e1ab20c2cd63d2aeaa72a2b2ff7682d9d34fd82303a9acbe62c1ad535a5606cbacf0e35c8503a7e89c9726f13681c38b5603ad77f174c8e4ea587aae4311
+  data.tar.gz: 609d93e6f8c0b63fb04bd4215a1e996085e8ecada6b4620a3591f764e75c47493e1fb483a15f6e8b582518b408aa2d80196084c7cc5e669bcdc17a9ba974df77

data/lib/json_api_client/helpers/associable.rb

@@ -4,7 +4,7 @@ module JsonApiClient
       extend ActiveSupport::Concern
 
       included do
-        class_attribute :associations
+        class_attribute :associations, instance_accessor: false
         self.associations = []
 
         include Associations::BelongsTo
@@ -30,12 +30,8 @@ module JsonApiClient
         def path(params = nil)
           parts = [table_name]
           if params
-            filters = params.fetch(:filter, params)
-            slurp = filters.slice(*prefix_params)
-            prefix_params.each do |param|
-              filters.delete(param)
-            end
-            parts.unshift(prefix_path % slurp.symbolize_keys)
+            path_params = params.delete(:path) || params
+            parts.unshift(prefix_path % path_params.symbolize_keys)
           else
             parts.unshift(prefix_path)
           end
@@ -49,7 +45,7 @@ module JsonApiClient
       protected
 
       def load_associations(params)
-        associations.each do |association|
+        self.class.associations.each do |association|
           if params.has_key?(association.attr_name.to_s)
             set_attribute(association.attr_name, association.parse(params[association.attr_name.to_s]))
           end

data/lib/json_api_client/helpers/dynamic_attributes.rb

@@ -1,7 +1,6 @@
 module JsonApiClient
   module Helpers
     module DynamicAttributes
-      extend ActiveSupport::Concern
 
       def attributes
         @attributes

data/lib/json_api_client/helpers/initializable.rb

@@ -4,7 +4,7 @@ module JsonApiClient
       extend ActiveSupport::Concern
 
       included do
-        class_attribute :initializers
+        class_attribute :initializers, instance_accessor: false
         self.initializers = []
       end
 
@@ -15,7 +15,7 @@ module JsonApiClient
       end
 
       def initialize(params = {})
-        initializers.each do |initializer|
+        self.class.initializers.each do |initializer|
           if initializer.respond_to?(:call)
             initializer.call(self, params)
           else

data/lib/json_api_client/helpers/linkable.rb

@@ -4,7 +4,7 @@ module JsonApiClient
       extend ActiveSupport::Concern
 
       included do
-        class_attribute :linker
+        class_attribute :linker, instance_accessor: false
         self.linker = Linking::Links
 
         # the links for this resource
@@ -13,7 +13,7 @@ module JsonApiClient
         initializer do |obj, params|
           links = params && params.delete("links")
           links ||= {}
-          obj.links = obj.linker.new(links)
+          obj.links = obj.class.linker.new(links)
         end
       end
 

data/lib/json_api_client/helpers/paginatable.rb

@@ -4,7 +4,7 @@ module JsonApiClient
       extend ActiveSupport::Concern
 
       included do
-        class_attribute :paginator
+        class_attribute :paginator, instance_accessor: false
         self.paginator = Paginating::Paginator
       end
 

data/lib/json_api_client/helpers/parsable.rb

@@ -4,7 +4,7 @@ module JsonApiClient
       extend ActiveSupport::Concern
 
       included do
-        class_attribute :parser
+        class_attribute :parser, instance_accessor: false
         self.parser = Parsers::Parser
       end
 

data/lib/json_api_client/helpers/queryable.rb

@@ -8,7 +8,7 @@ module JsonApiClient
           extend Forwardable
           def_delegators :new_scope, :where, :order, :includes, :select, :all, :paginate, :page, :first, :find
         end
-        class_attribute :connection_class, :connection_object, :connection_options, :query_builder
+        class_attribute :connection_class, :connection_object, :connection_options, :query_builder, instance_accessor: false
         self.connection_class = Connection
         self.connection_options = {}
         self.query_builder = Query::Builder

data/lib/json_api_client/helpers/relatable.rb

@@ -4,7 +4,7 @@ module JsonApiClient
       extend ActiveSupport::Concern
 
       included do
-        class_attribute :relationship_linker
+        class_attribute :relationship_linker, instance_accessor: false
         self.relationship_linker = Relationships::Relations
 
         # the relationships for this resource
@@ -13,7 +13,7 @@ module JsonApiClient
         initializer do |obj, params|
           relationships = params && params.delete("relationships")
           relationships ||= {}
-          obj.relationships = obj.relationship_linker.new(relationships)
+          obj.relationships = obj.class.relationship_linker.new(relationships)
         end
       end
 

data/lib/json_api_client/helpers/requestable.rb

@@ -5,7 +5,7 @@ module JsonApiClient
 
       included do
         attr_accessor :last_result_set, :errors
-        class_attribute :requestor_class
+        class_attribute :requestor_class, instance_accessor: false
         self.requestor_class = Query::Requestor
       end
 

data/lib/json_api_client/helpers/serializable.rb

@@ -1,22 +1,20 @@
 module JsonApiClient
   module Helpers
     module Serializable
-      RESERVED = ['id', 'type', 'links', 'meta', 'relationships']
+      extend ActiveSupport::Concern
 
-      # def as_json(options=nil)
-      #   attributes.slice(*RESERVED).tap do |h|
-      #     h['attributes'] = serialized_attributes
-      #   end
-      # end
-
-      def data
-        attributes.slice(*RESERVED).tap do |h|
-          h['attributes'] = serialized_attributes
-        end
+      included do
+        class_attribute :read_only_attributes, instance_accessor: false
+        self.read_only_attributes = ['id', 'type', 'links', 'meta', 'relationships']
       end
 
-      def serialized_attributes
-        attributes.except(*RESERVED)
+      def serializable_hash
+        attributes.slice('id', 'type').tap do |h|
+          relationships.serializable_hash.tap do |r|
+            h['relationships'] = r unless r.empty?
+          end
+          h['attributes'] = attributes.except(*self.class.read_only_attributes)
+        end
       end
 
     end

data/lib/json_api_client/included_data.rb

@@ -9,7 +9,7 @@ module JsonApiClient
         klass = Utils.compute_type(record_class, type.singularize.classify)
         h[type] = records.map do |datum|
           params = klass.parser.parameters_from_resource(datum)
-          resource = klass.new(params)
+          resource = klass.load(params)
           resource.result_set = result_set
           resource
         end.index_by(&:id)

data/lib/json_api_client/query/builder.rb

@@ -2,12 +2,13 @@ module JsonApiClient
   module Query
     class Builder
 
-      attr_reader :klass
+      attr_reader :klass, :path_params
 
       def initialize(klass)
         @klass = klass
         @primary_key = nil
         @pagination_params = {}
+        @path_params = {}
         @filters = {}
         @includes = []
         @orders = []
@@ -15,7 +16,9 @@ module JsonApiClient
       end
 
       def where(conditions = {})
-        @filters.merge!(conditions)
+        # pull out any path params here
+        @path_params.merge!(conditions.slice(*klass.prefix_params))
+        @filters.merge!(conditions.except(*klass.prefix_params))
         self
       end
 
@@ -66,6 +69,7 @@ module JsonApiClient
           .merge(order_params)
           .merge(select_params)
           .merge(primary_key_params)
+          .merge(path_params)
       end
 
       def to_a
@@ -90,6 +94,10 @@ module JsonApiClient
 
       private
 
+      def path_params
+        @path_params.empty? ? {} : {path: @path_params}
+      end
+
       def primary_key_params
         return {} unless @primary_key
 

data/lib/json_api_client/query/requestor.rb

@@ -10,13 +10,13 @@ module JsonApiClient
       # expects a record
       def create(record)
         request(:post, klass.path(record.attributes), {
-          data: record.data
+          data: record.serializable_hash
         })
       end
 
       def update(record)
         request(:patch, resource_path(record.attributes), {
-          data: record.data
+          data: record.serializable_hash
         })
       end
 

data/lib/json_api_client/relationships/relations.rb

@@ -11,6 +11,12 @@ module JsonApiClient
         attributes.present?
       end
 
+      def serializable_hash
+        Hash[attributes.map do |k, v|
+          [k, v.slice("data")]
+        end]
+      end
+
       protected
 
       def set_attribute(name, value)

data/lib/json_api_client/version.rb

@@ -1,3 +1,3 @@
 module JsonApiClient
-  VERSION = "1.0.0.beta3"
+  VERSION = "1.0.0.beta4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_api_client
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta3
+  version: 1.0.0.beta4
 platform: ruby
 authors:
 - Jeff Ching
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-08 00:00:00.000000000 Z
+date: 2015-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -171,9 +171,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Build client libraries compliant with specification defined by jsonapi.org
 test_files: []
-has_rdoc: