six_saferpay 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a080926b5bdf943166bbcd992d4d7a0225312de53b76dc531bd7647ec8a42f1c
-  data.tar.gz: dbcad29d4c52294fd934f2355176b0554c24db3696ac1e24cf64912fd6faff0b
+  metadata.gz: ccc4e59b09497c4bd69e43e3c83f144e0b77ed3b5fa3ab3c1a9ece66540f4b07
+  data.tar.gz: 5eb1be3135c3aa1eb253e8d0af0b0b5f9cda983466c5f861e3d4c01d05ad5b8a
 SHA512:
-  metadata.gz: 3e2633d3ddd558c1efb063dea3490d37c100abb9d7fa48672d14ecab55e53fc20e24c280b1d68b5a01780d6e59c472b8ce62d7b548ae3f8b01a26d26154b9574
-  data.tar.gz: b67ee84408caf95044891164d762bad9ad042401d982bda0d7265bcd9993934ee0e48b8345ac3b8f22a2e0e027521e48f39078997543c7274221d04274ab0469
+  metadata.gz: 2dc5c3e36ea120537bd0340e8d1b5228b795cadde23f6bdcfc6ab1da0ec5377f4ba85ab6f2cf877bace1e5a40511150b66c7ddb54d6fbb9ec604486ba316eb98
+  data.tar.gz: 20b80970bc27a450d1ecf2fb5569d11a68f0b9ae9e688c6c934d9cfa60c15379efe725d08f1555bbe43a0e76c8c275638ebeb3deaacb963e04ee091ef5481c59

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    six_saferpay (1.16.2.4.0)
+    six_saferpay (2.5.0)
       activesupport (~> 6.1, >= 6.1.3)
 
 GEM
@@ -22,6 +22,7 @@ GEM
     diff-lcs (1.4.4)
     docile (1.3.5)
     dotenv (2.7.6)
+    ffi (1.14.2-java)
     hashdiff (1.0.1)
     i18n (1.8.9)
       concurrent-ruby (~> 1.0)
@@ -32,6 +33,10 @@ GEM
     pry (0.14.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    pry (0.14.0-java)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+      spoon (~> 0.0)
     public_suffix (4.0.6)
     rake (13.0.3)
     rexml (3.2.4)
@@ -56,6 +61,9 @@ GEM
     simplecov_json_formatter (0.1.2)
     spinning_wheel (0.2.2)
       activesupport (>= 5.2.4.3)
+    spoon (0.0.6)
+      ffi
+    thor (1.1.0)
     tty-color (0.6.0)
     tty-cursor (0.7.1)
     tty-prompt (0.23.0)
@@ -77,18 +85,20 @@ GEM
     zeitwerk (2.4.2)
 
 PLATFORMS
+  arm64-darwin-20
   java
   ruby
 
 DEPENDENCIES
   bundler (~> 2.1)
   dotenv (~> 2.7, >= 2.7)
-  pry (~> 0.13)
+  pry (~> 0.14)
   rake (~> 13.0)
   rspec (~> 3.0)
   simplecov (~> 0.19)
   six_saferpay!
   spinning_wheel (~> 0.2.2)
+  thor (~> 1.1.0)
   tty-prompt (~> 0.22)
   vcr (~> 4.0, >= 4.0.0)
   webmock (~> 3.10, >= 3.10)

data/README.md

@@ -1,12 +1,12 @@
 [![Gem Version](https://badge.fury.io/rb/six_saferpay.svg)](https://badge.fury.io/rb/six_saferpay)
-[![Build Status](https://travis-ci.org/fadendaten/six_saferpay.svg?branch=master)](https://travis-ci.org/fadendaten/six_saferpay)
+[![Build Status](https://travis-ci.com/fadendaten/six_saferpay.svg?branch=master)](https://travis-ci.com/fadendaten/six_saferpay)
 [![Maintainability](https://api.codeclimate.com/v1/badges/76c9d1d0f261c276de96/maintainability)](https://codeclimate.com/github/fadendaten/six_saferpay/maintainability)
 
 # SixSaferpay
 
 ## Current API Version
 
-This gem is compatible with the SIX API version: `1.16`
+This gem is compatible with the SIX API version: `1.17`
 
 ## Installation
 

data/Thorfile

@@ -0,0 +1 @@
+Thor::Util.load_thorfile('lib/generators/models.rb')

data/lib/generators/models.rb

@@ -0,0 +1,96 @@
+require "thor"
+require 'active_support/inflector'
+
+module SixSaferpay
+  module Generators
+    class Model < Thor::Group
+      include Thor::Actions
+
+      attr_accessor :attributes, :file_name
+
+      argument :name
+      argument :method_attributes, optional: true, type: :hash
+      class_option :test_framework, :default => :test_unit
+
+      def self.source_root
+        File.dirname(__FILE__)
+      end
+
+      def file_name
+        @file_name = name.underscore
+      end
+
+      def create_attributes_array
+        @attributes = []
+        if method_attributes
+          method_attributes.each do |key, value|
+            split = value.split(':')
+
+            name = key.underscore
+            type = split.first
+            if split.length == 2
+              mandatory = split.last
+            else
+              mandatory = false
+            end
+
+            attribute = Attribute.new(name, type, mandatory)
+
+            @attributes << attribute
+          end
+        end
+      end
+
+      def create_model_file
+        template('templates/model.erb', "lib/six_saferpay/models/#{@file_name}.rb")
+      end
+
+      def create_test_file
+        template('templates/spec.erb', "spec/six_saferpay/models/#{@file_name}_spec.rb")
+      end
+
+      def create_fabric_file
+        template('templates/fabric.erb', "spec/fabrics/six_saferpay/models/#{@file_name.pluralize}.rb")
+      end
+
+    end
+
+    class Attribute
+      attr_accessor :name, :type, :mandatory
+
+      def initialize(name, type, mandatory = false)
+        @name = name
+        @type = type
+        if mandatory == "true"
+          @mandatory = true
+        elsif mandatory == "false"
+          @mandatory = false
+        else
+          @mandatory = mandatory
+        end
+      end
+
+      def mandatory?
+        @mandatory
+      end
+
+      def string?
+        @type == "String"
+      end
+
+      def to_s
+        to_h
+      end
+
+      def to_h
+        hash = Hash.new
+        hash.merge!(name: name)
+        hash.merge!(type: type)
+        hash.merge!(mandatory: mandatory)
+        hash
+      end
+
+    end
+
+  end
+end

data/lib/generators/templates/fabric.erb

@@ -0,0 +1,15 @@
+SpinningWheel.define do
+  fabric name: '<%= file_name %>', class_name: 'SixSaferpay::<%= name %>' do
+<%- attributes.each do |attr| -%>
+  <%- if attr.string? -%>
+  <%- if attr.mandatory? -%>
+    <%= "#{attr.name} { ' ' }" %>
+  <%- else -%>
+    <%= "#{attr.name} { nil }" %>
+  <%- end -%>
+  <%- else -%>
+    <%= "#{attr.name} { SpinningWheel.create('#{attr.name}') }" %>
+  <%- end -%>
+<%- end -%>
+  end
+end

data/lib/generators/templates/model.erb

@@ -0,0 +1,56 @@
+module SixSaferpay
+  class <%= name %>
+
+    attr_accessor(
+    <%- attributes.each do |attr| -%>
+      :<%= attr.name %>,
+    <%- end -%>
+    )
+
+    def initialize(
+<%- attributes.each_with_index do |attr, index| -%>
+      <%= "#{attr.name}:"-%>
+<%- unless attr.mandatory? -%>
+  <%- -%><%= ' nil' -%>
+<%- end -%>
+<%- unless attr == attributes.last -%>
+  <%- -%><%= ',' %>
+<%- end -%>
+<%- end %>
+      )
+<%- attributes.each_with_index do |attr, index| -%>
+    <%- if attr.string? -%>
+      <%= "@#{attr.name} = "-%><%= "#{attr.name}" %>
+    <%- else -%>
+      <%- %>
+      <%= "if #{attr.name}" %>
+        <%= "@#{attr.name} = "-%>
+        <%- -%><%= "SixSaferpay::#{attr.type}.new(#{attr.name}.to_h)" %>
+      <%= "end" %>
+    <%- end -%>
+<%- end -%>
+    end
+
+    def to_hash
+      hash = Hash.new
+<%- attributes.each do |attr| -%>
+  <%- if attr.string? -%>
+    <%- if attr.mandatory? -%>
+      <%= "if @#{attr.name}" %>
+        <%= "hash.merge!(#{attr.name}: @#{attr.name})" %>
+      <%= "end" %>
+    <%- else -%>
+      <%= "hash.merge!(#{attr.name}: @#{attr.name})" %>
+    <%- end -%>
+  <%- else -%>
+      <%= "if @#{attr.name}" %>
+        <%= "hash.merge!(#{attr.name}: @#{attr.name}.to_h)" %>
+      <%= "end" %>
+  <%- end -%>
+<%- end -%>
+      hash
+    end
+    alias_method :to_h, :to_hash
+
+  end
+end

data/lib/generators/templates/spec.erb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+RSpec.describe SixSaferpay::<%= name %> do
+
+subject { SpinningWheel.create('<%= file_name %>') }
+
+  let(:hash) {
+    {
+    <%- attributes.each do |attr| -%>
+      <%- if attr.string? -%>
+        <%= attr.name %>: subject.<%= attr.name %>,
+      <%- else -%>
+        <%= attr.name %>: subject.<%= attr.name %>.to_h,
+      <%- end -%>
+    <%- end -%>
+    }
+  }
+
+  describe 'to_hash' do
+    it 'returns the hash representation of the <%=name%>' do
+      expect(subject.to_hash).to eq(hash)
+    end
+  end
+end

data/lib/six_saferpay.rb

@@ -1,5 +1,6 @@
 require 'active_support/core_ext/hash'
 require 'active_support/core_ext/string'
+require 'active_support/inflector'
 require 'securerandom'
 require 'json'
 require 'net/http'
@@ -12,6 +13,10 @@ Dir[File.join(gem_root, "lib", "six_saferpay", "**/*.rb")].sort.each do |file|
   require file
 end
 
+Dir[File.join(gem_root, "lib", "generators", "**/*.thor")].sort.each do |file|
+  require file
+end
+
 module SixSaferpay
 
   class Config

data/lib/six_saferpay/api.rb

@@ -1,5 +1,5 @@
 module SixSaferpay
   module API
-    VERSION = '1.16'
+    VERSION = '1.17'
   end
 end

data/lib/six_saferpay/api/six_secure_card_data/requests/insert.rb

@@ -10,7 +10,8 @@ module SixSaferpay
                     :language_code,
                     :check,
                     :payment_methods,
-                    :card_form
+                    :card_form,
+                    :payment_means
                    )
 
       def initialize(request_header: nil,
@@ -21,7 +22,8 @@ module SixSaferpay
                      language_code: nil,
                      check: nil,
                      payment_methods: nil,
-                     card_form: nil
+                     card_form: nil,
+                     payment_means: nil
                     )
         @request_header = request_header || SixSaferpay::RequestHeader.new()
         @register_alias = SixSaferpay::RegisterAlias.new(register_alias.to_h) if register_alias
@@ -32,6 +34,7 @@ module SixSaferpay
         @check = SixSaferpay::Check.new(check.to_h) if check
         @payment_methods = payment_methods
         @card_form = SixSaferpay::CardForm.new(card_form.to_h) if card_form
+        @payment_means = SixSaferpay::RequestPaymentMeans.new(payment_means.to_h) if payment_means
       end
 
       def to_hash
@@ -45,6 +48,7 @@ module SixSaferpay
         hash.merge!(check: @check.to_h) if @check
         hash.merge!(payment_methods: @payment_methods) if @payment_methods
         hash.merge!(card_form: @card_form.to_h) if @card_form
+        hash.merge!(payment_means: @payment_means.to_h) if @payment_means
         hash
       end
       alias_method :to_h, :to_hash

data/lib/six_saferpay/api/six_secure_card_data/responses/insert_response.rb

@@ -5,17 +5,21 @@ module SixSaferpay
       attr_accessor(:response_header,
                     :token,
                     :expiration,
-                    :redirect_url
+                    :redirect_required,
+                    :redirect
                    )
 
       def initialize(response_header:,
                      token:,
                      expiration:,
-                     redirect_url: )
+                     redirect_required:,
+                     redirect:
+                    )
         @response_header = SixSaferpay::ResponseHeader.new(response_header.to_h) if response_header
         @token = token
         @expiration = expiration
-        @redirect_url = redirect_url
+        @redirect_required = redirect_required
+        @redirect = SixSaferpay::Redirect.new(redirect.to_h) if redirect
       end
 
       def to_hash
@@ -23,7 +27,8 @@ module SixSaferpay
         hash.merge!(response_header: @response_header.to_h) if @response_header
         hash.merge!(token: @token) if @token
         hash.merge!(expiration: @expiration) if @expiration
-        hash.merge!(redirect_url: @redirect_url) if @redirect_url
+        hash.merge!(redirect_required: @redirect_required) if !@redirect_required.nil?
+        hash.merge!(redirect: @redirect.to_h) if @redirect
         hash
       end
       alias_method :to_h, :to_hash

data/lib/six_saferpay/models/card_form.rb

@@ -1,15 +1,24 @@
 module SixSaferpay
   class CardForm
 
-    attr_accessor(:holder_name)
+    attr_accessor(
+      :holder_name,
+      :verification_code
+    )
 
-    def initialize(holder_name: nil)
+    def initialize(
+      holder_name: nil,
+      verification_code: nil
+    )
       @holder_name = holder_name
+      @verification_code = verification_code
+
     end
 
     def to_hash
       hash = Hash.new
       hash.merge!(holder_name: @holder_name) if @holder_name
+      hash.merge!(verification_code: @verification_code) if @verification_code
       hash
     end
     alias_method :to_h, :to_hash

data/lib/six_saferpay/version.rb

@@ -1,3 +1,3 @@
 module SixSaferpay
-  VERSION = "2.4.0"
+  VERSION = "2.5.0"
 end

data/six_saferpay.gemspec

@@ -31,8 +31,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'vcr', '~> 4.0', '>= 4.0.0'
   spec.add_development_dependency 'webmock', '~> 3.10', '>= 3.10'
   spec.add_development_dependency 'dotenv', '~> 2.7', '>= 2.7'
-  spec.add_development_dependency 'pry', '~> 0.13'
+  spec.add_development_dependency 'pry', '~> 0.14'
   spec.add_development_dependency 'tty-prompt', '~> 0.22'
   spec.add_development_dependency 'simplecov', '~> 0.19'
   spec.add_development_dependency 'spinning_wheel', '~> 0.2.2'
+  spec.add_development_dependency 'thor', '~> 1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: six_saferpay
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Fadendaten GmbH
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2021-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -139,14 +139,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
@@ -189,6 +189,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.2
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 description: This Gem helps you consume the SIX Saferpay API. Accoring the documentation
   of API of SIX Saferpay you can define your request models and get a response object
   back.
@@ -208,8 +222,13 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- Thorfile
 - bin/console
 - bin/setup
+- lib/generators/models.rb
+- lib/generators/templates/fabric.erb
+- lib/generators/templates/model.erb
+- lib/generators/templates/spec.erb
 - lib/six_saferpay.rb
 - lib/six_saferpay/api.rb
 - lib/six_saferpay/api/six_batch/requests/close.rb