currency_cloud 0.7.1 → 0.7.2

data/lib/currency_cloud/rates.rb

@@ -0,0 +1,5 @@
+module CurrencyCloud
+  class Rates
+    include CurrencyCloud::Resource
+  end
+end

data/lib/currency_cloud/reference.rb

@@ -0,0 +1,26 @@
+module CurrencyCloud
+  class Reference
+    include CurrencyCloud::Resource
+
+    resource :reference
+
+    def self.currencies
+      response = client.get("currencies")
+      response['currencies'].map { |c| Currency.new(c)}
+    end
+
+    def self.beneficiary_required_details(params={})
+      client.get("beneficiary_required_details", params)["details"]
+    end
+
+    def self.conversion_dates(params)
+      dates = client.get("conversion_dates", params)
+      ConversionDates.new(dates)
+    end
+
+    def self.settlement_accounts(params={})
+      response = client.get("settlement_accounts", params)
+      response['settlement_accounts'].map { |s| SettlementAccount.new(s) }
+    end
+  end
+end

data/lib/currency_cloud/request_handler.rb

@@ -1,20 +1,18 @@
 module CurrencyCloud
-
   class RequestHandler
-    
     attr_reader :session
-    
+
     def initialize(session = CurrencyCloud.session)
       @session = session
     end
-    
+
     def get(route, params={}, opts={})
       retry_authenticate('get', route, params, opts) do |url, params, options|
         options.merge!(:query => params)
         HTTParty.get(url, options)
       end
     end
-    
+
     def post(route, params={}, opts={})
       retry_authenticate('post', route, params, opts) do |url, params, options|
         options.merge!(:body => params)
@@ -23,9 +21,10 @@ module CurrencyCloud
     end
 
     private
+
     def retry_authenticate(verb, route, params, opts)
       should_retry = opts[:should_retry].nil? ? true : opts.delete(:should_retry)
-      
+
       params = process_params(params)
       full_url = build_url(route)
 
@@ -56,9 +55,9 @@ module CurrencyCloud
 
     def process_params(params)
       if session && session.on_behalf_of && CurrencyCloud::UUID_REGEX.match(session.on_behalf_of)
-        params.merge!(on_behalf_of: session.on_behalf_of)  
+        params.merge!(on_behalf_of: session.on_behalf_of)
       end
-      
+
       params
     end
 
@@ -67,9 +66,9 @@ module CurrencyCloud
       headers['X-Auth-Token'] = session.token if session && session.token
       headers
     end
-        
+
     def build_url(route)
-      "#{session.environment_url}/#{CurrencyCloud::ApiVersion}/" + route
+      "#{session.environment_url}/#{CurrencyCloud::API_VERSION}/" + route
     end
   end
 end

data/lib/currency_cloud/resource.rb

@@ -1,79 +1,81 @@
-require 'set'
+require "set"
+require_relative "./actions"
 
 module CurrencyCloud
-
-  class Resource
-  
-    def self.resource(resource=nil)
-      @resource ||= resource
+  module Resource
+    def self.included(base)
+      base.extend(ClassMethods)
     end
-    
-    def self.actions(*actions)
-      @actions ||= actions
-      @actions.each do |action|
-        self.class_eval do
-          action_module = CurrencyCloud::Actions.const_get(action.to_s.capitalize)
-          self.extend(action_module)
-        end
 
-
-        self.send(:include, CurrencyCloud::Actions::Save) if action == :update
-        self.send(:include, CurrencyCloud::Actions::InstanceDelete) if action == :delete
-      end
-    end
-    
     attr_reader :changed_attributes
-    
-    def initialize(object)
-      @object = object
+
+    def initialize(attributes)
+      @attributes = attributes
       @changed_attributes = Set.new
-      set_accessors(keys)
-    end
-    
-    def keys
-      @object.keys
+      set_accessors(valid_attributes)
     end
 
     def inspect
-      "#<#{self.class}:0x#{self.object_id.to_s(16)} #{@object.inspect}>"
+      "#<#{self.class}:0x#{self.object_id.to_s(16)} #{@attributes.inspect}>"
     end
-    
+
     private
 
+    attr_reader :attributes
+
+    def resource
+      self.class.resource
+    end
+
+    def attributes=(new_values)
+      @attributes = new_values.select { |k, _| valid_attributes.include?(k) }
+    end
+
+    def valid_attributes
+      @attributes.keys
+    end
+
     def changed?
       !@changed_attributes.empty?
     end
-    
+
+    def client
+      self.class.client
+    end
+
     def metaclass
       class << self; self; end
     end
-    
-    def set_accessors(keys)
+
+    def set_accessors(attributes)
       metaclass.instance_eval do
-        keys.each do |key|
-          define_method(key) { @object[key] }
-          define_method("#{key}=".to_sym) do |value|
-            @object[key] = value
-            @changed_attributes << key
+        attributes.each do |attribute|
+          define_method(attribute) { @attributes[attribute] }
+          define_method("#{attribute}=".to_sym) do |value|
+            @attributes[attribute] = value
+            @changed_attributes << attribute
           end
         end
       end
     end
 
-    def self.get(url, params={})
-      new(request.get(build_url(url), params))
-    end
-
-    def self.post(url, params={})
-      new(request.post(build_url(url), params))
-    end
+    module ClassMethods
+      def resource(resource = nil)
+        @resource ||= resource
+      end
 
-    def self.build_url(url)
-      "#{self.resource}/#{url}"
-    end
+      def actions(*actions)
+        actions.each do |action|
+          self.class_eval do
+            action_module = CurrencyCloud::Actions.const_get(action.to_s.capitalize)
+            self.extend(action_module)
+          end
+        end
+      end
 
-    def self.request
-      RequestHandler.new
+      def client
+        @client ||= Client.new(resource)
+      end
     end
   end
 end

data/lib/currency_cloud/response_handler.rb

@@ -1,16 +1,14 @@
 module CurrencyCloud
-  
   class ResponseHandler
-    
     attr_reader :verb, :route, :params, :response
-    
+
     def initialize(verb, route, params, response)
       @verb = verb
       @route = route
       @params = params
       @response = response
     end
-    
+
     def process
       if success?
         return parsed_response
@@ -18,13 +16,13 @@ module CurrencyCloud
         handle_failure
       end
     end
-    
+
     private
-    
+
     def success?
       [200, 202].include?(response.code)
     end
-    
+
     def handle_failure
       error_class = case response.code
         when 400 then BadRequestError
@@ -37,7 +35,7 @@ module CurrencyCloud
       raise error_class.new(verb, route, params, response) if error_class
       raise UnexpectedError.new(verb, route, params, response)
     end
-    
+
     def parsed_response
       @parsed_response ||= JSON.parse(response.body)
     end

data/lib/currency_cloud/session.rb

@@ -1,25 +1,25 @@
-module CurrencyCloud    
-
+module CurrencyCloud
   class Session
-    
-    Environments = { :production => 'https://api.thecurrencycloud.com',
-                     :demonstration => 'https://devapi.thecurrencycloud.com',
-                     :uat => 'https://api-uat1.ccycloud.com'}
-   
+    ENVIRONMENTS = {
+      :production => 'https://api.thecurrencycloud.com',
+      :demonstration => 'https://devapi.thecurrencycloud.com',
+      :uat => 'https://api-uat1.ccycloud.com'
+    }
+
     attr_reader :environment, :login_id, :api_key
     attr_accessor :token, :on_behalf_of
-    
+
     def self.validate_environment(environment)
-      unless Environments.keys.include?(environment)
-        raise CurrencyCloud::GeneralError, "'#{environment}' is not a valid environment, must be one of: #{Environments.keys.join(", ")}"
+      unless ENVIRONMENTS.keys.include?(environment)
+        raise CurrencyCloud::GeneralError, "'#{environment}' is not a valid environment, must be one of: #{ENVIRONMENTS.keys.join(", ")}"
       end
     end
-   
+
     def initialize(environment, login_id, api_key, token)
       @environment = environment
       @login_id = login_id
       @api_key = api_key
-      
+
       if token
         self.class.validate_environment(environment)
         @token = token
@@ -27,16 +27,15 @@ module CurrencyCloud
         authenticate
       end
     end
-    
+
     def environment_url
-      Environments[environment]
+      ENVIRONMENTS[environment]
     end
 
     def close
       request.post('authenticate/close_session')
     end
-    
-    
+
     def authenticate
       validate
       params = {:login_id => login_id, :api_key => api_key}
@@ -47,16 +46,17 @@ module CurrencyCloud
       CurrencyCloud.token = @token = nil
       authenticate
     end
-    
+
     private
+
     def validate
       self.class.validate_environment(environment)
       raise CurrencyCloud::GeneralError, "login_id must be set using CurrencyCloud.login_id=" unless login_id
       raise CurrencyCloud::GeneralError, "api_key must be set using CurrencyCloud.api_key=" unless api_key
     end
-    
+
     def request
       RequestHandler.new(self)
     end
   end
-end
+end

data/lib/currency_cloud/{resources/settlement.rb → settlement.rb}

@@ -1,44 +1,48 @@
 module CurrencyCloud
-  
-  class Settlement < Resource
-    
+  class Settlement
+    include CurrencyCloud::Resource
+
     resource :settlements
-    
     actions :create, :retrieve, :find, :delete
 
     def add_conversion(conversion_id)
       update_attributes(Settlement.add_conversion(id, conversion_id))
     end
-    
+
     def remove_conversion(conversion_id)
       update_attributes(Settlement.remove_conversion(id, conversion_id))
     end
-    
+
     def release
       update_attributes(Settlement.release(id))
     end
-    
+
     def unrelease
       update_attributes(Settlement.unrelease(id))
     end
 
     def self.add_conversion(settlement_id, conversion_id)
-      post("#{settlement_id}/add_conversion", conversion_id: conversion_id)
+      attrs = client.post("#{settlement_id}/add_conversion", conversion_id: conversion_id)
+      new(attrs)
     end
-    
+
     def self.remove_conversion(settlement_id, conversion_id)
-      post("#{settlement_id}/remove_conversion", conversion_id: conversion_id)
+      attrs = client.post("#{settlement_id}/remove_conversion", conversion_id: conversion_id)
+      new(attrs)
     end
-    
+
     def self.release(settlement_id)
-      post("#{settlement_id}/release")
+      attrs = client.post("#{settlement_id}/release")
+      new(attrs)
     end
-    
+
     def self.unrelease(settlement_id)
-      post("#{settlement_id}/unrelease")
-    end    
+      attrs = client.post("#{settlement_id}/unrelease")
+      new(attrs)
+    end
 
     private
+
     def update_attributes(settlement)
       self.conversion_ids = settlement.conversion_ids
       self.status = settlement.status
@@ -48,4 +52,4 @@ module CurrencyCloud
       self
     end
   end
-end
+end

data/lib/currency_cloud/settlement_account.rb

@@ -0,0 +1,5 @@
+module CurrencyCloud
+  class SettlementAccount
+    include CurrencyCloud::Resource
+  end
+end

data/lib/currency_cloud/{resources/transaction.rb → transaction.rb}

@@ -1,7 +1,8 @@
 module CurrencyCloud
-  class Transaction < Resource
+  class Transaction
+    include CurrencyCloud::Resource
+
     resource :transactions
-    
     actions :retrieve, :find
   end
-end
+end

data/lib/currency_cloud/version.rb

@@ -1,8 +1,6 @@
 # Separate Gem version from 'API version'
 
 module CurrencyCloud
-
-  ApiVersion = 'v2' # API Version
-  Version = '0.7.1' # Gem Version
-
+  API_VERSION = 'v2' # API Version
+  VERSION = '0.7.2' # Gem Version
 end