tumblr-rb 1.2.0 → 1.3.0

data/Gemfile

@@ -1,4 +1,4 @@
-# A sample Gemfile
+source 'http://rubygems.org'
 
 gem 'weary','>= 0.7.1'
 gem 'highline', '>= 1.5.2'
@@ -7,6 +7,6 @@ group :test do
 	gem 'rake'
 	gem 'redgreen'
 	gem 'contest'
-	gem 'vcr'
+	gem 'vcr', '>= 0.3.1'
 	gem 'jeweler'
 end

data/Gemfile.lock

@@ -19,7 +19,7 @@ dependencies:
   vcr: 
     group: 
     - :test
-    version: ">= 0"
+    version: ">= 0.3.1"
   jeweler: 
     group: 
     - :test
@@ -29,36 +29,37 @@ dependencies:
     - :test
     version: ">= 0"
 specs: 
+- rake: 
+    version: 0.8.7
+- contest: 
+    version: 0.1.2
+- crack: 
+    version: 0.1.7
+- fakeweb: 
+    version: 1.2.8
 - json_pure: 
-    version: 1.2.2
+    version: 1.2.4
+- gemcutter: 
+    version: 0.5.0
 - git: 
     version: 1.2.5
-- redgreen: 
-    version: 1.2.2
+- highline: 
+    version: 1.5.2
 - rubyforge: 
     version: 2.0.4
+- jeweler: 
+    version: 1.4.0
 - ruby-hmac: 
     version: 0.4.0
-- crack: 
-    version: 0.1.7
 - oauth: 
     version: 0.3.6
-- weary: 
-    version: 0.7.1
-- rake: 
-    version: 0.8.7
-- gemcutter: 
-    version: 0.5.0
-- jeweler: 
-    version: 1.4.0
-- contest: 
-    version: 0.1.2
-- highline: 
-    version: 1.5.2
-- fakeweb: 
-    version: 1.2.8
+- redgreen: 
+    version: 1.2.2
 - vcr: 
-    version: 0.1.2
-hash: bb23bf752ce2daa339a799069ab0b6df9063a3a4
-sources: []
-
+    version: 0.3.1
+- weary: 
+    version: 0.7.2
+hash: 494102bf0992e5bb83118c12065b38b342f1de6a
+sources: 
+- Rubygems: 
+    uri: http://rubygems.org

data/Rakefile

@@ -23,7 +23,7 @@ begin
     gem.authors = ["Mark Wunsch"]
     gem.add_dependency 'weary', '>= 0.7.1'
     gem.add_dependency 'highline', '>= 1.5.2'
-    gem.add_development_dependency "bundler", ">= 0.9.7"
+    gem.add_development_dependency "bundler", ">= 0.9.19"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -51,8 +51,6 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
-
 task :default => :test
 
 require 'rake/rdoctask'

data/lib/tumblr.rb

@@ -1,7 +1,7 @@
 require 'weary'
 
 class Tumblr
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
   GENERATOR = "The Tumblr Gem v#{VERSION}"
   USER_AGENT = "TumblrGem/#{VERSION} (+http://github.com/mwunsch/tumblr)"
   

data/lib/tumblr/post.rb

@@ -7,6 +7,7 @@ class Tumblr
     POST_PARAMS = [:title,:body,:source,:caption,:'click-through-url',
                    :quote,:name,:url,:description,:conversation,
                    :embed,:'externally-hosted-url']
+    REBLOG_PARAMS = [:comment, :as]
     
     def self.parameters(*attributes)
       if !attributes.blank?
@@ -88,6 +89,10 @@ class Tumblr
       Writer.new(email,password).edit(to_h)
     end
     
+    def reblog(email, password)
+      Writer.new(email,password).reblog(to_h)
+    end
+    
     def delete(email, password)
       Writer.new(email,password).delete(to_h)
     end

data/lib/tumblr/writer.rb

@@ -22,6 +22,13 @@ class Tumblr
       edit.with = (Post::BASIC_PARAMS | Post::POST_PARAMS)
     end
     
+    # http://www.tumblr.com/docs/en/api#reblogging_posts
+    post :reblog do |reblog|
+      reblog.url = 'http://www.tumblr.com/api/reblog'
+      reblog.requires = [:email, :password, :'post-id', :'reblog-key']
+      reblog.with = (Post::BASIC_PARAMS | Post::POST_PARAMS | Post::REBLOG_PARAMS)
+    end
+    
     # http://www.tumblr.com/docs/en/api#deleting_posts
     post :delete do |del|
       del.url = 'http://www.tumblr.com/api/delete'

data/test/fixtures/vcr_cassettes/write/reblog.yml

@@ -0,0 +1,31 @@
+--- 
+- !ruby/struct:VCR::RecordedResponse 
+  method: :post
+  uri: http://www.tumblr.com:80/api/reblog
+  response: !ruby/object:Net::HTTPCreated 
+    body: "508128650"
+    body_exist: true
+    code: "201"
+    header: 
+      p3p: 
+      - CP="ALL ADM DEV PSAi COM OUR OTRo STP IND ONL"
+      content-type: 
+      - text/plain; charset=utf-8
+      connection: 
+      - close
+      x-tumblr-usec: 
+      - D=380408
+      server: 
+      - Apache/2.2.3 (Red Hat)
+      date: 
+      - Fri, 09 Apr 2010 12:36:41 GMT
+      content-length: 
+      - "9"
+      x-tumblr-perf: 
+      - "\"ch:12/country_code_for_ip,posts,tumblelogs,tumblelogs,version,users,users,tumblelogs,tumblelogs,version,users,users cm:4/rate-limiter,rate-limiter,users,version ce:0/ c:0/0 d:0/0 e:0/0\""
+      vary: 
+      - Accept-Encoding
+    http_version: "1.1"
+    message: Created
+    read: true
+    socket: 

data/test/helper.rb

@@ -11,8 +11,12 @@ end
 require 'pp'
 require 'test/unit'
 require 'contest'
-require 'redgreen'
 require 'vcr'
+# Ruby 1.9 does not like redgreen
+begin
+  require 'redgreen'
+rescue LoadError
+end
 
 begin
   require 'tumblr'
@@ -26,15 +30,15 @@ FakeWeb.allow_net_connect = false
 
 VCR.config do |c|
   # the cache_dir is where the cassette yml files will be saved.
-  c.cache_dir = File.join(File.dirname(__FILE__),'fixtures', 'vcr_cassettes')
+  c.cassette_library_dir = File.join(File.dirname(__FILE__),'fixtures', 'vcr_cassettes')
 
   # this record mode will be used for any cassette you create without specifying a record mode.
-  c.default_cassette_record_mode = :none
+  c.default_cassette_options = {:record => :none}
 end
 
 def hijack!(request, fixture)
-  record_mode = File.exist?(VCR::Cassette.new(fixture).cache_file) ? :none : :unregistered
-  VCR.with_cassette(fixture, :record => record_mode) do
+  record_mode = File.exist?(VCR::Cassette.new(fixture).file) ? :none : :unregistered
+  VCR.use_cassette(fixture, :record => record_mode) do
     request.perform
   end
 end

data/test/test_tumblr.rb

@@ -118,7 +118,7 @@ link
     
     test 'executes' do
       cred = {:email => 'test@testermcgee.com', :password => 'dontrevealmysecrets'}
-      response = VCR.with_cassette('write/write') do
+      response = VCR.use_cassette('write/write') do
         Tumblr.execute(cred, 'Hello World.')
       end
       assert response.is_a? Weary::Response
@@ -253,7 +253,7 @@ link
     
     test 'gets all the posts for a username' do
       reader = Tumblr::Reader.new('test@testermcgee.com','dontrevealmysecrets')
-      posts = VCR.with_cassette('read/authenticated') do
+      posts = VCR.use_cassette('read/authenticated') do
         reader.get_all_posts('mwunsch')
       end
       assert_equal 66, posts.count
@@ -309,6 +309,14 @@ link
       assert response.success?
       assert_equal 'Deleted', response.body
     end
+    
+    test 'reblogs a post' do
+      assert_respond_to Tumblr::Writer.new, :reblog
+      publisher = Tumblr::Writer.new('test@testermcgee.com','dontrevealmysecrets')
+      post = {:'post-id' => "507998507", :'reblog-key' => 'DifhdmQI'}
+      response = hijack! publisher.reblog(post), 'write/reblog'
+      assert_equal 201, response.code
+    end
   end
   
   describe 'Authenticator' do
@@ -469,6 +477,12 @@ link
         assert post.delete('test@testermcgee.com','dontrevealmysecrets').is_a? Weary::Request
       end
       
+      test 'reblogs itself' do
+        post = Tumblr::Post.new(123)
+        post.reblog_key = '0U812'
+        assert post.reblog('test@testermcgee.com','dontrevealmysecrets').is_a? Weary::Request
+      end
+      
       test 'likes itself' do
         post = Tumblr::Post.new(445597771)
         post.reblog_key = "DLVWOpfh"

data/tumblr-rb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tumblr-rb}
-  s.version = "1.2.0"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Wunsch"]
-  s.date = %q{2010-03-26}
+  s.date = %q{2010-04-14}
   s.default_executable = %q{tumblr}
   s.description = %q{Ruby library and command line utility to work with the Tumblr Blogging Platform, powered by Weary.}
   s.email = %q{mark@markwunsch.com}
@@ -56,6 +56,7 @@ Gem::Specification.new do |s|
      "test/fixtures/vcr_cassettes/read/unlike.yml",
      "test/fixtures/vcr_cassettes/write/delete.yml",
      "test/fixtures/vcr_cassettes/write/edit.yml",
+     "test/fixtures/vcr_cassettes/write/reblog.yml",
      "test/fixtures/vcr_cassettes/write/write.yml",
      "test/helper.rb",
      "test/test_tumblr.rb",
@@ -78,16 +79,16 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<weary>, [">= 0.7.1"])
       s.add_runtime_dependency(%q<highline>, [">= 1.5.2"])
-      s.add_development_dependency(%q<bundler>, [">= 0.9.7"])
+      s.add_development_dependency(%q<bundler>, [">= 0.9.19"])
     else
       s.add_dependency(%q<weary>, [">= 0.7.1"])
       s.add_dependency(%q<highline>, [">= 1.5.2"])
-      s.add_dependency(%q<bundler>, [">= 0.9.7"])
+      s.add_dependency(%q<bundler>, [">= 0.9.19"])
     end
   else
     s.add_dependency(%q<weary>, [">= 0.7.1"])
     s.add_dependency(%q<highline>, [">= 1.5.2"])
-    s.add_dependency(%q<bundler>, [">= 0.9.7"])
+    s.add_dependency(%q<bundler>, [">= 0.9.19"])
   end
 end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Mark Wunsch
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-26 00:00:00 -04:00
+date: 2010-04-14 00:00:00 -04:00
 default_executable: tumblr
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,8 +55,8 @@ dependencies:
         segments: 
         - 0
         - 9
-        - 7
-        version: 0.9.7
+        - 19
+        version: 0.9.19
   type: :development
   version_requirements: *id003
 description: Ruby library and command line utility to work with the Tumblr Blogging Platform, powered by Weary.
@@ -106,6 +106,7 @@ files:
 - test/fixtures/vcr_cassettes/read/unlike.yml
 - test/fixtures/vcr_cassettes/write/delete.yml
 - test/fixtures/vcr_cassettes/write/edit.yml
+- test/fixtures/vcr_cassettes/write/reblog.yml
 - test/fixtures/vcr_cassettes/write/write.yml
 - test/helper.rb
 - test/test_tumblr.rb