tumbl_rb 0.1.0 → 0.1.1

data/README.md

@@ -11,10 +11,12 @@ Simple Ruby wrapper for the Tumblr v2 API
 
 ## Examples
 
-### Add your api_key (consumer_oauth_key)
+### Global Configuration
 ```ruby
 TumblRb.configure do |config|
-    config.consumer_oauth_key = "1234567890"
+    config.consumer_oauth_key   = "1234567890" # API KEY
+    config.timeout              = 5 # OPEN/READ TIMEOUT
+    config.open_timeout         = 5 # OPEN TIMEOUT
 end
 ```
 

data/lib/tumbl_rb/client/blogs.rb

@@ -10,7 +10,32 @@ module TumblRb
       # @example
       #   TumblRb.info("andrewpthorp")
       def info(blog)
-        get("/v2/blog/#{Blog.new blog}/info", {}, false)
+        get("/v2/blog/#{Blog.new blog}/info", {}, false, false)
+      end
+
+      # Get the avatar of a blog
+      #
+      # @param [String, Hash] blog to get avatar from
+      # @param [Integer] size of integer (16, 24, 30, 40, 48, 64, 96, 128, 512)
+      #
+      # @return [Hashie::Mash]
+      # @example
+      #   TumblRb.avatar("andrewpthorp", 512)
+      def avatar(blog, size=64)
+        get("/v2/blog/#{Blog.new blog}/avatar/#{size}", {}, false, false)
+      end
+
+      # Get the followers of a blog
+      #
+      # @param [String, Hash] blog to get followers of
+      # @param [Integer] number of results (1-20, defaults 20)
+      # @param [Integer] result to start at (defaults 0)
+      #
+      # @return [Hashie::Mash]
+      # @example
+      #   TumblRb.followers("andrewpthorp", 20, 0)
+      def followers(blog, limit=20, offset=0)
+        get("/v2/blog/#{Blog.new blog}/followers", { :limit => limit, :offset => offset }, false, false)
       end
 
 

data/lib/tumbl_rb/configuration.rb

@@ -8,11 +8,14 @@ module TumblRb
       :api_version,
       :proxy,
       :consumer_oauth_key,
+      :timeout,
+      :open_timeout,
       :user_agent].freeze
 
-    DEFAULT_ADAPTER        = Faraday.default_adapter
-    DEFAULT_API_VERSION    = 2
-    DEFAULT_USER_AGENT     = "TumblRb Ruby Gem #{TumblRb::VERSION}".freeze
+    DEFAULT_ADAPTER         = Faraday.default_adapter
+    DEFAULT_API_VERSION     = 2
+    DEFAULT_USER_AGENT      = "TumblRb Ruby Gem #{TumblRb::VERSION}".freeze
+    DEFAULT_TIMEOUT         = 10
 
     attr_accessor(*VALID_OPTIONS_KEYS)
 
@@ -34,6 +37,8 @@ module TumblRb
       self.consumer_oauth_key     = nil
       self.proxy                  = nil
       self.user_agent             = DEFAULT_USER_AGENT
+      self.timeout                = DEFAULT_TIMEOUT
+      self.open_timeout           = DEFAULT_TIMEOUT
     end
   end
 end

data/lib/tumbl_rb/request.rb

@@ -11,6 +11,8 @@ module TumblRb
     def request(method, path, options, raw, include_meta)
       response = connection(raw).send(method) do |request|
         request.url(path, options)
+        request.options[:timeout] = timeout
+        request.options[:open_timeout] = open_timeout
       end
 
       if raw

data/lib/tumbl_rb/version.rb

@@ -1,3 +1,3 @@
 module TumblRb
-  VERSION = "0.1.0" unless defined?(TumblRb::VERSION)
+  VERSION = "0.1.1" unless defined?(TumblRb::VERSION)
 end

data/spec/tumbl_rb/client_spec.rb

@@ -35,4 +35,24 @@ describe TumblRb::Client do
     end
   end
 
+  describe "timeout" do
+    before do
+      @blog = "andrewpthorp.tumblr.com"
+    end
+
+    it "should raise an error when a timeout happens" do
+      client = TumblRb::Client.new(:timeout => 0, :open_timeout => 0)
+      lambda {
+        client.info(@blog)
+      }.should raise_error
+    end
+
+    it "should not raise an error when a timeout doesn't happen" do
+      stub_request(:get, "http://api.tumblr.com/v2/blog/#{@blog}/info").to_return(:body => fixture("info.json"))
+      client = TumblRb::Client.new
+      lambda {
+        client.info(@blog)
+      }.should_not raise_error
+    end
+  end
 end

data/tumbl_rb.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'faraday_middleware', '~> 0.8'
   s.add_runtime_dependency 'hashie', '~> 1.2'
   s.add_runtime_dependency 'multi_json', '~> 1.3'
+  s.add_runtime_dependency 'oauth', '~> 0.4'
 
   s.add_development_dependency 'json'
   s.add_development_dependency 'rake'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tumbl_rb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000 Z
+date: 2012-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -91,6 +91,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: oauth
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement