tumblr_client 0.5 → 0.6

data/README.md

@@ -5,13 +5,7 @@ currently available on the [Tumblr API](http://www.tumblr.com/docs/en/api/v2).
 
 ## Installation
 
-It hasn't been submitted to ruby gems yet so you'll have to build your gem first. 
-
-    gem build tumblr.gemspec
-
-Then you can just install with:
-
-    gem install tumblr-0.5.gem
+    gem install tumblr_client
 
 ## Usage
 
@@ -38,7 +32,7 @@ That's it! You now have a client that can make any request to the Tumblr API.
 
 ### Some quick examples
 
-Getting use information:
+Getting user information:
     
     >> client.info
 
@@ -47,8 +41,8 @@ Getting a specific blog's posts and type:
     #Grabbing a specific blogs posts
     >> client.posts("codingjester.tumblr.com")
     
-    #Grabbing only the last 10 photos off the blog
-    >> client.posts("codingjester.tumblr.com", "photo", :limit => 10)
+    #Grabbing only the last 10 photos off the blog 
+    >> client.posts("codingjester.tumblr.com", :type => "photo", :limit => 10)
 
 
 Posting some photos to Tumblr:

data/lib/tumblr/blog.rb

@@ -2,11 +2,12 @@ module Tumblr
   class Client
     module Blog
       
+      @@standard_options = [:type, :id, :tag, :limit, :offset, :reblog_info, :notes_info, :filter]
       #
       #Gets the info about the blog
       #
       def blog_info(blog_name)
-        info = get("v2/blog/#{blog_name}/info", {:api_key => Tumblr::consumer_key})
+        get("v2/blog/#{blog_name}/info", {:api_key => Tumblr::consumer_key})
       end
     
       #
@@ -14,7 +15,7 @@ module Tumblr
       #Defaults to 64
       #
       def avatar(blog_name, size=64)
-        avatar = get("v2/blog/#{blog_name}/avatar", {:size => size})
+        get("v2/blog/#{blog_name}/avatar", {:size => size})
       end
     
       #
@@ -26,11 +27,11 @@ module Tumblr
         end
       end
 
-      def posts(blog_name, type=false, options={})
+      def posts(blog_name, options={})
         url = "v2/blog/#{blog_name}/posts"
         
-        if type
-          url = "#{url}/#{type}"
+        if options.has_key?(:type)
+          url = "#{url}/#{options[:type]}"
         end
         
         params = {:api_key => Tumblr::consumer_key}

data/lib/tumblr/helpers.rb

@@ -1,6 +1,7 @@
 module Tumblr
   class Client
     module Helper
+      
       def valid_options(valid_opts, opts)
         bad_opts = opts.select { |val| !valid_opts.include?(val) }
         if !bad_opts.empty?

data/lib/tumblr/post.rb

@@ -2,6 +2,8 @@ module Tumblr
   class Client
     module Post
       
+      @@standard_post_options  = [:state, :tags, :tweet, :date, :markdown, :slug]
+      
       def edit(blog_name, options={})
         post("v2/blog/#{blog_name}/post/edit", options)  
       end
@@ -16,58 +18,88 @@ module Tumblr
       end
 
       def photo(blog_name, options={})
-        options[:type] = "photo"
-        if options.has_key?(:data)
-          #Probably can be refactored
-          if options[:data].kind_of?(Array)
-            count = 0
-            options[:data].each do |filepath|
-              options["data[#{count}]"] = File.open(filepath, 'rb').read()
-              count += 1
+        valid_opts = @@standard_post_options + [:caption, :link, :data, :source] 
+        if valid_options(valid_opts, options)
+          options[:type] = "photo"
+          if (options.has_key?(:data) && options.has_key?(:source))
+            raise Exception, "You can only use one parameter, either source or data."
+          end
+          if options.has_key?(:data)
+            #Probably can be refactored
+            if options[:data].kind_of?(Array)
+              count = 0
+              options[:data].each do |filepath|
+                options["data[#{count}]"] = File.open(filepath, 'rb').read()
+                count += 1
+              end
+              options.delete(:data)
+            else
+              options[:data] = File.open(options[:data],'rb').read()
             end
-            options.delete(:data)
-          else
-            options[:data] = File.open(options[:data],'rb').read()
           end
+          post("v2/blog/#{blog_name}/post", options)  
         end
-        post("v2/blog/#{blog_name}/post", options)  
       end
       
       def quote(blog_name, options={})
-        options[:type] = "quote"
-        post("v2/blog/#{blog_name}/post", options)
+        valid_opts = @@standard_post_options + [:quote, :source]
+        if valid_options(valid_opts, options)
+          options[:type] = "quote"
+          post("v2/blog/#{blog_name}/post", options)
+        end
       end
 
       def text(blog_name, options={})
-        options[:type] = "text"
-        post("v2/blog/#{blog_name}/post", options)
+        valid_opts = @@standard_post_options + [:title, :body]
+        if valid_options(valid_opts, options)
+          options[:type] = "text"
+          post("v2/blog/#{blog_name}/post", options)
+        end
       end
 
       def link(blog_name, options={})
-        options[:type] = "link"
-        post("v2/blog/#{blog_name}/post", options)
+        valid_opts = @@standard_post_options + [:title, :url, :description]
+        if valid_options(valid_opts, options)
+          options[:type] = "link"
+          post("v2/blog/#{blog_name}/post", options)
+        end
       end
 
       def chat(blog_name, options={})
-        options[:type] = "chat"
-        post("v2/blog/#{blog_name}/post", options)
+        valid_opts = @@standard_post_options + [:title, :conversation]
+        if valid_options(valid_opts, options)
+          options[:type] = "chat"
+          post("v2/blog/#{blog_name}/post", options)
+        end
       end
 
       def audio(blog_name, options={})
-        options[:type] = "audio"
-        post("v2/blog/#{blog_name}/post", options)
+        valid_opts = @@standard_post_options + [:data, :caption, :external_url]
+        if valid_options(valid_opts, options)
+          options[:type] = "audio"
+          if (options.has_key?(:data) && options.has_key?(:external_url))
+            raise Exception, "You can only use one parameter, either data or external url."
+          end
+          if(options.has_key?(:data))
+            options[:data] = File.open(options[:data],'rb').read()
+          end
+          post("v2/blog/#{blog_name}/post", options)
+        end
       end
       
       def video(blog_name, options={})
-        options[:type] = "video"
-        post("v2/blog/#{blog_name}/post", options)
-      end
-
-      def answer(blog_name, options={})
-        options[:type] = "answer"
-        post("v2/blog/#{blog_name}/post", options)
+        valid_opts = @@standard_post_options + [:data, :embed, :caption]
+        if valid_options(valid_opts, options)
+          options[:type] = "video"
+          if (options.has_key?(:data) && options.has_key?(:embed))
+            raise Exception, "You can only use one parameter, either data or embed."
+          end
+          if(options.has_key?(:data))
+            options[:data] = File.open(options[:data],'rb').read()
+          end
+          post("v2/blog/#{blog_name}/post", options)
+        end
       end
-
     end
-  end
+   end
 end

data/tumblr.gemspec

@@ -18,5 +18,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.5"
+    gem.version = "0.6"
 end

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
-  version: "0.5"
+  - 6
+  version: "0.6"
 platform: ruby
 authors: 
 - John Bunting
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-31 00:00:00 -04:00
+date: 2012-04-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency