balanced 0.3.5 → 0.3.6

data/lib/balanced/pager.rb

@@ -2,6 +2,8 @@ require "cgi"
 
 module Balanced
   class Pager
+    DEFAULT_SEP = /[&;] */n
+
     include Enumerable
 
     # A pager for paginating through resource records.
@@ -21,12 +23,6 @@ module Balanced
     def first
       load! unless @page
       items.first.nil? ? nil : resource_class.construct_from_response(items.first)
-=begin
-      if items.first.nil?
-        return nil
-      end
-      resource_class.construct_from_response items.first
-=end
     end
 
     def total
@@ -55,15 +51,13 @@ module Balanced
       return enum_for :each unless block_given?
 
       load! unless @page
-
       loop do
-        @page[:items].each do |record|
-          yield resource_class.construct_from_response record
+        @page[:items].each do |r|
+          yield resource_class.construct_from_response r
         end
-        break if @page[:next_uri].nil?
+        raise StopIteration if @page[:next_uri].nil?
         self.next
       end
-
     end
 
     # @return [nil]
@@ -138,8 +132,17 @@ module Balanced
     def load_from uri, params
       parsed_uri = URI.parse(uri)
 
+      params ||= {}
+
       unless parsed_uri.query.nil?
-        params.merge! CGI::parse(parsed_uri.query)
+        # The reason we don't use CGI::parse here is because
+        # the balanced api currently can't handle variable[]=value.
+        # Faraday ends up encoding a simple query string like:
+        #    {"limit"=>["10"], "offset"=>["0"]}
+        # to limit[]=10&offset[]=0 and that's cool, but
+        # we have to make sure balanced supports it.
+        query_params = parse_query(parsed_uri.query)
+        params.merge! query_params
         parsed_uri.query = nil
       end
 
@@ -148,5 +151,28 @@ module Balanced
       @uri = @page[:uri]
     end
 
+    # Stolen from Mongrel, with some small modifications:
+    # Parses a query string by breaking it up at the '&'
+    # and ';' characters.  You can also use this to parse
+    # cookies by changing the characters used in the second
+    # parameter (which defaults to '&;').
+    def parse_query(qs, d = nil)
+      params = {}
+
+      (qs || '').split(d ? /[#{d}] */n : DEFAULT_SEP).each do |p|
+        k, v = p.split('=', 2).map { |x| CGI::unescape(x) }
+        if (cur = params[k])
+          if cur.class == Array
+            params[k] << v
+          else
+            params[k] = [cur, v]
+          end
+        else
+          params[k] = v
+        end
+      end
+
+      params
+    end
   end
 end

data/lib/balanced/resources/account.rb

@@ -88,11 +88,11 @@ module Balanced
       destination_uri = args[3] || options.fetch(:destination_uri) { nil }
 
       credit = Credit.new(
-          :uri => self.credits_uri,
-          :amount => amount,
-          :meta => meta,
-          :description => description,
-          :destination_uri => destination_uri,
+        :uri => self.credits_uri,
+        :amount => amount,
+        :meta => meta,
+        :description => description,
+        :destination_uri => destination_uri,
       )
       credit.save
     end

data/lib/balanced/version.rb

@@ -1,3 +1,3 @@
 module Balanced
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
 end

data/spec/balanced/resources/transactions_spec.rb

@@ -0,0 +1,72 @@
+require "spec_helper"
+
+describe Balanced::Transaction do
+
+  use_vcr_cassette
+
+  before do
+    api_key = Balanced::ApiKey.new.save
+    Balanced.configure api_key.secret
+    @marketplace = Balanced::Marketplace.new.save
+    @merchant_attributes = {
+        :type => "person",
+        :name => "Billy Jones",
+        :street_address => "801 High St.",
+        :postal_code => "94301",
+        :country => "USA",
+        :dob => "1842-01",
+        :phone_number => "+16505551234",
+    }
+    bank_account = Balanced::BankAccount.new(
+      :account_number => "1234567890",
+      :bank_code => "321174851",
+      :name => "Jack Q Merchant"
+    ).save
+    card = Balanced::Card.new(
+      :card_number => "4111111111111111",
+      :expiration_month => "1",
+      :expiration_year => "2015",
+    ).save
+    @merchant = @marketplace.create_merchant(
+      :email_address => "merchant@example.org",
+      :merchant => @merchant_attributes,
+      :bank_account_uri => bank_account.uri,
+      :name => "Jack Q Merchant"
+    )
+    @buyer = @marketplace.create_buyer(
+      :email_address => "buyer+transactions@example.org",
+      :card_uri => card.uri,
+      :name => "Jack Q Buyer"
+    ).save
+    1.upto 5 do |n|
+      @buyer.debit(1000, :description => "Transaction ##{n}")
+      @merchant.credit(500, :description => "Credit from Debit ##{n}")
+    end
+  end
+
+  describe "Transaction" do
+    use_vcr_cassette
+
+    it "#all" do
+      Balanced::Transaction.all.length.should eql(15)
+    end
+
+    describe "#paginate" do
+      use_vcr_cassette
+
+      it "#total" do
+        Balanced::Transaction.paginate.total.should eql(15)
+      end
+
+      it "#each" do
+        counter = 0
+        Balanced::Transaction.paginate.each do |transaction|
+          counter += 1
+        end
+        counter.should eql(15)
+      end
+
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: balanced
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-05 00:00:00.000000000 Z
+date: 2012-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -98,6 +98,7 @@ files:
 - spec/balanced/resources/api_key_spec.rb
 - spec/balanced/resources/hold_spec.rb
 - spec/balanced/resources/marketplace_spec.rb
+- spec/balanced/resources/transactions_spec.rb
 - spec/balanced/response/balanced_exception_middleware_spec.rb
 - spec/balanced_spec.rb
 - spec/client_spec.rb
@@ -133,6 +134,7 @@ test_files:
 - spec/balanced/resources/api_key_spec.rb
 - spec/balanced/resources/hold_spec.rb
 - spec/balanced/resources/marketplace_spec.rb
+- spec/balanced/resources/transactions_spec.rb
 - spec/balanced/response/balanced_exception_middleware_spec.rb
 - spec/balanced_spec.rb
 - spec/client_spec.rb