balanced 0.5.1 → 0.5.2

data/CONTRIBUTORS

@@ -4,3 +4,5 @@ Alex Notov
 Josh Deeden
 Ivan Lyutov
 Alex Sharp
+Marc Sherry
+Joonas Bergius

data/lib/balanced/resources/bank_account.rb

@@ -7,17 +7,11 @@ module Balanced
   class BankAccount
     include Balanced::Resource
 
-    def self.has_account?
-      self.respond_to?('account') && !self.account.nil?
-    end
-
     def self.uri
-      # Override the default nesting -- bank accounts can be toplevel now
-      if !self.has_account?
-         self.collection_path
-      else
-         self.class.uri
-      end
+      # Override the default nesting -- bank accounts can be top-level now
+      # but they can also be nested under marketplaces, which is what we
+      # want to default to unless explicitly set
+       self.collection_path
     end
 
     def initialize attributes = {}
@@ -28,6 +22,10 @@ module Balanced
       super attributes
     end
 
+    def has_account?
+      self.respond_to? 'account' and !self.account.nil?
+    end
+
     # Creates a Debit of funds from this BankAccount to your Marketplace's escrow account.
     #
     # @param [String] appears_on_statement_as If nil then Balanced will use
@@ -55,18 +53,28 @@ module Balanced
       options = args.last.is_a?(Hash) ? args.pop : {}
       amount = args[0] || options.fetch(:amount) { nil }
       description = args[1] || options.fetch(:description) { nil }
-      if !self.class.has_account?
-        Credit.new(
-          :amount => amount,
-          :description => description,
-          :uri => self.credits_uri,
-        ).save
-      else
+
+      if self.has_account?
         meta = args[2] || options.fetch(:meta) { nil }
         appears_on_statement_as = args[3] || options.fetch(:appears_on_statement_as) { nil }
-        destination_url = args[4] || options.fetch(:destination_uri) { self.uri }
-        self.account.credit(amount, meta, description, destination_uri, appears_on_statement_as)
+        destination_uri = args[4] || options.fetch(:destination_uri) { self.uri }
+        credit = self.account.credit(
+            :amount => amount,
+            :meta => meta,
+            :description => description,
+            :destination_uri => destination_uri,
+            :appears_on_statement_as => appears_on_statement_as
+        )
+      else
+        credit = Credit.new(
+            :uri => self.credits_uri,
+            :amount => amount,
+            :description => description
+        )
+        credit.save
       end
+
+      credit
     end
 
     def invalidate

data/lib/balanced/resources/resource.rb

@@ -118,7 +118,7 @@ module Balanced
       if self == Balanced::Merchant || self == Balanced::Marketplace || self == Balanced::ApiKey
         collection_path
       else
-        if !Balanced::Marketplace.marketplace_exists?
+        unless Balanced::Marketplace.marketplace_exists?
           raise Balanced::StandardError, "#{self.name} is nested under a marketplace, which is not created or configured."
         end
 

data/lib/balanced/version.rb

@@ -1,3 +1,3 @@
 module Balanced
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

data/spec/balanced/resources/bank_account_spec.rb

@@ -6,13 +6,13 @@ describe Balanced::BankAccount do
   before do
     api_key = Balanced::ApiKey.new.save
     Balanced.configure api_key.secret
+
     @marketplace = Balanced::Marketplace.new.save
-    card = Balanced::Card.new(
+    card = @marketplace.create_card(
       :card_number      => "5105105105105100",
       :expiration_month => "12",
       :expiration_year  => "2015"
-    ).save
-
+    )
     # An initial balance for the marketplace
     @buyer = @marketplace.create_buyer(
         :email_address => 'buyer@example.org',
@@ -43,18 +43,46 @@ describe Balanced::BankAccount do
     use_vcr_cassette
 
     before do
-      @bank_account = Balanced::BankAccount.new(
-                 :account_number => "0987654321",
-                 :bank_code => "321174851",
-                 :name => "Timmy T. McTimmerson",
-                 :type => "checking"
-      ).save
+      @bank_account = @marketplace.create_bank_account(
+        :account_number => "0987654321",
+        :bank_code => "321174851",
+        :name => "Timmy T. McTimmerson",
+        :type => "checking"
+      )
     end
 
-    describe 'account' do
-      use_vcr_cassette
+    context 'without an account' do
+
       subject { @bank_account.account }
       it { should be_nil }
+
+      describe 'has_account?' do
+
+        subject { @bank_account.has_account? }
+        it { should be_false }
+
+      end
+    end
+
+    context 'with an account' do
+      use_vcr_cassette
+      before do
+        @account = @marketplace.create_account
+        bank_account = @marketplace.create_bank_account(
+            :account_number => "0987654321",
+            :bank_code => "321174851",
+            :name => "Timmy T. McTimmerson",
+            :type => "checking"
+        )
+        @account.add_bank_account(bank_account.uri)
+        @bank_account_two = bank_account.reload
+      end
+
+      describe 'has_account?' do
+        subject { @bank_account_two.has_account? }
+        it { should be_true }
+      end
+
     end
 
     describe 'account_number' do
@@ -80,12 +108,42 @@ describe Balanced::BankAccount do
       end
 
       describe 'bank_account' do
-        use_vcr_cassette
-
         subject { @credit.bank_account }
         its(:account_number) {should end_with '4321'}
         its(:routing_number) {should eql '321174851'}
+
       end
+
+      describe 'without an account' do
+         subject { @credit }
+         it { should respond_to :account }
+         its(:account) { should be_nil }
+      end
+
+      describe 'with an account' do
+        use_vcr_cassette
+
+        before do
+          @account = @marketplace.create_account
+          bank_account = @marketplace.create_bank_account(
+            :account_number => "1234567890111",
+            :bank_code => "021000021",
+            :name => "Timmy T. McTimmerson",
+            :type => "checking"
+          )
+          @account.add_bank_account(bank_account.uri)
+          bank_account = bank_account.reload
+          @credit_with_account = bank_account.credit(
+            :amount => 500,
+            :description => 'Blahblahblah'
+          )
+        end
+
+         subject { @credit_with_account }
+         it { should respond_to :account }
+         it { should be_instance_of Balanced::Credit }
+      end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: balanced
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2012-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday