cloud_payments 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e65806150df505158679b9614835f31235eb91d
-  data.tar.gz: fb0bbe75f1d804547b4eef7fa4f6e3ec72f65a94
+  metadata.gz: 87ad4228e46b088bd3c828392f883daed80b30a9
+  data.tar.gz: e557846dcc4fce01747d2d852d717560d4d36068
 SHA512:
-  metadata.gz: ebc7f7442b275344048f833e615f889abfb38a1253a06e10199a328835447cf3d076d7a2af3263174461963cbcef1ae8549a9d499d606ccf09652b1486d2bd6b
-  data.tar.gz: 8bb8fe1362062a6ba1cb73cdfc43a845ff80519380b2be392cc19a0dd738e5d7af529d190bbbfe9fdfc766e8a7555707741695d185a29784d55b5c949b842621
+  metadata.gz: f6d77521d6995902f1f6692c4f39faa2ac84c0daffe44d3c57c80e2209b6d37426ab2791158a536d8023706c15170769af00d1f7dbb8d9eac71b89e486266b51
+  data.tar.gz: d6c183255aa997ec093fe8ff4b745ed5079e5f85926c350c9e17876689589d29bfb9938da0c3bb8b024017cd03306771a019bc48c25540020fbf49c2c50e5499

data/.travis.yml

@@ -1,16 +1,12 @@
 language: ruby
-sudo:     false
-cache:    bundler
-script:   bundle exec rspec
+cache: bundler
+script: bundle exec rspec
+before_install: gem install bundler
 env:
   - CODECLIMATE_REPO_TOKEN=8e9b89269d9aafc2dec2706a43825201de496b743505d7a7666068f7b22b07d
 rvm:
-  - '1.9.3'
-  - '2.0'
-  - '2.1'
   - '2.2'
-  - '2.3.0'
-  - rbx-2
+  - '2.3'
   - ruby-head
 matrix:
   allow_failures:

data/Gemfile

@@ -6,5 +6,5 @@ gemspec
 gem 'oj'
 gem 'pry'
 gem 'rack'
-gem 'webmock', require: 'webmock/rspec'
-gem "codeclimate-test-reporter", group: :test, require: nil
+gem 'webmock'
+gem "codeclimate-test-reporter", group: :test, require: nil

data/lib/cloud_payments/client/gateway_errors.rb

@@ -1,5 +1,6 @@
 module CloudPayments
   class Client
