acfs 0.43.1 → 0.43.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b273e1b3c19b7b27fdbea33867f442ec33ada319
-  data.tar.gz: cd853ac93c6276d23cae140d860bf563ba62159b
+  metadata.gz: bb6beef716e78e480aedddca7a82b3038c2cdb66
+  data.tar.gz: 594fabd1f7d3367a69585b5c57756769543ffbf0
 SHA512:
-  metadata.gz: a73b486b0685757f0f5495f9cd358978a6702f78805c5ceeb354aa3e7da086bdae2b4fe0f11a664cb8c1ed753aeb50b7a9bfe4f2cac47b14241f33f883d31ba2
-  data.tar.gz: 088703ae6692aab3666106c6bd3afcdda44fa37676e4351842e32a1b1777a29fff31daf1b2f0c05c03fe0a6d85d12058aedd87a17710530a28c30b117231c8b6
+  metadata.gz: d8e27c7c86a770e016c1ea57f7f1a38b08e8ab77fa2cc3f6b13dcd8c2abb5c2bbcf32e4c85c4ddd5da05a724e736d16a80b554a834fc77e886284e5141c79e6c
+  data.tar.gz: 47fc747abc4dcec91a32804c8d6618da3062361ac70bde1ee8f228516e62b3122fd0ee5f930acbe66df7ec06c3a8e9d424cd7df1266b7c2f8ff848496d92663b

data/lib/acfs/collections/paginatable.rb

@@ -8,7 +8,7 @@ module Acfs::Collections
         opts[:url]
       end
 
-      attr_reader :total_pages, :current_page
+      attr_reader :total_pages, :current_page, :total_count
     end
 
     def process_response(response)
@@ -49,6 +49,10 @@ module Acfs::Collections
         @total_pages = Integer(headers['X-Total-Pages'])
       end
 
+      if headers['X-Total-Count']
+        @total_count = Integer(headers['X-Total-Count'])
+      end
+
       setup_links headers['Link'] if headers['Link']
     end
 

data/lib/acfs/errors.rb

@@ -46,10 +46,13 @@ module Acfs
     attr_reader :stubs, :operation
 
     def initialize(opts = {})
+      require 'pp'
+
       @stubs     = opts.delete :stubs
       @operation = opts.delete :operation
 
-      super opts, 'Ambiguous stubs.'
+      super opts, "Ambiguous stubs for #{operation.action} on #{operation.resource}.\n" +
+        stubs.map {|s| "  #{s.opts.pretty_inspect}" }.join
     end
   end
 
@@ -97,7 +100,7 @@ module Acfs
     def initialize(opts = {})
       @base_class    = opts.delete :base_class
       @type_name     = opts.delete :type_name
-      opts[:message] = "Recieved ressource type `#{type_name}` is no subclass of #{base_class}"
+      opts[:message] = "Received resource type `#{type_name}` is no subclass of #{base_class}"
       super
     end
   end

data/lib/acfs/resource/attributes/integer.rb

@@ -17,7 +17,11 @@ module Acfs::Resource::Attributes
     # @return [Fixnum] Casted object as fixnum.
     #
     def cast_type(obj)
+      return 0 if obj == ''
+
       Integer obj
+    rescue ArgumentError => e
+      raise TypeError.new e.message
     end
   end
 end

data/lib/acfs/resource/query_methods.rb

@@ -137,7 +137,7 @@ class Acfs::Resource
       def find_by!(params, &block)
         find_by params do |m|
           if m.nil?
-            raise Acfs::ResourceNotFound.new message: 'Recieved erronious ' \
+            raise Acfs::ResourceNotFound.new message: 'Received erroneous ' \
               "response: no `#{name}` with params #{params} found"
           end
           block.call m unless block.nil?

data/lib/acfs/version.rb

@@ -2,7 +2,7 @@ module Acfs
   module VERSION
     MAJOR = 0
     MINOR = 43
-    PATCH = 1
+    PATCH = 2
     STAGE = nil
 
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')

data/spec/acfs/collection_spec.rb

@@ -13,11 +13,15 @@ describe Acfs::Collection do
       before do
         stub_request(:get, 'http://users.example.org/users')
           .to_return response([{id: 1, name: 'Anon', age: 12, born_at: 'Berlin'}],
-            headers: {'X-Total-Pages' => '2'})
+            headers: {
+              'X-Total-Pages' => '2',
+              'X-Total-Count' => '10'
+            })
       end
 
       its(:total_pages) { should eq 2 }
       its(:current_page) { should eq 1 }
+      its(:total_count) { should eq 10 }
     end
 
     context 'with page parameter' do
@@ -25,11 +29,15 @@ describe Acfs::Collection do
       before do
         stub_request(:get, 'http://users.example.org/users?page=2')
           .to_return response([{id: 1, name: 'Anon', age: 12, born_at: 'Berlin'}],
-            headers: {'X-Total-Pages' => '2'})
+            headers: {
+              'X-Total-Pages' => '2',
+              'X-Total-Count' => '10'
+            })
       end
 
       its(:total_pages) { should eq 2 }
       its(:current_page) { should eq 2 }
+      its(:total_count) { should eq 10 }
     end
 
     context 'with non-numerical page parameter' do
@@ -37,11 +45,15 @@ describe Acfs::Collection do
       before do
         stub_request(:get, 'http://users.example.org/users?page=e546f5')
           .to_return response([{id: 1, name: 'Anon', age: 12, born_at: 'Berlin'}],
-            headers: {'X-Total-Pages' => '2'})
+            headers: {
+              'X-Total-Pages' => '2',
+              'X-Total-Count' => '10'
+            })
       end
 
       its(:total_pages) { should eq 2 }
       its(:current_page) { should eq 'e546f5' }
+      its(:total_count) { should eq 10 }
     end
 
     describe '#next_page' do

data/spec/acfs/resource/attributes/integer_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Acfs::Resource::Attributes::Integer do
+  subject { Acfs::Resource::Attributes::Integer.new }
+
+  describe 'cast' do
+    it 'should cast integer strings' do
+      expect(subject.cast('123')).to eq 123
+    end
+
+    it 'should cast empty string (backward compatibility)' do
+      expect(subject.cast('')).to eq 0
+    end
+
+    it 'should not cast invalid integers' do
+      expect { subject.cast 'abc' }.to raise_error TypeError
+    end
+  end
+end

data/spec/acfs/stub_spec.rb

@@ -163,10 +163,16 @@ describe Acfs::Stub do
         end
 
         let!(:comments) { Comment.all }
-        let(:headers) { {'X-Total-Pages' => '2'} }
+        let(:headers) do
+          {
+            'X-Total-Pages' => '2',
+            'X-Total-Count' => '10'
+          }
+        end
         subject { Acfs.run; comments }
 
         its(:total_pages) { should eq 2 }
+        its(:total_count) { should eq 10 }
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acfs
 version: !ruby/object:Gem::Version
-  version: 0.43.1
+  version: 0.43.2
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -182,6 +182,7 @@ files:
 - spec/acfs/resource/attributes/date_time_spec.rb
 - spec/acfs/resource/attributes/dict_spec.rb
 - spec/acfs/resource/attributes/float_spec.rb
+- spec/acfs/resource/attributes/integer_spec.rb
 - spec/acfs/resource/attributes/list_spec.rb
 - spec/acfs/resource/attributes/uuid_spec.rb
 - spec/acfs/resource/attributes_spec.rb
@@ -226,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: An abstract API base client for service oriented application.
@@ -244,6 +245,7 @@ test_files:
 - spec/acfs/resource/attributes/date_time_spec.rb
 - spec/acfs/resource/attributes/dict_spec.rb
 - spec/acfs/resource/attributes/float_spec.rb
+- spec/acfs/resource/attributes/integer_spec.rb
 - spec/acfs/resource/attributes/list_spec.rb
 - spec/acfs/resource/attributes/uuid_spec.rb
 - spec/acfs/resource/attributes_spec.rb