json_api_client 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e195eadd40239f5f99664964d3a590391dec380
-  data.tar.gz: e5f3c9c5a20df353acff52f8443cad0dc672fcb6
+  metadata.gz: 03f3ebad69192424dfef02c6b9e285ed0b9d9b6c
+  data.tar.gz: c2964f6af0ef14bc87785e66608040de04f9aef3
 SHA512:
-  metadata.gz: 2b806a5c622f8c170952b61cdc9c4d9283710fa9afcfef03e4c41e47809c492b22b00fdc6870f3236306186fd3af8c47691c623ae8cb813e917cd28e6646db4b
-  data.tar.gz: a695a07000cd0302a97b1990b29f6b3e837052e7ed1a0f28fb6b57c22425f65213c455ea146fb8b2254ce62348f002ec56f77ae63208ccec609457f4bb95918b
+  metadata.gz: a293d1e82116f8021b31b0f3174a11fd8ae91d5a28268c279ff6ee5958b5b88c286381f6db692cfb09aa123e06d2390db87d351aa92eda953e71f8c4df80d317
+  data.tar.gz: eb601756c170737bdd82cd05653661d1fa716227947a6f84bb22c77af79b231a38755c363aefdfc6e8cdd5743de7bff18cf16d05223d2c929e61ddbba96f63d5

data/lib/json_api_client/connection.rb

@@ -3,7 +3,8 @@ module JsonApiClient
 
     attr_reader :faraday
 
-    def initialize(site)
+    def initialize(options = {})
+      site = options.fetch(:site)
       @faraday = Faraday.new(site) do |builder|
         builder.request :url_encoded
         builder.use Middleware::JsonRequest
@@ -17,6 +18,7 @@ module JsonApiClient
     # insert middleware before ParseJson - middleware executed in reverse order - 
     #   inserted middleware will run after json parsed
     def use(middleware, *args, &block)
+      return if faraday.builder.locked?
       faraday.builder.insert_before(Middleware::ParseJson, middleware, *args, &block)
     end
 

data/lib/json_api_client/helpers/attributable.rb

@@ -21,16 +21,6 @@ module JsonApiClient
         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
@@ -43,8 +33,26 @@ module JsonApiClient
         attributes.fetch(primary_key, "").to_s
       end
 
+      def respond_to?(method, include_private = false)
+        if (method.to_s =~ /^(.*)=$/) || has_attribute?(method)
+          true
+        else
+          super
+        end
+      end
+
       protected
 
+      def method_missing(method, *args, &block)
+        if method.to_s =~ /^(.*)=$/
+          set_attribute($1, args.first)
+        elsif has_attribute?(method)
+          attributes[method]
+        else
+          super
+        end
+      end
+
       def read_attribute(name)
         attributes.fetch(name, nil)
       end
@@ -59,4 +67,4 @@ module JsonApiClient
 
     end
   end
-end
+end

data/lib/json_api_client/helpers/queryable.rb

@@ -8,8 +8,9 @@ module JsonApiClient
           extend Forwardable
           def_delegators :new_scope, :where, :order, :includes, :all, :paginate, :page, :first
         end
-        class_attribute :connection_class
+        class_attribute :connection_class, :connection_object, :connection_options
         self.connection_class = Connection
+        self.connection_options = {}
       end
 
       module ClassMethods
@@ -17,18 +18,16 @@ module JsonApiClient
           Scope.new(self)
         end
 
-        def connection
-          @connection ||= begin
-            super
-          rescue
-            build_connection
-          end
-          yield(@connection) if block_given?
-          @connection
+        def connection(&block)
+          build_connection(&block)
+          connection_object
         end
 
         def build_connection
-          connection_class.new(site)
+          return connection_object unless connection_object.nil?
+          self.connection_object = connection_class.new(connection_options.merge(site: site)).tap do |conn|
+            yield(conn) if block_given?
+          end
         end
       end
 

data/lib/json_api_client/version.rb

@@ -1,3 +1,3 @@
 module JsonApiClient
-  VERSION = "0.2.4"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_api_client
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Jeff Ching
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport