gratitude 0.0.9 → 0.0.10

data/spec/gratitude/statistics_spec.rb

@@ -3,282 +3,275 @@ require "spec_helper"
 describe Gratitude::Statistics do
 
   describe "default attributes" do
-    it "should include httparty methods" do
-      Gratitude::Statistics.should include(HTTParty)
+    it "includes httparty methods" do
+      expect(Gratitude::Statistics).to include(HTTParty)
     end
 
-
-    it "should have the base uri set to gittip's payday api endpoint" do
-      expect(Gratitude::Statistics.base_uri).to eq("https://www.gittip.com/about/stats.json")
+    it "sets the base uri equal to gittip's payday api endpoint" do
+      expect(Gratitude::Statistics.base_uri)
+        .to eq("https://www.gittip.com/about/stats.json")
     end
-  end # default attributes
+  end
 
   describe "instance methods" do
-
-    before do
-      VCR.insert_cassette "statistics"
-    end
-
-    after do
-      VCR.eject_cassette
-    end
-
+    before { VCR.insert_cassette "statistics" }
+    after { VCR.eject_cassette }
     let(:stats) { Gratitude::Statistics.current }
 
-    it "should respond to #repsonse" do
+    it "responds to #repsonse" do
       expect(stats).to respond_to(:response)
     end
 
     describe "#average_tip_amount" do
-      it "should return the correct average tip amount" do
+      it "returns the correct average tip amount" do
         expect(stats.average_tip_amount).to eq(1.2348237280979524)
       end
 
-      it "should return a float" do
+      it "returns a float" do
         expect(stats.average_tip_amount.class).to be(Float)
       end
 
-      it "should return the same value as its alias: #average_tip" do
+      it "returns the same value as its alias: #average_tip" do
         expect(stats.average_tip_amount).to eq(stats.average_tip)
       end
     end
 
     describe "#average_number_of_tippees" do
-      it "should return the correct average number of tippees" do
+      it "returns the correct average number of tippees" do
         expect(stats.average_number_of_tippees).to eq(3)
       end
 
-      it "should return a fixnum" do
+      it "returns a fixnum" do
         expect(stats.average_number_of_tippees.class).to be(Fixnum)
       end
 
-      it "should return the same value as its alias: #average_tippees" do
+      it "returns the same value as its alias: #average_tippees" do
         expect(stats.average_number_of_tippees).to eq(stats.average_tippees)
       end
     end
 
     describe "#amount_in_escrow" do
-      it "should return the correct amount in escrow" do
+      it "returns the correct amount in escrow" do
         expect(stats.amount_in_escrow).to eq(50441.17)
       end
 
-      it "should return a float" do
+      it "returns a float" do
         expect(stats.amount_in_escrow.class).to be(Float)
       end
 
-      it "should return the same value as its alias: #escrow" do
+      it "returns the same value as its alias: #escrow" do
         expect(stats.amount_in_escrow).to eq(stats.escrow)
       end
     end
 
     describe "#last_thursday" do
-      it "should return the correct value for last thursday" do
+      it "returns the correct value for last thursday" do
         expect(stats.last_thursday).to eq("last Thursday")
       end
 
-      it "should be a string" do
+      it "returns a string" do
         expect(stats.last_thursday.class).to be(String)
       end
     end
 
     describe "#number_of_achs" do
-      it "should return the correct number of ach credits" do
+      it "returns the correct number of ach credits" do
         expect(stats.number_of_ach_credits).to eq(299)
       end
 
-      it "should be a fixnum" do
+      it "returns a fixnum" do
         expect(stats.number_of_ach_credits.class).to be(Fixnum)
       end
 
-      it "should return the same value as its alias: #nach" do
+      it "returns the same value as its alias: #nach" do
         expect(stats.number_of_ach_credits).to eq(stats.nach)
       end
 
-      it "should return the same value as its alias: #number_of_achs" do
+      it "returns the same value as its alias: #number_of_achs" do
         expect(stats.number_of_ach_credits).to eq(stats.number_of_achs)
       end
     end
 
     describe "#number_of_active_users" do
-      it "should return the correct number of active users" do
+      it "returns the correct number of active users" do
         expect(stats.number_of_active_users).to eq(1719)
       end
 
-      it "should be a fixnum" do
+      it "returns a fixnum" do
         expect(stats.number_of_active_users.class).to be(Fixnum)
       end
 
-      it "should return the same value as its alias: #nactive" do
+      it "returns the same value as its alias: #nactive" do
         expect(stats.number_of_active_users).to eq(stats.nactive)
       end
     end
 
     describe "#number_of_credit_cards" do
-      it "should return the correct number of credit cards on file" do
+      it "returns the correct number of credit cards on file" do
         expect(stats.number_of_credit_cards).to eq(1496)
       end
 
-      it "should be a fixnum" do
+      it "returns a fixnum" do
         expect(stats.number_of_credit_cards.class).to be(Fixnum)
       end
 
-      it "should return the same value as its alias: #ncc" do
+      it "returns the same value as its alias: #ncc" do
         expect(stats.number_of_credit_cards).to eq(stats.ncc)
       end
     end
 
     describe "#number_of_givers" do
-      it "should return the correct number of givers" do
+      it "returns the correct number of givers" do
         expect(stats.number_of_givers).to eq(1113)
       end
 
-      it "should be a fixnum" do
+      it "returns a fixnum" do
         expect(stats.number_of_givers.class).to be(Fixnum)
       end
 
-      it "should return the same value as its alias: #ngivers" do
+      it "returns the same value as its alias: #ngivers" do
         expect(stats.number_of_givers).to eq(stats.ngivers)
       end
     end
 
     describe "#number_who_give_and_receive" do
-      it "should return the correct number of users who both give and receive" do
+      it "returns the correct number of users who both give and receive" do
         expect(stats.number_who_give_and_receive).to eq(301)
       end
 
-      it "should be a fixnum" do
+      it "returns a fixnum" do
         expect(stats.number_who_give_and_receive.class).to be(Fixnum)
       end
 
-      it "should return the same value as its alias: #noverlap" do
+      it "returns the same value as its alias: #noverlap" do
         expect(stats.number_who_give_and_receive).to eq(stats.noverlap)
       end
     end
 
     describe "#number_of_receivers" do
-      it "should return the correct number of receivers" do
+      it "returns the correct number of receivers" do
         expect(stats.number_of_receivers).to eq(907)
       end
 
-      it "should be a fixnum" do
+      it "returns a fixnum" do
         expect(stats.number_of_receivers.class).to be(Fixnum)
       end
 
-      it "should return the same value as its alias: #nreceivers" do
+      it "returns the same value as its alias: #nreceivers" do
         expect(stats.number_of_receivers).to eq(stats.nreceivers)
       end
     end
 
     describe "#other_people" do
-      it "should return the correct value for #other_people" do
+      it "returns the correct value for #other_people" do
         expect(stats.other_people).to eq("three other people")
       end
 
-      it "should be a string" do
+      it "returns a string" do
         expect(stats.other_people.class).to be(String)
       end
     end
 
     describe "#percentage_of_users_with_credit_cards" do
-      it "should return the correct value for #percentage_of_users_with_credit_cards" do
+      it "returns the correct value for #percentage_of_users_with_credit_cards" do
         expect(stats.percentage_of_users_with_credit_cards).to eq("7.6")
       end
 
-      it "should be a string" do
+      it "returns a string" do
         expect(stats.percentage_of_users_with_credit_cards.class).to be(String)
       end
 
-      it "should return the same value as its alias: #pcc" do
+      it "returns the same value as its alias: #pcc" do
         expect(stats.percentage_of_users_with_credit_cards).to eq(stats.pcc)
       end
     end
 
     describe "#punctuation" do
-      it "should return the correct value for #punctuation" do
+      it "returns the correct value for #punctuation" do
         expect(stats.punctuation).to eq(".")
       end
 
-      it "should be a string" do
+      it "returns a string" do
         expect(stats.punctuation.class).to be(String)
       end
 
-      it "should return the same value as its alias: #pcc" do
+      it "returns the same value as its alias: #pcc" do
         expect(stats.punctuation).to eq(stats.punc)
       end
     end
 
     describe "#statements" do
-      it "should return an array" do
+      it "returns an array" do
         expect(stats.statements.class).to be(Array)
       end
 
-      it "should contain 16 elements in the array" do
+      it "contain the currect number of elements in the array" do
         expect(stats.statements.size).to eq(16)
       end
 
-      it "should have a hash for each element in the array" do
+      it "has a hash for each element in the array" do
         expect(stats.statements.first.class).to be(Hash)
       end
 
-      it "should have statement as a key in each hash element" do
+      it "has statement as a key in each hash element" do
         expect(stats.statements.first.has_key?("statement")).to be(true)
       end
 
-      it "should have username as a key in each hash element" do
+      it "has username as a key in each hash element" do
         expect(stats.statements.first.has_key?("username")).to be(true)
       end
     end
 
     describe "#this_thursday" do
-      it "should return the correct value for this thursday" do
+      it "returns the correct value for this thursday" do
         expect(stats.this_thursday).to eq("this Thursday")
       end
 
-      it "should be a string" do
+      it "returns a string" do
         expect(stats.this_thursday.class).to be(String)
       end
     end
 
     describe "#tip_distribution_json" do
-      it "should return a hash" do
+      it "returns a hash" do
         expect(stats.tip_distribution_json.class).to be(Hash)
       end
     end
 
     describe "#number_of_tips" do
-      it "should return the correct number of tips" do
+      it "returns the correct number of tips" do
         expect(stats.number_of_tips).to eq(4710)
       end
 
-      it "should be a fixnum" do
+      it "returns a fixnum" do
         expect(stats.number_of_tips.class).to be(Fixnum)
       end
 
-      it "should return the same value as its alias: #tip_n" do
+      it "returns the same value as its alias: #tip_n" do
         expect(stats.number_of_tips).to eq(stats.tip_n)
       end
     end
 
     describe "#value_of_total_backed_tips" do
-      it "should return the correct value of total backed tips" do
+      it "returns the correct value of total backed tips" do
         expect(stats.value_of_total_backed_tips).to eq(5849.36)
       end
 
-      it "should be a float" do
+      it "returns a float" do
         expect(stats.value_of_total_backed_tips.class).to be(Float)
       end
 
-      it "should return the same value as its alias: #total_backed_tips" do
+      it "returns the same value as its alias: #total_backed_tips" do
         expect(stats.value_of_total_backed_tips).to eq(stats.total_backed_tips)
       end
     end
 
     describe "#transfer_volume" do
-      it "should return the correct transfer volume" do
+      it "returns the correct transfer volume" do
         expect(stats.transfer_volume).to eq(5464.38)
       end
 
-      it "should be a float" do
+      it "returns a float" do
         expect(stats.transfer_volume.class).to be(Float)
       end
     end

data/spec/gratitude/tips_spec.rb

@@ -1,187 +1,95 @@
 require "spec_helper"
 
 describe Gratitude::Client::Tips do
-
   let(:username) { "gratitude_test" }
   let(:api_key) { "5962b93a-5bf7-4cb6-ae6f-aa4114c5e4f2" }
-
-  let(:client) { Gratitude::Client.new(:username => username, :api_key => api_key) }
-
-  describe "methods that do not interact with the API" do
-
-    describe "#tips_url" do
-      it "returns the correct tips_url" do
-        expect(client.tips_url).to eq("https://www.gittip.com/gratitude_test/tips.json")
-      end
+  let(:client) do
+    Gratitude::Client.new(:username => username, :api_key => api_key)
+  end
+
+  describe "GET Requests" do
+    before { VCR.insert_cassette "get_tips" }
+    after { VCR.eject_cassette }
+    let(:current_tips) do
+      [
+        {"amount"=>"1.00", "platform"=>"gittip", "username"=>"whit537"},
+        {"amount"=>"0.25", "platform"=>"gittip", "username"=>"JohnKellyFerguson"}
+      ]
     end
 
-    describe "#authorization" do
-      it "returns the correct authorization hash" do
-        expect(client.authorization).to eq({ :username =>  api_key })
+    describe "#current_tips" do
+      it "returns the correct array of current tips" do
+        expect(client.current_tips).to eq (current_tips)
       end
     end
 
-    describe "#tip_hash_based_upon(username, amount)" do
-      it "returns the correct tip hash when given an integer" do
-        expect(client.tip_hash_based_upon("whit537", 1)).to eq(
-          { "amount" => "1", "platform" => "gittip", "username" => "whit537" })
-      end
-
-      it "returns the correct tip hash when given an integer in a string" do
-        expect(client.tip_hash_based_upon("whit537", "1")).to eq(
-          { "amount" => "1", "platform" => "gittip", "username" => "whit537" })
-      end
-
-      it "returns the correct tip hash when given a float" do
-        expect(client.tip_hash_based_upon("whit537", 0.25)).to eq(
-          { "amount" => "0.25", "platform" => "gittip", "username" => "whit537" })
-      end
-
-      it "returns the correct tip hash when given a float" do
-        expect(client.tip_hash_based_upon("whit537", "0.25")).to eq(
-          { "amount" => "0.25", "platform" => "gittip", "username" => "whit537" })
+    describe "#current_tips_total" do
+      it "returns the correct total of current tips" do
+        expect(client.current_tips_total).to eq(1.25)
       end
-    end #single_tip_hash
-
-
-    describe "#tips_array" do
-
-      context "when using symbols as keys" do
-        it "returns the correct tips array when given an array with one tip" do
-          expect(client.prepared_tips_array([:username => "whit537", :amount => "1"])).to eq(
-            [{ "amount" => "1", "platform" => "gittip", "username" => "whit537" }])
+    end
+  end #GET Requests
+
+  describe "POST Requests" do
+    describe "#update_tips" do
+      context "when updating a single tip" do
+        before { VCR.insert_cassette "post_single_tip" }
+        after { VCR.eject_cassette }
+        let(:single_tip_response) do
+          [{"amount"=>"5", "platform"=>"gittip", "username"=>"whit537"}]
         end
 
-        it "returns the correct tips array when given an array with two tips" do
-          expect(client.prepared_tips_array([
-            { :username => "whit537", :amount => "1" },
-            { :username => "JohnKellyFerguson", :amount => "0.25" }
-          ])).to eq([
-            { "amount" => "1", "platform" => "gittip", "username" => "whit537" },
-            { "amount" => "0.25", "platform" => "gittip", "username" => "JohnKellyFerguson" }
-            ])
+        it "updates the correct tip information" do
+          expect(
+            client.update_tips(
+              [{ :username => "whit537", :amount => "5" }]
+              ).parsed_response).to eq(single_tip_response)
         end
-      end # symbols as keys
+      end #update_tips
 
-      context "when using strings as keys" do
-        it "returns the correct tips array when given an array with one tip" do
-          expect(client.prepared_tips_array(["username" => "whit537", "amount" => "1"])).to eq(
-            [{ "amount" => "1", "platform" => "gittip", "username" => "whit537" }])
-        end
+      context "when updating multiple tips" do
+        before { VCR.insert_cassette "post_multiple_tips" }
+        after { VCR.eject_cassette }
 
-        it "returns the correct tips array when given an array with one tip" do
-              expect(client.prepared_tips_array([
-                { "username" => "whit537", "amount" => "1" },
-                { "username" => "JohnKellyFerguson", "amount" => "0.25" }
-              ])).to eq([
-                { "amount" => "1", "platform" => "gittip", "username" => "whit537" },
-                { "amount" => "0.25", "platform" => "gittip", "username" => "JohnKellyFerguson" }
-                ])
+        let(:multi_tip_response) do
+          [
+            {"amount"=>"10", "platform"=>"gittip", "username"=>"whit537"},
+            {"amount"=>"4", "platform"=>"gittip", "username"=>"JohnKellyFerguson"}
+          ]
         end
-      end # strings as keys
-
-    end #tips_array
-
-  end # methods that do not interact with the API
-
-
-  describe "authentication and api requests" do
-
-    context "GET Requests" do
-      let(:current_tips) { [{"amount"=>"1.00", "platform"=>"gittip", "username"=>"whit537"},
-                            {"amount"=>"0.25", "platform"=>"gittip", "username"=>"JohnKellyFerguson"}] }
 
-      before do
-        VCR.insert_cassette "get_tips"
-      end
+        it "updates the correct tip information" do
+          expect(
+            client.update_tips(
+              [{ :username => "whit537", :amount => "10" },
+               { :username => "JohnKellyFerguson", :amount => "4"}]
+              ).parsed_response).to eq(multi_tip_response)
+        end
+      end # updating multiple tips
 
-      after do
-        VCR.eject_cassette
-      end
+    end #update_tips
 
-      describe "#current_tips" do
-        it "returns the correct array of current tips" do
-          expect(client.current_tips).to eq (current_tips)
-        end
+    describe "#update_tips_and_prune" do
+      let(:previous_tips) do
+        [
+          {"amount"=>"1.00", "platform"=>"gittip", "username"=>"whit537"},
+          {"amount"=>"0.25", "platform"=>"gittip", "username"=>"JohnKellyFerguson"}
+        ]
       end
-
-      describe "#current_tips_total" do
-        it "returns the correct total of current tips" do
-          expect(client.current_tips_total).to eq(1.25)
-        end
+      let(:pruned_tips) do
+        [{ "amount"=>"1.00", "platform"=>"gittip", "username"=>"whit537" }]
       end
-    end #GET Requests
-
-    context "POST Requests" do
-
-      describe "#update_tips" do
-
-        context "when updating a single tip" do
-          let(:single_tip_response) { [{"amount"=>"5", "platform"=>"gittip", "username"=>"whit537"}] }
-
-          before do
-            VCR.insert_cassette "post_single_tip"
-          end
-
-          after do
-            VCR.eject_cassette
-          end
 
-          it "updates the correct tip information" do
-            expect(
-              client.update_tips(
-                [{ :username => "whit537", :amount => "5" }]
-                ).parsed_response).to eq(single_tip_response)
-          end
-        end #updating a single tip
-
-        context "when updating multiple tips" do
-          let(:multi_tip_response) { [
-                                      {"amount"=>"10", "platform"=>"gittip", "username"=>"whit537"},
-                                      {"amount"=>"4", "platform"=>"gittip", "username"=>"JohnKellyFerguson"}
-                                      ] }
-
-          before do
-            VCR.insert_cassette "post_multiple_tips"
-          end
-
-          after do
-            VCR.eject_cassette
-          end
-
-          it "updates the correct tip information" do
-            expect(
-              client.update_tips(
-                [{ :username => "whit537", :amount => "10" },
-                 { :username => "JohnKellyFerguson", :amount => "4"}]
-                ).parsed_response).to eq(multi_tip_response)
-          end
-        end # updating multiple tips
-
-        # context "when passing in a non-existent username" do
-        #   before do
-        #     VCR.insert_cassette "post_tip_error"
-        #   end
-
-        #   after do
-        #     VCR.eject_cassette
-        #   end
-
-        #   it "raises an error" do
-        #     expect(
-        #       client.update_tips(
-        #         [ {:username => "not_a_real_user", :amount => "20"} ]
-        #         ).parsed_response).to eq()
-        #   end
-        # end # non-existent username
-
-      end #update_tips
-
-      describe "#update_tips_and_prune" do
+      before { VCR.insert_cassette "update_and_prune" }
+      after { VCR.eject_cassette }
 
+      it "removes tips that were not part of the request" do
+        expect { client.update_tips_and_prune(pruned_tips) }
+          .to change { client.current_tips }
+          .from(previous_tips).to(pruned_tips)
       end
 
-    end #POST Requests
+    end
 
-  end # authentication and api requests
+  end #POST Requests
 end

data/spec/gratitude/version_spec.rb

@@ -2,6 +2,6 @@ require "spec_helper"
 
 describe Gratitude do
   it "has a version" do
-    expect(Gratitude::VERSION).not_to be_nil
+    expect(Gratitude::VERSION).to_not be_nil
   end
-end
+end

data/spec/spec_helper.rb

@@ -16,4 +16,4 @@ VCR.configure do |c|
   c.cassette_library_dir = 'spec/cassettes'
   c.hook_into :webmock
   c.default_cassette_options = { record: :new_episodes, serialize_with: :json }
-end
+end