json_api_client 0.0.3 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5db14498ef10dc6d6aaa4bcb65b0a6c5bdcb300
-  data.tar.gz: 75c000bfceb5104a78ab2929f0c160254ce129e5
+  metadata.gz: 55c6437405ac925859c235fc1c28899da18f54b2
+  data.tar.gz: abfb9a165a77775fc473128713443599a75b6821
 SHA512:
-  metadata.gz: f5eae53897bbd0f37a524e979b3c81374ba74607ee4f8e3594d6c581230ad4cca41fb9b355d306ca7da6ef222e9af37613c19e9b4856545908f66a28a16dde2c
-  data.tar.gz: de3bcf1db477b01d2f89bd9744b5c94eeb7bdd1644752335f44ea667e9b6c0c0ccca3e042a54e6a3e540cb4c1ed63db41c1caa5f2d1ab4232c84eff8350be4fa
+  metadata.gz: 1d6599831ca8fe60b51f2f1012549ea816aa7cfb04ee372c2a4e0a0a7810c04881e9d83e6da8e51f1383d4fb8e558110df0d0ebea4c9113b0421bd02ac148e89
+  data.tar.gz: 9d7cd4619f496614c8f29bf1913afef270a314c567c571fa229d4c6b0982b6a2313a31bdbba10a3a2d21a595f121150d6f4dcd2e00738934eb95738d292635ee

data/lib/json_api_client.rb

@@ -7,6 +7,7 @@ module JsonApiClient
   autoload :Attributes, 'json_api_client/attributes'
   autoload :Connection, 'json_api_client/connection'
   autoload :Errors, 'json_api_client/errors'
+  autoload :Helpers, 'json_api_client/helpers'
   autoload :Links, 'json_api_client/links'
   autoload :Middleware, 'json_api_client/middleware'
   autoload :Parser, 'json_api_client/parser'

data/lib/json_api_client/associations.rb

@@ -4,60 +4,5 @@ module JsonApiClient
     autoload :BelongsTo, 'json_api_client/associations/belongs_to'
     autoload :HasMany, 'json_api_client/associations/has_many'
     autoload :HasOne, 'json_api_client/associations/has_one'
-
-    extend ActiveSupport::Concern
-
-    included do
-      class_attribute :associations
-      self.associations = []
-
-      include BelongsTo
-      include HasMany
-      include HasOne
-
-      initialize :load_associations
-    end
-
-    module ClassMethods
-      def belongs_to_associations
-        associations.select{|association| association.is_a?(BelongsTo::Association) }
-      end
-
-      def prefix_params
-        belongs_to_associations.map(&:param)
-      end
-
-      def prefix_path
-        belongs_to_associations.map(&:to_prefix_path).join("/")
-      end
-
-      def path(params = nil)
-        parts = [table_name]
-        if params
-          slurp = params.slice(*prefix_params)
-          prefix_params.each do |param|
-            params.delete(param)
-          end
-          parts.unshift(prefix_path % slurp)
-        else
-          parts.unshift(prefix_path)
-        end
-        parts.reject!{|part| part == "" }
-        File.join(*parts)
-      rescue KeyError
-        raise ArgumentError, "Not all prefix parameters specified"
-      end
-    end
-
-    protected
-
-    def load_associations(params)
-      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
-      end
-    end
-
   end
 end

data/lib/json_api_client/helpers.rb

@@ -0,0 +1,11 @@
+module JsonApiClient
+  module Helpers
+    autoload :Associable, 'json_api_client/helpers/associable'
+    autoload :Attributable, 'json_api_client/helpers/attributable'
+    autoload :Initializable, 'json_api_client/helpers/initializable'
+    autoload :Linkable, 'json_api_client/helpers/linkable'
+    autoload :Parsable, 'json_api_client/helpers/parsable'
+    autoload :Queryable, 'json_api_client/helpers/queryable'
+    autoload :Serializable, 'json_api_client/helpers/serializable'
+  end
+end

data/lib/json_api_client/helpers/associable.rb

@@ -0,0 +1,60 @@
+module JsonApiClient
+  module Helpers
+    module Associable
+      extend ActiveSupport::Concern
+
+      included do
+        class_attribute :associations
+        self.associations = []
+
+        include Associations::BelongsTo
+        include Associations::HasMany
+        include Associations::HasOne
+
+        initializer :load_associations
+      end
+
+      module ClassMethods
+        def belongs_to_associations
+          associations.select{|association| association.is_a?(Associations::BelongsTo::Association) }
+        end
+
+        def prefix_params
+          belongs_to_associations.map(&:param)
+        end
+
+        def prefix_path
+          belongs_to_associations.map(&:to_prefix_path).join("/")
+        end
+
+        def path(params = nil)
+          parts = [table_name]
+          if params
+            slurp = params.slice(*prefix_params)
+            prefix_params.each do |param|
+              params.delete(param)
+            end
+            parts.unshift(prefix_path % slurp)
+          else
+            parts.unshift(prefix_path)
+          end
+          parts.reject!{|part| part == "" }
+          File.join(*parts)
+        rescue KeyError
+          raise ArgumentError, "Not all prefix parameters specified"
+        end
+      end
+
+      protected
+
+      def load_associations(params)
+        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
+        end
+      end
+
+    end
+  end
+end

