tumblr_client 0.6.9 → 0.6.11

data/lib/tumblr/blog.rb

@@ -7,7 +7,7 @@ module Tumblr
       #Gets the info about the blog
       #
       def blog_info(blog_name)
-        get("v2/blog/#{blog_name}/info", {:api_key => Tumblr::consumer_key})
+        get("v2/blog/#{blog_name}/info", {:api_key => @consumer_key})
       end
 
       #
@@ -35,7 +35,7 @@ module Tumblr
       def blog_likes(blog_name, options={})
         if valid_options([:limit, :offset], options)
           url = "v2/blog/#{blog_name}/likes"
-          params = {:api_key => Tumblr::consumer_key}
+          params = {:api_key => @consumer_key}
           unless options.empty?
             params.merge!(options)
           end
@@ -50,7 +50,7 @@ module Tumblr
           url = "#{url}/#{options[:type]}"
         end
         
-        params = {:api_key => Tumblr::consumer_key}
+        params = {:api_key => @consumer_key}
         unless options.empty?
           params.merge!(options)
         end

data/lib/tumblr/client.rb

@@ -22,5 +22,18 @@ module Tumblr
         instance_variable_set("@#{key}".to_sym, attrs[key])
       end
     end
+
+    def api_host
+      ENV['TUMBLR_API_HOST'] || 'api.tumblr.com'
+    end
+
+    def credentials
+      {
+        :consumer_key => @consumer_key,
+        :consumer_secret => @consumer_secret,
+        :token => @oauth_token,
+        :token_secret => @oauth_token_secret
+      }
+    end
   end
 end

data/lib/tumblr/connection.rb

@@ -10,10 +10,11 @@ module Tumblr
           :accept => "application/json",
           :user_agent => "Tumblr v1.0"
         },
-        :url => "http://api.tumblr.com/"
+        :url => "http://#{api_host}/"
       }
-      Faraday.new("http://api.tumblr.com/", default_options.merge(options)) do |builder|
-        builder.use Tumblr::Request::TumblrOAuth, Tumblr::credentials if not Tumblr::credentials.empty?
+      Faraday.new("http://#{api_host}/", default_options.merge(options)) do |builder|
+        data = { :api_host => api_host }.merge(credentials)
+        builder.use Tumblr::Request::TumblrOAuth, data unless credentials.empty?
         builder.use Faraday::Request::UrlEncoded
         builder.use FaradayMiddleware::ParseJson, :content_type => "application/json"
         builder.use Faraday::Adapter::NetHttp

data/lib/tumblr/request/oauth.rb

@@ -21,7 +21,7 @@ module Tumblr
         end
         env[:request_headers]["Authorization"] = self.oauth_gen(env[:method], url, signature_params) 
         env[:request_headers]["Content-type"] = "application/x-www-form-urlencoded"                                                                              
-        env[:request_headers]["Host"] = "api.tumblr.com"
+        env[:request_headers]["Host"] = @options[:api_host]
         
 
         @app.call(env)
@@ -33,7 +33,7 @@ module Tumblr
 
       def oauth_gen(method, url, params)
          params[:oauth_consumer_key] = @options[:consumer_key]
-         params[:oauth_nonce] = Time.now.to_i
+         params[:oauth_nonce] = Base64.encode64(OpenSSL::Random.random_bytes(32)).gsub(/\W/, '')
          params[:oauth_signature_method] = 'HMAC-SHA1'
          params[:oauth_timestamp] = Time.now.to_i
          params[:oauth_token] = @options[:token]

data/lib/tumblr/tagged.rb

@@ -5,7 +5,7 @@ module Tumblr
       @@standard_options = [:before, :limit, :filter]
       
       def tagged(tag, options={})
-        params = {:tag => tag, :api_key => Tumblr::consumer_key}
+        params = {:tag => tag, :api_key => @consumer_key}
         unless options.empty?
           params.merge!(options)
         end

data/tumblr.gemspec

@@ -1,23 +1,23 @@
 # encoding: utf-8
 
 Gem::Specification.new do |gem|
-    gem.add_dependency 'faraday', '>= 0.8'
-    gem.add_dependency 'faraday_middleware'
-    gem.add_dependency 'json'
-    gem.add_dependency 'oauth'
-    gem.add_development_dependency 'rake'
-    gem.add_development_dependency 'rspec'
-    gem.add_development_dependency 'webmock'
-    gem.authors = ["John Bunting"]
-    gem.description = %q{A Ruby wrapper for the Tumblr v2 API}
-    gem.email = ['codingjester@gmail.com']
-    gem.executables = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
-    gem.files = `git ls-files`.split("\n")
-    gem.homepage = "http://github.com/codingjester/tumblr_client"
-    gem.name = "tumblr_client"
-    gem.require_paths = ["lib"]
-    gem.required_rubygems_version = Gem::Requirement.new('>= 1.3.6')
-    gem.summary = %q{Tumblr API wrapper}
-    gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
-    gem.version = "0.6.9"
+  gem.add_dependency 'faraday', '>= 0.8'
+  gem.add_dependency 'faraday_middleware'
+  gem.add_dependency 'json'
+  gem.add_dependency 'oauth'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'webmock'
+  gem.authors = ["John Bunting"]
+  gem.description = %q{A Ruby wrapper for the Tumblr v2 API}
+  gem.email = ['codingjester@gmail.com']
+  gem.executables = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
+  gem.files = `git ls-files`.split("\n")
+  gem.homepage = "http://github.com/codingjester/tumblr_client"
+  gem.name = "tumblr_client"
+  gem.require_paths = ["lib"]
+  gem.required_rubygems_version = Gem::Requirement.new('>= 1.3.6')
+  gem.summary = %q{Tumblr API wrapper}
+  gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.version = "0.6.11"
 end

metadata

@@ -1,136 +1,117 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: tumblr_client
-version: !ruby/object:Gem::Version
-  version: 0.6.9
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 11
+  version: 0.6.11
 platform: ruby
-authors:
+authors: 
 - John Bunting
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-29 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-02-02 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 8
+        version: "0.8"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: faraday_middleware
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: json
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: oauth
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: oauth
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: webmock
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
 description: A Ruby wrapper for the Tumblr v2 API
-email:
+email: 
 - codingjester@gmail.com
-executables:
+executables: 
 - tumblr
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .path
 - Gemfile
@@ -151,28 +132,37 @@ files:
 - lib/tumblr/user.rb
 - lib/tumblr_client.rb
 - tumblr.gemspec
+has_rdoc: true
 homepage: http://github.com/codingjester/tumblr_client
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Tumblr API wrapper
 test_files: []
+