+    class ReasonedGatewayError < StandardError; end
     module GatewayErrors; end
 
     REASON_CODES = {
@@ -29,7 +30,7 @@ module CloudPayments
 
     GATEWAY_ERRORS = REASON_CODES.inject({}) do |result, error|
       status, name = error
-      result[status] = GatewayErrors.const_set(name, Class.new(StandardError))
+      result[status] = GatewayErrors.const_set(name, Class.new(ReasonedGatewayError))
       result
     end
   end

data/lib/cloud_payments/client/serializer/base.rb

@@ -20,7 +20,14 @@ module CloudPayments
 
         def convert_keys_from_api(attributes)
           attributes.each_with_object({}) do |(key, value), result|
-            value = convert_keys_from_api(value) if value.is_a?(Hash)
+            value = case value
+            when Hash
+              convert_keys_from_api(value)
+            when Array
+              value.map { |item| convert_keys_from_api(item) }
+            else
+              value
+            end
 
             key = key.to_s.gsub(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2')
             key.gsub!(/([a-z\d])([A-Z])/, '\1_\2')

data/lib/cloud_payments/namespaces/subscriptions.rb

@@ -6,6 +6,11 @@ module CloudPayments
         Subscription.new(response[:model])
       end
 
+      def find_all(account_id)
+        response = request(:find, account_id: account_id)
+        Array(response[:model]).map { |item| Subscription.new(item) }
+      end
+
       def create(attributes)
         response = request(:create, attributes)
         Subscription.new(response[:model])

data/lib/cloud_payments/version.rb

@@ -1,3 +1,3 @@
 module CloudPayments
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/cloud_payments/models/transaction_spec.rb

@@ -205,7 +205,7 @@ describe CloudPayments::Transaction do
     subject{ CloudPayments::Transaction.new(default_attributes.merge(attributes)) }
 
     describe '#subscription' do
-      before{ stub_api_request('subscriptions/find/successful').perform }
+      before{ stub_api_request('subscriptions/get/successful').perform }
 
       context 'with subscription_id' do
         let(:attributes){ { subscription_id: 'sc_8cf8a9338fb' } }

data/spec/cloud_payments/namespaces/base_spec.rb

@@ -14,8 +14,8 @@ describe CloudPayments::Namespaces::Base do
   subject{ TestNamespace.new(CloudPayments.client) }
 
   def stub_api(path, body = '')
-    url = "http://user:pass@localhost:9292#{path}"
-    stub_request(:post, url).with(body: body, headers: headers)
+    url = "http://localhost:9292#{path}"
+    stub_request(:post, url).with(body: body, headers: headers, basic_auth: ['user', 'pass'])
   end
 
   describe '#request' do
@@ -63,7 +63,13 @@ describe CloudPayments::Namespaces::Base do
 
       context 'config.raise_banking_errors = true' do
         before { CloudPayments.config.raise_banking_errors = true }
-        specify{ expect{ subject.request(:path, request_params) }.to raise_error(CloudPayments::Client::GatewayErrors::LostCard) }
+        specify do
+          begin
+            subject.request(:path, request_params)
+          rescue CloudPayments::Client::GatewayErrors::LostCard => err
+            expect(err).to be_a CloudPayments::Client::ReasonedGatewayError
+          end
+        end
       end
 
       context 'config.raise_banking_errors = false' do

data/spec/cloud_payments/namespaces/subscriptions_spec.rb

@@ -5,7 +5,7 @@ describe CloudPayments::Namespaces::Subscriptions do
 
   describe '#find' do
     context do
-      before{ stub_api_request('subscriptions/find/successful').perform }
+      before{ stub_api_request('subscriptions/get/successful').perform }
 
       specify{ expect(subject.find('sc_8cf8a9338fb')).to be_instance_of(CloudPayments::Subscription) }
 
@@ -21,6 +21,25 @@ describe CloudPayments::Namespaces::Subscriptions do
     end
   end
 
+  describe '#find_all' do
+    context do
+      before{ stub_api_request('subscriptions/find/successful').perform }
+
+      specify{ expect(subject.find_all("user@example.com")).to be_instance_of(Array) }
+      specify{ expect(subject.find_all("user@example.com").first).to be_instance_of(CloudPayments::Subscription) }
+
+      context do
+        let(:sub){ subject.find_all("user@example.com").first }
+
+        specify{ expect(sub.id).to eq('sc_8cf8a9338fb') }
+        specify{ expect(sub.account_id).to eq('user@example.com') }
+        specify{ expect(sub.description).to eq('Monthly subscription') }
+        specify{ expect(sub.started_at).to eq(DateTime.parse('2014-08-09T11:49:41')) }
+        specify{ expect(sub).to be_active }
+      end
+    end
+  end
+
   describe '#create' do
     let(:attributes){ {
       token: '477BBA133C182267F',

data/spec/fixtures/apis/subscriptions/find/successful.yml

@@ -1,11 +1,11 @@
 ---
 :request:
-  :url: '/subscriptions/get'
-  :body: '{"Id":"sc_8cf8a9338fb"}'
+  :url: '/subscriptions/find'
+  :body: '{"AccountId":"user@example.com"}'
 :response:
   :body: >
     {
-      "Model":{
+      "Model":[{
         "Id":"sc_8cf8a9338fb",
         "AccountId":"user@example.com",
         "Description":"Monthly subscription",
@@ -25,7 +25,7 @@
         "FailedTransactionsNumber":0,
         "LastTransactionDateIso":"2014-08-09T11:49:41",
         "NextTransactionDateIso":"2014-08-09T11:49:41"
-      },
+      }],
       "Success":true,
       "Message": null
     }

data/spec/fixtures/apis/subscriptions/get/successful.yml

@@ -0,0 +1,31 @@
+---
+:request:
+  :url: '/subscriptions/get'
+  :body: '{"Id":"sc_8cf8a9338fb"}'
+:response:
+  :body: >
+    {
+      "Model":{
+        "Id":"sc_8cf8a9338fb",
+        "AccountId":"user@example.com",
+        "Description":"Monthly subscription",
+        "Email":"user@example.com",
+        "Amount":1.02,
+        "CurrencyCode":0,
+        "Currency":"RUB",
+        "RequireConfirmation":false,
+        "StartDateIso":"2014-08-09T11:49:41",
+        "IntervalCode":1,
+        "Interval":"Month",
+        "Period":1,
+        "MaxPeriods":12,
+        "StatusCode":0,
+        "Status":"Active",
+        "SuccessfulTransactionsNumber":0,
+        "FailedTransactionsNumber":0,
+        "LastTransactionDateIso":"2014-08-09T11:49:41",
+        "NextTransactionDateIso":"2014-08-09T11:49:41"
+      },
+      "Success":true,
+      "Message": null
+    }

data/spec/spec_helper.rb

@@ -8,6 +8,9 @@ end
 require 'bundler'
 Bundler.require(:default, :test)
 
+require 'webmock/rspec'
+
+WebMock.enable!
 WebMock.disable_net_connect!
 
 Dir["./spec/support/**/*.rb"].each { |f| require f }
@@ -25,14 +28,4 @@ RSpec.configure do |config|
   config.include CloudPayments::RSpec::Helpers
 
   config.after(:suite){ WebMock.allow_net_connect! }
-
-  # config.around :each, time_freeze: ->(v){ v.is_a?(Date) || v.is_a?(Time) || v.is_a?(String) } do |example|
-  #   datetime = if example.metadata[:time_freeze].is_a?(String)
-  #     DateTime.parse(example.metadata[:time_freeze])
-  #   else
-  #     example.metadata[:time_freeze]
-  #   end
-
-  #   Timecop.freeze(datetime){ example.run }
-  # end
 end

data/spec/support/helpers.rb

@@ -44,13 +44,13 @@ module CloudPayments
           @webmock_stub ||= begin
             if fixture
               WebMock::StubRegistry.instance.register_request_stub(WebMock::RequestStub.new(:post, url)).
-                with(body: request[:body] || '', headers: request_headers)
+                with(body: request[:body] || '', headers: request_headers, basic_auth: ['user', 'pass'])
             end
           end
         end
 
         def url
-          "http://user:pass@localhost:9292#{request[:url]}"
+          "http://localhost:9292#{request[:url]}"
         end
 
         def request_headers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloud_payments
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - undr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-22 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -163,6 +163,7 @@ files:
 - spec/fixtures/apis/subscriptions/cancel/successful.yml
 - spec/fixtures/apis/subscriptions/create/successful.yml
 - spec/fixtures/apis/subscriptions/find/successful.yml
+- spec/fixtures/apis/subscriptions/get/successful.yml
 - spec/fixtures/apis/subscriptions/update/successful.yml
 - spec/fixtures/apis/tokens/auth/failed.yml
 - spec/fixtures/apis/tokens/auth/successful.yml
@@ -235,6 +236,7 @@ test_files:
 - spec/fixtures/apis/subscriptions/cancel/successful.yml
 - spec/fixtures/apis/subscriptions/create/successful.yml
 - spec/fixtures/apis/subscriptions/find/successful.yml
+- spec/fixtures/apis/subscriptions/get/successful.yml
 - spec/fixtures/apis/subscriptions/update/successful.yml
 - spec/fixtures/apis/tokens/auth/failed.yml
 - spec/fixtures/apis/tokens/auth/successful.yml