instapush 0.1.0 → 0.2.0

data/README.md

@@ -11,17 +11,22 @@ Installation
 Usage
 -----
 
-    # Connect to Instapaper and add "http://kimjoar.net" to the user "kjbekkelund@gmail.com"
-    # The password is optional and can be omitted when you don't have a password
-    # on Instapaper.
+Connect to Instapaper and add "http://kimjoar.net" to the user "kjbekkelund@gmail.com". The password is optional and can be omitted when you don't have a password on Instapaper.
+
     InstaPush.connect "kjbekkelund@gmail.com", "password" do
       add "http://kimjoar.net"
     end
-    
-    # Similarly you can use:
+
+Similarly you can use:
+
     conn = InstaPush.connect "kjbekkelund@gmail.com", "password"
     conn.add "http://kimjoar.net"
-    
-    # Just authenticate with Instapaper. Calling this before adding pages is 
-    # not necessary.
+
+Just authenticate with Instapaper. Calling this before adding pages is not necessary.
+
     InstaPush.authenticate "kjbekkelund@gmail.com", "password"
+
+In the wild
+-----------
+
+* [Merging from Pinboard to Instapaper](http://kimjoar.net/merging-from-pinboard-to-instapaper.html)

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/instapush.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{instapush}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kim Joar Bekkelund"]
-  s.date = %q{2010-07-27}
+  s.date = %q{2010-08-06}
   s.description = %q{Ruby wrapper for the Instapaper API.}
   s.email = %q{kjbekkelund@gmail.com}
   s.extra_rdoc_files = [

data/lib/instapush.rb

@@ -4,32 +4,36 @@ require 'rest_client'
 
 class InstaPush
   class AuthFailedError < StandardError; end
-  
+
   class << self
     def connect(username, password = nil, &block)
       conn = new username, password
-      
+
       if block_given?
-        conn.instance_eval(&block)
+        if block.arity == 1
+          block.call(conn)
+        else
+          conn.instance_eval(&block)
+        end
       else
         conn
       end
     end
-    
+
     def authenticate(username, password = nil)
       conn = connect(username, password)
       raise AuthFailedError unless conn.authenticate
     end
   end
-  
+
   attr_reader :username, :password, :api_url
-  
+
   def initialize(username, password)
     @username = username
     @password = password
     @api_url = "https://www.instapaper.com/api/"
   end
-  
+
   def authenticate
     RestClient.post authenticate_url,
                     :username => username,
@@ -38,24 +42,24 @@ class InstaPush
     errors << $!
     false
   end
-  
+
   def add(url, opts = {})
     opts.merge! :url      => url,
-                :username => username, 
+                :username => username,
                 :password => password
-    
+
     RestClient.post add_url, opts
   rescue RestClient::RequestFailed
     errors << $!
     false
   end
-  
+
   def errors
     @errors ||= []
   end
-  
+
   def method_missing(sym)
     raise NoMethodError unless sym.to_s.include? '_url'
     api_url + sym.to_s.chomp('_url')
   end
-end
+end

data/spec/instapush_spec.rb

@@ -7,26 +7,26 @@ describe InstaPush do
     RestClient.stub!(:post).with("https://www.instapaper.com/api/authenticate", hash_including(:username => 'not_working@gmail.com')).and_raise(RestClient::Forbidden)
     RestClient.stub!(:post).with("https://www.instapaper.com/api/authenticate", hash_including(:username => 'kjbekkelund@gmail.com')).and_return("200")
   end
-  
+
   describe ".connect" do
     it "should yield an instance of InstaPush if a block is given" do
       yielded = nil
       InstaPush.connect("kjbekkelund@gmail.com") { yielded = self }
       yielded.should be_kind_of(InstaPush)
     end
-    
+
     it "should return an instance of InstaPush if a block is not given" do
       conn = InstaPush.connect "kjbekkelund@gmail.com"
       conn.should be_kind_of(InstaPush)
     end
   end
-  
+
   describe ".authenticate" do
     it "should raise an exception when it fails" do
       lambda { InstaPush.authenticate("not_working@gmail.com") }.should raise_error(InstaPush::AuthFailedError)
     end
   end
-  
+
   describe "#errors" do
     it "should include an error when an api method has failed" do
       InstaPush.connect "not_working@gmail.com" do
@@ -34,15 +34,15 @@ describe InstaPush do
         errors.length.should == 1
       end
     end
-    
+
     it "should include the exception raised" do
       InstaPush.connect "not_working@gmail.com" do
         authenticate
         errors.first.to_s.should == "Forbidden"
       end
-    end 
+    end
   end
-  
+
   context "a connected user" do
     before do
       @conn = InstaPush.connect "kjbekkelund@gmail.com"
@@ -52,38 +52,38 @@ describe InstaPush do
       it "should return a status code of 200 if the authentication is successful" do
         @conn.authenticate.should == "200"
       end
-      
+
       it "should return false if the authentication was unsuccessful" do
         @conn = InstaPush.connect "not_working@gmail.com"
         @conn.authenticate.should be_false
       end
     end
-    
+
     describe "#add" do
       it "should post the url to Instapaper" do
         RestClient.should_receive(:post).once.with("https://www.instapaper.com/api/add", hash_including(:url => "http://kimjoar.net"))
         @conn.add "http://kimjoar.net"
       end
-      
+
       it "should include additional parameters in the call to Instapaper" do
         RestClient.should_receive(:post).once.with("https://www.instapaper.com/api/add", hash_including(:title=>"Kim Joar", :selection=>"description"))
         @conn.add "http://kimjoar.net", :title => "Kim Joar", :selection => "description"
       end
-      
+
       it "should return a response code of 201 when successful" do
         RestClient.should_receive(:post).once.with("https://www.instapaper.com/api/add", hash_including(:title=>"Kim Joar", :selection=>"description")).and_return("201")
         @conn.add("http://kimjoar.net", :title => "Kim Joar", :selection => "description").should == "201"
       end
     end
-    
-    describe "#method_missing" do    
+
+    describe "#method_missing" do
       it "should return the extended api url if the input ends with _url" do
         @conn.add_url.should == "https://www.instapaper.com/api/add"
       end
-      
+
       it "should raise a no method error if the method does not exist and the input does not end with _url" do
         lambda { @conn.method_that_dont_exist }.should raise_error(NoMethodError)
       end
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: instapush
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Kim Joar Bekkelund
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-27 00:00:00 +02:00
+date: 2010-08-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency