api-client 2.4.0 → 2.5.0.rc1

data/.travis.yml

@@ -6,4 +6,5 @@ rvm:
   - ree
 gemfile:
   - gemfiles/Gemfile.net_http
-  - gemfiles/Gemfile.typhoeus
+  - gemfiles/Gemfile.typhoeus
+install: bundle install --without developer

data/Gemfile

@@ -1,4 +1,10 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in api-client.gemspec
-gemspec
+gemspec
+
+group :developer do
+  gem 'redcarpet'
+  gem 'pry'
+  gem 'pry-debugger'
+end

data/README.md

@@ -45,12 +45,16 @@ Create an initializer:
 
 ```ruby
 ApiClient.configure do |config|
-   # Api path
+   # You can define an api entry point
    config.path = 'http://api.example.com'
+   # or several ones
+   config.paths = { :default => 'http://api.example.com', :auth => 'http://auth.example.com' }
    # Default header
    config.header = { 'param1' => '123329845729384759237592348712876817234'}
    # Basic Auth
    config.basic_auth('user', 'pass')
+   # If inside Rails
+   config.mock = Rails.env.test?
 end
 ```
 
@@ -80,6 +84,8 @@ Then, on your action, just put into it:
 
 ```ruby
 @user = User.get(3)
+#or
+@user = User.find(3)
 ```
 
 where 3 is the id of the user.
@@ -88,6 +94,8 @@ To a request that returns a collection of the object, use:
 
 ```ruby
 @user = User.collection
+#or
+@user = User.all
 ```
 
 ## Advanced Usage
@@ -117,6 +125,15 @@ class Person < ApiClient::Base
 end
 ```
 
+In case you need to work with one api entry point, it will define you path as the default.
+If you need multiple entry points, you must define a name to each one, so you can refer to them on the model as:
+
+```ruby
+class User < ApiClient::Base
+    self.path = :auth
+end
+```
+
 This code will create a setter and a getter for houses and cars and initialize the respective class.
 
 Since version 2.0.0, it is possible to make api calls from the object. The syntax is pretty much the same.
@@ -134,11 +151,27 @@ end
 
 With this setting no requisitions will be made. All calls will just return a new object with the attributes received.
 
+## Parallel
+
+When making parallel requests, the requests are made in threads, so to get the response it is necessary to specify
+an initialized object to update when the requisition is complete.
+
+```ruby
+@users = ApiClient::Collection.new({}, User)
+@cars = ApiClient::Collection.new({}, Car)
+@house = House.new
+
+ApiClient.parallel do
+    User.all.on_complete_update(@users)
+    Car.all.on_complete_update(@cars)
+    House.find(1).on_complete_update(@house)
+end
+```
+
 ## More Examples
 [Project](https://github.com/zertico/api-client/tree/master/examples)
 
 ## TODO
-* Add support for parallel requests
 * Add more Response Handlers
 
 ## Mantainers

data/api-client.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.version     = ApiClient::VERSION
   gem.authors     = %q{Paulo Henrique Lopes Ribeiro}
   gem.email       = %q{plribeiro3000@gmail.com}
-  gem.summary     = %q{Client to make Api calls}
+  gem.summary     = %q{Api client easy to play with parallelism support!}
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features,examples,gemfiles}/*`.split("\n")

data/lib/api-client.rb

@@ -16,19 +16,38 @@ module ApiClient
   #   ApiClient.configure do |config|
   #     config.path = "api.example.com"
   #   end
+  # @yield Yield the configuration object
+  # @yieldparam block The Configuration object
+  # @yieldreturn [ApiClient::Configuration] The Configuration object
   def self.configure(&block)
     yield @config ||= ApiClient::Configuration.new
   end
 
   # Global settings for ApiClient
+  #
+  # @return [Hash] configuration attributes
   def self.config
     @config
   end
 
+  # Parallel api requisitions
+  #
+  # @yield The requisitions to be made
+  # @yieldparam block A block with requisition objects
+  # @return [False] the value of the hydra config
+  def self.parallel(&block)
+    raise Exceptions::NotPossible unless defined?(::Typhoeus)
+    config.hydra = ::Typhoeus::Hydra.new
+    yield
+    config.hydra.run
+    config.hydra = false
+  end
+
   # Default Settings
   configure do |config|
     config.path = ''
     config.header = {}
     config.mock = false
+    config.hydra = false
   end
 end

data/lib/api-client/base.rb

@@ -42,7 +42,6 @@ module ApiClient
       false
     end
 
-
     # Return the api name to be used by this model.
     #
     # @return [False] return the default api name.
@@ -74,7 +73,7 @@ module ApiClient
 
     # Set the resource path of the object on the api.
     #
-    # @param [String] resource path string.
+    # @param [String] resource_path path string.
     def self.resource_path=(resource_path)
       resource_path = resource_path[1, resource_path.size - 1] if resource_path[0, 1] == '/'
       @resource_path = resource_path
@@ -96,7 +95,7 @@ module ApiClient
 
     # Set methods to initialize associated objects.
     #
-    # @param [Hash] association classes.
+    # @param [Hash] associations classes.
     def self.associations=(associations = {})
       associations.each do |association, class_name|
         class_eval <<-EVAL
@@ -117,7 +116,7 @@ module ApiClient
 
     # Overwrite #attr_acessor method to save instance_variable names.
     #
-    # @param [Array] instance variables.
+    # @param [Array] vars instance variables.
     def self.attr_accessor(*vars)
       @attributes ||= []
       @attributes.concat(vars)
@@ -138,6 +137,15 @@ module ApiClient
       self.class.instance_variable_get('@attributes').inject({}) { |hash, attribute| hash.merge(attribute.to_sym => self.send("#{attribute}")) }
     end
 
+    # Update instance values based on a hash
+    #
+    # @param attr New attributes
+    def attributes=(attr = {})
+      remove_root(attr).each do |key, value|
+        send("#{key}=", value)
+      end
+    end
+
     # Return a hash with a root node and all instance variables setted through attr_accessor and its currently values.
     #
     # @return [Hash] instance variables and its values.
@@ -148,10 +156,11 @@ module ApiClient
     # Initialize a collection of objects. The collection will be an ApiClient::Collection object.
     # The objects in the collection will be all instances of this (ApiClient::Base) class.
     #
-    # @param [String] url to get the collection.
     # @return [Collection] a collection of objects.
     def self.collection
-      ApiClient::Collection.new(self, self.path, self.resource_path).collection
+      url = "#{ApiClient.config.path[path]}#{resource_path}"
+      attributes = ApiClient::Parser.response(ApiClient::Dispatcher.get(url), url)
+      ApiClient::Collection.new(attributes, self)
     end
 
     class << self

data/lib/api-client/class_methods.rb

@@ -1,27 +1,16 @@
 module ApiClient
   # This module handles the logic to make an api call and initialize an object with the response.
   module ClassMethods
-    # Initialize an object based on a hash of attributes.
-    #
-    # @param [Hash] attributes hash of attributes.
-    # @return [Base] the object initialized.
-    def build(attributes)
-      hash = remove_root(attributes)
-      hash = hash.merge({ 'response' => attributes })
-      new(hash)
-    end
-
     # Make a get requisition and initialize an object with the response.
     #
     # @param [Integer] id id of the object.
     # @param [Hash] header hash with the header options.
     # @return [Base] the object initialized.
     def get(id, header = {})
-      return build(:id => id) if ApiClient.config.mock
+      return new(:id => id) if ApiClient.config.mock
       url = "#{ApiClient.config.path[path]}#{self.resource_path}/#{id}"
       response = ApiClient::Dispatcher.get(url, header)
-      params = ApiClient::Parser.response(response, url)
-      build(params)
+      build(response, url)
     end
 
     alias_method :find, :get
@@ -32,11 +21,10 @@ module ApiClient
     # @param [Hash] header hash with the header options.
     # @return [Base] the object initialized.
     def post(attributes, header = {})
-      return build(attributes) if ApiClient.config.mock
+      return new(attributes) if ApiClient.config.mock
       url = "#{ApiClient.config.path[path]}#{self.resource_path}"
       response = ApiClient::Dispatcher.post(url, attributes, header)
-      params = ApiClient::Parser.response(response, url)
-      build(params)
+      build(response, url)
     end
 
     alias_method :create, :post
@@ -47,11 +35,10 @@ module ApiClient
     # @param [Hash] header hash with the header options.
     # @return [Base] the object initialized.
     def put(attributes, header = {})
-      return build(attributes) if ApiClient.config.mock
+      return new(attributes) if ApiClient.config.mock
       url = "#{ApiClient.config.path[path]}#{self.resource_path}"
       response = ApiClient::Dispatcher.put(url, attributes, header)
-      params = ApiClient::Parser.response(response, url)
-      build(params)
+      build(response, url)
     end
 
     alias_method :update_attributes, :put
@@ -62,11 +49,10 @@ module ApiClient
     # @param [Hash] header hash with the header options.
     # @return [Base] the object initialized.
     def patch(attributes, header = {})
-      return build(attributes) if ApiClient.config.mock
+      return new(attributes) if ApiClient.config.mock
       url = "#{ApiClient.config.path[path]}#{self.resource_path}"
       response = ApiClient::Dispatcher.patch(url, attributes, header)
-      params = ApiClient::Parser.response(response, url)
-      build(params)
+      build(response, url)
     end
 
     # Make a delete requisition and initialize an object with the response.
@@ -75,11 +61,10 @@ module ApiClient
     # @param [Hash] header hash with the header options.
     # @return [Base] the object initialized.
     def delete(id, header = {})
-      return build(:id => id) if ApiClient.config.mock
+      return new(:id => id) if ApiClient.config.mock
       url = "#{ApiClient.config.path[path]}#{self.resource_path}/#{id}"
       response = ApiClient::Dispatcher.delete(url, header)
-      params = ApiClient::Parser.response(response, url)
-      build(params)
+      build(response, url)
     end
 
     alias_method :destroy, :delete
@@ -93,5 +78,20 @@ module ApiClient
       attributes = attributes[self.root_node.to_s] if attributes.key?(self.root_node.to_s)
       attributes
     end
+
+    protected
+
+    # Initialize an object based on a hash of attributes.
+    #
+    # @param [Response] response requisition response.
+    # @param [String] url the url of the requisition.
+    # @return [Base] the object initialized.
+    def build(response, url)
+      return response if ApiClient.config.hydra
+      attributes = ApiClient::Parser.response(response, url)
+      hash = remove_root(attributes)
+      hash = hash.merge({ 'response' => attributes })
+      new(hash)
+    end
   end
 end

data/lib/api-client/collection.rb

@@ -1,20 +1,33 @@
 # ApiClient::Collection handle a collection of objects
-class ApiClient::Collection
-  include Enumerable
-
-  attr_accessor :collection
-
-  # Initialize a collection of given objects
+class ApiClient::Collection < Array
+  # Initialize a collection of objects based on attributes.
   #
+  # @param [String] attributes the array of attributes.
   # @param [Class] klass The class to instantiate the objects.
-  # @param [String] path The url of the api.
-  # @param [String] resource_path The url to get the data.
   # @return [Collection] the collection of objects.
-  def initialize(klass, path, resource_path)
-    url = "#{ApiClient.config.path[path]}#{resource_path}"
-    @collection = ApiClient::Parser.response(ApiClient::Dispatcher.get(url), url)
-    @collection.map! do |attributes|
-      klass.new(attributes)
+  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
+  end
+
+  # Update the collection of objects based on the new attributes.
+  #
+  # @param [String] attributes the array of attributes.
+  # @return [Collection] the collection of objects.
+  def update(attributes)
+    self.clear
+    if attributes.instance_of?(Array)
+      attributes.each do |attr|
+        self << @klass.new(attr)
+      end
+    else
+      self << @klass.new(attributes)
     end
   end
 end

data/lib/api-client/configuration.rb

@@ -1,7 +1,7 @@
 module ApiClient
   # ApiClient::Configuration provides a way to configure ApiClient globally.
   class Configuration
-    attr_accessor :mock
+    attr_accessor :mock, :hydra
     attr_reader :header
 
     # Return the api url.
@@ -24,7 +24,7 @@ module ApiClient
 
     # Set several api urls.
     #
-    # @param [Hash] hash with paths to api urls.
+    # @param [Hash] paths hash with paths to api urls.
     def paths=(paths = {})
       @paths = {}
       paths.each do |name, path|
@@ -45,7 +45,8 @@ module ApiClient
 
     # Set a basic authentication for all requisitions.
     #
-    # @param [Hash] header the default header for requisitions.
+    # @param [String] account the user for requisitions.
+    # @param [String] password the password for requisitions.
     def basic_auth(account, password)
       @header.merge!({ 'Authorization' => "Basic #{["#{account}:#{password}"].pack('m').delete("\r\n")}" })
     end

data/lib/api-client/dispatcher.rb

@@ -2,12 +2,20 @@
 module ApiClient::Dispatcher
   autoload :Typhoeus, 'api-client/dispatcher/typhoeus'
   autoload :NetHttp, 'api-client/dispatcher/net-http'
+  autoload :Parallel, 'api-client/dispatcher/parallel'
 
+  # It passes the call to a more specific class to handle the dispatch logic based on the environment.
+  #
+  # @param [Symbol] method_name the name of the method.
+  # @param [Array] args array of params to be passed ahead.
   def self.method_missing(method_name, *args)
-    if defined?(::Typhoeus)
-      return Typhoeus.send(method_name, *args) if Typhoeus.respond_to?(method_name)
-    else
-      return NetHttp.send(method_name, *args) if NetHttp.respond_to?(method_name)
+    case true
+      when ApiClient.config.hydra != false && defined?(::Typhoeus) != nil
+        return Parallel.send(method_name, *args) if Parallel.respond_to?(method_name)
+      when defined?(::Typhoeus)
+        return Typhoeus.send(method_name, *args) if Typhoeus.respond_to?(method_name)
+      else
+        return NetHttp.send(method_name, *args) if NetHttp.respond_to?(method_name)
     end
     super
   end
@@ -18,10 +26,14 @@ module ApiClient::Dispatcher
   # @param [Boolean] include_private if it does work to private methods as well.
   # @return [Boolean] if it responds to the method or not.
   def self.respond_to_missing?(method_name, include_private = false)
-    if defined?(::Typhoeus)
-      return true if Typhoeus.respond_to?(method_name)
+    case true
+      when ApiClient.config.hydra && defined?(::Typhoeus)
+        return true if Parallel.respond_to?(method_name)
+      when defined?(::Typhoeus)
+        return true if Typhoeus.respond_to?(method_name)
+      else
+        return true if NetHttp.respond_to?(method_name)
     end
-    return true if NetHttp.respond_to?(method_name)
     super
   end
 end

data/lib/api-client/dispatcher/net-http.rb

@@ -1,7 +1,7 @@
 require 'net/http'
 require 'api-client/net/http' unless Net::HTTP.new('').respond_to?(:patch)
 
-# ApiClient::Dispatcher provides methods to make requests using the native ruby library 'net/http'
+# ApiClient::Dispatcher::NetHttp provides methods to make requests using the native ruby library 'net/http'
 module ApiClient::Dispatcher::NetHttp
   # Make a get request and returns it.
   #

data/lib/api-client/dispatcher/parallel.rb

@@ -0,0 +1,72 @@
+# ApiClient::Dispatcher provides methods to make requests using typhoeus
+class ApiClient::Dispatcher::Parallel
+  # Initialize a new object and save the request in a instance variable.
+  #
+  # @param [Typhoeus::Request] requisition the requisition object.
+  def initialize(requisition)
+    @requisition = requisition
+  end
+
+  # When the requisition finish, this method update the given object with the response.
+  #
+  # @param [ApiClient::Base, ApiClient::Collection] variable the object to update with the response.
+  def on_complete_update(variable)
+    @requisition.on_complete do |response|
+      attributes = ApiClient::Parser.response(response, response.effective_url)
+      if variable.instance_of?(ApiClient::Collection)
+        variable.update(attributes)
+      else
+        variable.attributes = attributes
+      end
+    end
+    ApiClient.config.hydra.queue @requisition
+  end
+
+  # Make a get request and returns it.
+  #
+  # @param [String] url of the api request.
+  # @param [Hash] header attributes of the request.
+  # @return [Typhoeus::Request] the response object.
+  def self.get(url, header = {})
+    new(::Typhoeus::Request.new(url, :headers => ApiClient.config.header.merge(header)))
+  end
+
+  # Make a post request and returns it.
+  #
+  # @param [String] url of the api request.
+  # @param [Hash] args attributes of object.
+  # @param [Hash] header attributes of the request.
+  # @return [Typhoeus::Request] the response object.
+  def self.post(url, args, header = {})
+    new(::Typhoeus.Request.new(url, :method => :post, :body => args, :headers => ApiClient.config.header.merge(header)))
+  end
+
+  # Make a put request and returns it.
+  #
+  # @param [String] url of the api request.
+  # @param [Hash] args attributes of object.
+  # @param [Hash] header attributes of the request.
+  # @return [Typhoeus::Request] the response object.
+  def self.put(url, args, header = {})
+    new(::Typhoeus.Request.new(url, :method => :put, :body => args, :headers => ApiClient.config.header.merge(header)))
+  end
+
+  # Make a patch request and returns it.
+  #
+  # @param [String] url of the api request.
+  # @param [Hash] args attributes of object.
+  # @param [Hash] header attributes of the request.
+  # @return [Typhoeus::Request] the response object.
+  def self.patch(url, args, header = {})
+    new(::Typhoeus.Request.new(url, :method => :patch, :body => args, :headers => ApiClient.config.header.merge(header)))
+  end
+
+  # Make a delete request and returns it.
+  #
+  # @param [String] url of the api request.
+  # @param [Hash] header attributes of the request.
+  # @return [Typhoeus::Request] the response object.
+  def self.delete(url, header = {})
+    new(::Typhoeus.Request.new(url, :method => :delete, :headers => ApiClient.config.header.merge(header)))
+  end
+end

data/lib/api-client/dispatcher/typhoeus.rb

@@ -1,6 +1,4 @@
-require 'typhoeus'
-
-# ApiClient::Dispatcher provides methods to make requests using typhoeus
+# ApiClient::Dispatcher::Typhoeus provides methods to make requests using typhoeus
 module ApiClient::Dispatcher::Typhoeus
   # Make a get request and returns it.
   #

data/lib/api-client/exceptions.rb

@@ -7,6 +7,7 @@ module ApiClient::Exceptions
   autoload :Generic, 'api-client/exceptions/generic'
   autoload :InternalServerError, 'api-client/exceptions/internal_server_error'
   autoload :NotFound, 'api-client/exceptions/not_found'
+  autoload :NotPossible, 'api-client/exceptions/not_possible'
   autoload :ServiceUnavailable, 'api-client/exceptions/service_unavailable'
   autoload :Unauthorized, 'api-client/exceptions/unauthorized'
 end

data/lib/api-client/exceptions/not_possible.rb

@@ -0,0 +1,9 @@
+# Exception raised when a parallel requisition can' be performed as Typhoeus must be defined on the Project
+class ApiClient::Exceptions::NotPossible < ApiClient::Exceptions::Generic
+  # Initialize a new exception.
+  #
+  # @return [NotPossible] a new exception.
+  def self.initialize
+    super('Typhoeus must be defined to make parallel requests!')
+  end
+end

data/lib/api-client/instance_methods.rb

@@ -1,29 +1,15 @@
 module ApiClient
   # This module handles the logic to make an api call and update_attributes the current object with the response.
   module InstanceMethods
-    # Update an object based on a hash of attributes.
-    #
-    # @param [Hash] attributes hash of attributes.
-    # @return [Base] the update_attributes object.
-    def update(attributes)
-      hash = remove_root(attributes)
-      hash = hash.merge({ 'response' => attributes })
-      hash.each do |key, value|
-        send("#{key}=", value)
-      end
-      self
-    end
-
     # Make a get requisition and update the object with the response.
     #
     # @param [Hash] header hash with the header options.
     # @return [Base] the object updated.
     def get(header = {})
-      return update({}) if ApiClient.config.mock
+      return self if ApiClient.config.mock
       url = "#{ApiClient.config.path[path]}#{self.class.resource_path}/#{id}"
       response = ApiClient::Dispatcher.get(url, header)
-      attributes = ApiClient::Parser.response(response, url)
-      update(attributes)
+      update(response, url)
     end
 
     alias_method :reload, :get
@@ -33,11 +19,10 @@ module ApiClient
     # @param [Hash] header hash with the header options.
     # @return [Base] the object updated.
     def post(header = {})
-      return update({}) if ApiClient.config.mock
+      return self if ApiClient.config.mock
       url = "#{ApiClient.config.path[path]}#{self.class.resource_path}"
       response = ApiClient::Dispatcher.post(url, self.to_hash, header)
-      attributes = ApiClient::Parser.response(response, url)
-      update(attributes)
+      update(response, url)
     end
 
     alias_method :create, :post
@@ -47,11 +32,10 @@ module ApiClient
     # @param [Hash] header hash with the header options.
     # @return [Base] the object updated.
     def put(header = {})
-      return update({}) if ApiClient.config.mock
+      return self if ApiClient.config.mock
       url = "#{ApiClient.config.path[path]}#{self.class.resource_path}"
       response = ApiClient::Dispatcher.put(url, self.to_hash, header)
-      attributes = ApiClient::Parser.response(response, url)
-      update(attributes)
+      update(response, url)
     end
 
     alias_method :update_attributes, :put
@@ -61,11 +45,10 @@ module ApiClient
     # @param [Hash] header hash with the header options.
     # @return [Base] the object updated.
     def patch(header = {})
-      return update({}) if ApiClient.config.mock
+      return self if ApiClient.config.mock
       url = "#{ApiClient.config.path[path]}#{self.class.resource_path}"
       response = ApiClient::Dispatcher.patch(url, self.to_hash, header)
-      attributes = ApiClient::Parser.response(response, url)
-      update(attributes)
+      update(response, url)
     end
 
     # Make a delete requisition and update the object with the response.
@@ -73,11 +56,10 @@ module ApiClient
     # @param [Hash] header hash with the header options.
     # @return [Base] the object updated.
     def delete(header = {})
-      return update({}) if ApiClient.config.mock
+      return self if ApiClient.config.mock
       url = "#{ApiClient.config.path[path]}#{self.class.resource_path}/#{id}"
       response = ApiClient::Dispatcher.delete(url, header)
-      attributes = ApiClient::Parser.response(response, url)
-      update(attributes)
+      update(response, url)
     end
 
     alias_method :destroy, :delete
@@ -91,5 +73,21 @@ module ApiClient
       attributes = attributes[self.class.root_node.to_s] if attributes.key?(self.class.root_node.to_s)
       attributes
     end
+
+    protected
+
+    # Update an object based on a hash of attributes.
+    #
+    # @param [Response] response requisition response.
+    # @param [String] url the url of the requisition.
+    # @return [Base] the update_attributes object.
+    def update(response, url)
+      return response if ApiClient.config.hydra
+      attributes = ApiClient::Parser.response(response, url)
+      hash = remove_root(attributes)
+      hash = hash.merge({ 'response' => attributes })
+      self.attributes = hash
+      self
+    end
   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.4.0'
+  VERSION = '2.5.0.rc1'
 end

data/spec/api-client/base_spec.rb

@@ -162,7 +162,7 @@ describe ApiClient::Base do
 
   describe '.attributes' do
     it 'should return an array of attributes' do
-      User.attributes.should == [:a, :b]
+      User.attributes.should == [ :a, :b ]
     end
   end
 
@@ -172,6 +172,17 @@ describe ApiClient::Base do
     end
   end
 
+  describe '#attributes=' do
+    before :each do
+      @user = User.new
+      @user.attributes=({ :a => 'a', :b => 'b' })
+    end
+
+    it 'should update the attributes' do
+      @user.attributes.should == { :a => 'a', :b => 'b' }
+    end
+  end
+
   describe '#to_hash' do
     it 'should return a hash with root node and the attributes and its currently values' do
       User.new.to_hash.should == { :user => { :a => nil, :b => nil } }
@@ -180,12 +191,11 @@ describe ApiClient::Base do
 
   describe '.collection' do
     before :each do
-      ApiClient::Collection.stub(:new).with(User, :default, 'users').and_return(collection)
-      collection.stub(:collection => [ user, user ])
+      stub_request(:any, 'http://api.example.com/users').to_return(:body => '[]')
     end
 
     it 'should return a collection of objects' do
-      User.collection.should == [ user, user ]
+      User.collection.should be_an_instance_of(ApiClient::Collection)
     end
   end
 

data/spec/api-client/class_methods_spec.rb

@@ -7,28 +7,6 @@ describe ApiClient::ClassMethods do
       stub_request(:any, 'http://api.example.com/users/1').to_return(:body => {'a' => 'b'}.to_json)
     end
 
-    context '.build' do
-      context 'with a root node' do
-        it 'should return an user' do
-          User.build('user' => { 'a' => 'b'}).should be_an_instance_of(User)
-        end
-
-        it 'should set the response' do
-          User.build('user' => { 'a' => 'b'}).response.should == { 'user' => { 'a' => 'b' } }
-        end
-      end
-
-      context 'without a root node' do
-        it 'should return an user' do
-          User.build('a' => 'b').should be_an_instance_of(User)
-        end
-
-        it 'should set the response' do
-          User.build('a' => 'b').response.should == { 'a' => 'b' }
-        end
-      end
-    end
-
     context '.get' do
       it 'should return an user' do
         User.get(1).should be_an_instance_of(User)

data/spec/api-client/collection_spec.rb

@@ -3,19 +3,49 @@ require 'spec_helper'
 describe ApiClient::Collection do
   let(:user) { User.new }
 
-  before :each do
-    stub_request(:get, 'http://api.example.com/users').to_return(:body => [ { 'a' => 'b' }, { 'a' => 'b2' } ].to_json)
-    User.stub(:new => user)
-    @collection = ApiClient::Collection.new(User, :default, 'users')
-  end
+  describe '.initialize' do
+    it 'should save the class in an instance_variable' do
+      ApiClient::Collection.new([], User).instance_variable_get('@klass').should == User
+    end
+
+    context 'with a collection of attributes' do
+      before :each do
+        attributes = [ { :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
 
-  it 'should include enumerable module' do
-    @collection.should respond_to(:first)
+    context 'with a single object attribute' do
+      before :each do
+        attributes = { :user => { :a => 'a' } }
+        @collection = ApiClient::Collection.new(attributes, User)
+      end
+
+      it 'should initialize a single object' do
+        @collection.size.should == 1
+      end
+    end
   end
 
-  describe '.initialize' do
-    it 'Should initialize a collection of Objects' do
-      @collection.collection.should == [user, user]
+  describe '#update' do
+    before :each do
+      attributes = [ { :user => { :a => 'a' } }, { :user => { :b => 'b' } } ]
+      @collection = ApiClient::Collection.new(attributes, User)
+    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
+      end
+    end
+
+    context 'with a single object attribute' do
+      it 'should update the collection with the new object based on the attributes' do
+        @collection.update({ :user => { :a => 'a' } }).size.should == 1
+      end
     end
   end
 end

data/spec/api-client/dispatcher_spec.rb

@@ -27,7 +27,7 @@ describe ApiClient::Dispatcher do
     it 'should return the request' do
       ApiClient::Dispatcher.patch('http://api.example.com/user/5', {}, {}).body.should == ('asd')
     end
-  end if ApiClient::Dispatcher.respond_to?(:patch)
+  end
 
   describe '.delete' do
     it 'should return the request' do

data/spec/api-client/instance_methods_spec.rb

@@ -12,28 +12,6 @@ describe ApiClient::InstanceMethods do
       stub_request(:any, 'http://api.example.com/users/1').to_return(:body => {'a' => 'b'}.to_json)
     end
 
-    context '.update' do
-      context 'with a root node' do
-        it 'should update the object' do
-          user.update('user' => { 'a' => 'b'}).should be_an_instance_of(User)
-        end
-
-        it 'should set the response' do
-          user.update('user' => { 'a' => 'b'}).response.should == { 'user' => { 'a' => 'b' } }
-        end
-      end
-
-      context 'without a root node' do
-        it 'should update the object' do
-          user.update('a' => 'b').should be_an_instance_of(User)
-        end
-
-        it 'should set the response' do
-          user.update('a' => 'b').response.should == { 'a' => 'b' }
-        end
-      end
-    end
-
     context '.get' do
       it 'should return an user' do
         user.get.should be_an_instance_of(User)

data/spec/api-client_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+describe ApiClient do
+  describe '.parallel' do
+    if defined?(::Typhoeus)
+      before :each do
+        stub_request(:any, 'http://api.example.com/users/1').to_return(:body => {'a' => '1'}.to_json)
+        stub_request(:any, 'http://api.example.com/users/2').to_return(:body => {'a' => '2'}.to_json)
+        stub_request(:any, 'http://api.example.com/users/3').to_return(:body => {'a' => '3'}.to_json)
+        stub_request(:any, 'http://api.example.com/users/4').to_return(:body => {'a' => '4'}.to_json)
+        stub_request(:any, 'http://api.example.com/users/5').to_return(:body => {'a' => '5'}.to_json)
+        @user1 = User.new
+        @user2 = User.new
+        @user3 = User.new
+        @user4 = User.new
+        @user5 = User.new
+        ApiClient.parallel do
+          User.find(1).on_complete_update(@user1)
+          User.find(2).on_complete_update(@user2)
+          User.find(3).on_complete_update(@user3)
+          User.find(4).on_complete_update(@user4)
+          User.find(5).on_complete_update(@user5)
+        end
+      end
+
+      it 'initialize user1' do
+        @user1.attributes.should == { :a => '1', :b => nil }
+      end
+
+      it 'initialize user2' do
+        @user2.attributes.should == { :a => '2', :b => nil }
+      end
+
+      it 'initialize user3' do
+        @user3.attributes.should == { :a => '3', :b => nil }
+      end
+
+      it 'initialize user4' do
+        @user4.attributes.should == { :a => '4', :b => nil }
+      end
+
+      it 'initialize user5' do
+        @user5.attributes.should == { :a => '5', :b => nil }
+      end
+    else
+      it 'should raise an exception' do
+        expect { ApiClient.parallel {} }.to raise_error(ApiClient::Exceptions::NotPossible)
+      end
+    end
+  end
+
+  context 'settings' do
+    it 'should return the configured path' do
+      ApiClient.config.path.should == { :default => 'http://api.example.com/' }
+    end
+
+    it 'should return the default header' do
+      ApiClient.config.header.should == { 'Content-Type' => 'application/json' }
+    end
+
+    it 'should have mock equal false' do
+      ApiClient.config.mock.should be_false
+    end
+
+    it 'should have hydra equal false' do
+      ApiClient.config.hydra.should be_false
+    end
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: api-client
 version: !ruby/object:Gem::Version
-  version: 2.4.0
-  prerelease: 
+  version: 2.5.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Paulo Henrique Lopes Ribeiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-11 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -159,6 +159,7 @@ files:
 - lib/api-client/configuration.rb
 - lib/api-client/dispatcher.rb
 - lib/api-client/dispatcher/net-http.rb
+- lib/api-client/dispatcher/parallel.rb
 - lib/api-client/dispatcher/typhoeus.rb
 - lib/api-client/errors.rb
 - lib/api-client/exceptions.rb
@@ -169,13 +170,13 @@ files:
 - lib/api-client/exceptions/generic.rb
 - lib/api-client/exceptions/internal_server_error.rb
 - lib/api-client/exceptions/not_found.rb
+- lib/api-client/exceptions/not_possible.rb
 - lib/api-client/exceptions/service_unavailable.rb
 - lib/api-client/exceptions/unauthorized.rb
 - lib/api-client/instance_methods.rb
 - lib/api-client/net/http.rb
 - lib/api-client/parser.rb
 - lib/api-client/version.rb
-- spec/api-client.rb
 - spec/api-client/base_spec.rb
 - spec/api-client/class_methods_spec.rb
 - spec/api-client/collection_spec.rb
@@ -184,6 +185,7 @@ files:
 - spec/api-client/errors_spec.rb
 - spec/api-client/instance_methods_spec.rb
 - spec/api-client/parser_spec.rb
+- spec/api-client_spec.rb
 - spec/spec_helper.rb
 homepage: 
 licenses:
@@ -200,22 +202,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3601308474644028566
+      hash: -3068055785354345759
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -3601308474644028566
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Client to make Api calls
+summary: Api client easy to play with parallelism support!
 test_files:
 - examples/config/initializers/api-client.rb
 - examples/controllers/application_controller.rb
@@ -229,7 +228,6 @@ test_files:
 - examples/scripts/example.rb
 - gemfiles/Gemfile.net_http
 - gemfiles/Gemfile.typhoeus
-- spec/api-client.rb
 - spec/api-client/base_spec.rb
 - spec/api-client/class_methods_spec.rb
 - spec/api-client/collection_spec.rb
@@ -238,5 +236,6 @@ test_files:
 - spec/api-client/errors_spec.rb
 - spec/api-client/instance_methods_spec.rb
 - spec/api-client/parser_spec.rb
+- spec/api-client_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/spec/api-client.rb

@@ -1,17 +0,0 @@
-require 'spec_helper'
-
-describe ApiClient do
-  context 'default settings' do
-    it 'should have a blank path' do
-      ApiClient.config.path.should == ''
-    end
-
-    it 'should have an empty header' do
-      ApiClient.config.header.should == {}
-    end
-
-    it 'should have mock equal false' do
-      ApiClient.config.mock.should be_false
-    end
-  end
-end