balanced 0.2.1 → 0.2.2

data/examples/examples.rb

@@ -1,7 +1,9 @@
+$:.unshift("/Users/mahmoud/code/poundpay/ruby/balanced-ruby/lib")
+require 'balanced'
 
 # create our new api key
 api_key = Balanced::ApiKey.new.save
-puts "Our secret is: ", api_key
+puts "Our secret is: ", api_key.secret
 
 # configure with our secret
 Balanced.configure(api_key.secret)
@@ -9,6 +11,14 @@ Balanced.configure(api_key.secret)
 # create our marketplace
 marketplace = Balanced::Marketplace.new.save
 
+# what's my merchant?
+raise "Merchant.me should not be nil" if Balanced::Merchant.me.nil?
+
+# what's my marketplace?
+raise "Marketplace.my_marketplace should not be nil" if Balanced::Marketplace.my_marketplace.nil?
+
+# cool! let's create a new card.
+
 card = Balanced::Card.new(
   :card_number => "5105105105105100",
   :expiration_month => "12",
@@ -16,32 +26,59 @@ card = Balanced::Card.new(
 ).save
 
 # create our account
-buyer = marketplace.create_buyer(
-    :email_address => "buyer@example.org",
-    :card_uri => card.uri
-)
+buyer = marketplace.create_buyer("buyer@example.org", card.uri)
 
 # hold some amount of funds on the buyer, lets say 15$
-the_hold = buyer.hold(
-    :amount => 1500,
-)
+the_hold = buyer.hold(1500)
 
 # the hold has a fee of 35c
-assert the_hold.fee == 35
+raise "The hold's fee is incorrect" if the_hold.fee != 35
 
-# nah, lets just debit it
-debit = the_hold.debit()
+# nah, lets just capture it
+debit = the_hold.capture()
 
 # hmm, how much money do i have in escrow? should equal
 # the debit amount
-marketplace = marketplace.find(marketplace.uri)
-assert marketplace.in_escrow == 1500
+marketplace = marketplace.my_marketplace
+raise "1500 is not in escrow! this is wrong" if marketplace.in_escrow != 1500
 
 
 # cool. now let me refund
 refund = debit.refund()  # the full amount!
 
 # notice how Balanced refunds you your fees?
-assert (refund.fee + debit.fee) == 0
+raise "Woah, fees are incorrect" if (refund.fee + debit.fee) != 0
+
+# ok, we have a merchant that's signing up, let's create an account for them
+# first, lets create their bank account
+bank_account = Balanced::BankAccount.new(
+    :account_number => "1234567890",
+    :bank_code => "12",
+    :name => "Jack Q Merchant",
+).save
+
+merchant = marketplace.create_merchant(
+    "merchant@example.org",
+    {
+      :type => "person",
+      :name => "Billy Jones",
+      :street_address => "801 High St.",
+      :postal_code => "94301",
+      :country => "USA",
+      :dob => "1842-01",
+      :phone_number => "+16505551234",
+    },
+    bank_account.uri,
+    "Jack Q Merchant",
+)
+
+# oh our buyer is interested in buying something for 130.00$
+another_debit = buyer.debit(13000, "MARKETPLACE.COM")
+
+# lets credit our merchant 110.00$
+credit = merchant.credit(11000, "Buyer purchased something on MARKETPLACE.COM")
 
+# our fee is 15% so, we earned ~20
+mp_credit = marketplace.owner_account.credit(2000, "Our commission from MARKETPLACE.COM")
 
+# and there you have it :)

data/lib/balanced.rb

@@ -69,7 +69,7 @@ module Balanced
       begin
         Balanced.const_get class_name
       rescue NameError
-        false
+        return false
       end
       true
     end

data/lib/balanced/base.rb

@@ -19,6 +19,42 @@ module Balanced
         Utils.underscore resource_name
       end
 
+      def construct_from_response payload
+        payload = Balanced::Utils.hash_with_indifferent_read_access payload
+        klass = Balanced.from_uri(payload[:uri])
+        instance = klass.new payload
+        payload.each do |name, value|
+          klass.class_eval {
+            attr_accessor name.to_s
+          }
+          # 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
+          elsif name =~ /_uri$/
+            modified_name = name.sub(/_uri$/, '')
+            klass.instance_eval {
+              define_method(modified_name) {
+                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
+                if Balanced.is_collection(value)
+                  # TODO: return the pager
+                  p "TODO: return the pager for this class: #{values_class}"
+                  values_class.new
+                else
+                  values_class.find(value)
+                end
+              }
+            }
+          end
+
+          instance.instance_variable_set "@#{name}", value
+        end
+        instance
+      end
+
     end
 
     attr_reader :attributes
@@ -46,7 +82,7 @@ module Balanced
 
     # delegate the query to the pager module
 
-    def find (uri, options={})
+    def find uri, options={}
       payload = Balanced.get :uri => uri
       construct_from_response payload
     end
@@ -56,7 +92,7 @@ module Balanced
       method = :post
       if uri.nil?
         uri = self.class.collection_path
-      else
+      elsif !Balanced.is_collection(uri)
         method = :put
       end
       response = Balanced.send(method, uri, self.attributes)
@@ -67,45 +103,10 @@ module Balanced
       Balanced.delete :uri => self.attributes['uri']
     end
 
-    def construct_from_response payload
-      klass = Balanced.from_uri(payload['uri'])
-      instance = klass.new payload
-      payload.each do |name, value|
-        klass.class_eval {
-          attr_accessor name.to_s
-        }
-        # 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
-        elsif name =~ /_uri$/
-          modified_name = name.sub(/_uri$/, '')
-          klass.instance_eval {
-            define_method(modified_name) {
-              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
-              if Balanced.is_collection(value)
-                # TODO: return the pager
-                p "TODO: return the pager for this class: #{values_class}"
-                values_class.new
-              else
-                values_class.find(value)
-              end
-            }
-          }
-        end
-
-        instance.instance_variable_set "@#{name}", value
-      end
-      instance
-    end
-
     def reload response = nil
       if response
         return if response.body.to_s.length.zero?
-        fresh = self.construct_from_response response.body
+        fresh = self.class.construct_from_response response.body
       else
         fresh = self.find(@attributes['uri'])
       end

data/lib/balanced/client.rb

@@ -45,11 +45,13 @@ module Balanced
     end
 
     def url
-      URI::HTTP.build(
-          :scheme => @config[:scheme],
+      _url = URI::HTTP.build(
           :host => @config[:host],
           :port => @config[:port],
-      ).to_s
+      )
+      # wow. yes, this is what you actually have to do.
+      _url.scheme = @config[:scheme]
+      _url
     end
 
     # wtf..

data/lib/balanced/resources.rb

@@ -5,10 +5,19 @@ module Balanced
 
   class Account < Resource
 
+
+    def initialize attributes = {}
+      Balanced::Utils.stringify_keys! attributes
+      unless attributes.has_key? 'uri'
+        attributes['uri'] = Balanced::Marketplace.my_marketplace.send(self.class.collection_name + '_uri')
+      end
+      super attributes
+    end
+
     def debit (amount=nil,
         appears_on_statement_as=nil,
         hold_uri=nil,
-        meta=nil,
+        meta={},
         description=nil,
         source_uri=nil)
       debit = Debit.new(
@@ -64,7 +73,15 @@ module Balanced
   class Merchant < Resource
 
     def self.me
+      # TODO: use query
+      response = Balanced.get collection_path
+      return nil if response.body.to_s.length.zero? or response.body['total'] == 0
+      payload = response.body
+      construct_from_response payload['items'][0]
+    end
 
+    def me
+      self.class.me
     end
 
   end
@@ -72,6 +89,15 @@ module Balanced
   class Marketplace < Resource
 
     def self.my_marketplace
+      # TODO: use query
+      response = Balanced.get collection_path
+      return nil if response.body.to_s.length.zero? or response.body['total'] == 0
+      payload = response.body
+      construct_from_response payload['items'][0]
+    end
+
+    def my_marketplace
+      self.class.my_marketplace
     end
 
     def create_buyer email_address, card_uri, name=nil, meta={}
@@ -101,12 +127,21 @@ module Balanced
 
   class Hold < Resource
 
+    def initialize attributes = {}
+      Balanced::Utils.stringify_keys! attributes
+      unless attributes.has_key? 'uri'
+        attributes['uri'] = Balanced::Marketplace.my_marketplace.send(self.class.collection_name + '_uri')
+      end
+      super attributes
+    end
+
     def void
       @is_void = true
       save
     end
 
-    def capture amount, appears_on_statement_as, meta, description
+    def capture amount=nil, appears_on_statement_as=nil, meta={}, description=nil
+      amount ||= self.amount
       self.account.debit(amount, appears_on_statement_as, self.uri, meta, description)
     end
 
@@ -114,6 +149,14 @@ module Balanced
 
   class Debit < Resource
 
+    def initialize attributes = {}
+      Balanced::Utils.stringify_keys! attributes
+      unless attributes.has_key? 'uri'
+        attributes['uri'] = Balanced::Marketplace.my_marketplace.send(self.class.collection_name + '_uri')
+      end
+      super attributes
+    end
+
     def refund amount=nil, description=nil
       refund = Refund.new(
           :uri => self.refunds_uri,
@@ -127,17 +170,48 @@ module Balanced
   end
 
   class Credit < Resource
+    def initialize attributes = {}
+      Balanced::Utils.stringify_keys! attributes
+      unless attributes.has_key? 'uri'
+        attributes['uri'] = Balanced::Marketplace.my_marketplace.send(self.class.collection_name + '_uri')
+      end
+      super attributes
+    end
+
   end
 
   class Refund < Resource
+    def initialize attributes = {}
+      Balanced::Utils.stringify_keys! attributes
+      unless attributes.has_key? 'uri'
+        attributes['uri'] = Balanced::Marketplace.my_marketplace.send(self.class.collection_name + '_uri')
+      end
+      super attributes
+    end
+
   end
 
   class Transaction < Resource
+    def initialize attributes = {}
+      Balanced::Utils.stringify_keys! attributes
+      unless attributes.has_key? 'uri'
+        attributes['uri'] = Balanced::Marketplace.my_marketplace.send(self.class.collection_name + '_uri')
+      end
+      super attributes
+    end
+
   end
 
   class Card < Resource
+    def initialize attributes = {}
+      Balanced::Utils.stringify_keys! attributes
+      unless attributes.has_key? 'uri'
+        attributes['uri'] = Balanced::Marketplace.my_marketplace.send(self.class.collection_name + '_uri')
+      end
+      super attributes
+    end
 
-    def debit amount=nil, appears_on_statement_as=nil, holds_uri=nil, meta=nil, description=nil
+    def debit amount=nil, appears_on_statement_as=nil, holds_uri=nil, meta={}, description=nil
       self.account.debit(amount, appears_on_statement_as, holds_uri, meta, description, self.uri)
     end
 
@@ -147,12 +221,19 @@ module Balanced
   end
 
   class BankAccount < Resource
+    def initialize attributes = {}
+      Balanced::Utils.stringify_keys! attributes
+      unless attributes.has_key? 'uri'
+        attributes['uri'] = Balanced::Marketplace.my_marketplace.send(self.class.collection_name + '_uri')
+      end
+      super attributes
+    end
 
-    def debit amount, appears_on_statement_as=nil, meta=mil, description=nil
+    def debit amount, appears_on_statement_as=nil, meta={}, description=nil
       self.account.debit(amount, appears_on_statement_as, meta, description, self.uri)
     end
 
-    def credit amount, description=nil, meta=nil
+    def credit amount, description=nil, meta={}
       self.account.credit(amount, description, meta, self.uri)
     end
   end

data/lib/balanced/version.rb

@@ -1,3 +1,3 @@
 module Balanced
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: balanced
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-19 00:00:00.000000000 Z
+date: 2012-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday