paymill_ruby 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f34701098ef1e12edee39999c74dd828ce7e97d1
-  data.tar.gz: 86226113f04964f01e0ea3ea7b596440b5d8ed16
+  metadata.gz: 77d34134bdbbec75492b51f0d0a40b55e3a2b5ca
+  data.tar.gz: 7c410e7c84db042c9029fc24ea3ab14a050a7cad
 SHA512:
-  metadata.gz: 915418949f32fc65a7a23914574511c05bc59ae569a9f829f836494b2bf30b6e1d06d6fad430d26ce223a074460d4ce0f316b973a7345315a7ac34ff428b9ae9
-  data.tar.gz: fc3778b33308d85932a502836dc0b9c757495354cd73960c107a545e5e0ae1a8972559ef52d93511682de4541938c1a0aefaf5fc2d0a3a10f9420224e8e27839
+  metadata.gz: da8161a22fa858ebf64515458d9faa34cd1d3fb4dcda8f1fd9286c8aa2e93a707b711c84f50303f71f753e8abde35ab96d40527c69c7d29533f7ffa725d200d8
+  data.tar.gz: f555ea37bea2028b6f7e786335787d8e8ebf13fa8385a21f8fe2eb13069d276615164b29a814002cd90e331c1898a3a6fc0a32ee720a7fe594b10dc60b588797

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### v2.0.1
+  * allow creating [Checksum](https://github.com/paymill/paymill-ruby/blob/master/lib/paymill/models/checksum.rb#L19) with the parameters __shipping_amount__, __handling_amount__ and __client_id__
+  * fix [issue #23](https://github.com/paymill/paymill-ruby/issues/23) Checksum with Client
+  * fix serialisation for arrays [PR #24](https://github.com/paymill/paymill-ruby/pull/24), thanks to [@morgoth](https://github.com/morgoth)
+
 ### v2.0.0
 * add [PR #21](https://github.com/paymill/paymill-ruby/pull/21) Do not try to cast every value of JSON to integer, thanks to [@morgoth](https://github.com/morgoth)
 

data/README.md

@@ -205,12 +205,19 @@ Checksum.create( checksum_type: 'paypal', amount: 9700, currency: 'EUR', descrip
 Contributing
 ============
 
-1.	Fork it ( https://github.com/paymill/paymill-ruby/fork )
-2.	Create your feature branch (`git checkout -b my-new-feature`)
-3.	Setup the project (`bundle install`)
-4.	Setup PAYMILL's private test key in your environment (`export PAYMILL_API_TEST_PRIVATE_KEY="<YOUR_TEST_KEY>"`)
-5.	Setup PAYMILL's public test key in your environment (`export PAYMILL_API_TEST_PUBLIC_KEY="<YOUR_TEST_KEY>"`)
-6.	Run all the tests (`rspec .)` or a subset from them (`rspec ./spec/paymill/models/client_spec.rb`)
-7.	Commit your changes (`git commit -am 'Add some feature'`)
-8.	Push to the branch (`git push origin my-new-feature`)
-9.	Create a new Pull Request
+1. [Fork it](https://github.com/paymill/paymill-ruby/fork)
+2. Create feature branch
+  - `git checkout -b my-new-feature`
+3. Setup the project
+  - `bundle install`
+4. Setup PAYMILL's keys in your environment:
+  -	private test key `export PAYMILL_API_TEST_PRIVATE_KEY="<YOUR_TEST_KEY>"`
+  -	public test key `export PAYMILL_API_TEST_PUBLIC_KEY="<YOUR_TEST_KEY>"`
+5. Run the tests
+  - all specs: `rspec .`
+  - single spec: `rspec ./spec/paymill/models/client_spec.rb`
+6. Commit your changes
+  - `git commit -am 'Add some feature'`
+7. Push your changes
+  - `git push origin my-new-feature`
+8. Create new Pull Request

data/lib/paymill/models/base.rb

@@ -28,10 +28,10 @@ module Paymill
       json.each_pair do |key, value|
         case value.class.name
         when 'Array'
-          unless key[-1].eql? 's'
-            instance_variable_set( "@#{key}s", value.map { |e| (e.is_a? String) ? e : objectize( key, e ) } )
+          if key.end_with?('s')
+            instance_variable_set( "@#{key}", value.map { |e| (e.is_a? String) ? e : objectize( key[0...-1], e ) } )
           else
-            instance_variable_set( "@#{key}", value.map { |e| (e.is_a? String) ? e : objectize( key, e ) } )
+            instance_variable_set( "@#{key}s", value.map { |e| (e.is_a? String) ? e : objectize( key, e ) } )
           end
         when 'Hash'
           instance_variable_set( "@#{key}", objectize( key, value ) )

data/lib/paymill/models/checksum.rb

@@ -16,7 +16,12 @@ module Paymill
     end
 
     def self.allowed_arguments
-      [:checksum_type, :amount, :currency, :description, :return_url, :cancel_url, :items, :shipping_address, :billing_address, :fee_amount, :fee_payment, :fee_currency, :app_id]
+      [
+        :checksum_type, :amount, :currency, :return_url, :cancel_url, :description,
+        :shipping_address, :billing_address, :items, :shipping_amount, :handling_amount, :client_id,
+        :require_reusable_payment, :reusable_payment_description,
+        :fee_amount, :fee_payment, :fee_currency, :app_id
+      ]
     end
 
     def self.mandatory_arguments

data/lib/paymill/version.rb

@@ -1,3 +1,3 @@
 module Paymill
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/spec/paymill/models/checksum_spec.rb

@@ -33,6 +33,45 @@ module Paymill
         expect( checksum.updated_at ).to be_a Time
       end
 
+      it 'should create new checksum with minimum parameters and shipping and handling amount', :vcr do
+        checksum = Checksum.create( checksum_type: 'paypal', amount: 4200, currency: 'EUR', description: 'Chuck Testa', return_url: 'https://testa.com', cancel_url: 'https://test.com/cancel', shipping_amount: 300, handling_amount: 500 )
+
+        expect( checksum.action ).to eq 'transaction'
+        expect( checksum.checksum ).to be_a String
+        expect( checksum.data ).to eq 'amount=4200&currency=EUR&description=Chuck+Testa&return_url=https%3A%2F%2Ftesta.com&cancel_url=https%3A%2F%2Ftest.com%2Fcancel&shipping_amount=300&handling_amount=500'
+        expect( checksum.id ).to be_a String
+        expect( checksum.type ).to eq 'paypal'
+        expect( checksum.app_id ).to be_nil
+        expect( checksum.created_at ).to be_a Time
+        expect( checksum.updated_at ).to be_a Time
+      end
+
+      it 'should create new checksum with minimum parameters and client', :vcr do
+        checksum = Checksum.create( checksum_type: 'paypal', amount: 4200, currency: 'EUR', description: 'Chuck Testa', return_url: 'https://testa.com', cancel_url: 'https://test.com/cancel', client_id: 'client_c43af14afac0e4f58f90' )
+
+        expect( checksum.action ).to eq 'transaction'
+        expect( checksum.checksum ).to be_a String
+        expect( checksum.data ).to eq 'amount=4200&currency=EUR&description=Chuck+Testa&return_url=https%3A%2F%2Ftesta.com&cancel_url=https%3A%2F%2Ftest.com%2Fcancel&client_id=client_c43af14afac0e4f58f90'
+        expect( checksum.id ).to be_a String
+        expect( checksum.type ).to eq 'paypal'
+        expect( checksum.app_id ).to be_nil
+        expect( checksum.created_at ).to be_a Time
+        expect( checksum.updated_at ).to be_a Time
+      end
+
+      it 'should create new checksum with minimum parameters and reusable payment', :vcr do
+        checksum = Checksum.create( checksum_type: 'paypal', amount: 4200, currency: 'EUR', description: 'Chuck Testa', return_url: 'https://testa.com', cancel_url: 'https://test.com/cancel', require_reusable_payment: true, reusable_payment_description: 'recurring paypal' )
+
+        expect( checksum.action ).to eq 'transaction'
+        expect( checksum.checksum ).to be_a String
+        expect( checksum.data ).to eq 'amount=4200&currency=EUR&description=Chuck+Testa&return_url=https%3A%2F%2Ftesta.com&cancel_url=https%3A%2F%2Ftest.com%2Fcancel&require_reusable_payment=true&reusable_payment_description=recurring+paypal'
+        expect( checksum.id ).to be_a String
+        expect( checksum.type ).to eq 'paypal'
+        expect( checksum.app_id ).to be_nil
+        expect( checksum.created_at ).to be_a Time
+        expect( checksum.updated_at ).to be_a Time
+      end
+
       it 'should create new checksum with minimum parameters and billing address', :vcr do
         checksum = Checksum.create( checksum_type: 'paypal', amount: 4200, currency: 'EUR', description: 'Chuck Testa', return_url: 'https://testa.com', cancel_url: 'https://test.com/cancel', billing_address: billing_address )
 

data/spec/paymill/models/refund_spec.rb

@@ -57,6 +57,14 @@ module Paymill
         expect( refund.app_id ).to be_nil
       end
 
+      it 'should return nested refund in transaction object' do
+        transaction = Transaction.create( token: @token, amount: 100, currency: currency )
+        refund = Refund.create( transaction, amount: 100, description: 'Refunded By Ruby' )
+        transaction_with_refund = Transaction.find( transaction.id )
+
+        expect( transaction_with_refund.refunds.first.id ).to eq refund.id
+      end
+
       it 'should throw ArgumentError when no amount given', :vcr do
         expect{ Refund.create( Transaction.create( token: @token, amount: 290, currency: currency ) ) }.to raise_error ArgumentError
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paymill_ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Vassil Nikolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler