balanced 0.7.5 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 702de4ea3bdcd354e312e317d8d065c88a4b40f1
-  data.tar.gz: 21dbefe6a866777a6a2ef4372d254c3be9d41f05
+  metadata.gz: c7186ba853d6660c7502ad3767c186b1df7561a8
+  data.tar.gz: 42fbc557f0911e4a666d9df08ba0eb93122eef72
 SHA512:
-  metadata.gz: 2dd3628ee2e6de7a7f88aa21a11ffc097c3cb1dbdcc8f933ee9d3dfb137277b21d4cb203ace1fc4f39de4f385c274430de4b57322ecb06295463f024a2797539
-  data.tar.gz: 8d19b4684e94ef36beb8bc2d1119d665e7a0f489b1d76a68b932c00af99c784b2aad60cb047867e5e99e503dbe40fa49180bcad4ff24bbbce07efd8105c8ce56
+  metadata.gz: bba78d1960941223a2fb01eadc1cb73b1f0b617577889b0705dd11e4d04f83cea273e6696d2eea418ed1b68d7d4e33aa26127411a4b1b6a8f882fdb0ba5b9252
+  data.tar.gz: 665f3459a00d622a9d366c4637928f7fed47cf9e73cfaf73d1c0b1ee3e31b6d77415ab632da22a60b69ddaa830d23788113d9734dc0152a950a60243798cfdd1

data/.gitignore

@@ -33,4 +33,3 @@ spec/cassettes
 # OS X
 .DS_Store
 
-.ruby-version

data/.rbenv-version

@@ -0,0 +1 @@
+1.9.2-p290

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.0.0-p247

data/Gemfile

@@ -4,6 +4,7 @@ source 'https://rubygems.org'
 
 gem "faraday"
 gem "faraday_middleware"
+gem "json"
 
 group :development do
   gem "yard"

data/balanced.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Sign up on https://balancedpayments.com/}
   gem.homepage      = "https://balancedpayments.com"
 
-  gem.add_dependency("faraday", '~> 0.8.6')
+  gem.add_dependency("faraday", '>= 0.8.6')
   gem.add_dependency("faraday_middleware", '~> 0.9.0')
 
   gem.files         = `git ls-files`.split($\)
@@ -22,4 +22,4 @@ Gem::Specification.new do |gem|
   gem.name          = "balanced"
   gem.require_paths = %w(lib)
   gem.version       = Balanced::VERSION
-end
+end

data/examples/bank_account_debits.rb

@@ -1,8 +1,9 @@
 """
 Learn how to authenticate a bank account so you can debit with it.
 """
-cwd = File.dirname(File.dirname(File.absolute_path(__FILE__)))
+cwd = File.dirname(File.dirname(File.expand_path(__FILE__)))
 $:.unshift(cwd + "/lib")
+require 'rubygems'
 require 'balanced'
 
 host = ENV.fetch('BALANCED_HOST') { nil }

data/examples/customers.rb

@@ -1,8 +1,8 @@
-cwd = File.dirname(File.dirname(File.absolute_path(__FILE__)))
+cwd = File.dirname(File.dirname(File.expand_path(__FILE__)))
 $:.unshift(cwd + "/lib")
+require 'rubygems'
 require 'balanced'
 
-
 begin
   Balanced::Card
 rescue NameError
@@ -45,7 +45,7 @@ customer = marketplace.create_customer(
             :line1 => "1234 1st Street",
             :city  => "San Francisco",
             :state => "CA"
-          }
+        }
   ).save
 
 puts "our customer uri is #{customer.uri}"
@@ -61,7 +61,7 @@ bank_account = marketplace.create_bank_account(
 card = marketplace.create_card(
           :card_number       => "4111111111111111",
           :expiration_month  => "12",
-          :expiration_year   => "2015",
+          :expiration_year   => "2015"
         ).save
 
 puts "our bank account uri is #{bank_account.uri}"
@@ -108,3 +108,7 @@ raise "active card is incorrect" unless customer.active_card.id == card.id
 puts "check to see what is the active bank_account for a customer"
 
 raise "active bank account is incorrect" unless customer.active_bank_account.id == bank_account.id
+
+
+
+

data/examples/events_and_callbacks.rb

@@ -3,8 +3,9 @@ Welcome weary traveller. Sick of polling for state changes? Well today have I
 got good news for you. Run this example below to see how to get yourself some
 callback goodness and to understand how events work.
 """
-cwd = File.dirname(File.dirname(File.absolute_path(__FILE__)))
+cwd = File.dirname(File.dirname(File.expand_path(__FILE__)))
 $:.unshift(cwd + "/lib")
+require 'rubygems'
 require 'balanced'
 require 'net/http'
 require 'uri'

data/examples/examples.rb

@@ -1,5 +1,6 @@
-cwd = File.dirname(File.dirname(File.absolute_path(__FILE__)))
+cwd = File.dirname(File.dirname(File.expand_path(__FILE__)))
 $:.unshift(cwd + "/lib")
+require 'rubygems'
 require 'balanced'
 
 begin
@@ -52,7 +53,7 @@ puts "cool! let's create a new card."
 card = Balanced::Card.new(
   :card_number => "5105105105105100",
   :expiration_month => "12",
-  :expiration_year => "2015",
+  :expiration_year => "2015"
 ).save
 puts "Our card uri: #{card.uri}"
 
@@ -83,7 +84,7 @@ puts "ok, we have a merchant that's signing up, let's create an account for them
 bank_account = marketplace.create_bank_account(
     :account_number => "1234567890",
     :routing_number => "322271627",
-    :name => "Jack Q Merchant",
+    :name => "Jack Q Merchant"
 )
 
 merchant = marketplace.create_merchant(
@@ -95,10 +96,10 @@ merchant = marketplace.create_merchant(
       :postal_code => "94301",
       :country => "USA",
       :dob => "1842-01",
-      :phone_number => "+16505551234",
+      :phone_number => "+16505551234"
     },
     :bank_account_uri => bank_account.uri,
-    :name => "Jack Q Merchant",
+    :name => "Jack Q Merchant"
 )
 
 puts "oh our buyer is interested in buying something for 530.00$"

data/examples/exception_handling.rb

@@ -1,5 +1,6 @@
-cwd = File.dirname(File.dirname(File.absolute_path(__FILE__)))
+cwd = File.dirname(File.dirname(File.expand_path(__FILE__)))
 $:.unshift(cwd + "/lib")
+require 'rubygems'
 require 'balanced'
 
 begin

data/lib/balanced/client.rb

@@ -70,9 +70,9 @@ module Balanced
     def url
       builder = (config[:scheme] == 'http') ? URI::HTTP : URI::HTTPS
 
-      builder.build ({:host => config[:host],
-                         :port => config[:port],
-                         :scheme => config[:scheme]})
+      builder.build({:host => config[:host],
+                     :port => config[:port],
+                     :scheme => config[:scheme]})
     end
 
     def method_missing(method, *args, &block)

data/lib/balanced/resources/account.rb

@@ -60,7 +60,7 @@ module Balanced
           :meta => meta,
           :description => description,
           :source_uri => source_uri,
-          :on_behalf_of_uri => on_behalf_of,
+          :on_behalf_of_uri => on_behalf_of
       )
       debit.save
     end
@@ -81,12 +81,14 @@ module Balanced
       amount = args[0] || options.fetch(:amount) { }
       meta = args[1] || options.fetch(:meta) { nil }
       source_uri = args[2] || options.fetch(:source_uri) { nil }
+      description = args[3] || options.fetch(:description) { nil }
 
       hold = Hold.new(
           :uri => self.holds_uri,
           :amount => amount,
           :meta => meta,
           :source_uri => source_uri,
+          :description => description
       )
       hold.save
     end
@@ -102,9 +104,9 @@ module Balanced
       warn_on_positional args
 
       if args.last.is_a? Hash
-        args.last.merge! uri: self.credits_uri
+        args.last.merge! :uri => self.credits_uri
       else
-        args << { uri: self.credits_uri }
+        args << { :uri => self.credits_uri }
       end
       Credit.new(*args).save
     end

data/lib/balanced/resources/card.rb

@@ -56,13 +56,15 @@ module Balanced
       options = args.last.is_a?(Hash) ? args.pop : {}
       amount = args[0] || options.fetch(:amount) { nil }
       meta = args[1] || options.fetch(:meta) { nil }
+      description = args[3] || options.fetch(:description) { nil }
 
       ensure_associated_to_account!
 
       self.account.hold(
           :amount => amount,
           :meta => meta,
-          :source_uri => self.uri
+          :source_uri => self.uri,
+          :description => description
       )
     end
 

data/lib/balanced/resources/credit.rb

@@ -27,23 +27,23 @@ module Balanced
       unless bank_account.nil?
         # Accountless bank account
         attributes = {
-            uri: uri,
-            amount: amount,
-            description: description,
-            bank_account: bank_account,
-            meta: nil
+            :uri => uri,
+            :amount => amount,
+            :description => description,
+            :bank_account => bank_account,
+            :meta => nil
         }
       else
         meta = args[2] || options.fetch(:meta) { nil }
         destination_uri = args[3] || options.fetch(:destination_uri) { nil }
         appears_on_statement_as = args[4] || options.fetch(:appears_on_statement_as) { nil }
         attributes = {
-            uri: uri,
-            amount: amount,
-            meta: meta,
-            description: description,
-            destination_uri: destination_uri,
-            appears_on_statement_as: appears_on_statement_as
+            :uri => uri,
+            :amount => amount,
+            :meta => meta,
+            :description => description,
+            :destination_uri => destination_uri,
+            :appears_on_statement_as => appears_on_statement_as
         }
       end
 
@@ -63,9 +63,8 @@ module Balanced
           :uri => self.reversals_uri,
           :credit_uri => self.uri,
           :amount => amount,
-          :description => description,
+          :description => description
       )
-
       reversal.save
     end
 

data/lib/balanced/resources/customer.rb

@@ -61,7 +61,7 @@ module Balanced
           :meta => meta,
           :description => description,
           :source_uri => source_uri,
-          :on_behalf_of_uri => on_behalf_of,
+          :on_behalf_of_uri => on_behalf_of
       )
       debit.save
     end

data/lib/balanced/resources/debit.rb

@@ -38,7 +38,7 @@ module Balanced
           :uri => self.refunds_uri,
           :debit_uri => self.uri,
           :amount => amount,
-          :description => description,
+          :description => description
       )
       refund.save
     end

data/lib/balanced/resources/resource.rb

@@ -1,5 +1,4 @@
-require_relative "../pager"
-
+require File.expand_path('../../pager', __FILE__)
 
 module Balanced
   module Resource
@@ -89,7 +88,7 @@ module Balanced
     end
 
     def method_missing(method, *args, &block)
-      case method
+      case method.to_s
         when /(.+)\=$/
           attr = method.to_s.chop
           @attributes[attr] = args[0]
@@ -107,16 +106,8 @@ module Balanced
           #
           # This solves the acute problem, for now.
           if @attributes.has_key? "#{method}_uri"
-
             value = @attributes["#{method}_uri"]
-            # what if the server returns a _uri that we don't know how to
-            # construct? Welp, we catch that NameError and return to super.
-            begin
-              values_class = Balanced.from_uri(value)
-            rescue NameError
-              super
-            end
-
+            values_class = Balanced.from_uri(value)
             # if uri is a collection -> this would definitely be if
             # it ends in a symbol then we should allow a lazy executor of
             # the query pager
@@ -126,112 +117,111 @@ module Balanced
             else
               return values_class.find(value)
             end
-
           else
             super
           end
       end
     end
-
-  def self.included(base)
-    base.extend ClassMethods
-  end
-
-  module ClassMethods
-    def resource_name
-      Utils.demodulize name
+    
+    def self.included(base)
+      base.extend ClassMethods
     end
 
-    def collection_name
-      Utils.pluralize Utils.underscore(resource_name)
-    end
+    module ClassMethods
+      def resource_name
+        Utils.demodulize name
+      end
 
-    def collection_path
-      ["/v#{Balanced.config[:version]}", collection_name].compact.join '/'
-    end
+      def collection_name
+        Utils.pluralize Utils.underscore(resource_name)
+      end
 
-    def member_name
-      Utils.underscore resource_name
-    end
+      def collection_path
+        ["/v#{Balanced.config[:version]}", collection_name].compact.join '/'
+      end
 
-    # Returns the resource URI for a given class.
-    #
-    # @example A Balanced::Account resource
-    #   Balanced::Account.uri # => "/v1/marketplaces/TEST-MP72zVdg2j9IiqRffW9lczRZ/accounts"
-    #
-    # @return [String] the uri of the instance or the class
-    def uri
-      # the uri of a particular resource depends if there's a marketplace
-      # created or not. if there's a marketplace, then all resources have their
-      # own uri from there and the top level ones. if there's not a marketplace
+      def member_name
+        Utils.underscore resource_name
+      end
+
+      # Returns the resource URI for a given class.
       #
-      #    if there's an api key, then the merchant is available
-      #    if there's no api key, the only resources exposed are purely top level
-      if self == Balanced::Merchant || self == Balanced::Marketplace || self == Balanced::ApiKey
-        collection_path
-      else
-        unless Balanced::Marketplace.marketplace_exists?
-          raise Balanced::StandardError, "#{self.name} is nested under a marketplace, which is not created or configured."
-        end
+      # @example A Balanced::Account resource
+      #   Balanced::Account.uri # => "/v1/marketplaces/TEST-MP72zVdg2j9IiqRffW9lczRZ/accounts"
+      #
+      # @return [String] the uri of the instance or the class
+      def uri
+        # the uri of a particular resource depends if there's a marketplace
+        # created or not. if there's a marketplace, then all resources have their
+        # own uri from there and the top level ones. if there's not a marketplace
+        #
+        #    if there's an api key, then the merchant is available
+        #    if there's no api key, the only resources exposed are purely top level
+        if self == Balanced::Merchant || self == Balanced::Marketplace || self == Balanced::ApiKey
+          collection_path
+        else
+          unless Balanced::Marketplace.marketplace_exists?
+            raise Balanced::StandardError, "#{self.name} is nested under a marketplace, which is not created or configured."
+          end
 
-        Balanced::Marketplace.marketplace_uri + "/#{collection_name}"
+          Balanced::Marketplace.marketplace_uri + "/#{collection_name}"
+        end
       end
-    end
 
-    def construct_from_response payload
-      payload = Balanced::Utils.hash_with_indifferent_read_access payload
-      return payload if payload[:uri].nil?
-      klass = Balanced.from_uri(payload[:uri])
-      instance = klass.new payload
+      def construct_from_response payload
+        payload = Balanced::Utils.hash_with_indifferent_read_access payload
+        return payload if payload[:uri].nil?
+        klass = Balanced.from_uri(payload[:uri])
+        instance = klass.new payload
 
-      # http://stackoverflow.com/a/2495650/133514
-      instance_eigen = class << instance; self; end
+        # http://stackoverflow.com/a/2495650/133514
+        instance_eigen = class << instance; self; end
 
-      payload.each do |name, value|
+        payload.each do |name, value|
 
-        # here is where our interpretations will begin.
-        # if the value is a sub-resource, lets instantiate the class
-        # and set it correctly
-        if value.instance_of? Hash and value.has_key? 'uri'
-          value = construct_from_response value
-        end
+          # here is where our interpretations will begin.
+          # if the value is a sub-resource, lets instantiate the class
+          # and set it correctly
+          if value.instance_of? Hash and value.has_key? 'uri'
+            value = construct_from_response value
+          end
 
-         # Get attribute
-        instance.class.send(:define_method, name, proc{@attributes[name]})
-         # Set attribute
-        instance.class.send(:define_method, "#{name}=",  proc{ |value| @attributes[name] = value })
-         # Is attribute present?
-        instance.class.send(:define_method, "#{name}?", proc{ !!@attributes[name] })
+           # Get attribute
+          instance.class.send(:define_method, name, proc{@attributes[name]})
+           # Set attribute
+          instance.class.send(:define_method, "#{name}=",  proc{ |value| @attributes[name] = value })
+           # Is attribute present?
+          instance.class.send(:define_method, "#{name}?", proc{ !!@attributes[name] })
 
-        instance.send("#{name}=".to_s, value)
+          instance.send("#{name}=".to_s, value)
+        end
+        instance
       end
-      instance
-    end
 
-    def find *arguments
-      scope   = arguments.slice!(0)
-      options = arguments.slice!(0) || {}
-      case scope
-        when :all   then all(options)
-        when :first then paginate(options).first
-        else
-          response = Balanced.get scope, options
-          construct_from_response response.body
+      def find *arguments
+        scope   = arguments.slice!(0)
+        options = arguments.slice!(0) || {}
+        case scope
+          when :all   then all(options)
+          when :first then paginate(options).first
+          else
+            response = Balanced.get scope, options
+            construct_from_response response.body
+        end
       end
-    end
 
-    def paginate options = {}
-      Balanced::Pager.new uri, options
-    end
-    alias scoped paginate
-    alias where  paginate
+      def paginate options = {}
+        Balanced::Pager.new uri, options
+      end
+      alias scoped paginate
+      alias where  paginate
 
-    def all options = {}
-      pager = paginate(options)
-      pager.to_a
-    end
+      def all options = {}
+        pager = paginate(options)
+        pager.to_a
+      end
 
-  end
+    end
 
   end
 end