wegift-ruby-client 1.7.2 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 354e3ffd5e6a48aa62b42f45f18befa65c58a175
-  data.tar.gz: 23e9db8aa35458e2fd47c2c5f39b2d87606cac50
+SHA256:
+  metadata.gz: 93fcfceee73c751a093784421b2949ac0e220599fd88a9e74f7573d3ca9f9326
+  data.tar.gz: d9eb089ab2bbc0534d8bb08c30f3b38ea8bd6a9108316a648bfbd8ef5654c4c0
 SHA512:
-  metadata.gz: 2226058175cac736b14c6810c0482dec1fe8ae5b79f3ed0229340c477319eeb2da5a57e6f7c977ef41c697a57cb13fdf5d3aad683b473e256a990e07b7be0fd8
-  data.tar.gz: 7344a534379e21c0999a5f64d890f8359a35706e04ab2d1aac57f8562c014e292c537b1f926365366d5b8d961175b543fce35a1f58b41e524a74d8bd10c838ed
+  metadata.gz: 867d00650d5da67a8049bf44fd1a7dd03beddfa43a4b8b647298b6ca659a42a85c0bcc8ebaa7bf24046d4bbf399c27e07e3c1a5ca3346fbb3358a77a8afc6bb5
+  data.tar.gz: ff53bae7dae3bc129699d9b17f09558f20d7967320640480f740fb4b5f811d36af4dd7c0379675d965a7b938fc99178b793d8b1e2cfb529ad34bfadff39ffbbb

data/.gitignore

@@ -11,6 +11,9 @@
 # rspec failure tracking
 .rspec_status
 
+# debugger
+.byebug_history
+
 # idea/rubymine
 *.iml
 

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in wegift-ruby-client.gemspec

data/README.md

@@ -70,6 +70,8 @@ if order.is_successful?
   order.code
   order.order_id
   order.pin
+  order.barcode_format
+  order.barcode_string
   order.expiry_date
   order.delivery_url
 

data/Rakefile

@@ -1,6 +1,8 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "wegift"
+require 'bundler/setup'
+require 'wegift'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +11,5 @@ require "wegift"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/lib/wegift.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'wegift/version'
 require 'wegift/client'
 
@@ -8,5 +10,4 @@ require 'wegift/models/products'
 require 'wegift/models/order'
 
 module Wegift
-
-end
+end

data/lib/wegift/client.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'faraday'
 
 require_relative 'models/response'
@@ -7,7 +8,6 @@ require_relative 'models/products'
 require_relative 'models/order'
 
 module Wegift
-
   class Client
     attr_accessor :api_host, :api_path, :api_key, :api_secret, :connection
 
@@ -19,18 +19,20 @@ module Wegift
       @api_key = options[:api_key].to_s
       @api_secret = options[:api_secret]
 
-      @connection = Faraday.new(:url => @api_host) do |c|
+      @connection = Faraday.new(url: @api_host) do |c|
         c.basic_auth(@api_key, @api_secret)
         c.adapter Faraday.default_adapter
-        c.options[:proxy] = {
-            :uri => URI(options[:proxy])
-        } unless options[:proxy].nil?
+        unless options[:proxy].nil?
+          c.options[:proxy] = {
+            uri: URI(options[:proxy])
+          }
+        end
       end
     end
 
     def request(method, path, payload = {})
       @connection.send(method) do |req|
-        req.url [@api_path, path].join('')
+        req.url [@api_path, path].join
         req.headers['Content-Type'] = 'application/json'
         req.body = payload.to_json if method.to_sym.eql?(:post)
         req.params = payload if method.to_sym.eql?(:get)
@@ -42,13 +44,13 @@ module Wegift
 
     # global methods
 
-    def products()
-      products = Wegift::Products.new()
+    def products
+      products = Wegift::Products.new
       products.get(self)
     end
 
     def product(id = nil)
-      products = Wegift::Product.new(:product_code => id)
+      products = Wegift::Product.new(product_code: id)
       products.get(self)
     end
 
@@ -56,7 +58,5 @@ module Wegift
       order = Wegift::Order.new(options)
       order.post(self)
     end
-
   end
-
 end

data/lib/wegift/models/initializable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Initializable
   def initialize(params = {})
     params.each do |key, value|
@@ -5,4 +7,4 @@ module Initializable
       send(setter, value) if respond_to?(setter.to_sym, false)
     end
   end
-end
+end

data/lib/wegift/models/order.rb

@@ -1,16 +1,19 @@
-class Wegift::Order < Wegift::Response
+# frozen_string_literal: true
 
+class Wegift::Order < Wegift::Response
   PATH = '/order-digital-card'
 
-  DELIVERY_METHODS = {:direct => 'direct', :email => 'email'}
-  DELIVERY_FORMATS = {:code => 'raw', :url => 'url-instant'}
+  DELIVERY_METHODS = { direct: 'direct', email: 'email' }.freeze
+  DELIVERY_FORMATS = { code: 'raw', url: 'url-instant' }.freeze
 
   # request/payload
-  attr_accessor :product_code, :currency_code, :amount, :delivery_method, :delivery_format,
-                :notification_email, :delivery_email, :external_ref
+  attr_accessor :product_code, :currency_code, :amount, :delivery_method,
+                :delivery_format, :notification_email, :delivery_email,
+                :external_ref
 
   # response/success
-  attr_accessor :code, :expiry_date, :pin, :order_id, :cvc2, :delivery_url
+  attr_accessor :code, :expiry_date, :pin, :order_id, :cvc2, :delivery_url,
+                :barcode_format, :barcode_string
 
   def initialize(params = {})
     super(params)
@@ -21,22 +24,22 @@ class Wegift::Order < Wegift::Response
 
   def payload
     {
-        :product_code => @product_code,
-        :currency_code => @currency_code,
-        :amount => @amount,
-        :delivery_method => @delivery_method,
-        :delivery_format => @delivery_format,
-        :notification_email => @notification_email,
-        :delivery_email => @delivery_email,
-        :external_ref => @external_ref,
+      product_code: @product_code,
+      currency_code: @currency_code,
+      amount: @amount,
+      delivery_method: @delivery_method,
+      delivery_format: @delivery_format,
+      notification_email: @notification_email,
+      delivery_email: @delivery_email,
+      external_ref: @external_ref
     }
   end
 
   # Order Digital Card
   # POST /api/b2b-sync/v1/order-digital-card
   def post(ctx)
-    response = ctx.request(:post, PATH, self.payload)
-    self.parse(response)
+    response = ctx.request(:post, PATH, payload)
+    parse(response)
   end
 
   def parse(response)
@@ -44,7 +47,7 @@ class Wegift::Order < Wegift::Response
 
     # nested status/error object
     # assuming root "status" is always "SUCCESS" if "e_code" is set
-    #{
+    # {
     #  "e_code": {
     #    "error_code": "EC001",
     #    "error_string": "Error retrieving E-Code from data processor",
@@ -55,14 +58,20 @@ class Wegift::Order < Wegift::Response
     #  "error_string": null,
     #  "order_id": 18,
     #  "status": "SUCCESS"
-    #}
+    # }
 
     # override root "status" if set
     if @payload['e_code'] && @payload['e_code']['status'].eql?(STATUS[:error])
       @status = @payload['e_code']['status']
-      @error_code = @payload['e_code']['error_code'] unless @payload['e_code']['error_code'].blank?
-      @error_string = @payload['e_code']['error_string'] unless @payload['e_code']['error_string'].blank?
-      @error_details = @payload['e_code']['error_details'] unless @payload['e_code']['error_details'].blank?
+      unless @payload['e_code']['error_code'].blank?
+        @error_code = @payload['e_code']['error_code']
+      end
+      unless @payload['e_code']['error_string'].blank?
+        @error_string = @payload['e_code']['error_string']
+      end
+      unless @payload['e_code']['error_details'].blank?
+        @error_details = @payload['e_code']['error_details']
+      end
     end
 
     # set valid data
@@ -72,11 +81,12 @@ class Wegift::Order < Wegift::Response
       @pin = @payload['e_code']['pin']
       @cvc2 = @payload['e_code']['cvc2']
       @delivery_url = @payload['e_code']['delivery_url']
+      @barcode_string = @payload['e_code']['barcode_string']
+      @barcode_format = @payload['e_code']['barcode_format']
     end
 
     @order_id = @payload['order_id']
 
     self
   end
-
 end

data/lib/wegift/models/product.rb

@@ -1,5 +1,6 @@
-class Wegift::Product < Wegift::Response
+# frozen_string_literal: true
 
+class Wegift::Product < Wegift::Response
   PATH = '/products'
 
   # request/payload
@@ -13,7 +14,8 @@ class Wegift::Product < Wegift::Response
                 :terms_and_conditions_html,
                 :terms_and_conditions_url,
                 :terms_and_conditions_pdf_url,
-                :e_code_usage_type
+                :e_code_usage_type,
+                :barcode_format
 
   def initialize(params = {})
     super
@@ -27,12 +29,12 @@ class Wegift::Product < Wegift::Response
   # GET /api/b2b-sync/v1/products/ID
   def get(ctx)
     response = ctx.request(:get, path)
-    self.parse(response)
+    parse(response)
   end
 
   def parse(response)
     super(response)
+
     Wegift::Product.new(@payload)
   end
-
 end

data/lib/wegift/models/products.rb

@@ -1,5 +1,6 @@
-class Wegift::Products < Wegift::Response
+# frozen_string_literal: true
 
+class Wegift::Products < Wegift::Response
   PATH = '/products'
 
   attr_accessor :all
@@ -8,16 +9,21 @@ class Wegift::Products < Wegift::Response
   # GET /api/b2b-sync/v1/products/
   def get(ctx)
     response = ctx.request(:get, PATH)
-    self.parse(response)
+    parse(response)
+  end
+
+  # Find all products by fieldname.
+  def find(name, value)
+    Wegift::Products.new(all: all.select! { |p| p.send(name).eql?(value) })
   end
 
   def parse(response)
     super(response)
 
-    if self.is_successful?
-      # TODO separate?
+    if is_successful?
+      # TODO: separate?
       if @payload['products']
-        @all = @payload['products'].map{|p| Wegift::Product.new(p)}
+        @all = @payload['products'].map { |p| Wegift::Product.new(p) }
       end
     else
       @all = []
@@ -25,5 +31,4 @@ class Wegift::Products < Wegift::Response
 
     self
   end
-
 end

data/lib/wegift/models/response.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require_relative 'initializable'
 
 class Wegift::Response
   include Initializable
 
-  STATUS = {:success => 'SUCCESS', :error => 'ERROR'}
+  STATUS = { success: 'SUCCESS', error: 'ERROR' }.freeze
 
   # Field Name Contents
   #
@@ -16,7 +18,7 @@ class Wegift::Response
   attr_accessor :payload, :status, :error_code, :error_string, :error_details
 
   def is_successful?
-    @status && @status.eql?(STATUS[:success])
+    @status&.eql?(STATUS[:success])
   end
 
   def parse(response = {})
@@ -37,5 +39,4 @@ class Wegift::Response
       @error_details = response.reason_phrase
     end
   end
-
 end

data/lib/wegift/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 module Wegift
   # api-version.lib-build
-  VERSION = '1.7.2'
+  VERSION = '1.8.0'
 end

data/wegift-ruby-client.gemspec

@@ -1,5 +1,6 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'wegift/version'
 
@@ -9,11 +10,10 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Klaas Endrikat']
   spec.email         = ['klaas.endrikat@googlemail.com']
 
-  spec.summary       = %q{A simple Ruby client for the WEGIFT API}
+  spec.summary       = 'A simple Ruby client for the WEGIFT API'
   spec.homepage      = 'https://github.com/kendrikat/wegift-ruby-client'
   spec.license       = 'MIT'
 
-
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
@@ -24,9 +24,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'json', '~> 1.7', '>= 1.7.7'
 
   spec.add_development_dependency 'bundler', '~> 1.14'
+  spec.add_development_dependency 'byebug', '~> 11'
+  spec.add_development_dependency 'dotenv', '~> 2.2', '>= 2.2.0'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'vcr', '~> 3.0', '>= 3.0.3'
-  spec.add_development_dependency 'webmock', '~> 2.3', '>= 2.3.2'
-  spec.add_development_dependency 'dotenv', '~> 2.2', '>= 2.2.0'
+  spec.add_development_dependency 'webmock', '~> 3.5', '>= 3.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wegift-ruby-client
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.8.0
 platform: ruby
 authors:
 - Klaas Endrikat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-26 00:00:00.000000000 Z
+date: 2020-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -64,6 +64,40 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -116,42 +150,22 @@ dependencies:
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+        version: 3.5.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.2
-- !ruby/object:Gem::Dependency
-  name: dotenv
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 3.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
 description: 
 email:
 - klaas.endrikat@googlemail.com
@@ -199,8 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A simple Ruby client for the WEGIFT API