paymill_ruby 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77d34134bdbbec75492b51f0d0a40b55e3a2b5ca
-  data.tar.gz: 7c410e7c84db042c9029fc24ea3ab14a050a7cad
+  metadata.gz: a9527e1a8cd00aa060bb7beb6b0add7de0a05f74
+  data.tar.gz: 0ebe9916b684c9c5f7b366ecd101011f615fea79
 SHA512:
-  metadata.gz: da8161a22fa858ebf64515458d9faa34cd1d3fb4dcda8f1fd9286c8aa2e93a707b711c84f50303f71f753e8abde35ab96d40527c69c7d29533f7ffa725d200d8
-  data.tar.gz: f555ea37bea2028b6f7e786335787d8e8ebf13fa8385a21f8fe2eb13069d276615164b29a814002cd90e331c1898a3a6fc0a32ee720a7fe594b10dc60b588797
+  metadata.gz: 4720162b2c476c36945fb4762f006ad997801d00b020329c0a105fba81540bf9ee1799d4218e8bfeaebdd8a769bfd43005a330c310c25f3d0f0996850d6c1a19
+  data.tar.gz: db24cedf764c1a83faa8b4c5531b396c4e24aaf22e46b51e0436bc61ee5b9e68c1995b192d2c9c9732673afe706b4865da38de84a5f0bc47c7beb6332bf2f312

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### v2.0.2
+  * fix change class name of ShoppingCartItem to Item
+  * fix [PR #25](https://github.com/paymill/paymill-ruby/pull/25) update of subscription, thanks to [@Archetylator](https://github.com/Archetylator)
+
 ### 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

data/lib/paymill.rb

@@ -20,7 +20,7 @@ module Paymill
   autoload :PaymentMethod,        'paymill/models/payment_method'
   autoload :Preauthorization,     'paymill/models/preauthorization'
   autoload :Refund,               'paymill/models/refund.rb'
-  autoload :ShoppingCartItem,     'paymill/models/shopping_cart_item'
+  autoload :Item,                 'paymill/models/item'
   autoload :Subscription,         'paymill/models/subscription'
   autoload :SubscriptionCount,    'paymill/models/subscription_count'
   autoload :Transaction,          'paymill/models/transaction'

data/lib/paymill/models/checksum.rb

@@ -2,7 +2,7 @@ module Paymill
   class Checksum
     extend Restful::Create
 
-    attr_reader :id, :created_at, :updated_at, :app_id, :action, :checksum, :data, :type, :shipping_address
+    attr_reader :id, :created_at, :updated_at, :app_id, :action, :checksum, :data, :type, :items, :shipping_address
 
     def initialize( json )
       deserialize( json )

data/lib/paymill/models/{shopping_cart_item.rb → item.rb}

@@ -1,10 +1,10 @@
 module Paymill
-  class ShoppingCartItem
+  class Item
     attr_accessor :name, :amount, :quantity, :item_number, :url, :description
 
     def initialize( arguments = {} )
       arguments.each do |key, value|
-        raise ArgumentError.new( "parameter #{key} is not allowed" ) unless ShoppingCartItem.instance_methods( false ).include? key
+        raise ArgumentError.new( "parameter #{key} is not allowed" ) unless Item.instance_methods( false ).include? key
         instance_variable_set( "@#{key}", ( Integer( value ) rescue value ) )
       end
     end

data/lib/paymill/models/subscription.rb

@@ -48,7 +48,7 @@ module Paymill
     end
 
     def update_offer_with_refund_and_capture_date( offer )
-      update_offer( offer, 1 )
+      update_offer( offer, 2 )
     end
 
     def stop_trial_period()
@@ -136,7 +136,7 @@ module Paymill
       @amount = nil
       @payment = nil
       @offer = offer
-      update( offer_change_type: 1 )
+      update( offer_change_type: flag )
     end
 
   end

data/lib/paymill/models/transaction.rb

@@ -3,7 +3,7 @@ module Paymill
     include Restful::Update
 
     attr_accessor :description
-    attr_reader :amount, :client, :currency, :origin_amount, :status, :livemode, :refunds,
+    attr_reader :amount, :client, :currency, :origin_amount, :status, :livemode, :refunds, :items,
                 :response_code, :is_fraud, :short_id, :fees, :invoices, :payment, :preauthorization, :mandate_reference
 
     protected

data/lib/paymill/restful/methods.rb

@@ -71,7 +71,7 @@ module Paymill
       parameters.each do |key, value|
         if value.is_a? Array
           value.each.with_index do |e, index|
-            if e.is_a? ShoppingCartItem
+            if e.is_a? Item
               e.instance_variables.each do |var|
                 attributes["items[#{index}][#{var.to_s[1..-1]}]"] = e.instance_variable_get( var ) unless e.instance_variable_get( var ).to_s.empty?
               end

data/lib/paymill/version.rb

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

data/spec/paymill/models/checksum_spec.rb

@@ -9,12 +9,12 @@ module Paymill
       )
     }
     let( :rambo_poster ) {
-      ShoppingCartItem.new(
+      Item.new(
         name: "Rambo Poster", description: "John J. Rambo", amount: 2200, quantity: 3, item_number: "898-24342-343", url: "http://www.store.com/items/posters/12121-rambo"
       )
     }
     let( :comando_poster ) {
-      ShoppingCartItem.new(
+      Item.new(
         name: "Comando Poster", description: "John Matrix", amount: 3100, quantity: 1, item_number: "898-24342-341", url: "http://www.store.com/items/posters/12121-comando"
       )
     }

data/spec/paymill/models/subscription_spec.rb

@@ -358,10 +358,9 @@ module Paymill
 
       it 'should change the offer of a subscription with no refund and unchanged capture date', :vcr do
         subscription = Subscription.create( payment: @payment, offer: offer )
+        subscription_before_update = subscription.dup
         new_offer = Offer.create( name: 'Foo', amount: 4990, currency: 'EUR', interval: '2 WEEK')
-
         subscription.update_offer_without_changes( new_offer )
-
         expect( subscription.id ).to be_a String
         expect( subscription.offer.amount.to_s ).to eq new_offer.amount # bug in API
         expect( subscription.offer.currency ).to eq new_offer.currency
@@ -378,6 +377,7 @@ module Paymill
         expect( subscription.period_of_validity ).to be_nil
         expect( subscription.end_of_period ).to be_nil
         expect( subscription.next_capture_at ).to be_a Time
+        expect( subscription.next_capture_at ).to eq subscription_before_update.next_capture_at
         expect( subscription.created_at ).to be_a Time
         expect( subscription.updated_at ).to be_a Time
         expect( subscription.canceled_at ).to be_nil
@@ -391,6 +391,7 @@ module Paymill
 
       it 'should change the offer of a subscription with refund and unchanged capture date', :vcr do
         subscription = Subscription.create( payment: @payment, offer: offer )
+        subscription_before_update = subscription.dup
         new_offer = Offer.create( name: 'Foo', amount: 1990, currency: 'EUR', interval: '2 WEEK')
 
         subscription.update_offer_with_refund( new_offer )
@@ -411,6 +412,7 @@ module Paymill
         expect( subscription.period_of_validity ).to be_nil
         expect( subscription.end_of_period ).to be_nil
         expect( subscription.next_capture_at ).to be_a Time
+        expect( subscription.next_capture_at ).to eq subscription_before_update.next_capture_at
         expect( subscription.created_at ).to be_a Time
         expect( subscription.updated_at ).to be_a Time
         expect( subscription.canceled_at ).to be_nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paymill_ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Vassil Nikolov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,13 +143,13 @@ files:
 - lib/paymill/models/client.rb
 - lib/paymill/models/fee.rb
 - lib/paymill/models/invoice.rb
+- lib/paymill/models/item.rb
 - lib/paymill/models/merchant.rb
 - lib/paymill/models/offer.rb
 - lib/paymill/models/payment.rb
 - lib/paymill/models/payment_method.rb
 - lib/paymill/models/preauthorization.rb
 - lib/paymill/models/refund.rb
-- lib/paymill/models/shopping_cart_item.rb
 - lib/paymill/models/subscription.rb
 - lib/paymill/models/subscription_count.rb
 - lib/paymill/models/transaction.rb
@@ -247,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: The official ruby wrapper for PAYMILL's API.