balanced 0.3.10 → 0.3.11

data/README.md

@@ -57,7 +57,7 @@ spec/cassettes.  To clear them and regenerate:
 
 ### Building Documentation
 
-Documentation is build using YARD - http://rubydoc.info/docs/yard
+Documentation is built using YARD - http://rubydoc.info/docs/yard
  
     export AMAZON_ACCESS_KEY_ID='xxx'
     export AMAZON_SECRET_ACCESS_KEY='yyy' 

data/examples/examples.rb

@@ -65,9 +65,6 @@ puts "our buyer account: #{buyer.uri}"
 puts "hold some amount of funds on the buyer, lets say 15$"
 the_hold = buyer.hold(:amount => 1500)
 
-puts "the hold has a fee of 30c, here's the fee #{the_hold.fee}"
-raise "The hold's fee is incorrect" if the_hold.fee != 30
-
 puts "ok, no more holds! lets just capture it (for the full amount)"
 debit = the_hold.capture
 
@@ -79,9 +76,6 @@ puts "i have #{marketplace.in_escrow} in escrow!"
 puts "cool. now let me refund the full amount"
 refund = debit.refund()  # the full amount!
 
-puts "notice how Balanced refunds you your fees? refund fees: #{refund.fee}"
-raise "Woah, fees are incorrect" if (refund.fee + debit.fee) != 0
-
 puts "ok, we have a merchant that's signing up, let's create an account for them " \
      "first, lets create their bank account."
 

data/lib/balanced/client.rb

@@ -14,6 +14,9 @@ module Balanced
       :port => 5000,
       :version => '1',
       :logging_level => 'WARN',
+      :connection_timeout => 2,
+      :read_timeout => 5,
+      :logger => nil
     }
 
     attr_reader :conn
@@ -26,13 +29,23 @@ module Balanced
     end
 
     def build_conn
-      logger = Logger.new(STDOUT)
-      logger.level = Logger.const_get(DEFAULTS[:logging_level].to_s)
+      if config[:logger]
+        logger = config[:logger]
+      else
+        logger = Logger.new(STDOUT)
+        logger.level = Logger.const_get(config[:logging_level].to_s)
+      end
 
       Faraday.register_middleware :response,
           :handle_balanced_errors => lambda {Faraday::Response::RaiseBalancedError}
 
-      @conn = Faraday.new url do |cxn|
+      options = {
+        :request => {
+          :open_timeout => config[:connection_timeout],
+          :timeout => config[:read_timeout]
+        }
+      }
+      @conn = Faraday.new(url, options) do |cxn|
         cxn.request  :json
 
         cxn.response :logger, logger

data/lib/balanced/pager.rb

@@ -3,6 +3,7 @@ require "cgi"
 module Balanced
   class Pager
     DEFAULT_SEP = /[&;] */n
+    DEFAULT_LIMIT = 10
 
     include Enumerable
 
@@ -34,17 +35,29 @@ module Balanced
       load! unless @page
       @page[:limit]
     end
+    alias limit_value limit
 
     def offset
       load! unless @page
       @page[:offset]
     end
+    alias offset_value offset
 
     def items
       load! unless @page
       @page[:items]
     end
 
+    def current_page
+      (offset / limit) + 1
+    end
+
+    def num_pages
+      num = total / limit
+      num += 1 if total % limit > 0
+      num
+    end
+
     # @return [Array] Iterates through the current page of records.
     # @yield [record]
     def each
@@ -133,6 +146,7 @@ module Balanced
       parsed_uri = URI.parse(uri)
 
       params ||= {}
+      params = adjust_pagination_params(params)
 
       unless parsed_uri.query.nil?
         # The reason we don't use CGI::parse here is because
@@ -151,6 +165,15 @@ module Balanced
       @uri = @page[:uri]
     end
 
+    def adjust_pagination_params(original)
+      adjusted = original.dup
+      per = adjusted.delete(:per)
+      adjusted[:limit] = per unless per.nil?
+      page = adjusted.delete(:page)
+      adjusted[:offset] = (adjusted[:limit] || DEFAULT_LIMIT) * ([page, 1].max - 1) unless page.nil?
+      adjusted
+    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

data/lib/balanced/resources/account.rb

@@ -17,9 +17,9 @@ module Balanced
 
     # Attempts to find an existing buyer account by email
     #
-    # @param [String] email An email of a buyer account
-    # @return [Account] if buyer is found
-    # @return [nil] if buyer is not found
+    # @param [String] email An email of an account
+    # @return [Account] if account is found
+    # @return [nil] if account is not found
     def self.find_by_email email
       self.find(:first, :email_address => email)
     end

data/lib/balanced/version.rb

@@ -1,3 +1,3 @@
 module Balanced
-  VERSION = '0.3.10'
+  VERSION = '0.3.11'
 end

data/spec/balanced/pager_spec.rb

@@ -0,0 +1,42 @@
+require "spec_helper"
+
+describe Balanced::Pager do
+  describe "#adjust_pagination_params" do
+    subject { Balanced::Pager.new 'a uri'}
+
+    it "sets limit based on per" do
+      params = subject.send(:adjust_pagination_params, per: 5)
+      params[:limit].should == 5
+    end
+
+    it "sets offset based on page and default limit" do
+      params = subject.send(:adjust_pagination_params, page: 2)
+      params[:offset].should == 10
+    end
+
+    it "sets offset based on page and per" do
+      params = subject.send(:adjust_pagination_params, page: 2, per: 4)
+      params[:offset].should == 4
+    end
+
+    it "prefers per to limit" do
+      params = subject.send(:adjust_pagination_params, per: 5, limit: 10)
+      params[:limit].should == 5
+    end
+
+    it "falls back to limit" do
+      params = subject.send(:adjust_pagination_params, limit: 3)
+      params[:limit].should == 3
+    end
+
+    it "prefers page to offset" do
+      params = subject.send(:adjust_pagination_params, page: 2, offset: 0)
+      params[:offset].should == 10
+    end
+
+    it "falls back to offset" do
+      params = subject.send(:adjust_pagination_params, offset: 6)
+      params[:offset].should == 6
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: balanced
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
+date: 2012-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -47,7 +47,8 @@ description: ! "Balanced is the payments platform for marketplaces.\n    Integra
   a payments experience just like Amazon for your marketplace.\n    Forget about dealing
   with banking systems, compliance, fraud, and security.\n    "
 email:
-- mahmoud@poundpay.com
+- !binary |-
+  bWFobW91ZEBwb3VuZHBheS5jb20=
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -94,6 +95,7 @@ files:
 - lib/balanced/response/balanced_exception_middleware.rb
 - lib/balanced/utils.rb
 - lib/balanced/version.rb
+- spec/balanced/pager_spec.rb
 - spec/balanced/resources/account_spec.rb
 - spec/balanced/resources/api_key_spec.rb
 - spec/balanced/resources/hold_spec.rb
@@ -130,6 +132,7 @@ signing_key:
 specification_version: 3
 summary: Sign up on https://balancedpayments.com/
 test_files:
+- spec/balanced/pager_spec.rb
 - spec/balanced/resources/account_spec.rb
 - spec/balanced/resources/api_key_spec.rb
 - spec/balanced/resources/hold_spec.rb
@@ -140,3 +143,4 @@ test_files:
 - spec/client_spec.rb
 - spec/spec_helper.rb
 - spec/utils_spec.rb
+has_rdoc: