finix 0.16 → 1.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTBhYjJkMzMzMDBlOGU1YWFjNzg3ZGE3ZGE5ZmIyNjUyNjdlOThmOA==
-  data.tar.gz: !binary |-
-    MjAwOWU5OGM0MzA0ODBjZTQyY2Q5MTIxZWM5MzA5ZWZjZjU2ODI1ZA==
+SHA256:
+  metadata.gz: b2113c64b98a0f7729b214378351c869b439939316fb7434e68ae6fce4e37615
+  data.tar.gz: 4455191f1ff93fa1c75113b2a5f8bd06ef6398d29f38fd651244c744d63fb47d
 SHA512:
-  metadata.gz: !binary |-
-    ZDIyMzA4YmYwMjYzMzhhNTkzZmJmYzQwMjRkNmMwZGNmZDFkZjYwMGJhZWM1
-    YmNlNDkyYmNjYjBhMTQ3YWQ3NTkxMmY2NDBiZDIxNmNkMmI5YzZlMmIzNDdl
-    Y2RlM2NjN2EzNDBiNzg5NWViMjM0OTU1NDE3NDYwYTkxZDI5NTA=
-  data.tar.gz: !binary |-
-    MDRhNGViY2QxNmViYTAxNmM1ZDc1ZTA0YWQ0NmM3YzhlNTY4OGVkYmRiNjU5
-    MTIyZTI5OTVkMTlmOGE0YWViZDU0NWNlYzJkMjY0ZTIyMThkYmMwOTliOTYx
-    NWJkZTYwY2VmZjVlNGFjZDM1MmRiZWU4OTQzNTU4YmIyNTdmZWU=
+  metadata.gz: d7cafefb9e31ce6e4d1df5dd354b1460f7516db83d1eccc0694fcc0eb963cc903112b0ef0b5d149bd30531b7a3764ae8271cb7af6dafb2a01aec9eb86124619c
+  data.tar.gz: 26c164b5dad922de5a1cf3c2d8dff27af487e54de2a34b9e4a13c14689f042e876bb2812a1bf26077c1d5fde3dd0b09fec38a7faca7ee7e5385718072f6d3733

data/.circleci/config.yml

@@ -0,0 +1,22 @@
+version: 2.1
+jobs:
+  rspec_tests:
+    working_directory: ~/workspace
+    docker:
+    - image: circleci/ruby:2.7
+    steps:
+    - checkout
+    - restore_cache:
+        keys:
+        - v1-dep-{{checksum "Gemfile.lock"}}
+    - run: 'bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3'
+    - save_cache:
+        key: v1-dep-{{checksum "Gemfile.lock"}}
+        paths:
+        - vendor/bundle
+        - ~/.bundle
+    - run: bundle exec rspec --format documentation
+workflows:
+  test:
+    jobs:
+      - rspec_tests

data/.ruby-version

@@ -1 +1 @@
-1.9.3
+ruby-2.7

data/Gemfile

@@ -1,17 +1,9 @@
 source 'https://rubygems.org'
 
-gem 'rake', '~> 10.4.2'
+gem 'rake', '~> 13.0.1'
 
 group :test do
-  gem 'minitest', '~> 5.10.1'
-  gem 'minitest-reporters', '~> 1.1.13'
-  gem 'vcr', '~> 3.0.3'
   gem 'rspec', '~> 3.5.0'
-  gem 'dotenv', '~> 2.1.1'
-
-  if RUBY_VERSION >= '2.0'
-    gem 'byebug', '~> 9.0.6'
-  end
 end
 
-gemspec
+gemspec

data/Rakefile

@@ -3,19 +3,3 @@ require 'bundler/gem_tasks'
 require 'rake/testtask'
 require 'rspec/core/rake_task'
 require 'logger'
-require_relative 'test/test_it'
-require_relative 'test/helper_test'
-
-desc 'Run test suite'
-Rake::TestTask.new do |t|
-  Finix::FinixTest.logger = Logger.new STDOUT
-  Finix::FinixTest.logger.level = Logger::ERROR
-  t.pattern ='test/**/test_*.rb'
-end
-
-desc 'Run rspec suite'
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.pattern = Dir.glob('spec/**/*_spec.rb')
-end
-
-task testit: [:test, :spec]

data/finix.gemspec

@@ -5,7 +5,7 @@ require 'finix/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'finix'
-  spec.required_ruby_version = '>= 1.9'
+  spec.required_ruby_version = '>= 2.0'
   spec.version       = Finix::VERSION
   spec.authors       = ['finix-payments']
   spec.email         = ['support@finixpayments.com']
@@ -22,15 +22,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency('faraday', '~> 0.10.0')
-  spec.add_dependency('faraday_middleware', '~> 0.10.1')
-
-  if RUBY_VERSION >= '2.0'
-    spec.add_dependency('json', '~> 2.0.2')
-    spec.add_dependency('addressable', '~> 2.5.0')
-  else
-    spec.add_dependency('public_suffix', '~> 1.4.6')
-    spec.add_dependency('json', '~> 1.8')
-    spec.add_dependency('addressable', '~> 2.3')
-  end
+  spec.add_dependency('faraday', '~> 1.0.1')
+  spec.add_dependency('faraday_middleware', '~> 1.0.0')
 end

data/lib/finix.rb

@@ -1,6 +1,6 @@
 require_relative 'finix/version' unless defined? Finix::VERSION
-require_relative  'finix/client'
-require_relative  'finix/errors'
+require_relative 'finix/client'
+require_relative 'finix/errors'
 
 module Finix
 
@@ -43,7 +43,8 @@ module Finix
     end
 
     def get_href(cls)
-      href = hypermedia_registry.key(cls)
+      href = (not cls.nil? and not cls.hypermedia_types.nil?) ? cls.hypermedia_types.last : hypermedia_registry.key(cls)
+
       sps = cls
       while href.nil?
         sps = sps.superclass
@@ -65,6 +66,7 @@ module Finix
 
     def find_resource_cls(resource, attributes={})
       cls = hypermedia_registry[resource]
+      # cls = hypermedia_registry["__stub__#{resource}"] if cls.nil?
       cls = cls.send :hypermedia_subtype, attributes if not cls.nil? and cls.respond_to?(:hypermedia_subtype)
       cls
     end

data/lib/finix/hal_resource.rb

@@ -5,7 +5,9 @@ module Finix
     attr_accessor :attributes
 
     def method_missing(method, *args, &block)
-      [@attributes, @attributes['page'] || {}].each do |attrs|
+      attributes = [@attributes]
+      attributes << @attributes['page'] unless @attributes['page'].nil?
+      attributes.each do |attrs|
         if attrs.has_key?(method.to_s)
           return attrs[method.to_s]
         end
@@ -28,11 +30,13 @@ module Finix
     def load_page_from_response!(response)
       body = Finix::Utils.indifferent_read_access response.body
 
-      @hyperlinks = Finix::Utils.eval_class(self, IndifferentHash).new
+      hash_class = Finix::Utils.eval_class(self, IndifferentHash)
+      @hyperlinks = hash_class.new
       links = body.delete('_links')
       links.each { |key, link| @hyperlinks[key.to_sym] = link[:href] } unless links.nil?
 
-      @attributes = {'items' => [], 'page' => body.delete('page')} # clear attributes
+      page = body.delete('page')
+      @attributes = {'items' => [], 'page' => hash_class.new(page)} # clear attributes
       if body.has_key? '_embedded'
         resource_name, resources = body.delete('_embedded').first
         @resource_class = Finix.from_hypermedia_registry resource_name
@@ -41,6 +45,9 @@ module Finix
           cls.construct_from_response attrs
         end
       end
+
+      @attributes.merge! body
     end
   end
 end
+

data/lib/finix/indifferent_hash.rb

