json_api_client 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8e9a53aa57c72df6c4dc78894649007649a0324
-  data.tar.gz: 354fdef483cc69ca4b46d86604c4a8b3115c1e2b
+  metadata.gz: 12b14973ffe9a4a87d4981a8b56d0817e65c8816
+  data.tar.gz: 975fa606cb2b0bea5af663ed098ad45990327efe
 SHA512:
-  metadata.gz: 8bf7d6c2a780c673c66f9b976a5005a511d97b07388285713c0f22aca574166d9e21674b556bb3cc92208938cd6d6c54dd3ee5746ad061ee92b406cf62a62978
-  data.tar.gz: b6bfb230fbb8f55562edd4f4c66acf4443c4539e4f1c4802e180ba519a5df91dca8d59125629a68ad4d0469a8745453bb08e2874a72911f9bfa5f79d037ce407
+  metadata.gz: 6b51a687c23ea5a3f4bfddb16c621724d9e41870567c4386a68db8d0486c6003118a83fb657fab6b3a19699c093db0e951a7f2dffdc22b30f893ca916f482610
+  data.tar.gz: c6d1d89ccae79e4c9a17f861eb98f1a7030ee3d816304680d84ae17c7ed8b594b271a3378644b2b0816549e89354d875622468842dfcd4b54d1e3f44d8aa0c8e

data/lib/json_api_client/parser.rb

@@ -5,6 +5,7 @@ module JsonApiClient
       def parse(klass, response)
         data = response.body
         ResultSet.build(klass, data) do |result_set|
+          handle_meta(result_set, data)
           handle_pagination(result_set, data)
           handle_links(result_set, data)
           handle_errors(result_set, data)
@@ -13,23 +14,26 @@ module JsonApiClient
 
       private
 
+      def handle_meta(result_set, data)
+        result_set.meta = data.fetch("meta", {})
+      end
+
       def handle_pagination(result_set, data)
-        meta = data.fetch("meta", {})
-        result_set.per_page = meta.fetch("per_page") do
+        result_set.per_page = result_set.meta.fetch("per_page") do
           result_set.length
         end
-        result_set.total_entries = meta.fetch("total_entries") do
+        result_set.total_entries = result_set.meta.fetch("total_entries") do
           result_set.length
         end
-        result_set.current_page = meta.fetch("current_page", 1)
+        result_set.current_page = result_set.meta.fetch("current_page", 1)
 
         # can fall back to calculating via total entries and per_page
-        result_set.total_pages = meta.fetch("total_pages") do
+        result_set.total_pages = result_set.meta.fetch("total_pages") do
           (1.0 * result_set.total_entries / result_set.per_page).ceil rescue 1
         end
 
         # can fall back to calculating via per_page and current_page
-        result_set.offset = meta.fetch("offset") do
+        result_set.offset = result_set.meta.fetch("offset") do
           result_set.per_page * (result_set.current_page - 1)
         end
       end
@@ -49,9 +53,9 @@ module JsonApiClient
       end
 
       def handle_errors(result_set, data)
-        result_set.errors = data.fetch("meta", {}).fetch("errors", [])
+        result_set.errors = result_set.meta.fetch("errors", [])
       end
     end
 
   end
-end
+end

data/lib/json_api_client/query/base.rb

@@ -23,9 +23,9 @@ module JsonApiClient
       end
 
       def inspect
-        "method: #{request_method}; path: #{path}; params: #{params}, headers: #{headers}"
+        "#{self.class.name}: method: #{request_method}; path: #{path}; params: #{params}, headers: #{headers}"
       end
 
     end
   end
-end
+end

data/lib/json_api_client/resource.rb

@@ -56,6 +56,8 @@ module JsonApiClient
     include Helpers::CustomEndpoints
     include Helpers::Schemable
 
+    attr_reader :last_request_meta
+
     def save
       query = persisted? ? 
         Query::Update.new(self.class, attributes) :
@@ -78,9 +80,10 @@ module JsonApiClient
     def run_request(query)
       # reset errors if a new request is being made
       self.errors.clear if self.errors
-      
+
       result = self.class.run_request(query)
       self.errors = result.errors
+      @last_request_meta = result.meta
       if result.has_errors?
         return false
       else
@@ -92,4 +95,4 @@ module JsonApiClient
     end
 
   end
-end
+end

data/lib/json_api_client/result_set.rb

@@ -7,7 +7,8 @@ module JsonApiClient
                   :per_page,
                   :current_page,
                   :errors,
-                  :record_class
+                  :record_class,
+                  :meta
     alias_attribute :limit_value, :per_page
 
     def self.build(klass, data)

data/lib/json_api_client/version.rb

@@ -1,3 +1,3 @@
 module JsonApiClient
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_api_client
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Jeff Ching
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport