f00px 0.3.0 → 0.4.0

data/README.md

@@ -1,6 +1,6 @@
 # F00px
 
-500px api ruby gem
+500px api ruby gem [![Build Status](https://travis-ci.org/500px/f00px.png)](https://travis-ci.org/500px/f00px)
 
 ## Installation
 
@@ -20,16 +20,42 @@ Or install it yourself as:
 
 Add this code to some initializer:
 
-    F00px.configure do |config|
-        config.consumer_key = __consumer_key__
-        config.consumer_secret = __consumer_secret__
-        config.token = __token__
-        config.token_secret = __token_secret__
-    end
+```ruby
+F00px.configure do |config|
+  config.consumer_key = __consumer_key__
+  config.consumer_secret = __consumer_secret__
+  config.token = __token__
+  config.token_secret = __token_secret__
+end
+```
 
 Then just use the api:
 
-    response = F00px.get('/users/1')
+```ruby
+response = F00px.get('users/1')
+puts response.body
+```
+
+You also can create multiple clients.
+
+With oauth
+```ruby
+client = F00px::Client.new
+client.token = '__client_token__'
+client.token_secret = '__client_token_secret__'
+
+response = client.get('users')
+puts response.body
+```
+
+With xauth
+```ruby
+client = F00px::Client.new
+client.xauth('arthurnn', '**password**')
+
+response = client.get('users')
+puts response.body
+```
 
 ## Contributing
 

data/lib/#f00px.rb#

@@ -0,0 +1,35 @@
+require "f00px/version"
+require "cgi"
+require "faraday_middleware"
+require "typhoeus"
+require "typhoeus/adapters/faraday"
+require "f00px/error"
+require "f00px/authentication"
+require "f00plib/f00px/version.rbx/configuration"
+require "f00px/connection"
+require "f00px/request"
+require "f00px/api"
+require "f00px/client"
+
+
+module F00px
+
+  class << self
+
+    include Configuration
+
+    def client
+      @client ||= F00px::Client.new
+    end
+
+    private
+
+    def method_missing(method_name, *args, &block)
+      return super unless client.respond_to?(method_name)
+      client.send(method_name, *args, &block)
+    end
+
+  end
+
+
+end

data/lib/f00px/api/parameters_builder.rb

@@ -0,0 +1,29 @@
+module F00px
+  module ParametersBuilder
+
+    def initialize
+      @params = {}
+    end
+
+    def images(*images)
+      @params[:image_size] = Array(images)
+      self
+    end
+
+    def include_states(v)
+      @params[:include_states] = !!v
+      self
+    end
+
+    def options(opts)
+      images(*opts[:images]) if opts[:images]
+      @params.merge!(opts)
+      self
+    end
+
+    def build
+      @params
+    end
+
+  end
+end

data/lib/f00px/api/photos.rb

@@ -0,0 +1,57 @@
+module F00px
+  module Api
+    module Photos
+
+      def popular(*args)
+        options = get_options(args)
+        builder = args.first
+        builder ||= Builder.new
+
+        params = builder
+          .feature('popular')
+          .options(options)
+          .build
+
+        self.get('photos', params)
+      end
+
+      def user_photos(*args)
+        options = get_options(args)
+        user_id, builder = args
+        builder ||= Builder.new
+
+        params = builder
+          .feature('user')
+          .user_id(user_id)
+          .options(options)
+          .build
+
+        self.get('photos', params)
+      end
+
+      class Builder
+        include ParametersBuilder
+
+        def feature(f)
+          @params[:feature] = f
+          self
+        end
+
+        def user_id(uid)
+          @params[:user_id] = uid
+          self
+        end
+      end
+
+      private
+      def get_options(args)
+        if args.last.is_a?(Hash)
+          options = args.pop
+        else
+          options = {}
+        end
+        options
+      end
+    end
+  end
+end

data/lib/f00px/api.rb

@@ -0,0 +1,2 @@
+require "f00px/api/parameters_builder"
+require "f00px/api/photos"

data/lib/f00px/client.rb

@@ -6,6 +6,8 @@ module F00px
     include Connection
     include Request
 
+    include Api::Photos
+
     def self.configure(&block)
       Client.new.configure(&block)
     end
@@ -15,7 +17,5 @@ module F00px
         settings[key] = options[key] || F00px.__send__("#{key}".to_sym)
       end
     end
-
-
   end
 end

data/lib/f00px/configuration.rb

@@ -15,6 +15,8 @@ module F00px
     option :logger
     option :user_id
 
+    option :faraday_adapter, default: Faraday.default_adapter
+
     def self.included(base)
     end
 

data/lib/f00px/connection.rb

@@ -26,15 +26,9 @@ module F00px
 
         builder.use Faraday::Response::Logger, logger if logger?
 
-        builder.adapter connection_adapter
+        builder.adapter faraday_adapter
       end
     end
 
-    private
-
-    def connection_adapter
-      :typhoeus
-    end
-
   end
 end

data/lib/f00px/request/runner.rb

@@ -29,26 +29,37 @@ module F00px
       # Runs all queued requests. This method will block until all requests are complete.
       # As requests complete their callbacks will be executed.
       def run!
-        conn = @connection
-
-        responses = {}
-        conn.in_parallel do
+        execute_in_parallel do
           @queued_requests.each do |callback|
-            method, url, params = callback.info
-            params ||= {}
-            params[:auth_user_id] = user_id if user_id
-
-            response = conn.run_request(method, url, params, {})
+            execute_request(callback)
+          end
+        end
+      ensure
+        @queued_requests = []
+      end
 
-            response.on_complete do
-              callback.perform(response)
-            end
+      private
 
+      def execute_in_parallel
+        if @connection.in_parallel?
+          @connection.in_parallel do
+            yield
           end
+        else
+          yield
         end
+      end
 
-      ensure
-        @queued_requests = []
+      def execute_request(callback)
+        method, url, params = callback.info
+        params ||= {}
+        params[:auth_user_id] = user_id if user_id
+
+        response = @connection.run_request(method, url, params, {})
+
+        response.on_complete do
+          callback.perform(response)
+        end
       end
 
     end

data/lib/f00px/request.rb

@@ -8,21 +8,21 @@ module F00px
       queue = Request::Runner.new(connection)
       queue.user_id = user_id if user_id?
       queue.consumer_key = consumer_key if consumer_key?
-      yield(queue)
+      queue.instance_eval(&block)
       queue.run!
     end
 
     def get(url, params = {})
-      queue do |q|
-        q.get(url, params).complete do |response|
+      queue do
+        get(url, params).complete do |response|
           return response
         end
       end
     end
 
     def post(url, params = {})
-      queue do |q|
-        q.post(url, params).complete do |response|
+      queue do
+        post(url, params).complete do |response|
           return response
         end
       end

data/lib/f00px/version.rb

@@ -1,3 +1,3 @@
 module F00px
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/f00px.rb

@@ -1,13 +1,12 @@
 require "f00px/version"
 require "cgi"
 require "faraday_middleware"
-require "typhoeus"
-require "typhoeus/adapters/faraday"
 require "f00px/error"
 require "f00px/authentication"
 require "f00px/configuration"
 require "f00px/connection"
 require "f00px/request"
+require "f00px/api"
 require "f00px/client"
 
 module F00px

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: f00px
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-10 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
@@ -27,22 +27,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: typhoeus
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: simple_oauth
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +50,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/#f00px.rb#
+- lib/f00px/api/parameters_builder.rb
+- lib/f00px/api/photos.rb
+- lib/f00px/api.rb
 - lib/f00px/authentication.rb
 - lib/f00px/client.rb
 - lib/f00px/configuration/options.rb
@@ -102,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: f00px
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: 500px api rubygem