paymill 0.2.1 → 0.2.2

data/lib/paymill.rb

@@ -13,6 +13,8 @@ module Paymill
   autoload :Client,       "paymill/client"
   autoload :Offer,        "paymill/offer"
   autoload :Payment,      "paymill/payment"
+  autoload :Preauthorization, "paymill/preauthorization"
+  autoload :Refund,           "paymill/refund"
   autoload :Subscription, "paymill/subscription"
   autoload :Transaction,  "paymill/transaction"
   autoload :Webhook,      "paymill/webhook"
@@ -48,7 +50,12 @@ module Paymill
       https.verify_mode = OpenSSL::SSL::VERIFY_PEER
       https.ca_file     = File.join(File.dirname(__FILE__), "data/paymill.crt")
       https.start do |connection|
-        url = "/#{API_VERSION}/#{api_url}"
+        if api_url == "refunds"
+          url = "/#{API_VERSION}/#{api_url}/#{data[:id]}"
+          data.delete(:id)
+        else
+          url = "/#{API_VERSION}/#{api_url}"
+        end
         https_request = case http_method
                         when :post
                           Net::HTTP::Post.new(url)
@@ -73,8 +80,12 @@ module Paymill
     end
 
     def path_with_params(path, params)
-      encoded_params = URI.encode_www_form(params)
-      [path, encoded_params].join("?")
+      unless params.empty?
+        encoded_params = URI.encode_www_form(params)
+        [path, encoded_params].join("?")
+      else
+        path
+      end
     end
   end
 end

data/lib/paymill/base.rb

@@ -4,8 +4,11 @@ module Paymill
     include Paymill::Operations::Create
     include Paymill::Operations::Find
 
+    attr_accessor :created_at, :updated_at
+
     def initialize(attributes = {})
       set_attributes(attributes)
+      parse_timestamps
     end
 
     def set_attributes(attributes)
@@ -13,5 +16,10 @@ module Paymill
         instance_variable_set("@#{key}", value)
       end
     end
+
+    def parse_timestamps
+      @created_at = Time.at(created_at) if created_at
+      @updated_at = Time.at(updated_at) if updated_at
+    end
   end
 end

data/lib/paymill/client.rb

@@ -3,7 +3,6 @@ module Paymill
     include Paymill::Operations::Delete
     include Paymill::Operations::Update
 
-    attr_accessor :id, :email, :description, :attributes, :created_at,
-                  :updated_at, :payment, :subscription
+    attr_accessor :id, :email, :description, :attributes, :payment, :subscription
   end
 end

data/lib/paymill/payment.rb

@@ -1,6 +1,8 @@
 module Paymill
   class Payment < Base
+    include Paymill::Operations::Delete
+
     attr_accessor :id, :card_type, :country, :expire_month, :expire_year,
-                  :card_holder, :last4, :created_at, :updated_at
+                  :card_holder, :last4
   end
 end

data/lib/paymill/preauthorization.rb

@@ -0,0 +1,5 @@
+module Paymill
+  class Preauthorization < Base
+    attr_accessor :id, :amount, :status, :livemode, :payment, :preauthorization, :currency, :client
+  end
+end

data/lib/paymill/refund.rb

@@ -0,0 +1,5 @@
+module Paymill
+  class Refund < Base
+    attr_accessor :id, :transaction, :amount, :status, :description, :livemode
+  end
+end

data/lib/paymill/subscription.rb

@@ -3,7 +3,13 @@ module Paymill
     include Paymill::Operations::Delete
     include Paymill::Operations::Update
 
-    attr_accessor :id, :plan, :livemode, :cancel_at_period_end, :created_at, :updated_at,
-                  :canceled_at, :client, :trial_start, :trial_end
+    attr_accessor :id, :plan, :livemode, :cancel_at_period_end, :canceled_at, :client, :trial_start, :trial_end
+
+    def parse_timestamps
+      super
+      @canceled_at = Time.at(canceled_at) if canceled_at
+      @trial_start = Time.at(trial_start) if trial_start
+      @trial_end   = Time.at(trial_end)   if trial_end
+    end
   end
 end

data/lib/paymill/transaction.rb

@@ -1,7 +1,6 @@
 module Paymill
   class Transaction < Base
     attr_accessor :id, :amount, :status, :description, :livemode,
-                  :payment, :currency, :client, :created_at, :updated_at,
-                  :response_code
+                  :payment, :currency, :client, :response_code
   end
 end

data/lib/paymill/version.rb

@@ -1,3 +1,3 @@
 module Paymill
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/paymill/webhook.rb

@@ -2,7 +2,7 @@ module Paymill
   class Webhook < Base
     include Paymill::Operations::Delete
     include Paymill::Operations::Update
-    
-    attr_accessor :id, :url, :livemode, :event_types, :created_at, :updated_at
+
+    attr_accessor :id, :url, :livemode, :event_types
   end
-end
+end

data/spec/paymill/base_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+
+describe Paymill::Base do
+  describe "#parse_timestamps" do
+    context "given #created_at is present" do
+      it "creates a Time object" do
+        base = Paymill::Base.new(created_at: 1362823928)
+        base.created_at.class.should eql(Time)
+      end
+    end
+
+    context "given #updated_at is present" do
+      it "creates a Time object" do
+        base = Paymill::Base.new(updated_at: 1362823928)
+        base.updated_at.class.should eql(Time)
+      end
+    end
+  end
+end

data/spec/paymill/payment_spec.rb

@@ -47,4 +47,11 @@ describe Paymill::Payment do
       Paymill::Payment.create(valid_attributes)
     end
   end
+
+  describe ".delete" do
+    it "makes a new DELETE request using the correct API endpoint" do
+      Paymill.should_receive(:request).with(:delete, "payments/123", {}).and_return(true)
+      Paymill::Payment.delete("123")
+    end
+  end
 end

data/spec/paymill/preauthorization_spec.rb

@@ -0,0 +1,30 @@
+require "spec_helper"
+
+describe Paymill::Preauthorization do
+  let(:valid_attributes) do
+    { 
+      payment: "pay_d43cf0ee969d9847512b", 
+      amount: 4200,
+      currency: "EUR" 
+    }
+  end
+
+  let (:preauthorization) do
+    Paymill::Preauthorization.new(valid_attributes)
+  end
+
+  describe "#initialize" do
+    it "initializes all attributes correctly" do
+      preauthorization.payment.should eql("pay_d43cf0ee969d9847512b")
+      preauthorization.amount.should eql(4200)
+      preauthorization.currency.should eql("EUR")
+    end
+  end
+
+  describe ".create" do
+    it "makes a new POST request using the correct API endpoint" do
+      Paymill.should_receive(:request).with(:post, "preauthorizations", valid_attributes).and_return("data" => {})
+      Paymill::Preauthorization.create(valid_attributes)
+    end
+  end
+end

data/spec/paymill/refund_spec.rb

@@ -0,0 +1,120 @@
+require "spec_helper"
+
+describe Paymill::Refund do
+  let(:valid_attributes) do
+    { 
+      id: "refund_87bc404a95d5ce616049",
+      amount: "042",
+      status: "refunded",
+      description: nil,
+      livemode: false,
+      created_at: 1349947042, 
+      updated_at: 1349947042,
+      transaction: {
+        id: "tran_2848cb20a6bb578177db",
+        amount: "378",
+        origin_amount: 420,
+        status: "partial_refunded",
+        description: nil,
+        livemode: false,
+        created_at: 1349946216,
+        updated_at: 1349947042,
+        response_code: 20000,
+        refunds: [
+          {
+              id: "refund_87bc404a95d5ce616049",
+              amount: "042",
+              status: "refunded",
+              description: nil,
+              livemode: false,
+              created_at: 1349947042,
+              updated_at: 1349947042,
+              response_code: 20000
+          }
+        ],
+        payment: {
+          id: "pay_95ba26ba2c613ebb0ca8",
+          type: "debit",
+          client: "client_64b025ee5955abd5af66",
+          code: "860555000",
+          holder: "Max Mustermann",
+          account: "******2345",
+          created_at: 1349945681,
+          updated_at: 1349945681
+        },
+        client: {
+          id: "client_64b025ee5955abd5af66",
+          email: "lovely-client@example.com",
+          description: nil,
+          created_at: 1349945644,
+          updated_at: 1349945644,
+          payment: [
+              "pay_95ba26ba2c613ebb0ca8"
+          ],
+          subscription: nil
+        },
+        preauthorization: nil
+      }
+    }
+  end
+
+  let (:refund) do
+    Paymill::Refund.new(valid_attributes)
+  end
+
+  describe "#initialize" do
+    it "initializes all attributes correctly" do
+      refund.id.should eql("refund_87bc404a95d5ce616049")
+      refund.amount.should eql("042")
+      refund.status.should eql("refunded")
+      refund.description.should be_nil
+      refund.livemode.should be_false
+=begin
+      refund.transaction[:refunds].should eql(
+        [
+          {
+              id: "refund_87bc404a95d5ce616049",
+              amount: "042",
+              status: "refunded",
+              description: nil,
+              livemode: false,
+              created_at: 1349947042,
+              updated_at: 1349947042,
+              response_code: 20000
+          }
+        ]
+      )
+      refund.transaction[:payment].should eql(
+        {
+          id: "pay_95ba26ba2c613ebb0ca8",
+          type: "debit",
+          client: "client_64b025ee5955abd5af66",
+          code: "860555000",
+          holder: "Max Mustermann",
+          account: "******2345",
+          created_at: 1349945681,
+          updated_at: 1349945681
+        }
+      )
+      refund.transaction[:client].should eql(
+        id: "client_64b025ee5955abd5af66",
+        email: "lovely-client@example.com",
+        description: nil,
+        created_at: 1349945644,
+        updated_at: 1349945644,
+        payment: [
+            "pay_95ba26ba2c613ebb0ca8"
+        ],
+        subscription: nil
+      )
+=end
+    end
+  end
+
+  describe ".create" do
+    it "makes a new POST request using the correct API endpoint" do
+      Paymill.should_receive(:request).with(:post, "refunds", valid_attributes).and_return("data" => {})
+      Paymill::Refund.create(valid_attributes)
+    end
+  end
+end

