finix 0.13 → 1.0.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODNmZGZiNzc0NGE2NWI5NTlmMzUyZDA4NWIxZmFjZjdmM2Q2ODFmZg==
-  data.tar.gz: !binary |-
-    MGVjZWQ5NDgwNTBhZmFlNGJjODZiZjZhM2M4YTBiYmY3ODk3NDI3NQ==
+SHA256:
+  metadata.gz: ade5c9e0c2bd58f5ac07581952654d5b50aeed67606a423dafa3639c183f5298
+  data.tar.gz: 444938eed6284a21381bb13558b3c8ec5111361f583f216a13b9b038ac4448da
 SHA512:
-  metadata.gz: !binary |-
-    NDQ3MzBjOTQ0ZDg5OTRlZGIxYmJjYWY0OWMzYmM3MmU4NjZkYzJkZWU2MDIz
-    OTNhNWZlOTg2MzkyZTA4OWZjNDhiZTk4ZGEzMzEzN2RjMGM0MzAzZGM2Zjhi
-    MGU4YjRmMWQwYzE3ZDhhMWIxZmE5ZTU1ZjkwYzBkMGQ2MTRlYjU=
-  data.tar.gz: !binary |-
-    YjFkOGQ5M2E3NzMxYjg1ZDg4NjZjYmJhNmJmNjFjOWMzZTRmNGUxMWQyMjBk
-    NWI2ZWE3MDcyMThhYzVlNWMwM2UyY2FiZGJhZDdjODBkNjliZWQxNWFmMjkz
-    MGFjNjczYTI0ODVkYWU0OWU4ZGUzNzA2ZmRhNWY2ZjljYThhNTI=
+  metadata.gz: 9ce96db67f73345494dcd2407cdd4e493d9d73fdf533875516e85d3edfc99740b539540bfedf961aec5cd9dd222bd4f990bcd225d6e55c3ccf96ae52f5df3435
+  data.tar.gz: bf1d770c30b5e7a4d7795d2f37e8c4a8a1814cf957603a2ce18adcff43727e3779ad3bd378e5b4a494cfcb965494c879ea730cc197d48bc6f480cfa22692e3c0

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/.gitignore

@@ -1,4 +1,11 @@
 Gemfile.lock
 .idea/
 *.gem
-.report/
+.report/
+
+*ignore*
+.vcr/
+*.iml
+.byebug_history
+.DS_Store
+.env

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/.ruby-version

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

data/Gemfile

@@ -1,10 +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 'rspec', '~> 3.5.0'
 end
 
-gemspec
+gemspec

data/README.md

@@ -3,4 +3,37 @@
 [![CircleCI](https://circleci.com/gh/finix-payments/processing-ruby.svg?style=svg&circle-token=326db95733638463152e926a1016ec0383e554d2)](https://circleci.com/gh/finix-payments/processing-ruby)
 
 ## Getting Started
-`gem install finix`
+Add this line to your application's Gemfile:
+
+    gem 'finix'
+
+Then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install finix
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Write your code **and unit tests**
+4. Ensure all tests still pass (`bundle exec rspec`)
+5. Commit your changes (`git commit -am 'Add some feature'`)
+6. Push to the branch (`git push origin my-new-feature`)
+7. Create new pull request
+
+
+### Tests
+
+To run all tests:
+
+    $ bundle exec rspec
+
+
+To run a specific test:
+ 
+    $ bundle exec rspec ./spec/finix/resources/application_spec.rb
+

data/Rakefile

@@ -1,9 +1,5 @@
 require 'rake'
 require 'bundler/gem_tasks'
 require 'rake/testtask'
-
-desc 'Run test suite'
-Rake::TestTask.new do |t|
-  # t.test_files = FileList['test/**/test_*.rb']
-  t.pattern ='test/**/test_*.rb'
-end
+require 'rspec/core/rake_task'
+require 'logger'

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.1.0')
+  spec.add_dependency('faraday_middleware', '~> 1.0.0')
 end

data/lib/finix.rb

@@ -1,6 +1,6 @@
-require 'finix/version' unless defined? Finix::VERSION
-require 'finix/client'
-require 'finix/error'
+require_relative 'finix/version' unless defined? Finix::VERSION
+require_relative 'finix/client'
+require_relative 'finix/errors'
 
 module Finix
 
@@ -8,15 +8,15 @@ module Finix
   @config = {:root_url => 'https://localhost/processing'}
   @hypermedia_registry = {}
   @errors_registry = {
-      :unknown => Finix::ResourceErrors,
-      400 => Finix::BadRequest,
-      401 => Finix::Unauthorized,
-      402 => Finix::UpstreamProcessorError,
-      403 => Finix::Forbidden,
-      404 => Finix::NotFound,
-      405 => Finix::MethodNotAllowed,
-      422 => Finix::UnprocessableEntity,
-      500 => Finix::InternalServerError
+      :unknown => Errors,
+      400 => BadRequest,
+      401 => Unauthorized,
+      402 => PaymentRequired,
+      403 => Forbidden,
+      404 => NotFound,
+      405 => MethodNotAllowed,
+      422 => UnprocessableEntity,
+      500 => InternalServerError
   }
 
   class << self
@@ -35,7 +35,7 @@ module Finix
       @config[:user] = @config[:user].strip unless @config[:user].nil?
       @config[:password] = @config[:password].strip unless @config[:password].nil?
 
-      @client = Finix::Client.new @config
+      @client = Client.new @config
     end
 
     def split_the_href(href)
@@ -43,12 +43,14 @@ module Finix
     end
 
     def get_href(cls)
-      href = Finix.hypermedia_registry.key(cls)
-      href = Finix.hypermedia_registry.key(cls.superclass) if href.nil?
-      if href.nil? # support wrapper module
-        mod = cls.name.split('::').first
-        scls = cls.superclass.superclass.name.split('::').last
-        href = Finix.hypermedia_registry.key(self.instance_eval "#{mod}::#{scls}")
+      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
+        break if sps.nil?
+        clss = Finix::Utils.eval_class cls, sps
+        href = hypermedia_registry.key(clss)
       end
       href
     end
@@ -56,11 +58,17 @@ module Finix
     def from_hypermedia_registry(href, attributes={})
       split_uri = split_the_href(href)
       split_uri.reverse!.each do |resource|
-        cls = Finix.hypermedia_registry[resource]
-        cls = cls.send :hypermedia_subtype, attributes if not cls.nil? and cls.respond_to?(:hypermedia_subtype)
+        cls = find_resource_cls(resource, attributes)
         return cls unless cls.nil?
       end
-      Finix::Utils.eval_class self, 'UnknownResource'
+      Finix::Utils.eval_class self, UnknownResource
+    end
+
+    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
 
     def get(*args, &block)

data/lib/finix/client.rb

@@ -8,7 +8,7 @@ require 'finix/response/finix_error_middleware'
 module Finix
   class Client
 
-    DEFAULTS = {
+    DEFAULT_CONFIG = {
       :logging_level => 'WARN',
       :connection_timeout => 60,
       :read_timeout => 60,
@@ -21,7 +21,7 @@ module Finix
     attr_accessor :config
 
     def initialize(options={})
-      @config = DEFAULTS.merge options
+      @config = DEFAULT_CONFIG.merge options
       build_conn
     end
 

data/lib/finix/errors.rb

@@ -0,0 +1,47 @@
+require_relative 'hal_resource'
+module Finix
+
+  class Errors < ::StandardError
+    include Finix::HalResource
+    attr_reader :code
+    attr_reader :total
+
+    def initialize(response=nil)
+      @code = response[:status].to_i
+      @total = response[:body]['total'].to_i
+
+      load_page_from_response! response
+      @attributes['errors'] = @attributes.delete 'items'
+      @attributes.delete 'page'
+    end
+
+    def to_s
+      "#{@errors}"
+    end
+
+  end
+
+  class BadRequest < Errors
+  end
+
+  class Unauthorized < Errors
+  end
+
+  class PaymentRequired < Errors
+  end
+
+  class Forbidden < Errors
+  end
+
+  class NotFound < Errors
+  end
+
+  class MethodNotAllowed < Errors
+  end
+
+  class UnprocessableEntity < Errors
+  end
+
+  class InternalServerError < Errors
+  end
+end

data/lib/finix/hal_resource.rb

@@ -5,21 +5,49 @@ module Finix
     attr_accessor :attributes
 
     def method_missing(method, *args, &block)
-      if @attributes.has_key?(method.to_s)
-        return @attributes[method.to_s]
+      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
+      end
+
+      if @attributes.empty? or (@attributes.has_key?('page') and not @attributes.has_key?('items'))
+        self.refresh if self.respond_to? :refresh
+        return self.send :method_missing, method, *args, &block
       end
 
       case method.to_s
-        when /(.+)=$/
+        when /(.+)=$/ # support setting
           attr = method.to_s.chop
-          @attributes[attr] = args[0]
+          @attributes[attr] = args.slice(0)
         else
-          if @hyperlinks.has_key? "#{method}"
-            value = @hyperlinks["#{method}"]
-            result = value.call
-            return result
-          end
+          @hyperlinks.send :method_missing, method, *args, &block
       end
     end
+
+    def load_page_from_response!(response)
+      body = Finix::Utils.indifferent_read_access response.body
+
+      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?
+
+      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
+        @attributes['items'] = resources.map do |attrs|
+          cls = Finix.from_hypermedia_registry resource_name, attrs
+          cls.construct_from_response attrs
+        end
+      end
+
+      @attributes.merge! body
+    end
   end
 end
+

data/lib/finix/indifferent_hash.rb

@@ -0,0 +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}"]
+        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

@@ -1,80 +1,203 @@
 require 'cgi'
+require 'ostruct'
 require_relative 'hal_resource'
+require_relative 'indifferent_hash'
 
 module Finix
   class Pagination
 
-    include Enumerable
+    include ::Enumerable
     include HalResource
 
     attr_accessor :resource_class
+    attr_reader :attributes
+    attr_reader :hyperlinks
 
-    def initialize(href, opts={})
-      @hyperlinks = {}
-      @attributes = {}
+    def initialize(*args)
+      opts = args.slice!(0) || {}
+      href = opts.delete(:href)
 
+      @hyperlinks = Finix::Utils.eval_class(self, IndifferentHash).new
       @hyperlinks[:self] = href
+      @attributes = {}
       @resource_class = nil
+      extract_opts opts
+    end
+
+    def init!(*args)
+      opts = args.slice(0) || {}
+      extract_opts opts
+      self
     end
 
     def each
       return enum_for :each unless block_given?
-      current
+      fetch :first
       loop do
         items.each { |item| yield item }
         fetch :next
       end
     end
 
-    def current
-      refresh unless items
-      items
+    def count(*args)
+      refresh # always refresh to get last items
+
+      cnt = (block_given?) ? super(*args) : self.send(:method_missing, :count, args)
+      cnt = 0 if cnt.nil?
+      cnt
     end
 
-    def fetch(scope) # :next, :last, :first, :prev, :self
-      scope = scope.to_s.to_sym
-      if @hyperlinks[scope]
-        load_from @hyperlinks[scope]
+    def fetch(scope = nil) # :next, :last, :first, :prev, :self
+      opts = {}
+      if scope.is_a? Hash
+        opts = Finix::Utils.indifferent_read_access scope
+        scope = nil
+      end
+
+      scope = :self if scope.nil?
+      scope = scope.to_s.to_sym unless scope.nil?
+
+      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
 
       raise StopIteration
     end
 
+    alias retrieve fetch
+
     def refresh
-      fetch :self
+      fetch
+      self
     end
 
+    alias load! refresh
+    alias retrieve refresh
+
     def create(attrs={})
-      attrs = attrs.attributes if attrs.is_a?(Finix::Resource)
+      attrs = attrs.attributes if attrs.is_a?(Resource)
       attrs = Finix::Utils.indifferent_read_access attrs
+
       href = @hyperlinks[:self]
       @resource_class = Finix.from_hypermedia_registry href, attrs
-      @resource_class.new(attrs, href).save
+
+      attrs[:href] = href
+      @resource_class.new(attrs).save
+    end
+
+    def next_page
+      fetch :next
+      self
+    end
+
+    def previous_page
+      fetch :prev
+      self
+    end
+
+    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 load_from(url, params = {})
-      params ||= {}
+    # def current_page
+    #   (offset / limit) + 1
+    # end
+
+    def extract_opts(opts={})
+      opts = Finix::Utils.indifferent_read_access opts
+      limit = opts.delete('limit')
+      offset = opts.delete('offset')
+      @attributes['page'] = @attributes['page'] || {}
+      @attributes['page']['limit'] = limit unless limit.nil?
+      @attributes['page']['offset'] = offset unless offset.nil?
+      @attributes.merge! opts unless opts.empty?
+
+      if not limit.nil? or not offset.nil? # reset @hyperlinks
+        @hyperlinks.reject! {|k, v| k.to_s != 'self'}
+        parsed_url = URI.parse(@hyperlinks[:self])
+        parsed_url.query = nil
+        @hyperlinks[:self] = parsed_url.to_s
+      end
+    end
 
-      response = Finix.get url, params
-      body = Finix::Utils.indifferent_read_access response.body
+    def load_from(url, opts = {})
+      parsed_url = URI.parse(url)
 
-      links = body.delete('_links')
-      links.each { |key, link| @hyperlinks[key.to_sym] = link[:href] }
+      params = {}
+      params.merge! @attributes['page'] if @attributes.has_key? 'page'
+      params.merge! parse_query(parsed_url.query)
+      parsed_url.query = nil # remove query
 
-      @attributes = {} # 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
-        @attributes['page'] = body.delete('page')
+      # params page
+      opts ||= {}
+      page = opts.delete('page')
+      unless page.nil?
+        page = Finix::Utils.indifferent_read_access page
+        params.merge! page unless page.nil?
       end
+
+      params.merge! opts unless opts.empty?
+      params.delete('count') # remove count from previous query
+
+      response = Finix.get parsed_url.to_s, params
+      load_page_from_response! response
     end
 
+    # Stolen from Mongrel, with some small modifications:
+    # Parses a query string by breaking it up at the '&'
+    # and ';' characters.  You can also use this to parse
+    # cookies by changing the characters used in the second
+    # parameter (which defaults to '&;').
+    def parse_query(qs, d = nil)
+      params = {}
+      (qs || '').split(d ? /[#{d}] */n : /[&;] */n).each do |p|
+        k, v = p.split('=', 2).map { |x| CGI::unescape(x) }
+        if (cur = params[k])
+          if cur.class == Array
+            params[k] << v
+          else
+            params[k] = [cur, v]
+          end
+        else
+          params[k] = v
+        end
+      end
+
+      params
+    end
   end
-end
+end
+

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'
@@ -18,4 +21,5 @@ require 'finix/resources/verification'
 require 'finix/resources/dispute'
 require 'finix/resources/evidence'
 require 'finix/resources/refund'
-require 'finix/resources/settlement'
+require 'finix/resources/settlement'
+require 'finix/resources/error'

data/lib/finix/resources/application.rb

@@ -14,6 +14,7 @@ module Finix
       attrs = attrs.attributes if attrs.is_a?(Finix::Resource)
       self.processors.create(attrs)
     end
+    alias enable_processor create_processor
 
     def create_token(attrs={})
       attrs = attrs.attributes if attrs.is_a?(Finix::Resource)

data/lib/finix/resources/authorization.rb

@@ -11,6 +11,9 @@ module Finix
     end
 
     def capture(attrs={})
+      if attrs['capture_amount'].nil?
+        attrs['capture_amount'] = self.amount
+      end
       self.attributes = self.attributes.merge attrs
       self.save
     end

data/lib/finix/resources/error.rb

@@ -0,0 +1,12 @@
+module Finix
+  class Error < ::StandardError
+    include Finix::Resource
+    include Finix::HypermediaRegistry
+
+    define_hypermedia_types [:errors]
+
+    def message
+      @attributes['message']
+    end
+  end
+end

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

@@ -10,13 +10,11 @@ module Finix
       def hypermedia_subtype(response)
         unless response.nil?
           type = response['instrument_type'] || response['type']
-          name = self.name.sub! 'PaymentInstrument', 'PaymentCard'
           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
         self

data/lib/finix/resources/resource.rb

@@ -1,29 +1,35 @@
-require File.expand_path('../../pagination', __FILE__)
-require File.expand_path('../../utils', __FILE__)
-require File.expand_path('../../hal_resource', __FILE__)
-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(attributes = {}, href = nil)
-      @attributes = Utils.indifferent_read_access attributes
+    def initialize(*args)
+      opts = args.slice!(0) || {}
+      href = opts.delete(:href)
+      @attributes = Finix::Utils.indifferent_read_access opts
 
-      @hyperlinks = {}
+      @hyperlinks = Finix::Utils.eval_class(self, IndifferentHash).new
       @hyperlinks[:self] = href if href =~ URI::regexp
     end
 
+    alias links hyperlinks
+
     def hydrate(links)
       links.each do |key, link|
         property = key.sub(/.*?\./, '')
 
+        href = link[:href]
         if property == 'self'
-          @hyperlinks[:self] = link[:href]
+          @hyperlinks[:self] = href
         else
-          @hyperlinks[property] = Finix::Utils.callable(Finix::Utils.eval_class(self, 'Pagination').new link[:href], {})
+          split_uri = Finix.split_the_href(href).reverse!
+          cls = Finix.find_resource_cls split_uri[0]
+          cls = cls.nil? ? Finix.from_hypermedia_registry(href) : Finix::Utils.eval_class(self, Pagination)
+          @hyperlinks[property] = Finix::Utils.callable(cls.new :href => href)
         end
       end
     end
@@ -96,9 +102,9 @@ module Finix
 
     module ClassMethods
 
+      # this is class method, not callable from instance
       def construct_from_response(payload)
         payload = Finix::Utils.indifferent_read_access payload
-
         links = payload.delete('_links') || {}
         instance = self.new payload
         instance.hydrate(links)
@@ -107,17 +113,22 @@ 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)
-          return Finix::Utils.eval_class(self, 'Pagination').new href
+          href = Finix.get_href self
+          # href = Finix.hypermedia_registry.key(self)
+          return Finix::Utils.eval_class(self, Pagination).new :href => href
         end
 
         options = arguments.slice!(0) or {}
         if options.is_a? String and options =~ URI::regexp
           href = options
         else
-          href = Finix.hypermedia_registry.key(self) or Finix.hypermedia_registry.key(self.class)
-          id = options if options.is_a? String
-          id = options.delete(:id) if options.is_a? Hash
+          href = Finix.get_href(self) or Finix.get_href(self.class)
+          if options.is_a? Hash
+            options = Finix::Utils.indifferent_read_access options
+            id = options.delete('id')
+          elsif options.is_a? String
+            id = options
+          end
           href = "#{href}/#{id}" unless id.nil?
         end
 
@@ -125,9 +136,25 @@ module Finix
         construct_from_response response.body
       end
 
+      def pagination(*args)
+        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/response/finix_error_middleware.rb

@@ -1,17 +1,15 @@
 require 'faraday'
-require 'finix/error'
+require_relative '../errors'
 
 module Faraday
 
   class Response::RaiseApiError < Response::Middleware
-
     def on_complete(response)
       status_code = response[:status].to_i
       error_class = Finix.errors_registry[status_code]
-      raise Finix.errors_registry[:unknown].new(response) if error_class.nil? and status_code >= 400
-      raise error_class.new(response) if error_class
+      raise Finix.errors_registry[:unknown].new response if error_class.nil? and status_code >= 400
+      raise error_class.new response if error_class
     end
-
   end
 
 end

data/lib/finix/utils.rb

@@ -1,8 +1,9 @@
 module Finix
   module Utils
-    def eval_class(slf, name)
-      mod = slf.class.name.split("::").first unless slf.kind_of? Class or slf.kind_of? Module
-      mod = slf.name.split("::").first if mod.nil?
+    def eval_class(slf, cls)
+      mod = slf.class.name.sub(/::.*/, '') unless slf.kind_of? Class or slf.kind_of? Module
+      mod = slf.name.sub(/::.*/, '') if mod.nil?
+      name = demodulize cls.name
       self.instance_eval "#{mod}::#{name}"
     end
 
@@ -39,6 +40,10 @@ module Finix
       indifferent
     end
 
+    def demodulize(class_name_in_module)
+      class_name_in_module.to_s.sub(/^.*::/, '')
+    end
+
     extend self
   end
 end

data/lib/finix/version.rb

@@ -1,3 +1,3 @@
 module Finix
-  VERSION = '0.13'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,85 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: finix
 version: !ruby/object:Gem::Version
-  version: '0.13'
+  version: 1.0.1
 platform: ruby
 authors:
 - finix-payments
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-11 00:00:00.000000000 Z
+date: 2021-01-12 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.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 1.1.0
 - !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,34 +45,40 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .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
-- lib/finix/error.rb
+- lib/finix/errors.rb
 - lib/finix/hal_resource.rb
+- lib/finix/indifferent_hash.rb
 - lib/finix/pagination.rb
 - lib/finix/resources.rb
 - lib/finix/resources/application.rb
 - lib/finix/resources/authorization.rb
 - lib/finix/resources/bank_account.rb
 - 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
@@ -136,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.4.8
+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-preview3
-    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 test
-
-  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

data/lib/finix/error.rb

@@ -1,47 +0,0 @@
-module Finix
-
-  class ResourceErrors < ::StandardError
-    attr_reader :response
-    attr_reader :errors
-    attr_reader :code
-
-    def initialize(response=nil)
-      @response = response
-      @errors = []
-      unless response.nil?
-        @code = response[:status].to_i
-        @response[:body]['_embedded']['errors'].each { |error| @errors.push Utils.eval_class(self, 'ResourceError').new error}
-      end
-    end
-
-    def to_s
-      "#{@errors}"
-    end
-
-    def inspect
-      to_s
-    end
-  end
-
-  class ResourceError < ::StandardError
-    attr_reader :attributes
-
-    def initialize(error = {})
-      @attributes = {}
-      @attributes = @attributes.merge error
-    end
-
-    def to_s
-      "#{self.class.name.split('::').last || ''} #{@attributes}"
-    end
-  end
-
-  class BadRequest < ResourceErrors; end
-  class Unauthorized < ResourceErrors; end
-  class UpstreamProcessorError < ResourceErrors; end
-  class Forbidden < ResourceErrors; end
-  class NotFound < ResourceErrors; end
-  class MethodNotAllowed < ResourceErrors; end
-  class UnprocessableEntity < ResourceErrors; end
-  class InternalServerError < ResourceErrors; end
-end