finix 0.7 → 0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjIwZTY2OGE1ZjA0OWNhYWEwOGZmOTFkZWM1MjU5MzE0ZTdlNGQ0Yw==
+    Zjg0YmY4ZWE5ZDU2MDdlNzc3Mzg4MGM5YTU2YTAxZmFhY2YwZjNjNw==
   data.tar.gz: !binary |-
-    YzA3ZmQ1ZGZmMDliMzU5ZTU4NmZlYzllYWU5NzQ3MjZlYjRmZTNmNw==
+    ZmM5ODFlMzBlYzZlMWVjZmQwMTVkMGYyY2FjZDU0NDhlYTNjZmVlMw==
 SHA512:
   metadata.gz: !binary |-
-    NTc4NzJjMWE5Y2JkZjhjMjVlZDI3OTM4MjZjZDVjZDNhMzc3NjdhZGJlZTZl
-    YzAzOTdjODBiMDdiZmFiZWVmMDc2MGQwYzI3MzlmOGYwMmI4OTBhNDJjMDU2
-    ZDRhNzA3MmI1YzA2NTBkZDNlNzcyMDlhOGU5NDI1MGZhZjExZjg=
+    YjJmNGRlZmFlZDA2NjAxNTM5NWE0MjNhZGE1ZGVjN2Y2ODM2ZTA2NTRiODRh
+    YzQ2NWQ0MDBmMTNkYjA1NTYwYTIyN2NiOTVkYjVmOTVkM2FiNmFkMTBlNTFi
+    NWVmN2RmYmM2YTViZWI0ZmMyZDQ3NGEyZTYzYTdiZTZlNzNhYjY=
   data.tar.gz: !binary |-
-    YzJmZWZiYTExMDg5YTI5OTBhNjA2OGY5MzIzMWRlMGE0YTA5ZGUxYjQ0MjAx
-    OTA2ZDk0NWJhY2NlMDBhMWIwNmNhOTNiZDkzMWYwZTVlYWUyMWVmYjY1NTc0
-    NTY1MGViMzViODZhMDhkZGE3ZDM4ZTJhYmM5ZWE1MzUxMGVjZDA=
+    YjIzYzhiMDJhZjNlNDE3OGFiZDU1MjFhYzk1Y2JhYTQwZTk5NThiNGU3NzZi
+    MDZhMzVhOGFkN2M0NjhkYzg1YjRjYWZjZmU1MDI3ZTk0OTNmN2QxMzRmODg1
+    N2IwMjI4MmEzYzMwZmExNWRkNWY2NDFlYmE4ZDBiOWIxNDkyMDc=

data/circle.yml

@@ -18,4 +18,13 @@ test:
     - rvm $RUBY_VERSIONS --verbose do bundle exec rake test
 
   post:
-    - cp -Rf .report/ $CIRCLE_ARTIFACTS
+    - cp -Rf .report/ $CIRCLE_ARTIFACTS
+
+#deployment:
+#  release:
+#    tag: /v[0-9]+(\.[0-9]+)*/
+#    owner: finix-payments
+#    commands:
+#      - echo "--\n:rubygems_api_key: ${RUBYGEMS_API_KEY}" > ~/.gem/credentials
+#      - gem build *.gemspec
+#      - gem push *.gem

data/lib/finix.rb

@@ -5,7 +5,7 @@ require 'finix/error'
 module Finix
 
   @client = nil
-  @config = {:root_url=>'https://localhost/processing'}
+  @config = {:root_url => 'https://localhost/processing'}
   @hypermedia_registry = {}
 
   class << self
@@ -30,25 +30,20 @@ module Finix
       URI.parse(href).path.sub(/\/$/, '').split('/')
     end
 
-    def from_hypermedia_registry(resource_name)
-      cls = Finix.hypermedia_registry[resource_name]
-      if cls.nil?
-        return Finix::UnknownResource
-      end
-      cls
+    def get_href(cls)
+      href = Finix.hypermedia_registry.key(cls)
+      href = Finix.hypermedia_registry.key(cls.superclass) if href.nil?
+      href
     end
 
-    def from_href(href)
+    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)
         return cls unless cls.nil?
       end
-    end
-
-    def is_collection(href)
-      split_uri = split_the_href(href)
-      Finix.hypermedia_registry.has_key?(split_uri.last)
+      Finix::UnknownResource
     end
 
     def get(*args, &block)

data/lib/finix/pagination.rb

@@ -49,9 +49,7 @@ module Finix
       attrs = attrs.attributes if attrs.is_a?(Finix::Resource)
       attrs = Finix::Utils.indifferent_read_access attrs
       href = @hyperlinks[:self]
-      if @resource_class.nil?
-        @resource_class = Finix.from_href(href)
-      end
+      @resource_class = Finix.from_hypermedia_registry href, attrs
       @resource_class.new(attrs, href).save
     end
 
@@ -70,7 +68,10 @@ module Finix
       if body.has_key? '_embedded'
         resource_name, resources = body.delete('_embedded').first
         @resource_class = Finix.from_hypermedia_registry resource_name
-        @attributes['items'] = resources.map { |item| @resource_class.construct_from_response item }
+        @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')
       end
     end

data/lib/finix/resources.rb

@@ -17,4 +17,5 @@ require 'finix/resources/webhook'
 require 'finix/resources/verification'
 require 'finix/resources/dispute'
 require 'finix/resources/evidence'
-require 'finix/resources/refund'
+require 'finix/resources/refund'
+require 'finix/resources/settlement'

data/lib/finix/resources/authorization.rb

@@ -6,7 +6,7 @@ module Finix
     define_hypermedia_types [:authorizations]
 
     def void
-      self['void_me'] = true
+      self.void_me = true
       self.save
     end
 

data/lib/finix/resources/identity.rb

@@ -6,7 +6,7 @@ module Finix
 
     define_hypermedia_types [:identities]
 
-    def provision_merchant_on(attrs={})
+    def provision_merchant(attrs={})
       self.merchants.create(attrs)
     end
 
@@ -15,13 +15,7 @@ module Finix
         attrs.identity = self.id
         attrs = attrs.attributes
       else
-        attrs['identity'] = self.id # TODO might be error here
-      end
-
-      if attrs['type'] == 'PAYMENT_CARD'
-        self.payment_instruments.resource_class = Finix::PaymentCard
-      elsif attrs['type'] == 'BANK_ACCOUNT'
-        self.payment_instruments.resource_class = Finix::BankAccount
+        attrs['identity'] = self.id
       end
 
       self.payment_instruments.create(attrs)

data/lib/finix/resources/merchant.rb

@@ -2,6 +2,7 @@ module Finix
   class Merchant
     include Finix::Resource
     include Finix::HypermediaRegistry
+    include Finix::Verifiable
 
     define_hypermedia_types [:merchants]
   end

data/lib/finix/resources/payment_instrument.rb

@@ -2,7 +2,22 @@ module Finix
   class PaymentInstrument
     include Finix::Resource
     include Finix::HypermediaRegistry
+    include Finix::Verifiable
 
     define_hypermedia_types [:payment_instruments]
+
+    class << self
+      def hypermedia_subtype(response)
+        unless response.nil?
+          type = response['instrument_type'] || response['type']
+          if type == 'PAYMENT_CARD'
+            return Finix::PaymentCard
+          elsif type == 'BANK_ACCOUNT'
+            return Finix::BankAccount
+          end
+        end
+        self
+      end
+    end
   end
 end

data/lib/finix/resources/resource.rb

@@ -38,10 +38,9 @@ module Finix
       options = options.is_a?(Finix::Resource) ? options.attributes : options
       @attributes = @attributes.merge options
       href ||= @hyperlinks[:self]
-      # href = @attributes.delete('href')
       method = :post
       if href.nil?
-        href = Finix.hypermedia_registry.key(self.class)
+        href = Finix.get_href self.class
       elsif not @attributes[:id].nil?
         method = :put
       end
@@ -59,9 +58,7 @@ module Finix
     def sanitize
       to_submit = {}
       @attributes.each do |key, value|
-        if not value.is_a? Finix::Resource
-          to_submit[key] = value
-        end
+        to_submit[key] = value unless value.is_a? Finix::Resource
       end
       to_submit
     end
@@ -78,14 +75,11 @@ module Finix
         fresh = self.class.construct_from_response the_response.body
       else
         fresh = self.find(@hyperlinks[:self])
-        # fresh = self.find(@attributes[:href])
       end
       fresh and copy_from fresh
       self
     end
 
-    # alias refresh load!
-
     def copy_from(other)
       other.instance_variables.each do |ivar|
         instance_variable_set ivar, other.instance_variable_get(ivar)
@@ -96,6 +90,11 @@ module Finix
       "#{self.class.name.split('::').last || ''} #{@attributes}"
     end
 
+    def inspect
+      insp = super.inspect
+      "#{insp.split('::').last || ''}"
+    end
+
     def self.included(base)
       base.extend ClassMethods
     end
@@ -132,6 +131,7 @@ module Finix
       end
 
       alias find fetch
+      alias retrieve fetch
     end
 
   end

data/lib/finix/resources/verifiable.rb

@@ -1,12 +1,9 @@
 module Finix
   module Verifiable
-    def verify_on(attrs={})
+    def verify(attrs={})
       attrs = attrs.attributes if attrs.is_a?(Finix::Resource)
-      unless self.verifications.nil?
-        self.verifications.create(attrs)
-      else
-        raise NotImplementedError.new 'not found `verifications` rel'
-      end
+      return self.verifications.create(attrs) unless self.verifications.nil?
+      raise NotImplementedError.new 'not found `verifications` rel'
     end
   end
 end

data/lib/finix/utils.rb

@@ -1,45 +1,10 @@
 module Finix
-
   module Utils
 
     def callable(callable_or_not)
       callable_or_not.respond_to?(:call) ? callable_or_not : lambda { callable_or_not }
     end
 
-    def camelize(underscored_word)
-      underscored_word.to_s.gsub(/(?:^|_)(.)/) { $1.upcase }
-    end
-
-    def classify(table_name)
-      camelize singularize(table_name.to_s.sub(/.*\./, ''))
-    end
-
-    def demodulize(class_name_in_module)
-      class_name_in_module.to_s.sub(/^.*::/, '')
-    end
-
-    def pluralize(word)
-      word.to_s.sub(/([^s])$/, '\1s')
-    end
-
-    def singularize(word)
-      word.to_s.sub(/s$/, '').sub(/ie$/, 'y')
-    end
-
-    def underscore(camel_cased_word)
-      word = camel_cased_word.to_s.dup
-      word.gsub!(/::/, '/')
-      word.gsub!(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
-      word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
-      word.tr! '-', '_'
-      word.downcase!
-      word
-    end
-
-    # def extract_href_from_object(object)
-    #   object.respond_to?(:href) ? object.href : object
-    # end
-
     def indifferent_read_access(base = {})
       indifferent = Hash.new do |hash, key|
         hash[key.to_s] if key.is_a? Symbol
@@ -69,40 +34,6 @@ module Finix
       indifferent
     end
 
-    # def stringify_keys!(hash)
-    #   hash.keys.each do |key|
-    #     stringify_keys! hash[key] if hash[key].is_a? Hash
-    #     hash[key.to_s] = hash.delete key if key.is_a? Symbol
-    #   end
-    # end
-
-    # Validate all keys in a hash match *valid keys, raising ArgumentError on a mismatch.
-    # Note that keys are NOT treated indifferently, meaning if you use strings for keys but assert symbols
-    # as keys, this will fail.
-    #
-    # ==== Examples
-    #   { :name => "Rob", :years => "28" }.assert_valid_keys(:name, :age) # => raises "ArgumentError: Unknown key(s): years"
-    #   { :name => "Rob", :age => "28" }.assert_valid_keys("name", "age") # => raises "ArgumentError: Unknown key(s): name, age"
-    #   { :name => "Rob", :age => "28" }.assert_valid_keys(:name, :age) # => passes, raises nothing
-    # def assert_valid_keys(hash, *valid_keys)
-    #   unknown_keys = hash.keys - [valid_keys].flatten
-    #   raise(ArgumentError, "Unknown key(s): #{unknown_keys.join(', ')}") unless unknown_keys.empty?
-    # end
-
-    # http://pablomanrubia.com/2011/03/extending-ruby-to-validate-required-keys-in-a-hash-table/
-    #def assert_required_keys(hash, params)
-    #  params[:required] ||= []
-    #  params[:optional] ||= []
-    #  assert_valid_keys(hash, params[:required] + params[:optional])
-    #  pending_keys = params[:required] - hash.keys
-    #  raise(ArgumentError, "Required key(s) not present: #{pending_keys.join(', ')}") unless pending_keys.empty?
-    #end
-
-    # def assert_required_keys(hash, params)
-    #   params[:required] ||= []
-    #   pending_keys = params[:required] - hash.keys
-    #   raise(ArgumentError, "Required key(s) not present: #{pending_keys.join(', ')}") unless pending_keys.empty?
-    # end
     extend self
   end
 end

data/lib/finix/version.rb

@@ -1,3 +1,3 @@
 module Finix
-  VERSION = '0.7'
+  VERSION = '0.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: finix
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: '0.8'
 platform: ruby
 authors:
 - finix-payments
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-08 00:00:00.000000000 Z
+date: 2016-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday