tipjoy 0.0.9 → 0.0.10

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/lib/tipjoy/payment.rb

@@ -39,7 +39,7 @@ module Tipjoy
 
     def notify_tipjoy
       json = tipjoy_request(:post,"http://tipjoy.com/api/tweetpayment/notify/", { "tweet_id" => self.tweet_id })
-      Transaction.new(json)
+      Transaction.new(json['transactions'][0])
     end
   end
 end

data/spec/lib/tipjoy/payment_spec.rb

@@ -61,14 +61,35 @@ describe Tipjoy::Payment do
   describe "#pay" do
     before do
       @payment_tweet = {"user"=>
-              {"name"=>"poopr",
-                      "id"=>42670876,
-                      "screen_name"=>"poopr111"
-              },
-              "text"=>"p $1.25 @poopr112 for api test",
-              "id"=>1939894288,
-              "created_at"=>"Wed May 27 21:30:34 +0000 2009"
+          {"name"=>"poopr",
+              "id"=>42670876,
+              "screen_name"=>"poopr111"
+          },
+          "text"=>"p $1.25 @poopr112 for api test",
+          "id"=>1939894288,
+          "created_at"=>"Wed May 27 21:30:34 +0000 2009"
       }
+      @expected_transaction = {"result"=>"success",
+                               "transactions"=>[
+                                   {"permalink"=>"http://twitter.com/poopr112",
+                                       "time"=>"2009-05-27 15:53:21",
+                                       "twitter_username"=>"poopr111",
+                                       "is_private"=>false,
+                                       "twitter_user_id"=>"42670876",
+                                       "username"=>"poopr111",
+                                       "transaction_id"=>47702,
+                                       "amount"=>"1.25",
+                                       "userid"=>56673,
+                                       "tweet_message"=>"p $1.25 @poopr112 for api test",
+                                       "prettyTime"=>"4 days ago", "date_joined"=>"2009-05-26 10:24:07",
+                                       "verified"=>false,
+                                       "isLoan"=>1,
+                                       "tweet_id"=>"1939894288",
+                                       "tweet_message_html"=>"p $1.25 <a href='http://twitter.com/poopr112'>@poopr112</a> for api test",
+                                       "profile_image_url"=>"http://s3.amazonaws.com/twitter_thumbs/default.jpg"
+                                   }],
+                               "request"=>"/api/tweetpayment/notify/"
+                               }
     end
 
 
@@ -83,18 +104,6 @@ describe Tipjoy::Payment do
       @payment.pay
     end
 
-    #todo remove mock
-    it "should construct a transaction" do
-      @payment.transaction_id.should be_nil
-      @client.should_receive(:update).with("p $1.25 @poopr112 for api test").and_return(@payment_tweet)
-      @payment.should_receive(:tipjoy_request).and_return({:transaction_id => 1})
-
-      transaction = @payment.pay
-      
-      transaction.should_not be_nil
-      transaction.transaction_id.should == 1
-    end
-
     it "should construct a transaction" do
       @payment.transaction_id.should be_nil
       @client.should_receive(:update).with("p $1.25 @poopr112 for api test").and_return(@payment_tweet)
@@ -102,7 +111,7 @@ describe Tipjoy::Payment do
       transaction = @payment.pay
 
       transaction.should_not be_nil
-      transaction.transaction_id.should == 1
+      transaction.transaction_id.should == @expected_transaction['transactions'][0]['transaction_id']
     end
 
     describe "failure" do

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 dir = File.expand_path(File.dirname(__FILE__))
 require "rubygems"
 require 'spec'
-#require 'spec/autorun'
+require 'spec/autorun'
 #require 'mash'
 require dir + '/../init'
 require dir + '/doubles/fake_oauth_client'
@@ -31,4 +31,6 @@ share_examples_for "tipjoy request maker that might fail" do
       @request.call
     }.should raise_error(Tipjoy::RequestError)
   end
-end
+end
+
+Tipjoy.log!

data/tipjoy.gemspec

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tipjoy
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - Parker Thompson
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-30 00:00:00 -07:00
+date: 2009-06-01 00:00:00 -07:00
 default_executable: 
 dependencies: []
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tipjoy
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - Parker Thompson
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-30 00:00:00 -07:00
+date: 2009-06-01 00:00:00 -07:00
 default_executable: 
 dependencies: []