jamescallmebrent-rumblr 0.0.1 → 0.0.2

data/.gitignore

@@ -0,0 +1,4 @@
+*.sw?
+.DS_Store
+coverage
+*.gem

data/LICENSE.rdoc

@@ -22,4 +22,3 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

data/README.rdoc

@@ -4,14 +4,10 @@ Rumblr is a Ruby client for http://www.tumblr.com XML API.  It currently only pr
 
 = Overview
 
-Rumblr maps the Tumblr API 'authenticate' and 'read' calls.  User, Tumblelog and Post models have attributes provided by the API, as well as some convenience methods for common tasks.
+Rumblr maps the Tumblr API 'authenticate' and 'read' calls.  User, Tumblelog and Post models have the attributes provided by the API, as well as some convenience methods for common tasks.
 
-Please read Tumblr's official documentation (http://tumblr.com/api/) to learn more the API.
+Please read Tumblr's official documentation (http://tumblr.com/api/) to learn more about the API.
 
-== Dependencies
-
-* Ruby >= 1.8.6 (not tested with previous versions)
-* libxml-ruby >= 0.8.3
 
 == Dependencies
 
@@ -32,12 +28,13 @@ To get the latest version, simply type the following instruction into your comma
 In order to use this library you need a valid Tumblr account.
 Go to http://tumblr.com and register for a new account if you don't already have one.
 
+
 === Sample usage:
 
   require 'rumblr'
   include Rumblr
   
-  user = User.login({:email => 'brent.hargrave@gmail.com', :password => 'tumb198$'})
+  user = User.login({:email => 'name@domain.com', :password => 'pass'})
   
   user.tumblelogs.each do |log|
     puts log.name  # 'the tumblelogger'
@@ -53,22 +50,8 @@ Go to http://tumblr.com and register for a new account if you don't already have
     puts post.url   # 'http://tumblelogger.tumblr.com/post/12345/my-first-tumblr-post'
   end
 