@@ -1,12 +1,25 @@
 module Finix
   class IndifferentHash < ::Hash
+
+    def initialize(*args)
+      original_hash = args.slice!(0) || {}
+      self.merge!(original_hash)
+    end
+
     def method_missing(method, *args, &block)
       if self.has_key? "#{method}"
         value = self["#{method}"]
-        result = value.call
-        # result.init! args.slice(0) if result.respond_to? :init!
-        return result
+        return value.call(*args) if value.respond_to? :call
+        return value
+      end
+    end
+
+    def count(*args)
+      if self.has_key? 'count'
+        raise Exception.new 'Unsupported block_given exception' if block_given?
+        return self.send :method_missing, :count, *args
       end
+      super(*args)
     end
   end
 end

data/lib/finix/pagination.rb

@@ -32,7 +32,7 @@ module Finix
 
     def each
       return enum_for :each unless block_given?
-      fetch_first
+      fetch :first
       loop do
         items.each { |item| yield item }
         fetch :next
@@ -41,8 +41,10 @@ module Finix
 
     def count(*args)
       refresh # always refresh to get last items
-      return super *args if block_given?
-      self.send :method_missing, :count, args
+
+      cnt = (block_given?) ? super(*args) : self.send(:method_missing, :count, args)
+      cnt = 0 if cnt.nil?
+      cnt
     end
 
     def fetch(scope = nil) # :next, :last, :first, :prev, :self
@@ -54,8 +56,18 @@ module Finix
 
       scope = :self if scope.nil?
       scope = scope.to_s.to_sym unless scope.nil?
-      if @hyperlinks[scope]
-        load_from @hyperlinks[scope], opts
+
+      href = @hyperlinks[scope]
+      unless href
+        if scope == :first
+          @attributes['page']['offset'] = 0 unless @attributes['page']['offset'].nil?
+          href = @hyperlinks[:self]
+          href = href[/[^\?]+/]
+        end
+      end
+
+      if href
+        load_from href, opts
         return self.items
       end
 
@@ -69,6 +81,9 @@ module Finix
       self
     end
 
+    alias load! refresh
+    alias retrieve refresh
+
     def create(attrs={})
       attrs = attrs.attributes if attrs.is_a?(Resource)
       attrs = Finix::Utils.indifferent_read_access attrs
@@ -80,13 +95,47 @@ module Finix
       @resource_class.new(attrs).save
     end
 
-    private
+    def next_page
+      fetch :next
+      self
+    end
+
+    def previous_page
+      fetch :prev
+      self
+    end
 
-    def fetch_first
-      @attributes['page']['offset'] = 0 unless @attributes['page']['offset'].nil?
-      fetch(@hyperlinks[:first] ? :first : nil)
+    def last_page
+      fetch :last
+      self
     end
 
+    def first_page
+      fetch :first
+      self
+    end
+
+    def total
+      # refresh unless loaded
+      self.page.count
+    end
+
+    def num_pages
+      num = total / limit
+      num += 1 if total % limit > 0
+      num
+    end
+
+    def loaded
+      not self.items.nil?
+    end
+
+    private
+
+    # def current_page
+    #   (offset / limit) + 1
+    # end
+
     def extract_opts(opts={})
       opts = Finix::Utils.indifferent_read_access opts
       limit = opts.delete('limit')
@@ -125,21 +174,6 @@ module Finix
 
       response = Finix.get parsed_url.to_s, params
       load_page_from_response! response
-      # body = Finix::Utils.indifferent_read_access response.body
-      #
-      # @hyperlinks = Finix::Utils.eval_class(self, IndifferentHash).new
-      # links = body.delete('_links')
-      # links.each { |key, link| @hyperlinks[key.to_sym] = link[:href] }
-      #
-      # @attributes = {'items' => [], 'page' => body.delete('page')} # clear attributes
-      # if body.has_key? '_embedded'
-      #   resource_name, resources = body.delete('_embedded').first
-      #   @resource_class = Finix.from_hypermedia_registry resource_name
-      #   @attributes['items'] = resources.map do |attrs|
-      #     cls = Finix.from_hypermedia_registry resource_name, attrs
-      #     cls.construct_from_response attrs
-      #   end
-      # end
     end
 
     # Stolen from Mongrel, with some small modifications:

data/lib/finix/resources.rb

@@ -8,6 +8,9 @@ require 'finix/resources/identity'
 require 'finix/resources/processor'
 require 'finix/resources/token'
 require 'finix/resources/merchant'
+require 'finix/resources/merchant_profile'
+require 'finix/resources/risk_profile'
+require 'finix/resources/fee_profile'
 require 'finix/resources/payment_instrument'
 require 'finix/resources/payment_card'
 require 'finix/resources/bank_account'

data/lib/finix/resources/fee_profile.rb

@@ -0,0 +1,8 @@
+module Finix
+  class FeeProfile
+    include Finix::Resource
+    include Finix::HypermediaRegistry
+
+    define_hypermedia_types [:fee_profiles]
+  end
+end

data/lib/finix/resources/hypermedia.rb

@@ -11,7 +11,7 @@ module Finix
       def define_hypermedia_types(types)
         @hypermedia_types = types.map! do |t|
           t.to_s
-        end.sort!.freeze
+        end.sort!
 
         @hypermedia_types.each do |type|
           Finix.hypermedia_registry[type] = self
@@ -23,4 +23,4 @@ module Finix
 
   end
 
-end
+end

data/lib/finix/resources/merchant_profile.rb

@@ -0,0 +1,8 @@
+module Finix
+  class MerchantProfile
+    include Finix::Resource
+    include Finix::HypermediaRegistry
+
+    define_hypermedia_types [:merchant_profiles]
+  end
+end

data/lib/finix/resources/payment_instrument.rb

@@ -11,9 +11,9 @@ module Finix
         unless response.nil?
           type = response['instrument_type'] || response['type']
           if type == 'PAYMENT_CARD'
-            name = self.name.sub! 'PaymentInstrument', 'PaymentCard'
+            name = self.name.sub 'PaymentInstrument', 'PaymentCard'
           elsif type == 'BANK_ACCOUNT'
-            name = self.name.sub! 'PaymentInstrument', 'BankAccount'
+            name = self.name.sub 'PaymentInstrument', 'BankAccount'
           end
           return self.instance_eval name unless name.nil?
         end

data/lib/finix/resources/resource.rb

@@ -1,14 +1,10 @@
-require 'addressable/template'
-
 require_relative '../utils'
 require_relative '../hal_resource'
 require_relative '../pagination'
 require_relative '../indifferent_hash'
 
 module Finix
-
   module Resource
-
     include HalResource
 
     def initialize(*args)
@@ -117,7 +113,8 @@ module Finix
 
       def fetch(*arguments)
         if arguments.nil? or arguments.empty? or arguments[0].nil? or arguments[0].to_s.empty?
-          href = Finix.hypermedia_registry.key(self)
+          href = Finix.get_href self
+          # href = Finix.hypermedia_registry.key(self)
           return Finix::Utils.eval_class(self, Pagination).new :href => href
         end
 
@@ -140,15 +137,24 @@ module Finix
       end
 
       def pagination(*args)
-        href = Finix.hypermedia_registry.key(self)
+        href = Finix.get_href self
+        # href = Finix.hypermedia_registry.key(self)
         opts = args.slice!(0) || {}
         opts[:href] = href
         Finix::Utils.eval_class(self, Pagination).new opts
       end
 
       alias find fetch
-      alias retrieve fetch
-    end
 
+      def retrieve(*args)
+        pager_or_resource = fetch *args
+
+        if pager_or_resource.is_a? Pagination
+          pager_or_resource.load! unless pager_or_resource.loaded
+        end
+
+        pager_or_resource
+      end
+    end
   end
 end

data/lib/finix/resources/risk_profile.rb

@@ -0,0 +1,8 @@
+module Finix
+  class RiskProfile
+    include Finix::Resource
+    include Finix::HypermediaRegistry
+
+    define_hypermedia_types [:risk_profiles]
+  end
+end

data/lib/finix/resources/transfer.rb

@@ -3,10 +3,11 @@ module Finix
     include Finix::Resource
     include Finix::HypermediaRegistry
 
-    define_hypermedia_types [:transfers]
+    define_hypermedia_types [:transfers, :funding_transfers, :fees]
 
-    def reverse(refund_amount=0)
-      self.reversals.create :refund_amount => refund_amount
+    def reverse(args=0)
+      atts = args.is_a?(Hash) ? {}.merge(args) : {:refund_amount => args}
+      self.reversals.create atts
     end
   end
 end

data/lib/finix/resources/user.rb

@@ -1,4 +1,7 @@
 module Finix
+  # Your User is equivalent to an API Key and is used to authenticate when
+  # performing operations on the Finix API.
+
   class User
     include Finix::Resource
     include Finix::HypermediaRegistry

data/lib/finix/version.rb

@@ -1,3 +1,3 @@
 module Finix
-  VERSION = '0.16'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,85 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: finix
 version: !ruby/object:Gem::Version
-  version: '0.16'
+  version: 1.0.0
 platform: ruby
 authors:
 - finix-payments
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-27 00:00:00.000000000 Z
+date: 2020-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.1
-- !ruby/object:Gem::Dependency
-  name: public_suffix
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.6
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: addressable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 1.0.0
 description: Finix Ruby Client
 email:
 - support@finixpayments.com
@@ -87,15 +45,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
+- ".circleci/config.yml"
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- circle.yml
 - finix.gemspec
 - lib/finix.rb
 - lib/finix/client.rb
@@ -110,14 +68,17 @@ files:
 - lib/finix/resources/dispute.rb
 - lib/finix/resources/error.rb
 - lib/finix/resources/evidence.rb
+- lib/finix/resources/fee_profile.rb
 - lib/finix/resources/hypermedia.rb
 - lib/finix/resources/identity.rb
 - lib/finix/resources/merchant.rb
+- lib/finix/resources/merchant_profile.rb
 - lib/finix/resources/payment_card.rb
 - lib/finix/resources/payment_instrument.rb
 - lib/finix/resources/processor.rb
 - lib/finix/resources/refund.rb
 - lib/finix/resources/resource.rb
+- lib/finix/resources/risk_profile.rb
 - lib/finix/resources/settlement.rb
 - lib/finix/resources/token.rb
 - lib/finix/resources/transfer.rb
@@ -139,17 +100,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Finix Ruby Client

data/circle.yml

@@ -1,32 +0,0 @@
-machine:
-  ruby:
-    version: 1.9.3
-
-  environment:
-    RUBY_VERSIONS: 1.9.3,2.0.0,2.1.10,2.2.5,2.2.6,2.3.1,2.3.3,2.4.0
-    PROCESSING_URL: https://api-staging.finix.io/
-
-dependencies:
-  override:
-    - rvm get head
-    - rvm install $RUBY_VERSIONS
-    - rvm $RUBY_VERSIONS --verbose do gem install bundler
-    - rvm $RUBY_VERSIONS --verbose do bundle install
-
-test:
-  override:
-    - rvm $RUBY_VERSIONS --verbose do bundle exec rake testit
-
-  post:
-    - cp -Rf .report/ $CIRCLE_ARTIFACTS
-
-deployment:
-  release:
-    tag: /v[0-9]+(\.[0-9]+)*/
-    owner: finix-payments
-    commands:
-      - |
-        curl -u ${rubygems_user}:${rubygems_password} https://rubygems.org/api/v1/api_key.yaml > ~/.gem/credentials
-      - chmod 0600 ~/.gem/credentials
-      - gem build *.gemspec
-      - gem push *.gem