balanced 1.1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 219dbbd5adfbc85b25a89851e6d81149b7c6c885
-  data.tar.gz: 021828832cf8d9b233f41ad9c13578dbe5f21399
+  metadata.gz: 0a66e85ff9cfa64cba089a93a7be7196aad46869
+  data.tar.gz: df752979769567873fb795f385ac26b2b8f9d5bd
 SHA512:
-  metadata.gz: fbd91388524f30395916d87f33a8c8c2377473d996feb38780a99a92f0ffb337debdb2563abe4e483d05425854bd2c1f6e6b8262d904f8e582ba050be8cd6aa7
-  data.tar.gz: a6a2da990d5941e291c98e8db187acaf2346f2c1c0cc3112846ab31a9a7738b67102b4d174922675402984ee38a80efb6fe5c0a62404a0aec8e5f3aaf2e46d56
+  metadata.gz: b1aecb8be5843b8103c8da9e61f58bb8a8224d7f0df59757e883e9d0f6aec1d3c3e34990af58310d2cf3d338e8e64f5444603d1af4bc863eed9e5efa7c22b084
+  data.tar.gz: 7ddabfeea4044df97d0dbf1a70d034709f41ca3d27951327651ffd9b5f5e603dde59fd02521406ba5e9054f7ab550208ae9785780723b7158db79173aac1e4bf

data/.ruby-version

@@ -1 +1 @@
-2.1.0
+2.1.5

data/.travis.yml

@@ -1,9 +1,13 @@
 language: ruby
 bundler_args: --without development
-script: "bundle exec rake spec"
+script: bundle exec rake spec
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1.1
+- 1.8.7
+- 1.9.3
+- 2.1.1
+deploy:
+  provider: rubygems
+  api_key:
+    secure: 0pFmsvwqf1MKY8QGw3VDE6G6yi5b2JwA1zJIbxyv+12rNiA35Q8FszKK2cRdtpxczXt2aNanMqbwYGU+JDSo894l9vZVfbeSCZX1yg7mTxnjlvSloFtt4VMiRcJ7DANdtdmisYzJL2t5Pzaea/C8/hvjZGZrS34f/78+uO2Vln0=
+  on:
+    tags: true

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.2
+
+* Account and Settlement support
+
 ## 1.1.1
 
 * Fix nil fetch exception

data/README.md

@@ -28,7 +28,7 @@ Or install it yourself as:
 * [Balanced Overview](https://docs.balancedpayments.com/?language=ruby)
 * [RDoc](http://rubydoc.info/gems/balanced)
 * [Balanced API with Ruby examples](https://docs.balancedpayments.com/api?language=ruby)
-* [Example scripts](https://github.com/balanced/balanced-ruby/tree/master/examples)
+* [Example scripts](https://github.com/balanced/balanced-ruby/tree/master/scenarios)
 
 ## Contributing
 

data/lib/balanced/resources.rb

@@ -16,3 +16,5 @@ require 'balanced/resources/event'
 require 'balanced/resources/customer'
 require 'balanced/resources/order'
 require 'balanced/resources/transfer'
+require 'balanced/resources/account'
+require 'balanced/resources/settlement'

data/lib/balanced/resources/account.rb

@@ -0,0 +1,33 @@
+module Balanced
+  #  An Account is a way to pool funds from across multiple Orders
+  #
+  class Account < Balanced::FundingInstrument
+    include Balanced::Resource
+    include Balanced::HypermediaRegistry
+
+    define_hypermedia_types [:accounts]
+
+    # Creates a Credit of funds from to this Account.
+    #
+    # @return [Credit]
+    def credit(options = {})
+      options[:href] = self.credits.href
+      credit = Balanced::Credit.new(options)
+      credit.save
+    end
+
+    # Creates a Settlement from to this Account.
+    #
+    # @return [Credit]
+    def settle(options = {})
+      Balanced::Utils.assert_required_keys(
+          options,
+          :required => [:funding_instrument]
+      )
+      options[:href] = self.settlements.href
+      settlement = Balanced::Settlement.new(options)
+      settlement.save
+    end
+
+  end
+end

data/lib/balanced/resources/card.rb

@@ -23,7 +23,7 @@ module Balanced
     # @param [Hash] options
     # @return [Credit]
     def credit(options={})
-      if ! defined? self.credits
+      if ! self.respond_to?(:credits)
         raise Balanced::FundingInstrumentNotCreditable
       end
 

data/lib/balanced/resources/customer.rb

@@ -59,5 +59,13 @@ module Balanced
       save
     end
 
+    # Returns an Account with type 'payable'
+    #
+    # @return [Customer]
+    def payable_account
+      payable_account = self.accounts.where(:type=>'payable').first
+      payable_account
+    end
+
   end
 end

data/lib/balanced/resources/resource.rb

@@ -1,16 +1,12 @@
 require File.expand_path('../../pager', __FILE__)
 require File.expand_path('../../utils', __FILE__)
 require 'addressable/template'
-require 'pp'
-
 
 module Balanced
 
   module Resource
-
     attr_accessor :attributes
     attr_accessor :hyperlinks
-
     attr_accessor :id
     attr_accessor :href
     attr_accessor :links
@@ -113,7 +109,9 @@ module Balanced
     def sanitize
       to_submit = {}
       @attributes.each do |key, value|
-        unless value.is_a? Balanced::Resource
+        if value.is_a? Balanced::Resource
+          to_submit[key] = value.href if value.href
+        else
           to_submit[key] = value
         end
       end
@@ -260,7 +258,7 @@ module Balanced
         if arguments.nil? ||
            arguments.empty?  ||
            arguments[0].nil? ||
-           arguments[0].empty?
+           arguments[0].to_s.empty? # no symbol.empty? in 1.8.7
           raise Balanced::NotFound
         end
         scope = arguments.slice!(0)

data/lib/balanced/resources/settlement.rb

@@ -0,0 +1,12 @@
+module Balanced
+  # A Settlement is the action of moving money out of an Account to a bank
+  # account.
+  #
+  class Settlement
+    include Balanced::Resource
+    include Balanced::HypermediaRegistry
+
+    define_hypermedia_types [:settlements]
+
+  end
+end

data/lib/balanced/response/balanced_exception_middleware.rb

@@ -32,7 +32,7 @@ module Faraday
     }
     def on_complete(response)
       status_code = response[:status].to_i
-      if response.key? :body and response[:body] != nil and response[:body]['errors']
+      if response[:body] != nil && response[:body]['errors']
         category_code = response[:body]['errors'][0]['category_code']
       else
         category_code = nil

data/lib/balanced/utils.rb

@@ -2,7 +2,7 @@ module Balanced
 
   module Utils
 
-    def callable( callable_or_not )
+    def callable(callable_or_not)
       callable_or_not.respond_to?(:call) ? callable_or_not : lambda { callable_or_not }
     end
 

data/lib/balanced/version.rb

@@ -1,3 +1,3 @@
 module Balanced
-  VERSION = '1.1.1'
+  VERSION = '1.2.1'
 end

data/scenarios/account_credit/definition.rb

@@ -0,0 +1 @@
+Balanced::Account.credit

data/scenarios/account_credit/request.rb

@@ -0,0 +1,5 @@
+<%= boiler_plate %>
+account = Balanced::Account.fetch('<%= request['account_href'] %>')
+account.credit(
+<%= params_to_hash.call(payload).indent(2) %>
+)

data/scenarios/account_credit/ruby.mako

@@ -0,0 +1,49 @@
+% if mode == 'definition':
+Balanced::Account.credit
+% elif mode == 'request':
+require 'balanced'
+Balanced.configure('ak-test-YoVGJWMjOpkCPo6dWMfuiYbBYIB8q2JX')
+
+account = Balanced::Account.fetch('/accounts/AT68yF0GzJByks2OxU6oNjPy')
+account.credit(
+  :amount => 1000,
+  :appears_on_statement_as => 'ThingsCo',
+  :description => 'A simple credit',
+  :meta => {
+    :rating => 8
+  },
+  :order => '/orders/OR6c6n11zKSFfjE6kGNKtsE8'
+)
+% elif mode == 'response':
+#<Balanced::Credit:0x007fcde12a3580
+ @attributes=
+  {"amount"=>1000,
+   "appears_on_statement_as"=>"ThingsCo",
+   "created_at"=>"2014-12-17T21:24:09.952905Z",
+   "currency"=>"USD",
+   "description"=>"A simple credit",
+   "failure_reason"=>nil,
+   "failure_reason_code"=>nil,
+   "href"=>"/credits/CR6eZ4ImaC1iLixxrkHsoqcg",
+   "id"=>"CR6eZ4ImaC1iLixxrkHsoqcg",
+   "links"=>
+    {"customer"=>"CU68iUpvvUwpRpuuBL3u9Slq",
+     "destination"=>"AT68yF0GzJByks2OxU6oNjPy",
+     "order"=>"OR6c6n11zKSFfjE6kGNKtsE8"},
+   "meta"=>{"rating"=>"8"},
+   "status"=>"succeeded",
+   "transaction_number"=>"CRP9Y-4QQ-VGRE",
+   "updated_at"=>"2014-12-17T21:24:10.051544Z"},
+ @hyperlinks=
+  {"customer"=>
+    #<Proc:0x007fcde12a1938/lib/balanced/resources/resource.rb:56 (lambda)>,
+   "destination"=>
+    #<Proc:0x007fcde12abfa0/lib/balanced/resources/resource.rb:56 (lambda)>,
+   "events"=>
+    #<Proc:0x007fcde12aa128/lib/balanced/utils.rb:6 (lambda)>,
+   "order"=>
+    #<Proc:0x007fcde12a8788/lib/balanced/resources/resource.rb:56 (lambda)>,
+   "reversals"=>
+    #<Proc:0x007fcde12b28f0/lib/balanced/utils.rb:6 (lambda)>}>
+
+% endif

data/scenarios/account_list/definition.rb

@@ -0,0 +1 @@
+Balanced::Account.all

data/scenarios/account_list/request.rb

@@ -0,0 +1,2 @@
+<%= boiler_plate %>
+Balanced::Account.all

data/scenarios/account_list/ruby.mako

@@ -0,0 +1,64 @@
+% if mode == 'definition':
+Balanced::Account.all
+
+% elif mode == 'request':
+require 'balanced'
+Balanced.configure('ak-test-YoVGJWMjOpkCPo6dWMfuiYbBYIB8q2JX')
+
+Balanced::Account.all
+
+% elif mode == 'response':
+[#<Balanced::Account:0x007fcde12cb378
+  @attributes=
+   {"balance"=>0,
+    "can_credit"=>true,
+    "can_debit"=>true,
+    "created_at"=>"2014-12-17T21:23:58.053807Z",
+    "currency"=>"USD",
+    "href"=>"/accounts/AT61AkTlbK0xOgK0M85qbMJO",
+    "id"=>"AT61AkTlbK0xOgK0M85qbMJO",
+    "links"=>{"customer"=>"CU61tZf6xgGgpLmoNkXHfSOQ"},
+    "meta"=>{},
+    "type"=>"payable",
+    "updated_at"=>"2014-12-17T21:23:58.053810Z"},
+  @hyperlinks=
+   {"credits"=>
+     #<Proc:0x007fcde12c9348/lib/balanced/utils.rb:6 (lambda)>,
+    "customer"=>
+     #<Proc:0x007fcde12d3960/lib/balanced/resources/resource.rb:56 (lambda)>,
+    "debits"=>
+     #<Proc:0x007fcde12d1b10/lib/balanced/utils.rb:6 (lambda)>,
+    "refunds"=>
+     #<Proc:0x007fcde12dbc50/lib/balanced/utils.rb:6 (lambda)>,
+    "reversals"=>
+     #<Proc:0x007fcde12d9dd8/lib/balanced/utils.rb:6 (lambda)>,
+    "settlements"=>
+     #<Proc:0x007fcde12e3ef0/lib/balanced/utils.rb:6 (lambda)>}>,
+ #<Balanced::Account:0x007fcde12e3ea0
+  @attributes=
+   {"balance"=>0,
+    "can_credit"=>true,
+    "can_debit"=>true,
+    "created_at"=>"2014-12-17T21:23:57.406645Z",
+    "currency"=>"USD",
+    "href"=>"/accounts/AT60Eh7L4WodxuKzzN5LW4tG",
+    "id"=>"AT60Eh7L4WodxuKzzN5LW4tG",
+    "links"=>{"customer"=>"CU60xqwNwAzX21Qg0dddDDvG"},
+    "meta"=>{},
+    "type"=>"payable",
+    "updated_at"=>"2014-12-17T21:23:57.406647Z"},
+  @hyperlinks=
+   {"credits"=>
+     #<Proc:0x007fcde12e1ec0/lib/balanced/utils.rb:6 (lambda)>,
+    "customer"=>
+     #<Proc:0x007fcde12e0520/lib/balanced/resources/resource.rb:56 (lambda)>,
+    "debits"=>
+     #<Proc:0x007fcde12ea6b0/lib/balanced/utils.rb:6 (lambda)>,
+    "refunds"=>
+     #<Proc:0x007fcde12e8860/lib/balanced/utils.rb:6 (lambda)>,
+    "reversals"=>
+     #<Proc:0x007fcde12f29c8/lib/balanced/utils.rb:6 (lambda)>,
+    "settlements"=>
+     #<Proc:0x007fcde12f0b78/lib/balanced/utils.rb:6 (lambda)>}>]
+
+% endif

data/scenarios/account_list_customer/definition.rb

@@ -0,0 +1 @@
+Balanced::Customer.accounts

data/scenarios/account_list_customer/request.rb

@@ -0,0 +1,3 @@
+<%= boiler_plate %>
+customer = Balanced::Customer.fetch('<%= request['customer_href'] %>')
+customer.accounts

data/scenarios/account_list_customer/ruby.mako

@@ -0,0 +1,38 @@
+% if mode == 'definition':
+Balanced::Customer.accounts
+
+% elif mode == 'request':
+require 'balanced'
+Balanced.configure('ak-test-YoVGJWMjOpkCPo6dWMfuiYbBYIB8q2JX')
+
+customer = Balanced::Customer.fetch('/customers/CU68iUpvvUwpRpuuBL3u9Slq')
+customer.accounts
+% elif mode == 'response':
+[#<Balanced::Account:0x007fcde1318a10
+  @attributes=
+   {"balance"=>0,
+    "can_credit"=>true,
+    "can_debit"=>true,
+    "created_at"=>"2014-12-17T21:24:04.257700Z",
+    "currency"=>"USD",
+    "href"=>"/accounts/AT68yF0GzJByks2OxU6oNjPy",
+    "id"=>"AT68yF0GzJByks2OxU6oNjPy",
+    "links"=>{"customer"=>"CU68iUpvvUwpRpuuBL3u9Slq"},
+    "meta"=>{},
+    "type"=>"payable",
+    "updated_at"=>"2014-12-17T21:24:04.257702Z"},
+  @hyperlinks=
+   {"credits"=>
+     #<Proc:0x007fcde13229c0/lib/balanced/utils.rb:6 (lambda)>,
+    "customer"=>
+     #<Proc:0x007fcde1321020/lib/balanced/resources/resource.rb:56 (lambda)>,
+    "debits"=>
+     #<Proc:0x007fcde132b188/lib/balanced/utils.rb:6 (lambda)>,
+    "refunds"=>
+     #<Proc:0x007fcde1329310/lib/balanced/utils.rb:6 (lambda)>,
+    "reversals"=>
+     #<Proc:0x007fcde1333428/lib/balanced/utils.rb:6 (lambda)>,
+    "settlements"=>
+     #<Proc:0x007fcde13315b0/lib/balanced/utils.rb:6 (lambda)>}>]
+
+% endif

data/scenarios/account_show/definition.rb

@@ -0,0 +1 @@
+Balanced::Account.fetch

data/scenarios/account_show/request.rb

@@ -0,0 +1,2 @@
+<%= boiler_plate %>
+account = Balanced::Account.fetch('<%=request['uri']%>')

data/scenarios/account_show/ruby.mako

@@ -0,0 +1,37 @@
+% if mode == 'definition':
+Balanced::Account.fetch
+% elif mode == 'request':
+require 'balanced'
+Balanced.configure('ak-test-YoVGJWMjOpkCPo6dWMfuiYbBYIB8q2JX')
+
+account = Balanced::Account.fetch('/accounts/AT61AkTlbK0xOgK0M85qbMJO')
+
+% elif mode == 'response':
+#<Balanced::Account:0x007fcde1349d68
+ @attributes=
+  {"balance"=>0,
+   "can_credit"=>true,
+   "can_debit"=>true,
+   "created_at"=>"2014-12-17T21:23:58.053807Z",
+   "currency"=>"USD",
+   "href"=>"/accounts/AT61AkTlbK0xOgK0M85qbMJO",
+   "id"=>"AT61AkTlbK0xOgK0M85qbMJO",
+   "links"=>{"customer"=>"CU61tZf6xgGgpLmoNkXHfSOQ"},
+   "meta"=>{},
+   "type"=>"payable",
+   "updated_at"=>"2014-12-17T21:23:58.053810Z"},
+ @hyperlinks=
+  {"credits"=>
+    #<Proc:0x007fcde1353d18/lib/balanced/utils.rb:6 (lambda)>,
+   "customer"=>
+    #<Proc:0x007fcde1352378/lib/balanced/resources/resource.rb:56 (lambda)>,
+   "debits"=>
+    #<Proc:0x007fcde1350528/lib/balanced/utils.rb:6 (lambda)>,
+   "refunds"=>
+    #<Proc:0x007fcde135a640/lib/balanced/utils.rb:6 (lambda)>,
+   "reversals"=>
+    #<Proc:0x007fcde13587c8/lib/balanced/utils.rb:6 (lambda)>,
+   "settlements"=>
+    #<Proc:0x007fcde1362908/lib/balanced/utils.rb:6 (lambda)>}>
+
+% endif

data/scenarios/api_key_create/ruby.mako

@@ -3,19 +3,19 @@ Balanced::ApiKey.new
 
 % elif mode == 'request':
 require 'balanced'
-Balanced.configure('ak-test-2q80HU8DISm2atgm0iRKRVIePzDb34qYp')
+Balanced.configure('ak-test-YoVGJWMjOpkCPo6dWMfuiYbBYIB8q2JX')
 
 key = Balanced::ApiKey.new.save
 
 % elif mode == 'response':
-#<Balanced::ApiKey:0x007fa7d40b53a0
+#<Balanced::ApiKey:0x007fcde137bbd8
  @attributes=
-  {"created_at"=>"2014-05-15T00:38:16.692063Z",
-   "href"=>"/api_keys/AK1B3lNyPQ63pRQa1JDC5os5",
-   "id"=>"AK1B3lNyPQ63pRQa1JDC5os5",
+  {"created_at"=>"2014-12-17T21:24:11.308489Z",
+   "href"=>"/api_keys/AK6gw2iNQrFpQk7jb8ONNjdb",
+   "id"=>"AK6gw2iNQrFpQk7jb8ONNjdb",
    "links"=>{},
    "meta"=>{},
-   "secret"=>"ak-test-1GkkDibAyqrZDI1LDfepJSuUqKbSUnqA5"},
+   "secret"=>"ak-test-29kmTuMRgZTtOFmeMWVUclctfpNQnlUb5"},
  @hyperlinks={}>
 
 % endif