data/lib/json_api_client/helpers/attributable.rb

@@ -0,0 +1,62 @@
+module JsonApiClient
+  module Helpers
+    module Attributable
+      extend ActiveSupport::Concern
+
+      included do
+        attr_reader :attributes
+        attr_accessor :errors
+        initializer do |obj, params|
+          obj.attributes = params
+        end
+      end
+
+      def attributes=(attrs = {})
+        @attributes ||= {}.with_indifferent_access
+        @attributes.merge!(attrs)
+      end
+
+      def update_attributes(attrs = {})
+        self.attributes = attrs
+        save
+      end
+
+      def method_missing(method, *args, &block)
+        if match = method.to_s.match(/^(.*)=$/)
+          set_attribute(match[1], args.first)
+        elsif has_attribute?(method)
+          attributes[method]
+        else
+          super
+        end
+      end
+
+      def persisted?
+        attributes.has_key?(primary_key)
+      end
+
+      def query_params
+        attributes.except(primary_key)
+      end
+
+      def to_param
+        attributes.fetch(primary_key, "").to_s
+      end
+
+      protected
+
+      def read_attribute(name)
+        attributes.fetch(name, nil)
+      end
+
+      def set_attribute(name, value)
+        attributes[name] = value
+      end
+
+      def has_attribute?(attr_name)
+        attributes.has_key?(attr_name)
+      end
+
+    end
+  end
+end

data/lib/json_api_client/helpers/initializable.rb

@@ -0,0 +1,28 @@
+module JsonApiClient
+  module Helpers
+    module Initializable
+      extend ActiveSupport::Concern
+
+      included do
+        class_attribute :initializers
+        self.initializers = []
+      end
+
+      module ClassMethods
+        def initializer(method = nil, &block)
+          self.initializers.push(method || block)
+        end
+      end
+
+      def initialize(params = {})
+        initializers.each do |initializer|
+          if initializer.respond_to?(:call)
+            initializer.call(self, params)
+          else
+            self.send(initializer, params)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/json_api_client/helpers/linkable.rb

@@ -0,0 +1,16 @@
+module JsonApiClient
+  module Helpers
+    module Linkable
+      extend ActiveSupport::Concern
+
+      included do
+        attr_accessor :links
+
+        initializer do |obj, params|
+          links = params.delete(:links)
+          obj.links = links if links
+        end
+      end
+    end
+  end
+end

data/lib/json_api_client/helpers/parsable.rb

@@ -0,0 +1,19 @@
+module JsonApiClient
+  module Helpers
+    module Parsable
+      extend ActiveSupport::Concern
+
+      included do
+        class_attribute :parser
+        self.parser = Parser
+      end
+
+      module ClassMethods
+        def parse(data)
+          parser.parse(self, data)
+        end
+      end
+
+    end
+  end
+end

data/lib/json_api_client/helpers/queryable.rb

@@ -0,0 +1,39 @@
+module JsonApiClient
+  module Helpers
+    module Queryable
+      extend ActiveSupport::Concern
+
+      included do
+        class << self
+          extend Forwardable
+          def_delegators :new_scope, :where, :order, :includes, :all, :paginate, :page, :first
+        end
+      end
+
+      module ClassMethods
+        def new_scope
+          Scope.new(self)
+        end
+
+        def connection
+          @connection ||= begin
+            super
+          rescue
+            build_connection
+          end
+          yield(@connection) if block_given?
+          @connection
+        end
+
+        def build_connection
+          connection_class.new(site)
+        end
+
+        def connection_class
+          Connection
+        end
+      end
+
+    end
+  end
+end

data/lib/json_api_client/helpers/serializable.rb

@@ -0,0 +1,13 @@
+module JsonApiClient
+  module Helpers
+    module Serializable
+      def as_json
+        attributes
+      end
+
+      def read_attribute_for_serialization(name)
+        read_attribute(name)
+      end
+    end
+  end
+end

data/lib/json_api_client/resource.rb

@@ -6,19 +6,13 @@ require 'active_support/core_ext/class/attribute'
 
 module JsonApiClient
   class Resource
-    class_attribute :site, :primary_key, :link_style, :default_headers, :initializers, :parser
+    class_attribute :site, :primary_key, :link_style, :default_headers
 
     self.primary_key = :id
     self.link_style = :id # or :url
     self.default_headers = {}
-    self.initializers = []
-    self.parser = Parser
 
     class << self
-      # first 'scope' should build a new scope object
-      extend Forwardable
-      def_delegators :new_scope, :where, :order, :includes, :all, :paginate, :page, :first
-
       # base URL for this resource
       def resource
         File.join(site, path)
@@ -42,53 +36,18 @@ module JsonApiClient
         result.first
       end
 
-      def connection
-        @connection ||= begin
-          super
-        rescue
-          build_connection
-        end
-        yield(@connection) if block_given?
-        @connection
-      end
-
       def run_request(query)
         parse(connection.execute(query))
       end
-
-      private
-
-      def new_scope
-        Scope.new(self)
-      end
-
-      def parse(data)
-        parser.parse(self, data)
-      end
-
-      def build_connection
-        Connection.new(site)
-      end
-
-      def initialize(method = nil, &block)
-        self.initializers.push(method || block)
-      end
     end
 
-    include Attributes
-    include Associations
-    include Links
-
-    attr_accessor :errors
-    def initialize(params = {})
-      initializers.each do |initializer|
-        if initializer.respond_to?(:call)
-          initializer.call(self, params)
-        else
-          self.send(initializer, params)
-        end
-      end
-    end
+    include Helpers::Initializable
+    include Helpers::Attributable
+    include Helpers::Associable
+    include Helpers::Parsable
+    include Helpers::Queryable
+    include Helpers::Serializable
+    include Helpers::Linkable
 
     def save
       query = persisted? ? 

data/lib/json_api_client/version.rb

@@ -1,3 +1,3 @@
 module JsonApiClient
-  VERSION = "0.0.3"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: json_api_client
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.1
 platform: ruby
 authors:
 - Jeff Ching
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Build client libraries compliant with specification defined by jsonapi.org
@@ -72,34 +72,40 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
+- Rakefile
+- lib/json_api_client.rb
+- lib/json_api_client/associations.rb
 - lib/json_api_client/associations/base_association.rb
 - lib/json_api_client/associations/belongs_to.rb
 - lib/json_api_client/associations/has_many.rb
 - lib/json_api_client/associations/has_one.rb
-- lib/json_api_client/associations.rb
-- lib/json_api_client/attributes.rb
 - lib/json_api_client/connection.rb
 - lib/json_api_client/errors.rb
-- lib/json_api_client/links.rb
+- lib/json_api_client/helpers.rb
+- lib/json_api_client/helpers/associable.rb
+- lib/json_api_client/helpers/attributable.rb
+- lib/json_api_client/helpers/initializable.rb
+- lib/json_api_client/helpers/linkable.rb
+- lib/json_api_client/helpers/parsable.rb
+- lib/json_api_client/helpers/queryable.rb
+- lib/json_api_client/helpers/serializable.rb
+- lib/json_api_client/middleware.rb
 - lib/json_api_client/middleware/json_request.rb
 - lib/json_api_client/middleware/status.rb
-- lib/json_api_client/middleware.rb
 - lib/json_api_client/parser.rb
+- lib/json_api_client/query.rb
 - lib/json_api_client/query/base.rb
 - lib/json_api_client/query/create.rb
 - lib/json_api_client/query/destroy.rb
 - lib/json_api_client/query/find.rb
 - lib/json_api_client/query/update.rb
-- lib/json_api_client/query.rb
 - lib/json_api_client/resource.rb
 - lib/json_api_client/result_set.rb
 - lib/json_api_client/scope.rb
 - lib/json_api_client/utils.rb
 - lib/json_api_client/version.rb
-- lib/json_api_client.rb
-- LICENSE
-- Rakefile
-- README.md
 homepage: http://github.com/chingor13/json_api_client
 licenses:
 - MIT
@@ -110,17 +116,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Build client libraries compliant with specification defined by jsonapi.org

data/lib/json_api_client/attributes.rb

@@ -1,59 +0,0 @@
-module JsonApiClient
-  module Attributes
-    extend ActiveSupport::Concern
-
-    included do
-      attr_reader :attributes
-      initialize do |obj, params|
-        obj.attributes = params
-      end
-    end
-
-    def attributes=(attrs = {})
-      @attributes ||= {}.with_indifferent_access
-      @attributes.merge!(attrs)
-    end
-
-    def update_attributes(attrs = {})
-      self.attributes = attrs
-      save
-    end
-
-    def method_missing(method, *args, &block)
-      if match = method.to_s.match(/^(.*)=$/)
-        set_attribute(match[1], args.first)
-      elsif has_attribute?(method)
-        attributes[method]
-      else
-        nil
-      end
-    end
-
-    def persisted?
-      attributes.has_key?(primary_key)
-    end
-
-    def query_params
-      attributes.except(primary_key)
-    end
-
-    def to_param
-      attributes.fetch(primary_key, "").to_s
-    end
-
-    protected
-
-    def read_attribute(name)
-      attributes.fetch(name, nil)
-    end
-
-    def set_attribute(name, value)
-      attributes[name] = value
-    end
-
-    def has_attribute?(attr_name)
-      attributes.has_key?(attr_name)
-    end
-
-  end
-end

data/lib/json_api_client/links.rb

@@ -1,14 +0,0 @@
-module JsonApiClient
-  module Links
-    extend ActiveSupport::Concern
-
-    included do
-      attr_accessor :links
-
-      initialize do |obj, params|
-        links = params.delete(:links)
-        obj.links = links if links
-      end
-    end
-  end
-end