pagarme 1.2 → 1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmE0M2Q2YmY0ZDcyNmNkZjcyMWIzYTA2NzhhM2NmZjJlODcwOTc2NQ==
+    Zjc2N2JjZjZhYWZhMTViNjViNDhlNmRiOGNlZjlkODM1OWY4MzNkNw==
   data.tar.gz: !binary |-
-    ZDM3NzQyNDQ1NjhlZmFiNGIyMzQyNWI2Y2MyZDc1NmZjNzMwMTE2MQ==
+    YzEzNTNmYWY3NWQyZWRkYTMzODlkNjJhZjg5MjM1M2Q2ZjEwZTI3NQ==
 SHA512:
   metadata.gz: !binary |-
-    Njg1OTYyY2YxOGM4Y2QwMjE5N2QxNmMxZWFiMGEwNTQ0ZDU4MDc1MTk4NGVm
-    MWUyYjViNTE1ZDRkNDU3M2ZlMmMwMjcyNmMzNDkyMDY4YWVhNDFhZDEwNGMy
-    N2RiOTI4MzcwYTY0MjE2NTgyMDU2ZGMxNDFkNzJhYTZmOTNlMDQ=
+    M2VlMDYwMTIyZDA1MDk4ODdlNTg2ZmFhZjNjM2E2NGViYjcyY2YzNjEwYjMz
+    ZmU2OTYxMWEzZTg3Y2FhZDQxOTk2ZGRmZTM4YmRmZjUyYzA4NTQ0ZDc4ZDdh
+    ZTA2M2ZiNzcxNjM2YzMzMWRhNDNhNzJiMTc4NjA5NTQ2MjE0MjM=
   data.tar.gz: !binary |-
-    MzlhYzhlNTE3Mjc4NzcwNmNhZmFjZTFmNDcyZDNlYjNjZDExYWYxOWZlMjgx
-    NDcxZTNiMTI1NDhiZTY1ZmZkMjhiNDMzYjkwNmFmYjVmZmNiZmQ4ZWQ1Njg5
-    MzcyMjY2OTk2OTExYjhiYzU1YjQ0NmIxNmFlYWYwMGNjODRlOGQ=
+    OTI1OTg5YzgzYjFhMmRlYTkxZTIyY2NjZWZmNTQwZGE5ZjY4ZWYzNjYwYmFm
+    M2I5MjhlYWEzZTMyM2E3MzZjY2FmZGM1ZTVlY2UzMjM2YzhjMmVkZDQ4MzU1
+    ZGViNjEzN2I1YWQwMWEwYTAwZDAyMTY2ZTM1YTlkYWZjYTUzZjU=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pagarme (1.1)
+    pagarme (1.2)
       multi_json
       rest-client
 

data/lib/pagarme/model.rb

@@ -27,6 +27,7 @@ module PagarMe
 	def save
 	  request = PagarMe::Request.new(self.url, 'PUT')
 	  request.parameters = self.unsaved_values
+	  puts request.parameters.inspect
 	  response = request.run
 	  update(response)
 	end

data/lib/pagarme/request.rb

@@ -31,9 +31,6 @@ module PagarMe
 	  })
 	  error = nil
 
-	  puts self.class.encode(parameters)
-
-
 	  begin
 		response = RestClient::Request.execute({
 		  :method => self.method,

data/lib/pagarme/subscription.rb

@@ -4,22 +4,22 @@ require File.join(File.dirname(__FILE__), '..', 'pagarme')
 module PagarMe
   class Subscription < TransactionCommon
 
-	def to_hash
-	  {
-		:amount => self.amount,
-		:payment_method => self.payment_method,
-		:installments => self.installments,
-		:card_hash => (self.payment_method == 'credit_card' ? self.card_hash : nil),
-		:postback_url => self.postback_url,
-		:customer_email => self.customer_email,
-		:customer => (self.customer) ? self.customer.to_hash : nil,
-		:plan_id => (self.plan) ? self.plan.id : nil
-	  }
-	end
 
 	def create
-	  validation_error = self.card_hash ? nil : validate
-	  self.card_hash = generate_card_hash unless self.card_hash
+	  if self.plan
+		self.plan_id = plan.id
+	  end
+
+	  self.plan = nil
+	  super
+	end
+
+	def save
+	  if self.plan
+		self.plan_id = plan.id
+	  end
+
+	  self.plan = nil
 	  super
 	end
 

data/lib/pagarme/transaction.rb

@@ -5,24 +5,8 @@ require File.join(File.dirname(__FILE__), '..', 'pagarme')
 
 module PagarMe
   class Transaction < TransactionCommon
-	# server requests methods
-
-	def to_hash
-	  {
-		:amount => self.amount,
-		:payment_method => self.payment_method,
-		:installments => self.installments,
-		:card_hash => (self.payment_method == 'credit_card' ? self.card_hash : nil),
-		:postback_url => self[:postback_url],
-		:customer => (self.customer) ? self.customer.to_hash : nil,
-		:metadata => self.metadata
-	  }
-	end
-
 	def charge
-	  validation_error = self[:card_hash] ? nil : validate
-	  self.card_hash = generate_card_hash unless self[:card_hash]
-	  create
+	 	create
 	end
 
 	def refund

data/lib/pagarme/transaction_common.rb

@@ -12,6 +12,21 @@ module PagarMe
 	  before_set_filter :amount, :format_amount
 	end
 
+	def create
+	  validation_error = self.card_hash ? nil : validate
+	  self.card_hash = generate_card_hash unless self.card_hash
+	  unset_creditcard_information
+	  super
+	end
+	
+	def unset_creditcard_information
+	  self.card_number = nil
+	  self.card_holder_name = nil
+	  self.card_expiration_year = nil
+	  self.card_expiration_month = nil
+	  self.card_cvv = nil
+	end
+
 	def is_valid_credit_card(card)
 	  s1 = s2 = 0
 	  card.to_s.reverse.chars.each_slice(2) do |odd, even| 

data/pagarme.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "pagarme"
-  spec.version       = 1.2
+  spec.version       = 1.3
   spec.authors       = ["Pedro Franceschi", "Henrique Dubugras"]
   spec.email         = ["pedrohfranceschi@gmail.com", "henrique@pagar.me"]
   spec.description   = %q{Pagar.me's ruby gem}

data/test/pagarme/subscription.rb

@@ -25,16 +25,47 @@ module PagarMe
 		end
 	  end
 
-	  
-	  # should 'be able to pass metadata to subscription' do
+	  should 'be able to change plans' do
+		subscription = test_subscription
+		plan = test_plan
+		plan.create
+
+		plan2 = PagarMe::Plan.new({
+			:name => "Plano Silver",
+			:days => 30,
+			:amount => 3000
+		});
+		plan2.create
+
+		subscription.plan = plan
+		subscription.create
+
+		assert subscription.plan.id == plan.id
+		subscription.plan = plan2
+		subscription.save
+
+		assert subscription.plan.id == plan2.id
+	  end
+
+	  # should 'be able to change from a plan with trial to a plan without trial' do
 		# subscription = test_subscription
-		# subscription.metadata = {:event => {:event_name => "Evento 2 ", :id => 13}}
+		# plan = test_plan
+		# plan.create
+
+		# plan2 = test_plan
+		# plan2.trial_days = nil
+
+		# subscription.plan = plan
 		# subscription.create
 
-		# subscription2 = PagarMe::Subscription.find_by_id(subscription.id)
-		# assert subscription2.id == subscription.id
-		# assert subscription2.metadata.event.event_name == 'Evento 2'
-		# assert subscription2.metadata.event.id == 13
+		# assert subscription.plan_id == plan.id
+
+		# subscription.plan = plan2
+		# subscription.save
+
+		# assert subscription.plan_id == plan2.id
+		# p = PagarMe::Plan.find_by_id(subscription.plan_id)
+		# assert p.trial_days == nil
 	  # end
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pagarme
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.3'
 platform: ruby
 authors:
 - Pedro Franceschi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler