tipjoy 0.0.10 → 0.0.11

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/lib/tipjoy.rb

@@ -1,5 +1,5 @@
 module Tipjoy
-  TIPJOY_BASE_URL = "http://tipjoy.com"
+  TIPJOY_BASE_URL = "http://tipjoy.com/api"
 
   def self.log!(logger=Logger.new(true))
     self.logger = logger

data/lib/tipjoy/account.rb

@@ -3,8 +3,8 @@ module Tipjoy
     include Tipjoy::Requestor
     include Tipjoy::BulkInitializer
 
-    EXISTS_PATH = "/api/user/exists/"
-    CREATE_PATH = "/api/createTwitterAccount/"
+    EXISTS_PATH = "/user/exists/"
+    CREATE_PATH = "/createTwitterAccount/"
 
     attr_accessor :username
     attr_accessor :user_id

data/lib/tipjoy/result_error.rb

@@ -1,3 +1,9 @@
 module Tipjoy
-  class ResultError < Exception; end
+  class ResultError < Exception
+    attr_accessor :json
+    def initialize(json)
+      self.json = json
+      super
+    end
+  end
 end

data/lib/tipjoy/tipjoy_requestor.rb

@@ -21,7 +21,7 @@ module Tipjoy
       end
 
       def tipjoy_request(method, url, data={})
-        Tipjoy.logger.error("requesting via #{method} " + url + "with args " + data.inspect)
+        Tipjoy.logger.error("requesting via #{method} " + url + " with args " + data.inspect)
         response = tipjoy_http_request(method, url, data)
 
         if !(200..299).include?(response.code.to_i)
@@ -34,7 +34,7 @@ module Tipjoy
 
         if json['result'] != 'success'
           Tipjoy.logger.error("  ResultError " + json.inspect)
-          raise ::Tipjoy::ResultError.new(json.inspect)
+          raise ::Tipjoy::ResultError.new(json)
         end
 
         Tipjoy.logger.error("  response: " + json.inspect)

data/lib/tipjoy/transaction.rb

@@ -1,27 +1,47 @@
 module Tipjoy
   class Transaction
-#    include Tipjoy::Requestor
+    include Tipjoy::Requestor
     include Tipjoy::BulkInitializer
 
+    SHOW_SINGLE_PATH = '/transaction/show/'
+
     attr_accessor :transaction_id,
-            :username,
-            :userid,
-            :date_joined,
-            :is_loan,
-            :verified,
-            :permalink,
-            :time,
-            :pretty_time,
-            :amount,
-            :twitter_username,
-            :twitter_user_id,
-            :profile_image_url,
-            :tweet_id,
-            :tweet_message,
-            :tweet_message_html
+        :username,
+        :userid,
+        :date_joined,
+        :is_loan,
+        :verified,
+        :permalink,
+        :time,
+        :pretty_time,
+        :amount,
+        :twitter_username,
+        :twitter_user_id,
+        :profile_image_url,
+        :tweet_id,
+        :tweet_message,
+        :tweet_message_html
 
     def initialize(options={})
       assign_attributes(options)
     end
+
+    def amount=(a)
+      @amount = a.to_f
+    end
+
+    def is_loan=(is_loan)
+      @is_loan = (is_loan == 1) ? true : false
+    end
+
+    def self.find(id)
+      json = tipjoy_request(:get, TIPJOY_BASE_URL + SHOW_SINGLE_PATH + "?id=" + id.to_s)
+
+      return Transaction.new(json)
+
+    rescue ResultError => e
+      raise e unless e.json["reason"] == "invalid transaction id"
+      return nil
+    end
   end
 end

data/spec/lib/tipjoy/transaction_spec.rb

@@ -1,5 +1,62 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Tipjoy::Transaction do
+  before do
+    @expected_transaction = {"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"
+                                 }  
+  end
+
+  describe ".find" do
+    it "should return a transaction" do
+      transaction = Tipjoy::Transaction.find(@expected_transaction['transaction_id'])
+      transaction.should_not be_nil
+      transaction.transaction_id.should == @expected_transaction['transaction_id']
+      transaction.amount.should == @expected_transaction['amount'].to_f
+    end
+
+    it "should return nil if the transaction is not found" do
+      transaction = Tipjoy::Transaction.find(-1)
+      transaction.should be_nil
+    end
+
+    describe "failure" do
+      before do
+        @requestor = Tipjoy::Transaction
+        @request   = Proc.new do
+          Tipjoy::Transaction.find(-1)
+        end
+      end
+
+      it_should_behave_like "tipjoy request maker that might fail"
+    end
+  end
+
+  describe "#is_loan" do
+    it "should be true when response isLoan is 1" do
+      transaction = Tipjoy::Transaction.new({"isLoan"=>1})
+      transaction.is_loan.should be_true
+    end
+
+    it "should be false when response isLoan is 0" do
+      transaction = Tipjoy::Transaction.new({"isLoan"=>0})
+      transaction.is_loan.should be_false
+    end
+
+  end
 
 end

data/tipjoy.gemspec

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tipjoy
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors: 
 - Parker Thompson

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tipjoy
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors: 
 - Parker Thompson