poundpay 0.3.2 → 0.4.0

data/Rakefile

@@ -4,4 +4,6 @@ require "rspec/core/rake_task"
 
 Bundler::GemHelper.install_tasks
 
-Rspec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/examples/marketplace/application.rb

@@ -71,7 +71,7 @@ class Payment < SimpleController
 
   def authorize request
     if request.POST['sid'].kind_of?(Array)
-        payments = Poundpay::Payment.batch_update(:sid => request.POST['sid'], :status => 'authorized')
+        payments = Poundpay::Payment.batch_update(:sid => request.POST['sid'], :state => 'authorized')
         payments = payments.collect! {|p| p.schema }
         return PP.pp(payments, ''), "text/html"
     else
@@ -85,26 +85,23 @@ class Payment < SimpleController
   def release request
     payment = Poundpay::Payment.find(request.POST['sid'])
     payment.release
-    payment.save
     return PP.pp(payment.schema, ''), "text/html"
   end
 
   def cancel request
     payment = Poundpay::Payment.find(request.POST['sid'])
     payment.cancel
-    payment.save
     return PP.pp(payment.schema, ''), "text/html"
   end
 
   def escrow request
     if request.POST['sid'].kind_of?(Array)
-        payments = Poundpay::Payment.batch_update(:sid => request.POST['sid'], :status => 'escrowed')
+        payments = Poundpay::Payment.batch_update(:sid => request.POST['sid'], :state => 'escrowed')
         payments = payments.collect! {|p| p.schema }
         return PP.pp(payments, ''), "text/html"
     else
         payment = Poundpay::Payment.find(request.POST['sid'])
         payment.escrow
-        payment.save
         return PP.pp(payment.schema, ''), "text/html"
     end
   end
@@ -181,4 +178,4 @@ class ChargePermission < SimpleController
     return PP.pp(charge_permission.schema, ''), 'text/plain'
   end
 
-end
+end

data/lib/poundpay/elements.rb

@@ -78,40 +78,40 @@ module Poundpay
     end
 
     def authorize
-      unless status == 'STAGED'
-        raise PaymentAuthorizeException.new "Payment status is #{status}.  Only STAGED payments may be AUTHORIZED."
+      unless state == 'CREATED'
+        raise PaymentAuthorizeException.new "Payment state is #{state}.  Only CREATED payments may be AUTHORIZED."
       end
-      attributes['status'] = 'AUTHORIZED'
+      attributes['state'] = 'AUTHORIZED'
       save
     end
 
     def escrow
-      unless status == 'AUTHORIZED'
-        raise PaymentEscrowException.new "Payment status is #{status}.  Only AUTHORIZED payments may be ESCROWED."
+      unless state == 'AUTHORIZED'
+        raise PaymentEscrowException.new "Payment state is #{state}.  Only AUTHORIZED payments may be ESCROWED."
       end
-      attributes['status'] = 'ESCROWED'
+      attributes['state'] = 'ESCROWED'
       save
     end
 
     def release
-      statuses = ['ESCROWED']
-      unless statuses.include?(status)
-        raise PaymentReleaseException.new "Payment status is #{status}.  Only ESCROWED payments may be RELEASED."
+      states = ['ESCROWED']
+      unless states.include?(state)
+        raise PaymentReleaseException.new "Payment state is #{state}.  Only ESCROWED payments may be RELEASED."
       end
-      # Tried setting status with status=, but save still had status == 'ESCROWED'.
-      # Setting the status through the attributes, however, does work.
-      attributes['status'] = 'RELEASED'
+      # Tried setting state with state=, but save still had state == 'ESCROWED'.
+      # Setting the state through the attributes, however, does work.
+      attributes['state'] = 'RELEASED'
       save
     end
 
     def cancel
-      statuses = ['AUTHORIZED', 'ESCROWED']
-      unless statuses.include?(status)
-        raise PaymentCancelException.new "Payment status is #{status}.  Only payments with statuses " \
-        "#{statuses.join(', ')} may be canceled"
+      states = ['CREATED', 'AUTHORIZED', 'ESCROWED']
+      unless states.include?(state)
+        raise PaymentCancelException.new "Payment state is #{state}.  Only payments with states " \
+        "#{states.join(', ')} may be canceled"
       end
 
-      attributes['status'] = 'CANCELED'
+      attributes['state'] = 'CANCELED'
       save
     end
   end

data/lib/poundpay/rails.rb

@@ -1,10 +1,16 @@
 if defined? Rails
+  require 'erb'
+
   module Poundpay
     def self.configure_from_yaml(path)
-      pathname = Pathname.new Rails.root.join(path)
-      raise ArgumentError.new "File does not exist: #{pathname.to_s}" unless pathname.exist?
-      config = YAML::load_file(pathname)[Rails.env]
+      pathname = Rails.root.join(path)
+      raise ArgumentError, "File does not exist: #{pathname}" unless pathname.exist?
+
+      config = pathname.read
+      config = ERB.new(config).result if pathname.extname == '.erb'
+      config = YAML.load(config)[Rails.env]
+
       Poundpay.configure_from_hash(config)
     end
   end
-end
+end

data/lib/poundpay/resource.rb

@@ -7,7 +7,11 @@ module Poundpay
     self.format = Formats::UrlencodedJsonFormat
 
     class << self
-      attr_accessor_with_default(:primary_key, 'sid')
+      attr_writer :primary_key
+
+      def primary_key
+        @primary_key ||= 'sid'
+      end
 
       # Modified default to not use an extension
       def element_path(id, prefix_options = {}, query_options = nil)
@@ -41,9 +45,9 @@ module Poundpay
       end
 
       protected
-        def remove_extension(path)
-          path.sub /(\.#{format.extension})/, ""
-        end
+      def remove_extension(path)
+        path.sub /(\.#{format.extension})/, ""
+      end
     end
 
     # Poundpay accepts urlencoded form parameters
@@ -57,14 +61,14 @@ module Poundpay
     end
 
     protected
-        def self.urlencode(params)
-          params.to_a.collect! { |k, v|
-              if v.kind_of?(Array)
-                v.collect! { |x| "#{k}=#{CGI.escape(x.to_s)}"}.join("&")
-              else
-                "#{k}=#{CGI.escape(v.to_s)}"
-              end 
-          }.join("&")
+    def self.urlencode(params)
+      params.to_a.collect! { |k, v|
+        if v.kind_of?(Array)
+          v.collect! { |x| "#{k}=#{CGI.escape(x.to_s)}" }.join("&")
+        else
+          "#{k}=#{CGI.escape(v.to_s)}"
         end
+      }.join("&")
+    end
   end
-end
+end

data/lib/poundpay/version.rb

@@ -1,3 +1,3 @@
 module Poundpay
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/poundpay.gemspec

@@ -14,9 +14,9 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "poundpay"
 
-  s.add_dependency("activeresource", "~> 3.0.0")
+  s.add_dependency("activeresource", "~> 3.1")
 
-  s.add_development_dependency("rspec", ">= 2.0")
+  s.add_development_dependency("rspec", "~> 2.0")
   s.add_development_dependency("wirble")
 
   s.files         = `git ls-files`.split("\n")

data/spec/fixtures/payments.rb

@@ -1,6 +1,6 @@
 module Poundpay
   module PaymentFixture
-    def staged_payment_attributes
+    def created_payment_attributes
       {
         "amount"                     => 20000,
         "payer_fee_amount"           => 0,
@@ -9,7 +9,7 @@ module Poundpay
         "recipient_email_address"    => "david@example.com",
         "description"                => "Beats by Dr. Dre",
         "sid"                        => "PY1d82752a361211e0bce31231400042c7",
-        "status"                     => "STAGED",
+        "state"                      => "CREATED",
         "amount_to_credit_developer" => 550,
         "updated_at"                 => "2011-02-11T19:07:05.332356Z",
         "recipient_sid"              => nil,
@@ -23,26 +23,26 @@ module Poundpay
     end
 
     def authorized_payment_attributes
-      @attributes = staged_payment_attributes
-      @attributes["status"] = "AUTHORIZED"
+      @attributes = created_payment_attributes
+      @attributes["state"] = "AUTHORIZED"
       @attributes
     end
 
     def escrowed_payment_attributes
-      @attributes = staged_payment_attributes
-      @attributes["status"] = "ESCROWED"
+      @attributes = created_payment_attributes
+      @attributes["state"] = "ESCROWED"
       @attributes
     end
 
     def released_payment_attributes
-      @attributes = staged_payment_attributes
-      @attributes["status"] = "RELEASED"
+      @attributes = created_payment_attributes
+      @attributes["state"] = "RELEASED"
       @attributes
     end
 
     def canceled_payment_attributes
-      @attributes = staged_payment_attributes
-      @attributes["status"] = "CANCELED"
+      @attributes = created_payment_attributes
+      @attributes["state"] = "CANCELED"
       @attributes
     end
   end

data/spec/fixtures/poundpay.yml

@@ -16,5 +16,5 @@ future:
   api_version: gold
 
 invalid:
-  developer_sid: 
-  auth_token: 
+  developer_sid:
+  auth_token:

data/spec/fixtures/poundpay.yml.erb

@@ -0,0 +1,5 @@
+development:
+  developer_sid: DV0383d447360511e0bbac00264a09ff3c
+  auth_token: <%= 'erb_development_auth_token' %>
+  www_url: https://www-sandbox.poundpay.com
+  api_url: https://api-sandbox.poundpay.com

data/spec/poundpay/elements_spec.rb

@@ -68,24 +68,24 @@ describe Payment do
   end
 
   describe "#authorize" do
-    it "should not be able to authorize a non STAGED payment" do
-      @non_staged_payment = Payment.new authorized_payment_attributes
-      expect {@non_staged_payment.authorize}.to raise_error(PaymentAuthorizeException)
+    it "should not be able to authorize a non CREATED payment" do
+      @non_created_payment = Payment.new authorized_payment_attributes
+      expect {@non_created_payment.authorize}.to raise_error(PaymentAuthorizeException)
     end
 
-    it "should authorize a STAGED payment" do
-      @staged_payment = Payment.new staged_payment_attributes
-      @staged_payment.should_receive(:save).and_return(Payment.new authorized_payment_attributes)
+    it "should authorize a CREATED payment" do
+      @created_payment = Payment.new created_payment_attributes
+      @created_payment.should_receive(:save).and_return(Payment.new authorized_payment_attributes)
 
-      @staged_payment.authorize
-      @staged_payment.status.should == 'AUTHORIZED'
+      @created_payment.authorize
+      @created_payment.state.should == 'AUTHORIZED'
     end
   end
 
   describe "#escrow" do
-    it "should not be able to escrow a STAGED payment" do
-      @staged_payment = Payment.new staged_payment_attributes
-      expect {@staged_payment.escrow}.to raise_error(PaymentEscrowException)
+    it "should not be able to escrow a CREATED payment" do
+      @created_payment = Payment.new created_payment_attributes
+      expect {@created_payment.escrow}.to raise_error(PaymentEscrowException)
     end
 
     it "should escrow an AUTHORIZED payment" do
@@ -93,14 +93,14 @@ describe Payment do
       @authorized_payment.should_receive(:save).and_return(Payment.new escrowed_payment_attributes)
 
       @authorized_payment.escrow
-      @authorized_payment.status.should == 'ESCROWED'
+      @authorized_payment.state.should == 'ESCROWED'
     end
   end
 
   describe "#release" do
-    it "should not be able to release a STAGED payment" do
-      @staged_payment = Payment.new staged_payment_attributes
-      expect {@staged_payment.release}.to raise_error(PaymentReleaseException)
+    it "should not be able to release a CREATED payment" do
+      @created_payment = Payment.new created_payment_attributes
+      expect {@created_payment.release}.to raise_error(PaymentReleaseException)
     end
 
     it "should release an ESCROWED payment" do
@@ -108,14 +108,14 @@ describe Payment do
       @escrowed_payment.should_receive(:save).and_return(Payment.new released_payment_attributes)
 
       @escrowed_payment.release
-      @escrowed_payment.status.should == 'RELEASED'
+      @escrowed_payment.state.should == 'RELEASED'
     end
   end  
 
   describe "#cancel" do
-    it "should not be able to cancel a STAGED payment" do
-      @staged_payment = Payment.new staged_payment_attributes
-      expect {@staged_payment.cancel}.to raise_error(PaymentCancelException)
+    it "should not be able to cancel a RELEASED payment" do
+      @released_payment = Payment.new released_payment_attributes
+      expect {@released_payment.cancel}.to raise_error(PaymentCancelException)
     end
 
     it "should cancel an ESCROWED payment" do
@@ -123,7 +123,15 @@ describe Payment do
       @escrowed_payment.should_receive(:save).and_return(Payment.new canceled_payment_attributes)
 
       @escrowed_payment.cancel
-      @escrowed_payment.status.should == 'CANCELED'
+      @escrowed_payment.state.should == 'CANCELED'
+    end
+
+    it "should cancel a CREATED payment" do
+      @created_payment = Payment.new created_payment_attributes
+      @created_payment.should_receive(:save).and_return(Payment.new canceled_payment_attributes)
+
+      @created_payment.cancel
+      @created_payment.state.should == 'CANCELED'
     end
   end
 end

data/spec/poundpay/rails_spec.rb

@@ -2,48 +2,45 @@ require 'poundpay'
 
 describe Poundpay do
   module Rails
+    def self.root
+      Pathname(File.expand_path("../../fixtures", __FILE__))
+    end
+
+    def self.env
+      "development"
+    end
+  end
+
+  load File.expand_path("../../../lib/poundpay/rails.rb", __FILE__)
+
+  before do
+    Poundpay.should_not be_configured
   end
 
-  after (:each) do
+  after do
     Poundpay.clear_config!
   end
 
   it "should automatically load config if exists" do
-    load File.expand_path("../../../lib/poundpay/rails.rb", __FILE__)
+    Poundpay.configure_from_yaml "poundpay.yml"
 
-    module Rails
-      def self.root
-        Pathname(File.expand_path("../../fixtures", __FILE__))
-      end
-
-      def self.env
-        "development"
-      end
-    end
-
-    Poundpay.configured?.should be_false
-    Poundpay.configure_from_yaml "config/poundpay.yml"
-    Poundpay.configured?.should be_true
+    Poundpay.should be_configured
     Poundpay::Resource.password.should == "development_auth_token"
   end
 
-  it "should not do anything if config does not exist" do
-    load File.expand_path("../../../lib/poundpay/rails.rb", __FILE__)
+  it "configures using ERB files to allow ENV variables" do
+    Poundpay.configure_from_yaml "poundpay.yml.erb"
 
-    module Rails
-      def self.root
-        Pathname(File.expand_path("../../fixtures", __FILE__))
-      end
+    Poundpay.should be_configured
+    Poundpay::Resource.password.should == "erb_development_auth_token"
+  end
 
-      def self.env
-        "development"
-      end
-    end
+  it "should raise argument error and configure nothing if config does not exist" do
+    expect {
+      Poundpay.configure_from_yaml "wrong_path"
+    }.to raise_error(ArgumentError, /wrong_path/)
 
-    Poundpay.configured?.should be_false
-    expect { Poundpay.configure_from_yaml "wrong_path" }.to raise_error(ArgumentError, /wrong_path/)
-    Poundpay.configured?.should be_false
-    Poundpay::Resource.password.should == nil
+    Poundpay.should_not be_configured
+    Poundpay::Resource.password.should_not be
   end
-
-end
+end

metadata

@@ -1,55 +1,75 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: poundpay
-version: !ruby/object:Gem::Version
-  version: 0.3.2
+version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: 
+  segments: 
+  - 0
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
-authors:
+authors: 
 - Matin Tamizi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-14 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-03-16 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activeresource
-  requirement: &24260120 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        - 1
+        version: "3.1"
   type: :runtime
-  prerelease: false
-  version_requirements: *24260120
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &24259460 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.0'
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
   type: :development
-  prerelease: false
-  version_requirements: *24259460
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: wirble
-  requirement: &24259020 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *24259020
+  version_requirements: *id003
 description: Payments platform for marketplaces
 email: devsupport@poundpay.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .autotest
 - .gitignore
 - .gitmodules
@@ -79,6 +99,7 @@ files:
 - spec/fixtures/developers.rb
 - spec/fixtures/payments.rb
 - spec/fixtures/poundpay.yml
+- spec/fixtures/poundpay.yml.erb
 - spec/poundpay/callback_spec.rb
 - spec/poundpay/elements_spec.rb
 - spec/poundpay/exceptions_spec.rb
@@ -88,26 +109,36 @@ files:
 - spec/poundpay_spec.rb
 homepage: http://github.com/poundpay/poundpay-ruby
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: poundpay
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Poundpay Ruby library
 test_files: []
+