paymill 0.0.3 → 0.1.0

data/README.md

@@ -22,20 +22,21 @@ Now you can e.g. create a new client:
 
     Paymill::Client.create(email: "stefan.sprenger@dkd.de", description: "He is a Ruby guy.")
 
-Or find a existing client
+Or find a existing client:
 
     Paymill::Client.find("client_88a388d9dd48f86c3136")
 
-For retrieving a collection of all clients
+For retrieving a collection of all clients you might use the `all`
+operation:
 
-    Paymill::Client.all()
+    Paymill::Client.all
 
-We currently only support `create`, `find` and `all` operations.
+We currently only support the operations `create`, `find` and `all`.
 
 Requirements
 =====
 
-This gem was developed using Ruby 1.9 and version 1 of Paymill's API. Nonetheless, it should also work with Ruby 1.8.
+This gem was developed using Ruby 1.9 and version 2 of Paymill's API. Nonetheless, it should also work with Ruby 1.8.
 
 Bugs
 ======
@@ -56,4 +57,4 @@ Note on Patches/Pull Requests
 Copyright
 ======
 
-Copyright (c) 2012 dkd Internet Service GmbH, Stefan Sprenger. See LICENSE for details.
+Copyright (c) 2012 dkd Internet Service GmbH, Stefan Sprenger. See LICENSE for details.

data/lib/paymill.rb

@@ -4,13 +4,14 @@ require "json"
 require "paymill/version"
 
 module Paymill
-  API_BASE = "api.paymill.de"
+  API_BASE    = "api.paymill.de"
+  API_VERSION = "v2"
 
   @@api_key = nil
 
   autoload :Client,       "paymill/client"
-  autoload :CreditCard,   "paymill/credit_card"
   autoload :Offer,        "paymill/offer"
+  autoload :Payment,      "paymill/payment"
   autoload :Subscription, "paymill/subscription"
   autoload :Transaction,  "paymill/transaction"
 
@@ -44,7 +45,7 @@ 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 = "/v1/#{api_url}"
+        url = "/#{API_VERSION}/#{api_url}"
         https_request = case http_method
               when :post
                 Net::HTTP::Post.new(url)

data/lib/paymill/client.rb

@@ -6,7 +6,7 @@ module Paymill
     include Paymill::Operations::Find
 
     attr_accessor :id, :email, :description, :attributes, :created_at,
-                  :updated_at, :creditcard, :subscription
+                  :updated_at, :payment, :subscription
 
     def initialize(attributes = {})
       attributes.each_pair do |key, value|

data/lib/paymill/{credit_card.rb → payment.rb}

@@ -1,5 +1,5 @@
 module Paymill
-  class CreditCard
+  class Payment
     include Paymill::Operations::All
     include Paymill::Operations::Create
     include Paymill::Operations::Find

data/lib/paymill/transaction.rb

@@ -5,7 +5,7 @@ module Paymill
     include Paymill::Operations::Find
 
     attr_accessor :id, :amount, :status, :description, :livemode,
-                  :creditcard, :client, :created_at, :updated_at
+                  :payment, :client, :created_at, :updated_at
 
     def initialize(attributes = {})
       attributes.each_pair do |key, value|

data/lib/paymill/version.rb

@@ -1,3 +1,3 @@
 module Paymill
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

data/spec/paymill/payment_spec.rb

@@ -0,0 +1,50 @@
+require "spec_helper"
+
+describe Paymill::Payment do
+  let(:valid_attributes) do
+    {
+      card_type:    "visa",
+      country:      "germany",
+      expire_month: 12,
+      expire_year:  2012,
+      card_holder:  "Stefan Sprenger",
+      last4:        "1111"
+    }
+  end
+
+  let (:payment) do
+    Paymill::Payment.new(valid_attributes)
+  end
+
+  describe "#initialize" do
+    it "initializes all attributes correctly" do
+      payment.card_type.should eql("visa")
+      payment.country.should eql("germany")
+      payment.expire_month.should eql(12)
+      payment.expire_year.should eq(2012)
+      payment.card_holder.should eql("Stefan Sprenger")
+      payment.last4.should eql("1111")
+    end
+  end
+
+  describe ".find" do
+    it "makes a new GET request using the correct API endpoint to receive a specific creditcard" do
+      Paymill.should_receive(:request).with(:get, "payments/123", {}).and_return("data" => {})
+      Paymill::Payment.find("123")
+    end
+  end
+
+  describe ".all" do
+    it "makes a new GET request using the correct API endpoint to receive all payments" do
+      Paymill.should_receive(:request).with(:get, "payments/", {}).and_return("data" => {})
+      Paymill::Payment.all
+    end
+  end
+
+  describe ".create" do
+    it "makes a new POST request using the correct API endpoint" do
+      Paymill.should_receive(:request).with(:post, "payments", valid_attributes).and_return("data" => {})
+      Paymill::Payment.create(valid_attributes)
+    end
+  end
+end

data/spec/paymill/transaction_spec.rb

@@ -7,7 +7,7 @@ describe Paymill::Transaction do
       status: "pending",
       description: "Test transaction.",
       livemode: false,
-      creditcard: {
+      payment: {
         card_type: "visa",
         country: "germany"
       },
@@ -25,8 +25,8 @@ describe Paymill::Transaction do
       transaction.status.should eql("pending")
       transaction.description.should eql("Test transaction.")
       transaction.livemode.should eql(false)
-      transaction.creditcard[:card_type].should eql("visa")
-      transaction.creditcard[:country].should eql("germany")
+      transaction.payment[:card_type].should eql("visa")
+      transaction.payment[:country].should eql("germany")
       transaction.client.should eql("client_a013c")
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paymill
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-09 00:00:00.000000000 Z
+date: 2012-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2160826620 !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: *2160826620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160795040 !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: *2160795040
+  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
@@ -49,19 +59,19 @@ files:
 - lib/data/paymill.crt
 - lib/paymill.rb
 - lib/paymill/client.rb
-- lib/paymill/credit_card.rb
 - lib/paymill/offer.rb
 - lib/paymill/operations/all.rb
 - lib/paymill/operations/create.rb
 - lib/paymill/operations/delete.rb
 - lib/paymill/operations/find.rb
+- lib/paymill/payment.rb
 - lib/paymill/subscription.rb
 - lib/paymill/transaction.rb
 - lib/paymill/version.rb
 - paymill.gemspec
 - spec/paymill/client_spec.rb
-- spec/paymill/credit_card_spec.rb
 - spec/paymill/offer_spec.rb
+- spec/paymill/payment_spec.rb
 - spec/paymill/subscription_spec.rb
 - spec/paymill/transaction_spec.rb
 - spec/paymill_spec.rb
@@ -80,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3243121354173252569
+      hash: 4192098067474741217
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -89,17 +99,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3243121354173252569
+      hash: 4192098067474741217
 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/client_spec.rb
-- spec/paymill/credit_card_spec.rb
 - spec/paymill/offer_spec.rb
+- spec/paymill/payment_spec.rb
 - spec/paymill/subscription_spec.rb
 - spec/paymill/transaction_spec.rb
 - spec/paymill_spec.rb

data/spec/paymill/credit_card_spec.rb

@@ -1,50 +0,0 @@
-require "spec_helper"
-
-describe Paymill::CreditCard do
-  let(:valid_attributes) do
-    {
-      card_type:    "visa",
-      country:      "germany",
-      expire_month: 12,
-      expire_year:  2012,
-      card_holder:  "Stefan Sprenger",
-      last4:        "1111"
-    }
-  end
-
-  let (:credit_card) do
-    Paymill::CreditCard.new(valid_attributes)
-  end
-
-  describe "#initialize" do
-    it "initializes all attributes correctly" do
-      credit_card.card_type.should eql("visa")
-      credit_card.country.should eql("germany")
-      credit_card.expire_month.should eql(12)
-      credit_card.expire_year.should eq(2012)
-      credit_card.card_holder.should eql("Stefan Sprenger")
-      credit_card.last4.should eql("1111")
-    end
-  end
-
-  describe ".find" do
-    it "makes a new GET request using the correct API endpoint to receive a specific creditcard" do
-      Paymill.should_receive(:request).with(:get, "creditcards/123", {}).and_return("data" => {})
-      Paymill::CreditCard.find("123")
-    end
-  end
-
-  describe ".all" do
-    it "makes a new GET request using the correct API endpoint to receive all creditcards" do
-      Paymill.should_receive(:request).with(:get, "creditcards/", {}).and_return("data" => {})
-      Paymill::CreditCard.all
-    end
-  end
-
-  describe ".create" do
-    it "makes a new POST request using the correct API endpoint" do
-      Paymill.should_receive(:request).with(:post, "creditcards", valid_attributes).and_return("data" => {})
-      Paymill::CreditCard.create(valid_attributes)
-    end
-  end
-end