data/spec/paymill/subscription_spec.rb

@@ -30,8 +30,31 @@ describe Paymill::Subscription do
       subscription.livemode.should be_false
       subscription.cancel_at_period_end.should be_false
       subscription.client[:email].should eql("stefan.sprenger@dkd.de")
-      subscription.trial_start.should eql(1349945681)
-      subscription.trial_end.should eql(1349945682)
+      subscription.trial_start.to_i.should eql(1349945681)
+      subscription.trial_end.to_i.should eql(1349945682)
+    end
+  end
+
+  describe "#parse_timestamps" do
+    context "given #canceled_at is present" do
+      it "creates a Time object" do
+        subscription = Paymill::Subscription.new(canceled_at: 1362823928)
+        subscription.canceled_at.class.should eql(Time)
+      end
+    end
+
+    context "given #trial_start is present" do
+      it "creates a Time object" do
+        subscription = Paymill::Subscription.new(trial_start: 1362823928)
+        subscription.trial_start.class.should eql(Time)
+      end
+    end
+
+    context "given #trial_end is present" do
+      it "creates a Time object" do
+        subscription = Paymill::Subscription.new(trial_end: 1362823928)
+        subscription.trial_end.class.should eql(Time)
+      end
     end
   end
 

data/spec/paymill/webhook_spec.rb

@@ -20,8 +20,8 @@ describe Paymill::Webhook do
       webhook.url.should eql("<your-webhook-url>")
       webhook.livemode.should eql(false)
       webhook.event_types.should eql(["transaction.succeeded","transaction.failed"])   
-      webhook.created_at.should eql(1360368749)
-      webhook.updated_at.should eql(1360368749)
+      webhook.created_at.to_i.should eql(1360368749)
+      webhook.updated_at.to_i.should eql(1360368749)
     end
   end
   
@@ -67,4 +67,4 @@ describe Paymill::Webhook do
       webhook.url.should eql("<new-webhook-url>")
     end
   end
-end
+end

data/spec/paymill_spec.rb

@@ -23,6 +23,11 @@ describe Paymill do
         Paymill.request(:get, "transactions", { client: "client_id", order: "created_at_desc" })
         WebMock.should have_requested(:get, "https://#{Paymill::api_key}:@#{Paymill::API_BASE}/#{Paymill::API_VERSION}/transactions?client=client_id&order=created_at_desc")
       end
+
+      it "doesn't add a question mark if no params" do
+        Paymill.request(:get, "transactions", {})
+        WebMock.should have_requested(:get, "https://#{Paymill::api_key}:@#{Paymill::API_BASE}/#{Paymill::API_VERSION}/transactions")
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paymill
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-18 00:00:00.000000000 Z
+date: 2013-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2153450240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153450240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153464400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153464400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: API wrapper for Paymill.
 email:
 - stefan.sprenger@dkd.de
@@ -57,14 +67,19 @@ files:
 - lib/paymill/operations/find.rb
 - lib/paymill/operations/update.rb
 - lib/paymill/payment.rb
+- lib/paymill/preauthorization.rb
+- lib/paymill/refund.rb
 - lib/paymill/subscription.rb
 - lib/paymill/transaction.rb
 - lib/paymill/version.rb
 - lib/paymill/webhook.rb
 - paymill.gemspec
+- spec/paymill/base_spec.rb
 - spec/paymill/client_spec.rb
 - spec/paymill/offer_spec.rb
 - spec/paymill/payment_spec.rb
+- spec/paymill/preauthorization_spec.rb
+- spec/paymill/refund_spec.rb
 - spec/paymill/subscription_spec.rb
 - spec/paymill/transaction_spec.rb
 - spec/paymill/webhook_spec.rb
@@ -84,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3327817462008033572
+      hash: 216517499575340974
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -93,17 +108,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3327817462008033572
+      hash: 216517499575340974
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: API wrapper for Paymill.
 test_files:
+- spec/paymill/base_spec.rb
 - spec/paymill/client_spec.rb
 - spec/paymill/offer_spec.rb
 - spec/paymill/payment_spec.rb
+- spec/paymill/preauthorization_spec.rb
+- spec/paymill/refund_spec.rb
 - spec/paymill/subscription_spec.rb
 - spec/paymill/transaction_spec.rb
 - spec/paymill/webhook_spec.rb