tumblr-api 0.1.3 → 0.1.4

data/VERSION.yml

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

data/lib/tumblr.rb

@@ -7,7 +7,13 @@ require 'tumblr/request'
 require 'tumblr/post'
 
 class Tumblr    
-  class << self; attr_accessor :blog end
+  class << self
+    attr_reader :blog
+    
+    def blog=(_blog)
+      @blog = (_blog =~ /\./) ? _blog : "#{_blog}.tumblr.com"
+    end
+  end
   
   # tumblr errors
   class TumblrError < StandardError; end

data/lib/tumblr/request.rb

@@ -3,7 +3,7 @@ class Tumblr
     
     # a GET request to http://[YOURUSERNAME].tumblr.com/api/read
     def self.read(options = {})
-        response = HTTParty.get("http://#{Tumblr::blog ||= 'staff'}.tumblr.com/api/read", options)
+        response = HTTParty.get("http://#{Tumblr::blog}/api/read", options)
       return response unless raise_errors(response)
     end
     

data/spec/tumblr_spec.rb

@@ -1,10 +1,15 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Tumblr do
-  it "should set the current blog" do
+  it "should set the current blog suffixed with tumblr.com" do
     Tumblr::blog = 'myblog'
-    Tumblr::blog.should eql('myblog')
+    Tumblr::blog.should eql('myblog.tumblr.com')
   end
+  it "should set the current blog when a full domain is passed" do
+    Tumblr::blog = 'myblog.domain.com'
+    Tumblr::blog.should eql('myblog.domain.com')
+  end
+
 end
 
 describe Tumblr::Request, ".read" do
@@ -20,13 +25,13 @@ describe Tumblr::Request, ".read" do
       
   it "should return a tumblr object" do
     response = Tumblr::Request.read
-    response['tumblr'].is_a?(Hash).should eql(true)
+    response['tumblr'].should be_instance_of(Hash)
   end
   
   it "should even return a tumblr object when no blog specified" do
     Tumblr::blog = nil
     response = Tumblr::Request.read
-    response['tumblr'].is_a?(Hash).should eql true
+    response['tumblr'].should be_instance_of(Hash)
   end
 end
 
@@ -122,7 +127,7 @@ describe Tumblr::Post, ".all" do
   
   it "shoud always return an array" do
     response = Tumblr::Post.all
-    response.is_a?(Array).should eql(true)
+    response.should be_instance_of(Array)
   end
 end
 
@@ -163,7 +168,7 @@ describe Tumblr::Post, ".first" do
     
   it "shoud never return an array" do
     response = Tumblr::Post.first
-    response.is_a?(Array).should eql(false)
+    response.should_not be_instance_of(Array)
   end
 end
 
@@ -198,7 +203,7 @@ describe Tumblr::Post, ".last" do
   
   it "shoud never return an array" do
     response = Tumblr::Post.last
-    response.is_a?(Array).should eql(false)
+    response.should_not be_instance_of(Array)
   end
 end
 
@@ -220,7 +225,7 @@ describe Tumblr::Post, ".find" do
   
   it "shoud never return an array" do
     response = Tumblr::Post.find(108796131)
-    response.is_a?(Array).should eql(false)
+    response.should_not be_instance_of(Array)
   end
 end
 

data/tumblr-api.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tumblr-api}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Kreeftmeijer"]
-  s.date = %q{2009-11-17}
+  s.date = %q{2010-03-08}
   s.email = %q{jeff@kreeftmeijer.nl}
   s.extra_rdoc_files = [
     "LICENSE",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tumblr-api
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Jeff Kreeftmeijer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-17 00:00:00 +01:00
+date: 2010-03-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency