tumblr_client 0.6.8 → 0.6.9

data/Gemfile.lock

@@ -0,0 +1,43 @@
+PATH
+  remote: .
+  specs:
+    tumblr_client (0.6.8)
+      faraday (>= 0.8)
+      faraday_middleware
+      json
+      oauth
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.3.2)
+    crack (0.3.2)
+    diff-lcs (1.1.3)
+    faraday (0.8.4)
+      multipart-post (~> 1.1)
+    faraday_middleware (0.9.0)
+      faraday (>= 0.7.4, < 0.9)
+    json (1.7.6)
+    multipart-post (1.1.5)
+    oauth (0.4.7)
+    rake (10.0.3)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.1)
+    webmock (1.9.0)
+      addressable (>= 2.2.7)
+      crack (>= 0.1.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rake
+  rspec
+  tumblr_client!
+  webmock

data/bin/tumblr

@@ -2,21 +2,65 @@
 $:.unshift File.join File.dirname(__FILE__), '..', 'lib'
 require 'rubygems'
 require 'tumblr_client'
+require 'oauth'
 require 'yaml'
 require 'irb'
 require 'irb/completion'
 
-configuration = YAML.load_file File.join ENV['HOME'], '.tumblr' rescue {}
+path = File.join ENV['HOME'], '.tumblr'
 
-ENV['IRBRC'] = '.irbrc' if File.exists? '.irbrc'
+if File.exist?(path)
+
+  # Load configuration from data
+  configuration = YAML.load_file path
+  Tumblr.configure do |config|
+    Tumblr::Config::VALID_OPTIONS_KEYS.each do |key|
+      config.send(:"#{key}=", configuration[key.to_s])
+    end
+  end
+
+else
+
+  Tumblr.configure do |config|
+
+    puts "Register an application at: http://www.tumblr.com/oauth/apps"
+    print 'OAuth Consumer key: '
+    config.consumer_key = gets.chomp
+
+    print 'OAuth Consumer secret: '
+    config.consumer_secret = gets.chomp
+
+    site = 'http://www.tumblr.com'
+    consumer = OAuth::Consumer.new(config.consumer_key, config.consumer_secret, :site => site)
+    request_token = consumer.get_request_token
+
+    puts
+
+    puts request_token.authorize_url
+    puts "Post-redirect, copy the oauth_verifier"
+    print 'OAuth Verifier: '
+    verifier = gets.chomp
+
+    access_token = request_token.get_access_token :oauth_verifier => verifier
+    config.oauth_token = access_token.token
+    config.oauth_token_secret = access_token.secret
+
+  end
+
+  # Save credentials
+  File.open(path, 'w') do |f|
+    configuration = {}
+    Tumblr::Config::VALID_OPTIONS_KEYS.each do |key|
+      configuration[key.to_s] = Tumblr.send(key)
+    end
+    f.write YAML.dump configuration
+  end
 
-Tumblr.configure do |config|
-  config.consumer_key = configuration["consumer_key"]
-  config.consumer_secret = configuration["consumer_secret"]
-  config.oauth_token = configuration["oauth_token"]
-  config.oauth_token_secret = configuration["oauth_token_secret"]
 end
 
+
+ENV['IRBRC'] = '.irbrc' if File.exists? '.irbrc'
+
 puts %q[
         .                                 .o8       oooo
       .o8                                "888       `888

data/lib/tumblr/blog.rb

@@ -9,15 +9,17 @@ module Tumblr
       def blog_info(blog_name)
         get("v2/blog/#{blog_name}/info", {:api_key => Tumblr::consumer_key})
       end
-    
+
       #
-      #Gets the avatar of specified size
-      #Defaults to 64
+      # Gets the avatar URL of specified size
       #
-      def avatar(blog_name, size=64)
-        get("v2/blog/#{blog_name}/avatar", {:size => size})
+      def avatar(blog_name, size = nil)
+        response = get_response("v2/blog/#{blog_name}/avatar", :size => size)
+        if response.status == 301
+          response.headers['Location']
+        end
       end
-    
+
       #
       # Gets the list of followers for the blog
       #

data/lib/tumblr/post.rb

@@ -2,7 +2,7 @@ module Tumblr
   class Client
     module Post
       
-      @@standard_post_options  = [:state, :tags, :tweet, :date, :markdown, :slug]
+      @@standard_post_options  = [:state, :tags, :tweet, :date, :markdown, :slug, :format]
       
       def edit(blog_name, options={})
         post("v2/blog/#{blog_name}/post/edit", options)  

data/lib/tumblr/request.rb

@@ -3,17 +3,20 @@ require 'json'
 module Tumblr
   module Request
 
-    #Performs a get request
-    def get(path, params={})
-      response = connection.get do |req|
-        req.url path 
+    # Perform a get request and return the raw response
+    def get_response(path, params = {})
+      connection.get do |req|
+        req.url path
         req.params = params
       end
-      #Check for errors and encapsulate
-      respond(response)
     end
-    
-    #Performs post request
+
+    # Performs a get request
+    def get(path, params={})
+      respond get_response(path, params)
+    end
+
+    # Performs post request
     def post(path, params={})
       response = connection.post do |req|
         req.url path
@@ -30,6 +33,6 @@ module Tumblr
         response.body['meta']
       end
     end
-    
+
   end
 end

data/tumblr.gemspec

@@ -4,6 +4,7 @@ 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'
@@ -18,5 +19,5 @@ Gem::Specification.new do |gem|
     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.8"
+    gem.version = "0.6.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tumblr_client
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-16 00:00:00.000000000 Z
+date: 2013-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !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'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -118,6 +134,7 @@ files:
 - .gitignore
 - .path
 - Gemfile
+- Gemfile.lock
 - LICENSE.md
 - README.md
 - Rakefile