paytureman 0.7.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cab53a95a5cb505acc786ae18db994f36b2b5f2b
-  data.tar.gz: 6195ca545af50b0edbb0ee007704991494bf617b
+  metadata.gz: 93ed4accb43af89b5912d643d401bb0a57b3d820
+  data.tar.gz: 8f0dcd732997f6da697499957406e6f766fa291f
 SHA512:
-  metadata.gz: aa7323cddc4e9a62fad4a86f5f44b0002bc3cbccfc9b9b93eab0594135554846f69104ed04f6173fa32747f6473edb589b5bac5975c34ae75f6f2f5227ed2fbb
-  data.tar.gz: 2f6c25408ebecb50ee21d0ecafc1700c6ba9bd85440f43d39ee26010654b76563dfbc8da8e78614260412e909b14005e06913c581fe7334a8b86de1666e060aa
+  metadata.gz: 6309dc5b976f1d8a9d9da35e3e313ccb442ac12c41c1a7ed16c9d04d8b07137cdd09a5cb196b9243dbee213891ce95d4a18d148e3d8c164c592ca12558163398
+  data.tar.gz: 55fbc502ba9dd8d8536348b693279db95b3be5c83eea8bc7e2c7df320a46821ec5aacb9a682162cc0b23381eac75dce47f2becc1960c788062022a236d833e44

data/README.md

@@ -45,9 +45,7 @@ payment = Paytureman::PaymentNew.new(order_id, amount, customer_ip)
 payment = Paytureman::PaymentNew.new(order_id, amount, customer_ip, :production)
 
 # prepare it
-description = Paytureman::PaymentDescription.new
-description.product = 'Paytureman demo payment'
-description.total = amount
+description = Paytureman::PaymentDescription.new(product: 'Paytureman demo payment', total: amount, url: '...success url...')
 
 payment = payment.prepare(description)
 # ... assert(payment.kind_of?(Paytureman::PaymentPrepared))

data/lib/payments/payment_new.rb

@@ -1,11 +1,22 @@
 module Paytureman
 
-  class PaymentDescription < Struct.new(:product, :total, :template_tag, :language)
+  VALID_OPTIONS = [
+    :template_tag,
+    :language,
+    :url,
+    :total,
+    :product
+  ]
+
+  class PaymentDescription
+    def initialize(description = {})
+      @description = description.dup
+      @description.assert_valid_keys(*VALID_OPTIONS)
+    end
 
     def to_h
-      super.select { |_, v| v.present? }
+      @description.select { |_, v| v.present? }
     end
-
   end
 
   class PaymentNew < Payment

data/lib/payture/api.rb

@@ -12,9 +12,8 @@ module Paytureman
 
       data = { SessionType: :Block, OrderId: order_id, Amount: amount, IP: ip }
       data.merge!(description)
-
       init_params = {
-          'Data' => URI.escape(data.map { |a| a.join('=').camelize }.join(';'))
+          'Data' => URI.escape(data.map { |k, v| "#{k.to_s.camelize}=#{v}" }.join(';'))
       }
 
       response = make_request(:init, init_params)

data/lib/paytureman.rb

@@ -1,6 +1,7 @@
 require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/hash/keys'
 require 'rexml/document'
 require 'rest_client'
 require 'singleton'

data/paytureman.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "paytureman"
-  spec.version       = "0.7.0"
+  spec.version       = "1.0.0"
   spec.authors       = ["Ivan Kasatenko", "Nickolay Sverchkov", "Alexander Fomin"]
   spec.email         = ["contact@uniqsystems.ru"]
   spec.summary       = %q{Payture API implementation}

data/spec/requests/payment_process_spec.rb

@@ -74,14 +74,27 @@ describe "Payment" do
     expect(RestClient).to receive(:post).with(
       init_payment_url,
       {
-          "Data" => "SessionType=Block;OrderId=#{order_id};Amount=#{(amount*100).to_i};IP=#{ip};Product=#{URI.escape(product)};Total=#{total}",
+          "Data" => "SessionType=Block;OrderId=#{order_id};Amount=#{(amount*100).to_i};IP=#{ip};Product=#{URI.escape(product)};Total=#{total};Url=http://localhost:3000/?foo=bar",
           "Key" => "MerchantRutravel"
       }
     ).and_return(empty_response)
 
     payment = PaymentNew.new(order_id, amount, ip)
 
-    payment.prepare(PaymentDescription.new(product, total))
+    payment.prepare(PaymentDescription.new(product: product, total: total, url: 'http://localhost:3000/?foo=bar'))
+  end
+
+  it "should raise error if unkonwn option used" do
+    expect { PaymentDescription.new(unknown: 'foobar') }.to raise_error
+  end
+
+  it "should not use modified options" do
+    options = { url: 'url' }
+    description = PaymentDescription.new(options)
+    
+    options[:unknown] = 'foobar'
+
+    expect(description.to_h).to eq(url: 'url')
   end
 
   it "should not use description in request if they not defined" do
@@ -95,7 +108,7 @@ describe "Payment" do
 
     payment = PaymentNew.new(order_id, amount, ip)
 
-    payment.prepare(PaymentDescription.new(nil, nil, nil, nil))
+    payment.prepare(PaymentDescription.new(product: nil, total: nil, language: nil, url: nil))
   end
 
   let(:real_configuration) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paytureman
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Ivan Kasatenko
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2015-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest_client
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Payture API implementation
@@ -170,3 +170,4 @@ test_files:
 - spec/requests/payture/api_spec.rb
 - spec/requests/service/configuration_spec.rb
 - spec/spec_helper.rb
+has_rdoc: