tumblr-rb 1.1.1 → 1.2.0

data/lib/tumblr.rb

@@ -1,7 +1,7 @@
 require 'weary'
 
 class Tumblr
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
   GENERATOR = "The Tumblr Gem v#{VERSION}"
   USER_AGENT = "TumblrGem/#{VERSION} (+http://github.com/mwunsch/tumblr)"
   
@@ -36,9 +36,18 @@ class Tumblr
     reader.dashboard(parameters)
   end
   
-  def authenticate
+  def authenticate(theme = false)
     raise 'Requires an e-mail address and password' unless @credentials
-    Authenticator.new(@credentials[:email],@credentials[:password]).authenticate
+    params = theme ? {:'include-theme' => 1} : {}
+    Authenticator.new(@credentials[:email],@credentials[:password]).authenticate(params)
+  end
+  
+  def pages(username)
+    reader.pages(username)
+  end
+  
+  def all_pages(username)
+    reader.all_pages(username)
   end
   
   def reader

data/lib/tumblr/authenticator.rb

@@ -11,6 +11,7 @@ class Tumblr
     post :authenticate do |auth|
       auth.url = 'http://www.tumblr.com/api/authenticate'
       auth.requires = [:email, :password]
+      auth.with = [:'include-theme']
     end
     
   end

data/lib/tumblr/reader.rb

@@ -13,6 +13,18 @@ class Tumblr
       self.class.read username, :get, parameters(params)
     end
     
+    # http://www.tumblr.com/docs/en/api#api_pages
+    def pages(username)
+      Weary.get("http://#{username}.tumblr.com/api/pages")
+    end
+    
+    def all_pages(username)
+      raise 'You must provide an email address and password' if defaults.blank?
+      Weary.post("http://#{username}.tumblr.com/api/pages") do |req|
+        req.with = {:email => defaults[:email], :password => defaults[:password]}
+      end
+    end
+    
     # http://www.tumblr.com/docs/en/api#authenticated_read
     def authenticated_read(username, params={})
       raise 'You must provide an email address and password' unless (params.include?(:email) && params.include?(:password)) || defaults

data/test/fixtures/vcr_cassettes/read/all_pages.yml

@@ -0,0 +1,34 @@
+--- 
+- !ruby/struct:VCR::RecordedResponse 
+  method: :post
+  uri: http://tumblrgemtest.tumblr.com:80/api/pages
+  response: !ruby/object:Net::HTTPOK 
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <tumblr version="1.0"><pages><page url="http://tumblrgemtest.tumblr.com/test1" render-in-theme="true" title="Page Test 1" link-title="Page Test 1">Test #1</page><page url="http://tumblrgemtest.tumblr.com/test2" render-in-theme="true" title="Page Test 2">Whatsup</page></pages></tumblr>
+
+    body_exist: true
+    code: "200"
+    header: 
+      p3p: 
+      - CP="ALL ADM DEV PSAi COM OUR OTRo STP IND ONL"
+      content-type: 
+      - text/xml
+      connection: 
+      - close
+      x-tumblr-usec: 
+      - D=86883
+      server: 
+      - Apache/2.2.3 (Red Hat)
+      date: 
+      - Fri, 26 Mar 2010 17:35:45 GMT
+      content-length: 
+      - "325"
+      x-tumblr-perf: 
+      - "\"ch:0/ cm:0/ ce:0/ c:0/0 d:0/0 e:0/0\""
+      vary: 
+      - Accept-Encoding
+    http_version: "1.1"
+    message: OK
+    read: true
+    socket: 

data/test/fixtures/vcr_cassettes/read/pages.yml

@@ -0,0 +1,36 @@
+--- 
+- !ruby/struct:VCR::RecordedResponse 
+  method: :get
+  uri: http://tumblrgemtest.tumblr.com:80/api/pages
+  response: !ruby/object:Net::HTTPOK 
+    body: |
+      <?xml version="1.0" encoding="UTF-8"?>
+      <tumblr version="1.0"><pages><page url="http://tumblrgemtest.tumblr.com/test1" render-in-theme="true" title="Page Test 1" link-title="Page Test 1">Test #1</page></pages></tumblr>
+
+    body_exist: true
+    code: "200"
+    header: 
+      p3p: 
+      - CP="ALL ADM DEV PSAi COM OUR OTRo STP IND ONL"
+      content-type: 
+      - text/xml
+      connection: 
+      - close
+      x-tumblr-usec: 
+      - D=18293
+      server: 
+      - Apache/2.2.3 (Red Hat)
+      date: 
+      - Fri, 26 Mar 2010 17:21:33 GMT
+      content-length: 
+      - "218"
+      x-cache-auto: 
+      - miss
+      x-tumblr-perf: 
+      - "\"ch:0/ cm:0/ ce:0/ c:0/0 d:0/0 e:0/0\""
+      vary: 
+      - Accept-Encoding
+    http_version: "1.1"
+    message: OK
+    read: true
+    socket: 

data/test/test_tumblr.rb

@@ -110,6 +110,12 @@ link
       assert_equal auth.uri, tumbl.authenticate.uri
     end
     
+    test 'can pass include theme params to authenticate method' do
+      tumbl = Tumblr.new('test@testermcgee.com','dontrevealmysecrets')
+      include_theme = tumbl.authenticate(true)
+      assert include_theme.with.split('&').include?("include-theme=1")
+    end
+    
     test 'executes' do
       cred = {:email => 'test@testermcgee.com', :password => 'dontrevealmysecrets'}
       response = VCR.with_cassette('write/write') do
@@ -252,6 +258,21 @@ link
       end
       assert_equal 66, posts.count
     end
+    
+    test 'read pages' do
+      reader = Tumblr::Reader.new
+      assert_respond_to reader, :pages
+      response = hijack! reader.pages('tumblrgemtest'), 'read/pages'
+      assert response['tumblr'].has_key?("pages")
+    end
+    
+    test 'reads all pages by authenticating' do
+      reader = Tumblr::Reader.new('test@testermcgee.com','dontrevealmysecrets')
+      assert_respond_to reader, :all_pages
+      response = hijack! reader.all_pages('tumblrgemtest'), 'read/all_pages'
+      assert_equal 200, response.code
+      assert_equal 2, response['tumblr']['pages']['page'].count
+    end
   end
   
   describe 'Writer' do
@@ -306,6 +327,11 @@ link
       assert response.success?
       assert_equal 'mwunsch', response["tumblr"]["tumblelog"].first["name"]
     end
+    
+    test 'can include an optional theme' do
+      user = Tumblr::Authenticator.new('test@testermcgee.com','dontrevealmysecrets')
+      assert user.authenticate(:'include-theme' => 1).with.split('&').include?("include-theme=1")
+    end
   end
   
   describe 'Post' do

data/tumblr-rb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tumblr-rb}
-  s.version = "1.1.1"
+  s.version = "1.2.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-18}
+  s.date = %q{2010-03-26}
   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}
@@ -45,11 +45,13 @@ Gem::Specification.new do |s|
      "man/tumblr.5.html",
      "man/tumblr.5.ronn",
      "test/fixtures/vcr_cassettes/authenticate/authenticate.yml",
+     "test/fixtures/vcr_cassettes/read/all_pages.yml",
      "test/fixtures/vcr_cassettes/read/authenticated.yml",
      "test/fixtures/vcr_cassettes/read/authentication_failure.yml",
      "test/fixtures/vcr_cassettes/read/like.yml",
      "test/fixtures/vcr_cassettes/read/mwunsch.yml",
      "test/fixtures/vcr_cassettes/read/optional.yml",
+     "test/fixtures/vcr_cassettes/read/pages.yml",
      "test/fixtures/vcr_cassettes/read/tumblrgemtest.yml",
      "test/fixtures/vcr_cassettes/read/unlike.yml",
      "test/fixtures/vcr_cassettes/write/delete.yml",

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1
-  - 1
-  version: 1.1.1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Mark Wunsch
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-18 00:00:00 -04:00
+date: 2010-03-26 00:00:00 -04:00
 default_executable: tumblr
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -95,11 +95,13 @@ files:
 - man/tumblr.5.html
 - man/tumblr.5.ronn
 - test/fixtures/vcr_cassettes/authenticate/authenticate.yml
+- test/fixtures/vcr_cassettes/read/all_pages.yml
 - test/fixtures/vcr_cassettes/read/authenticated.yml
 - test/fixtures/vcr_cassettes/read/authentication_failure.yml
 - test/fixtures/vcr_cassettes/read/like.yml
 - test/fixtures/vcr_cassettes/read/mwunsch.yml
 - test/fixtures/vcr_cassettes/read/optional.yml
+- test/fixtures/vcr_cassettes/read/pages.yml
 - test/fixtures/vcr_cassettes/read/tumblrgemtest.yml
 - test/fixtures/vcr_cassettes/read/unlike.yml
 - test/fixtures/vcr_cassettes/write/delete.yml