paymill 0.2.0 → 0.2.1

data/.gitignore

@@ -3,4 +3,5 @@
 Gemfile.lock
 pkg/*
 *.html
-/.rvmrc
+/.rvmrc
+.project

data/Gemfile

@@ -4,3 +4,4 @@ gemspec
 
 gem "rspec"
 gem "rake"
+gem "webmock"

data/README.md

@@ -41,6 +41,12 @@ operation:
 
     Paymill::Client.all
 
+To sort and filter collection lists of objects, use the `all` method
+with an options hash. For example to find the most recent transactions
+belonging to a client you can use the following code:
+    
+    Paymill::Transaction.all(client: "<client_id>", order: "created_at_desc")
+
 Please note that Transactions and Payments cannot be updated.
 
 Requirements

data/lib/paymill/operations/all.rb

@@ -2,8 +2,8 @@ module Paymill
   module Operations
     module All
       module ClassMethods
-        def all
-          response = Paymill.request(:get, "#{self.name.split("::").last.downcase}s/", {})
+        def all(options = {})
+          response = Paymill.request(:get, "#{self.name.split("::").last.downcase}s/", options)
           results = []
           response["data"].each do |obj|
             results << self.new(obj)
@@ -17,4 +17,4 @@ module Paymill
       end
     end
   end
-end
+end

data/lib/paymill/transaction.rb

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

data/lib/paymill/version.rb

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

data/lib/paymill/webhook.rb

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

data/lib/paymill.rb

@@ -15,6 +15,7 @@ module Paymill
   autoload :Payment,      "paymill/payment"
   autoload :Subscription, "paymill/subscription"
   autoload :Transaction,  "paymill/transaction"
+  autoload :Webhook,      "paymill/webhook"
 
   module Operations
     autoload :All,    "paymill/operations/all"
@@ -49,15 +50,15 @@ module Paymill
       https.start do |connection|
         url = "/#{API_VERSION}/#{api_url}"
         https_request = case http_method
-              when :post
-                Net::HTTP::Post.new(url)
-              when :put
-                Net::HTTP::Put.new(url)
-              when :delete
-                Net::HTTP::Delete.new(url)
-              else
-                Net::HTTP::Get.new(url)
-              end
+                        when :post
+                          Net::HTTP::Post.new(url)
+                        when :put
+                          Net::HTTP::Put.new(url)
+                        when :delete
+                          Net::HTTP::Delete.new(url)
+                        else
+                          Net::HTTP::Get.new(path_with_params(url, data))
+                        end
         https_request.basic_auth(api_key, "")
         https_request.set_form_data(data) if [:post, :put].include? http_method
         @response = https.request(https_request)
@@ -70,5 +71,10 @@ module Paymill
 
       data
     end
+
+    def path_with_params(path, params)
+      encoded_params = URI.encode_www_form(params)
+      [path, encoded_params].join("?")
+    end
   end
 end

data/spec/paymill/transaction_spec.rb

@@ -8,6 +8,7 @@ describe Paymill::Transaction do
       status: "pending",
       description: "Test transaction.",
       livemode: false,
+      response_code: 20000,
       payment: {
         card_type: "visa",
         country: "germany"
@@ -26,6 +27,7 @@ describe Paymill::Transaction do
       transaction.status.should eql("pending")
       transaction.description.should eql("Test transaction.")
       transaction.livemode.should eql(false)
+      transaction.response_code.should eql(20000)
       transaction.payment[:card_type].should eql("visa")
       transaction.payment[:country].should eql("germany")
       transaction.client.should eql("client_a013c")
@@ -47,6 +49,13 @@ describe Paymill::Transaction do
     end
   end
 
+  describe ".all with options" do
+    it "makes a new GET request using the correct API endpoint to receive all transactions" do
+      Paymill.should_receive(:request).with(:get, "transactions/", { client: "client_id" }).and_return("data" => {})
+      Paymill::Transaction.all(client: "client_id")
+    end
+  end
+
   describe ".create" do
     it "makes a new POST request using the correct API endpoint" do
       Paymill.should_receive(:request).with(:post, "transactions", valid_attributes).and_return("data" => {})

data/spec/paymill/webhook_spec.rb

@@ -0,0 +1,70 @@
+require "spec_helper"
+
+describe Paymill::Webhook do
+  let(:valid_attributes) do
+    {
+      url: "<your-webhook-url>",
+      livemode:false,
+      event_types:["transaction.succeeded","transaction.failed"],
+      created_at:1360368749,
+      updated_at:1360368749
+    }
+  end
+
+  let (:webhook) do
+    Paymill::Webhook.new(valid_attributes)
+  end
+  
+  describe "#initialize" do
+    it "initializes all attributes correctly" 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)
+    end
+  end
+  
+  describe ".find" do
+    it "makes a new GET request using the correct API endpoint to receive a specific webhook" do
+      Paymill.should_receive(:request).with(:get, "webhooks/123", {}).and_return("data" => {})
+      Paymill::Webhook.find("123")
+    end
+  end
+
+  describe ".all" do
+    it "makes a new GET request using the correct API endpoint to receive all webhooks" do
+      Paymill.should_receive(:request).with(:get, "webhooks/", {}).and_return("data" => {})
+      Paymill::Webhook.all
+    end
+  end
+
+  describe ".create" do
+    it "makes a new POST request using the correct API endpoint" do
+      Paymill.should_receive(:request).with(:post, "webhooks", valid_attributes).and_return("data" => {})
+      Paymill::Webhook.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, "webhooks/123", {}).and_return(true)
+      Paymill::Webhook.delete("123")
+    end
+  end
+  
+  describe "#update_attributes" do
+    it "makes a new PUT request using the correct API endpoint" do
+      changed_attributes = {:url => "<new-webhook-url>"}
+      webhook.id    = 'hook_123'
+      Paymill.should_receive(:request).with(:put, "webhooks/hook_123", changed_attributes).and_return("data" => changed_attributes)
+      webhook.update_attributes(changed_attributes)
+    end
+
+    it "should set the returned attributes on the instance" do
+      Paymill.should_receive(:request).and_return("data" => {:url => "<new-webhook-url>"})
+      webhook.update_attributes({})
+      webhook.url.should eql("<new-webhook-url>")
+    end
+  end
+end

data/spec/paymill_spec.rb

@@ -7,5 +7,22 @@ describe Paymill do
         expect { Paymill.request(:get, "clients", {}) }.to raise_error(Paymill::AuthenticationError)
       end
     end
+
+    context "with an invalid api key" do
+      before(:each) do
+        WebMock.stub_request(:any, /#{Paymill::API_BASE}/).to_return(:body => "{}")
+        Paymill.api_key = "your-api-key"
+      end
+
+      it "attempts to get a url with one param" do
+        Paymill.request(:get, "transactions", { param_name: "param_value" })
+        WebMock.should have_requested(:get, "https://#{Paymill::api_key}:@#{Paymill::API_BASE}/#{Paymill::API_VERSION}/transactions?param_name=param_value")
+      end
+
+      it "attempts to get a url with more than one param" 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
+    end
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,8 +1,9 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'paymill'
-require 'rspec'
-require 'rspec/autorun'
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require "paymill"
+require "rspec"
+require "rspec/autorun"
+require "webmock/rspec"
 
 RSpec.configure do |config|
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paymill
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-29 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2153504740 !ruby/object:Gem::Requirement
+  requirement: &2153450240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153504740
+  version_requirements: *2153450240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153503800 !ruby/object:Gem::Requirement
+  requirement: &2153464400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153503800
+  version_requirements: *2153464400
 description: API wrapper for Paymill.
 email:
 - stefan.sprenger@dkd.de
@@ -60,12 +60,14 @@ files:
 - lib/paymill/subscription.rb
 - lib/paymill/transaction.rb
 - lib/paymill/version.rb
+- lib/paymill/webhook.rb
 - paymill.gemspec
 - spec/paymill/client_spec.rb
 - spec/paymill/offer_spec.rb
 - spec/paymill/payment_spec.rb
 - spec/paymill/subscription_spec.rb
 - spec/paymill/transaction_spec.rb
+- spec/paymill/webhook_spec.rb
 - spec/paymill_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/dkd/paymill-ruby
@@ -82,7 +84,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2201296574026171541
+      hash: 3327817462008033572
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -91,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2201296574026171541
+      hash: 3327817462008033572
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -104,5 +106,6 @@ test_files:
 - spec/paymill/payment_spec.rb
 - spec/paymill/subscription_spec.rb
 - spec/paymill/transaction_spec.rb
+- spec/paymill/webhook_spec.rb
 - spec/paymill_spec.rb
 - spec/spec_helper.rb