api-client 2.5.0 → 2.6.0

data/.travis.yml

@@ -1,10 +1,23 @@
-rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - jruby
-  - ree
-gemfile:
-  - gemfiles/Gemfile.net_http
-  - gemfiles/Gemfile.typhoeus
+matrix:
+  include:
+    - rvm: 1.8.7
+      gemfile: gemfiles/Gemfile.net_http_mime-types
+    - rvm: 1.8.7
+      gemfile: gemfiles/Gemfile.typhoeus_mime-types
+    - rvm: 1.9.2
+      gemfile: gemfiles/Gemfile.net_http
+    - rvm: 1.9.2
+      gemfile: gemfiles/Gemfile.typhoeus
+    - rvm: 1.9.3
+      gemfile: gemfiles/Gemfile.net_http
+    - rvm: 1.9.3
+      gemfile: gemfiles/Gemfile.typhoeus
+    - rvm: jruby
+      gemfile: gemfiles/Gemfile.net_http
+    - rvm: jruby
+      gemfile: gemfiles/Gemfile.typhoeus
+    - rvm: ree
+      gemfile: gemfiles/Gemfile.net_http_mime-types
+    - rvm: ree
+      gemfile: gemfiles/Gemfile.typhoeus_mime-types
 install: bundle install --without developer

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## v2.5.0
+
+* Add support for parallel requests. Yay! =)
+
 ## v2.4.0
 
 * Add support to multiple api entry points.

data/README.md

@@ -177,7 +177,6 @@ end
 ## Mantainers
 [@plribeiro3000](https://github.com/plribeiro3000)
 
-
 ## Contributing
 
 1. Fork it

data/gemfiles/Gemfile.net_http_mime-types

@@ -0,0 +1,6 @@
+source :rubygems
+
+gem 'activesupport', '>= 3.0', '< 4'
+gem 'mime-types', '< 2.0'
+
+gemspec :path => '../'

data/gemfiles/Gemfile.typhoeus

@@ -1,6 +1,6 @@
 source :rubygems
 
-gem 'typhoeus'
+gem 'typhoeus', '>= 0.5.0'
 
 gem 'activesupport', '>= 3.0', '< 4'
 

data/gemfiles/Gemfile.typhoeus_mime-types

@@ -0,0 +1,7 @@
+source :rubygems
+
+gem 'typhoeus', '>= 0.5.0'
+gem 'mime-types', '< 2.0'
+gem 'activesupport', '>= 3.0', '< 4'
+
+gemspec :path => '../'

data/lib/api-client/collection.rb

@@ -2,32 +2,44 @@
 class ApiClient::Collection < Array
   # Initialize a collection of objects based on attributes.
   #
-  # @param [String] attributes the array of attributes.
+  # @param [Hash/Array] the hash or array of attributes.
   # @param [Class] klass The class to instantiate the objects.
   # @return [Collection] the collection of objects.
   def initialize(attributes, klass)
     @klass = klass
-    if attributes.instance_of?(Array)
-      attributes.each do |attr|
-        self << @klass.new(attr)
-      end
-    else
-      self << @klass.new(attributes)
-    end
+    update(attributes)
   end
 
   # Update the collection of objects based on the new attributes.
   #
-  # @param [String] attributes the array of attributes.
+  # @param [Hash/Array] the hash or array of attributes.
   # @return [Collection] the collection of objects.
   def update(attributes)
     self.clear
+    @response = attributes
     if attributes.instance_of?(Array)
       attributes.each do |attr|
         self << @klass.new(attr)
       end
+    elsif attributes[@klass.name.pluralize.downcase].instance_of?(Array)
+      attributes = pagination_attributes(attributes)
+      attributes[@klass.name.pluralize.downcase].each do |attr|
+        self << @klass.new(attr)
+      end
     else
       self << @klass.new(attributes)
     end
   end
+
+  # Initialize some variables based on attributes.
+  #
+  # @param [Hash] the hash of attributes.
+  # @return [Hash] the hash of attributes without pagination attributes.
+  def pagination_attributes(attributes)
+    @total = attributes.delete("total")
+    @total_pages = attributes.delete("total_pages")
+    @offset = attributes.delete("offset")
+    @_links = attributes.delete("_links")
+    attributes
+  end
 end

data/lib/api-client/version.rb

@@ -1,5 +1,5 @@
 # High Level Namespace of the library ApiClient.
 module ApiClient
   # Version of the library.
-  VERSION = '2.5.0'
+  VERSION = '2.6.0'
 end

data/spec/api-client/collection_spec.rb

@@ -8,6 +8,17 @@ describe ApiClient::Collection do
       ApiClient::Collection.new([], User).instance_variable_get('@klass').should == User
     end
 
+    context 'with a hash of attributes' do
+      before :each do
+        attributes =  { 'users' => [ { :user => { :a => 'a' } }, { :user => { :b => 'b' } } ] }
+        @collection = ApiClient::Collection.new(attributes, User)
+      end
+
+      it 'should initialize a collection of objects' do
+        @collection.size.should == 2
+      end
+    end
+
     context 'with a collection of attributes' do
       before :each do
         attributes = [ { :user => { :a => 'a' } }, { :user => { :b => 'b' } } ]
@@ -36,6 +47,13 @@ describe ApiClient::Collection do
       attributes = [ { :user => { :a => 'a' } }, { :user => { :b => 'b' } } ]
       @collection = ApiClient::Collection.new(attributes, User)
     end
+
+    context 'with a hash of attributes' do
+      it 'Should update the collection with new objects based on the attributes' do
+        @collection.update({ 'users' => [ { :user => { :a => 'a' } }, { :user => { :b => 'b' } } ] }).size.should == 2
+      end
+    end
+
     context 'with a collection of attributes' do
       it 'Should update the collection with new objects based on the attributes' do
         @collection.update([ { :user => { :a => 'a' } }, { :user => { :b => 'b' } } ]).size.should == 2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api-client
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -151,7 +151,9 @@ files:
 - examples/models/user.rb
 - examples/scripts/example.rb
 - gemfiles/Gemfile.net_http
+- gemfiles/Gemfile.net_http_mime-types
 - gemfiles/Gemfile.typhoeus
+- gemfiles/Gemfile.typhoeus_mime-types
 - lib/api-client.rb
 - lib/api-client/base.rb
 - lib/api-client/class_methods.rb
@@ -202,7 +204,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4058944769664013271
+      hash: 2568135155809841734
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -211,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4058944769664013271
+      hash: 2568135155809841734
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -230,7 +232,9 @@ test_files:
 - examples/models/user.rb
 - examples/scripts/example.rb
 - gemfiles/Gemfile.net_http
+- gemfiles/Gemfile.net_http_mime-types
 - gemfiles/Gemfile.typhoeus
+- gemfiles/Gemfile.typhoeus_mime-types
 - spec/api-client/base_spec.rb
 - spec/api-client/class_methods_spec.rb
 - spec/api-client/collection_spec.rb