-
-== Credits
-
-Author:: {Brent Hargrave}[http://brenthargrave.info/] <brent.hargrave@gmail.com>
-
-This library was inspired by some great Ruby clients for other webservices:  {WWW::Delicious}[http://github.com/weppos/www-delicious/tree/master] and {dropio_api_ruby}[http://github.com/weppos/www-delicious/tree/master]
-
-
-== Resources
-
-* {GitHub}[http://github.com/jamescallmebrent/rumblr/]
-
-
-== FeedBack and Bug reports
-
-Please email {Brent Hargrave}[mailto:brent.hargrave@gmail.com] with any questions or feedback.
+  post = RegularPost.new(:title => "Post Title", :body => "Just a regular post!")
+  Client.instance.write(post, {:email => 'name@domain.com', :password => 'pass'})
 
 
 == License

data/Rakefile

@@ -0,0 +1,48 @@
+require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |s|
+    summary = %Q{Ruby client for the Tumblr API}
+
+    s.name = "rumblr"
+    s.summary = summary
+    s.email = "brent.hargrave@gmail.com"
+    s.homepage = "http://github.com/jamescallmebrent/rumblr"
+    s.description = summary
+    s.authors = ["Brent Hargrave", "Benny Wong"]
+    s.add_dependency('libxml-ruby', '>= 0.8.3')
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = 'rumblr'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |t|
+  t.libs << 'lib' << 'spec'
+  t.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+Spec::Rake::SpecTask.new(:rcov) do |t|
+  t.libs << 'lib' << 'spec'
+  t.spec_files = FileList['spec/**/*_spec.rb']
+  t.rcov = true
+end
+
+begin
+  require 'cucumber/rake/task'
+  Cucumber::Rake::Task.new(:features)
+rescue LoadError
+  puts "Cucumber is not available. In order to run features, you must: sudo gem install cucumber"
+end
+
+task :default => :spec

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 1
+:patch: 2

data/lib/rumblr/client.rb

@@ -21,7 +21,9 @@ module Rumblr
         user_attributes = parse_user_attributes_from(response_body)
         user_attributes.merge!(user_credentials)
       end
-      User.new(user_attributes)
+      user = User.new(user_attributes)
+      user.tumblelogs.each{ |tumblelog| tumblelog.user = user }
+      user
     end
     
     def read(options={})
@@ -35,8 +37,13 @@ module Rumblr
       
       request_url_host = URI.parse(options[:url]).host
       complete_request(request,host=request_url_host) do |response_body|
-        parser, parser.string = XML::Parser.new, response_body
+        parser = XML::Parser.string(response_body)
         doc = parser.parse
+        # parse and map tumblelog
+        tumblelog_element = doc.find_first('//tumblr/tumblelog')
+        tumblelog_attrs = cleanup_hash(tumblelog_element.attributes.to_h)
+        tumblelog_attrs.merge!(:url => options[:url])
+        tumblelog = Tumblelog.new(tumblelog_attrs)
         # parse and map posts
         posts = doc.find('//tumblr/posts/post').inject([]) do |array, element|
           post_attrs = cleanup_hash(element.attributes.to_h)
@@ -52,29 +59,27 @@ module Rumblr
           inner_attrs.delete(:tag)
           post_attrs.merge!(inner_attrs)
           # turn attributes into proper model
-          klass = case post_attrs[:type]
-                  when 'regular'      then RegularPost
-                  when 'photo'        then PhotoPost
-                  when 'quote'        then QuotePost
-                  when 'link'         then LinkPost
-                  when 'conversation' then ConversationPost
-                  when 'video'        then VideoPost
-                  when 'audio'        then AudioPost
-                  else raise          'unknown post type'
-                  end
+          klass = Rumblr.const_get(Post::TYPES[post_attrs[:type]])
+          raise 'unknown post type' unless klass
           post = klass.new(post_attrs)
+          post.tumblelog = tumblelog
           array << post
           array
         end
-        # parse and map tumblelog
-        tumblelog_element = doc.find_first('//tumblr/tumblelog')
-        tumblelog_attrs = cleanup_hash(tumblelog_element.attributes.to_h)
-        tumblelog_attrs.merge!(:url => options[:url])
-        tumblelog = Tumblelog.new(tumblelog_attrs)
       end
       return tumblelog, posts
     end
     
+    def write(post, creds)
+      raise(ArgumentError) unless post && post.is_a?(Post)
+      raise(ArgumentError) unless creds
+      uri = URI::HTTP.build(:path => "/api/write")
+      request = Net::HTTP::Post.new(uri.request_uri, DEFAULT_HEADER)
+      request.set_form_data(creds.merge(:type => Post::TYPES.invert[post.class]).merge(post.attribute_hash))
+      request_url_host = URI.parse(uri.request_uri).host
+      complete_request(request)
+    end
+    
     
     protected
     
@@ -111,7 +116,7 @@ module Rumblr
     private
     
     def parse_user_attributes_from(response_body)
-      parser, parser.string = XML::Parser.new, response_body
+      parser = XML::Parser.string response_body
       doc = parser.parse
       tumblelogs = doc.find('//tumblr/tumblelog').inject([]) do |array, element|
         tumblelog_attrs = cleanup_hash(element.attributes.to_h)
@@ -138,4 +143,4 @@ module Rumblr
   
   end
 
-end
+end

data/lib/rumblr/post.rb

@@ -3,7 +3,19 @@ module Rumblr
   # for attribute details, see Tumblr's documentation:
   # http://www.tumblr.com/api
   class Post < Resource
+    
+    TYPES = {
+      'regular'      => "RegularPost",
+      'photo'        => "PhotoPost",
+      'quote'        => "QuotePost",
+      'link'         => "LinkPost",
+      'conversation' => "ConversationPost",
+      'video'        => "VideoPost",
+      'audio'        => "AudioPost"
+    }
+    
     attr_reader :id, :url, :type, :unix_timestamp, :date_gmt, :date, :tags, :private
+    attr_accessor :tumblelog
     
     def initialize(attrs={})
       @private = false
@@ -18,34 +30,73 @@ module Rumblr
       !self.private?
     end
     
+    def attribute_hash
+      {:date => date}
+    end
+    
   end
   
   class RegularPost < Post
-    attr_reader :title, :body
+    attr_accessor :title, :body
+    
+    def attribute_hash
+      super.merge(:title => title, :body => body)
+    end
+    
   end
   
   class PhotoPost < Post
-    attr_reader :source, :data, :caption, :click_through_url
+    attr_accessor :source, :data, :caption, :click_through_url
+    
+    def attribute_hash
+      super.merge(:source => source, :data => data, :caption => caption, :click_through_url => click_through_url)
+    end
+    
   end
   
   class QuotePost < Post
-    attr_reader :quote, :source
+    attr_accessor :quote, :source
+    
+    def attribute_hash
+      super.merge(:quote => quote, :source => source)
+    end
+    
   end
   
   class LinkPost < Post
-    attr_reader :name, :url, :description
+    attr_accessor :name, :url, :description
+    
+    def attribute_hash
+      super.merge(:name => name, :url => url, :description => description)
+    end
+    
   end
   
   class ConversationPost < Post
-    attr_reader :title, :conversation
+    attr_accessor :title, :conversation
+    
+    def attribute_hash
+      super.merge(:title => title, :conversation => conversation)
+    end
+    
   end
   
   class VideoPost < Post
-    attr_reader :embed, :data, :title, :caption
+    attr_accessor :embed, :data, :title, :caption
+    
+    def attribute_hash
+      super.merge(:embed => embed, :data => data, :title => title, :caption => caption)
+    end
+    
   end
   
   class AudioPost < Post
-    attr_reader :data, :caption
+    attr_accessor :data, :caption
+    
+    def attribute_hash
+      super.merge(:data => data, :caption => caption)
+    end
+    
   end
   
-end
+end

data/lib/rumblr/tumblelog.rb

@@ -3,12 +3,17 @@ module Rumblr
   class Tumblelog < Resource
     attr_reader :name, :timezone, :cname, :title, :url, :avatar_url, :is_primary, 
                 :type, :private_id
+    attr_accessor :user
 
     def posts
       return [] unless self.url
       log, posts = Client.instance.read(:url => self.url)
       return posts
     end
+
+    def primary?
+      is_primary == "yes"
+    end
     
     class << self
       
@@ -21,4 +26,4 @@ module Rumblr
     
   end
   
-end
+end

data/lib/rumblr/user.rb

@@ -8,7 +8,7 @@ module Rumblr
     end
     
     def primary_tumblelog
-      self.tumblelogs.find { |log| log.is_primary }
+      self.tumblelogs.find { |log| log.primary? }
     end
     
     class << self
@@ -20,4 +20,4 @@ module Rumblr
 
   end
   
-end
+end

data/rumblr.gemspec

@@ -0,0 +1,60 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{rumblr}
+  s.version = "0.0.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Brent Hargrave", "Benny Wong"]
+  s.date = %q{2009-05-30}
+  s.description = %q{Ruby client for the Tumblr API}
+  s.email = %q{brent.hargrave@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE.rdoc",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "LICENSE.rdoc",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION.yml",
+     "lib/rumblr.rb",
+     "lib/rumblr/client.rb",
+     "lib/rumblr/post.rb",
+     "lib/rumblr/resource.rb",
+     "lib/rumblr/tumblelog.rb",
+     "lib/rumblr/user.rb",
+     "rumblr.gemspec",
+     "spec/rumblr/client_spec.rb",
+     "spec/rumblr/post_spec.rb",
+     "spec/rumblr/tumblelog_spec.rb",
+     "spec/rumblr/user_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/jamescallmebrent/rumblr}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.3}
+  s.summary = %q{Ruby client for the Tumblr API}
+  s.test_files = [
+    "spec/rumblr/client_spec.rb",
+     "spec/rumblr/post_spec.rb",
+     "spec/rumblr/tumblelog_spec.rb",
+     "spec/rumblr/user_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<libxml-ruby>, [">= 0.8.3"])
+    else
+      s.add_dependency(%q<libxml-ruby>, [">= 0.8.3"])
+    end
+  else
+    s.add_dependency(%q<libxml-ruby>, [">= 0.8.3"])
+  end
+end

data/spec/rumblr/client_spec.rb

@@ -108,4 +108,38 @@ module Rumblr
     
   end
   
+  describe Client, "writing to a public tumblelog" do
+    
+    before(:each) do
+      mock_successful(:authenticated_read)
+      @tumblelog, posts = @client.read( :url => 'http://dummylog.tumblr.com/', 
+                                        :email => 'valid',
+                                        :password => 'valid' )
+      mock_successful(:authenticated_write)
+    end
+    
+    it 'should raise an ArgumentError without post' do
+      lambda do
+        @client.write(nil, {:email => 'valid', :password => 'valid'})
+      end.should raise_error(ArgumentError)
+    end
+    
+    it 'should raise an ArgumentError if post is incorrect class' do
+      lambda do
+        @client.write("", {:email => 'valid', :password => 'valid'})
+      end.should raise_error(ArgumentError)
+    end
+    
+    it 'should raise an ArgumentError without creds' do
+      lambda do
+        @client.write(Rumblr::Post.new, nil)
+      end.should raise_error(ArgumentError)
+    end
+    
+    it 'should return an id' do
+      @client.write(Rumblr::Post.new, {:email => 'valid', :password => 'valid'}).should == "10001"
+    end
+    
+  end
+  
 end

data/spec/rumblr/post_spec.rb

@@ -5,7 +5,7 @@ module Rumblr
   describe Post, 'instances' do
     
     it 'should have attributes shared by every Post' do
-      Post.new.should respond_to(:id, :url, :type, :unix_timestamp, :date_gmt, :date, :tags, :private)
+      Post.new.should respond_to(:id, :url, :type, :unix_timestamp, :date_gmt, :date, :tags, :private, :tumblelog)
     end
     
     it 'private attribute should default to false' do
@@ -20,6 +20,10 @@ module Rumblr
       Post.new.should respond_to(:public?)
     end
     
+    it 'should provide a hash of attributes and values for API' do
+      Post.new.should respond_to(:attribute_hash)
+    end
+
   end
   
 end

data/spec/rumblr/tumblelog_spec.rb

@@ -35,5 +35,30 @@ module Rumblr
     end
     
   end
-  
+
+  describe Tumblelog, 'user' do
+    
+    describe 'logged in' do
+
+      before(:each) do
+        mock_successful(:authenticate)
+        @user = User.login(:email => 'valid_email', :password => 'valid_password')
+      end
+
+      it 'should have a user associated with it' do
+        @user.primary_tumblelog.user.should_not be_nil
+      end
+   
+    end
+
+    describe 'not logged in' do
+      
+      it 'should not have a user if anonymous read' do
+        mock_successful(:anonymous_read)
+        Tumblelog.find_by_url('valid_url').user.should be_nil
+      end
+      
+    end
+  end
+
 end

data/spec/rumblr/user_spec.rb

@@ -61,7 +61,7 @@ module Rumblr
     
     it 'should provide a primary tumblelog' do
       primary = @user.primary_tumblelog
-      primary.is_primary.should be_true
+      primary.is_primary.should == 'yes'
     end
     
   end

data/spec/spec_helper.rb

@@ -12,8 +12,12 @@ def mock_successful(request)
   }
   
   @client = Rumblr::Client.instance
-  # yes, this is cheating, but for now just concerned that xml is parsed right
-  @client.stub!(:complete_request).and_yield(responses_to[request])
+  if request == :authenticated_write
+    @client.stub!(:complete_request).and_return(responses_to[request])
+  else
+    # yes, this is cheating, but for now just concerned that xml is parsed right
+    @client.stub!(:complete_request).and_yield(responses_to[request])
+  end
 end
 
 def successful_authenticate_xml
@@ -98,8 +102,5 @@ def successful_authenticated_read_xml
 end
 
 def successful_authenticated_write_xml
-  response = <<-EOF
-    <?xml version="1.0" encoding="UTF-8"?>
-  EOF
-  response.strip!
+  "10001"
 end

metadata

@@ -1,48 +1,59 @@
 --- !ruby/object:Gem::Specification 
 name: jamescallmebrent-rumblr
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Brent Hargrave
+- Benny Wong
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-02-17 00:00:00 -08:00
+date: 2009-05-30 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: libxml-ruby
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.8.3
+    version: 
 description: Ruby client for the Tumblr API
 email: brent.hargrave@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- LICENSE.rdoc
+- README.rdoc
 files: 
+- .gitignore
 - LICENSE.rdoc
 - README.rdoc
+- Rakefile
 - VERSION.yml
-- lib/rumblr
+- lib/rumblr.rb
 - lib/rumblr/client.rb
 - lib/rumblr/post.rb
 - lib/rumblr/resource.rb
 - lib/rumblr/tumblelog.rb
 - lib/rumblr/user.rb
-- lib/rumblr.rb
-- spec/rumblr
+- rumblr.gemspec
 - spec/rumblr/client_spec.rb
 - spec/rumblr/post_spec.rb
 - spec/rumblr/tumblelog_spec.rb
 - spec/rumblr/user_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/jamescallmebrent/rumblr
 post_install_message: 
 rdoc_options: 
-- --inline-source
 - --charset=UTF-8
 require_paths: 
 - lib
@@ -63,7 +74,11 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Ruby client for the Tumblr API
-test_files: []
-
+test_files: 
+- spec/rumblr/client_spec.rb
+- spec/rumblr/post_spec.rb
+- spec/rumblr/tumblelog_spec.rb
+- spec/rumblr/user_spec.rb
+- spec/spec_helper.rb