finapps 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ba0dc49c6eb9279264ab1219ad0c28c0b033075
-  data.tar.gz: fc6826aff9063837a11f09acc07d17e53aef601c
+  metadata.gz: 9574b3eed162bb96cc5308dd0305166f40263409
+  data.tar.gz: f0d82e74f4fb58ea3544a7baf559f0403d8f7590
 SHA512:
-  metadata.gz: a045531b6c73e1aef3ef1f78582936562b635b790de99d86aea543fc1f35a68b041b59a33900ab157d03eb7c3cde2037850179fae6ffcbef8920185ca214e0e8
-  data.tar.gz: acebcc69e10d1bbfe1a5d1c3b48073778bcf53dc0c7e2a9123df653968c0813e737233d5ff61d6a03f6e8853210d8ec0edf1fe051555a7d2bffdb000b6cb50d4
+  metadata.gz: cf2e62fb190c83bb688ce7217bd95a1cf44c421d0aff1bf049dd8dce526d75ce530a60b9c91f90aec178cf8ed462854922259afe73e8b128407fa1f3734abbfa
+  data.tar.gz: b59461b34ca64d04cc621256e8a2b07c84e1c42717ea2b38c13fbdd8ad164dc51353084b19b6ba8e931bb1fb5b213a5271d70e688c1e1793b16d86cc910864fa

data/.gitignore

@@ -1,24 +1,31 @@
 /spec/examples.txt
 *.gem
-*.rbc
-.bundle
 .config
-.yardoc
 Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
 lib/bundler/man
 pkg
 rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
 *.bundle
 *.so
 *.o
 *.a
 mkmf.log
+
+
+# Ignore bundler config.
+/.bundle
+/vendor/bundle/
+/vendor/ruby/
+
+# Ignore all log files and tempfiles.
+/log/*
+!/log/.keep
+/tmp
+
+# various artifacts
+.project
+.secret
 .idea/
+/spec/tmp/*
+/spec/examples.txt
+

data/finapps.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'fuubar', '~> 2.0', '>= 2.0.0'
   spec.add_development_dependency 'rspec', '~> 3.4', '>= 3.4.0'
   spec.add_development_dependency 'webmock', '~> 1.24', '>= 1.24.2'
+  spec.add_development_dependency 'sinatra', '~> 1.4', '>= 1.4.7'
 
   spec.extra_rdoc_files = %w(README.md LICENSE.txt)
   spec.rdoc_options = %w(--line-numbers --inline-source --title finapps-ruby --main README.md)

data/lib/finapps/rest/alert.rb

@@ -8,7 +8,6 @@ module FinApps
 
       # @return [Hash, Array<String>]
       def list(page = 1, requested=100, sort='date', asc=false, read='all')
-        logger.debug "##{__method__.to_s} => Started"
 
         end_point = Defaults::END_POINTS[:alert_list]
         logger.debug "##{__method__.to_s} => end_point: #{end_point}"
@@ -22,16 +21,14 @@ module FinApps
 
         result, error_messages = @client.send_request(path, :get)
 
-        logger.debug "##{__method__.to_s} => Completed"
         return result, error_messages
       end
 
       # @return [Hash, Array<String>]
       def update(alert_id, read=true)
-        logger.debug "##{__method__.to_s} => Started"
-
         raise MissingArgumentsError.new 'Missing argument: alert_id.' if alert_id.blank?
         logger.debug "##{__method__.to_s} => alert_id: #{alert_id.inspect}"
+
         raise MissingArgumentsError.new 'Missing argument: read.' if read.blank?
         logger.debug "##{__method__.to_s} => read: #{read.inspect}"
 
@@ -44,14 +41,11 @@ module FinApps
 
         _, error_messages = @client.send_request(path, :put)
 
-        logger.debug "##{__method__.to_s} => Completed"
         error_messages
       end
 
       # @return [Hash, Array<String>]
       def delete(alert_id)
-        logger.debug "##{__method__.to_s} => Started"
-
         raise MissingArgumentsError.new 'Missing argument: alert_id.' if alert_id.blank?
         logger.debug "##{__method__.to_s} => alert_id: #{alert_id.inspect}"
 
@@ -63,7 +57,6 @@ module FinApps
 
         _, error_messages = @client.send_request(path, :delete)
 
-        logger.debug "##{__method__.to_s} => Completed"
         error_messages
       end
 

data/lib/finapps/rest/alert_definition.rb

@@ -8,24 +8,24 @@ module FinApps
 
       # @return [Hash, Array<String>]
       def list
-        logger.debug "##{__method__.to_s} => Started"
-
         end_point = Defaults::END_POINTS[:alert_definition_list]
         logger.debug "##{__method__.to_s} => end_point: #{end_point}"
 
         path = end_point
         logger.debug "##{__method__.to_s} => path: #{path}"
 
+<<<<<<< HEAD
+        result, error_messages = @client.send(path, :get)
+=======
         result, error_messages = @client.send_request(path, :get)
 
         logger.debug "##{__method__.to_s} => Completed"
+>>>>>>> develop
         return result, error_messages
       end
 
       # @return [Hash, Array<String>]
       def show(alert_name)
-        logger.debug "##{__method__.to_s} => Started"
-
         raise MissingArgumentsError.new 'Missing argument: alert_name.' if alert_name.blank?
         logger.debug "##{__method__.to_s} => alert_name: #{alert_name}"
 
@@ -35,9 +35,13 @@ module FinApps
         path = end_point.sub ':alert_name', ERB::Util.url_encode(alert_name)
         logger.debug "##{__method__.to_s} => path: #{path}"
 
+<<<<<<< HEAD
+        result, error_messages = @client.send(path, :get)
+=======
         result, error_messages = @client.send_request(path, :get)
 
         logger.debug "##{__method__.to_s} => Completed"
+>>>>>>> develop
         return result, error_messages
       end
 

data/lib/finapps/rest/alert_preferences.rb

@@ -8,24 +8,24 @@ module FinApps
 
       # @return [Hash, Array<String>]
       def show
-        logger.debug "##{__method__.to_s} => Started"
-
         end_point = Defaults::END_POINTS[:alert_preferences_show]
         logger.debug "##{__method__.to_s} => end_point: #{end_point}"
 
         path = end_point
         logger.debug "##{__method__.to_s} => path: #{path}"
 
+<<<<<<< HEAD
+        result, error_messages = @client.send(path, :get)
+=======
         result, error_messages = @client.send_request(path, :get)
 
         logger.debug "##{__method__.to_s} => Completed"
+>>>>>>> develop
         return result, error_messages
       end
 
       # @return [Hash, Array<String>]
       def update(params)
-        logger.debug "##{__method__.to_s} => Started"
-
         raise MissingArgumentsError.new 'Missing argument: params.' if params.blank?
         logger.debug "##{__method__.to_s} => params: #{params.inspect}"
 
@@ -35,9 +35,13 @@ module FinApps
         path = end_point
         logger.debug "##{__method__.to_s} => path: #{path}"
 
+<<<<<<< HEAD
+        _, error_messages = @client.send(path, :put, params.compact)
+=======
         _, error_messages = @client.send_request(path, :put, params.compact)
 
         logger.debug "##{__method__.to_s} => Completed"
+>>>>>>> develop
         error_messages
       end
 

data/lib/finapps/rest/alert_settings.rb

@@ -8,24 +8,24 @@ module FinApps
 
       # @return [Hash, Array<String>]
       def show
-        logger.debug "##{__method__.to_s} => Started"
-
         end_point = Defaults::END_POINTS[:alert_settings_show]
         logger.debug "##{__method__.to_s} => end_point: #{end_point}"
 
         path = end_point
         logger.debug "##{__method__.to_s} => path: #{path}"
 
+<<<<<<< HEAD
+        result, error_messages = @client.send(path, :get)
+=======
         result, error_messages = @client.send_request(path, :get)
 
         logger.debug "##{__method__.to_s} => Completed"
+>>>>>>> develop
         return result, error_messages
       end
 
       # @return [Hash, Array<String>]
       def update(params)
-        logger.debug "##{__method__.to_s} => Started"
-
         raise MissingArgumentsError.new 'Missing argument: params.' if params.blank?
         logger.debug "##{__method__.to_s} => params: #{params.inspect}"
 
@@ -35,9 +35,13 @@ module FinApps
         path = end_point
         logger.debug "##{__method__.to_s} => path: #{path}"
 
+<<<<<<< HEAD
+        _, error_messages = @client.send(path, :put, params.compact)
+=======
         _, error_messages = @client.send_request(path, :put, params.compact)
 
         logger.debug "##{__method__.to_s} => Completed"
+>>>>>>> develop
         error_messages
       end
 

data/lib/finapps/rest/budget_calculation.rb

@@ -10,10 +10,9 @@ module FinApps
       # @param [Number] income
       # @return [Array<Hash>, Array<String>]
       def create(budget_model_id, income)
-        logger.debug "##{__method__.to_s} => Started"
-
         raise MissingArgumentsError.new 'Missing argument: budget_model_id.' if budget_model_id.blank?
         logger.debug "##{__method__.to_s} => budget_model: #{budget_model_id}"
+
         raise MissingArgumentsError.new 'Missing argument: income.' if income.blank?
         logger.debug "##{__method__.to_s} => income: #{income}"
 
@@ -23,25 +22,31 @@ module FinApps
         path = end_point.sub(':budget_model_id', ERB::Util.url_encode(budget_model_id)).sub(':income', ERB::Util.url_encode(income))
         logger.debug "##{__method__.to_s} => path: #{path}"
 
+<<<<<<< HEAD
+        budget_calculation, error_messages = @client.send(path, :get)
+=======
         budget_calculation, error_messages = @client.send_request(path, :get)
         logger.debug "##{__method__.to_s} => Completed"
 
+>>>>>>> develop
         return budget_calculation, error_messages
       end
 
       # @return [Array<Hash>, Array<String>]
       def show
-        logger.debug "##{__method__.to_s} => Started"
-
         end_point = Defaults::END_POINTS[:budget_calculation_show]
         logger.debug "##{__method__.to_s} => end_point: #{end_point}"
 
         path = end_point
         logger.debug "##{__method__.to_s} => path: #{path}"
 
+<<<<<<< HEAD
+        budget_calculation, error_messages = @client.send(path, :get)
+=======
         budget_calculation, error_messages = @client.send_request(path, :get)
         logger.debug "##{__method__.to_s} => Completed"
 
+>>>>>>> develop
         return budget_calculation, error_messages
       end
 

data/lib/finapps/rest/budget_models.rb

@@ -8,21 +8,21 @@ module FinApps
 
       # @return [Array<Hash>, Array<String>]
       def list
-        logger.debug "##{__method__.to_s} => Started"
-
         path = Defaults::END_POINTS[:budget_models_list]
         logger.debug "##{__method__.to_s} => path: #{path}"
 
+<<<<<<< HEAD
+        budget_models, error_messages = @client.send(path, :get)
+=======
         budget_models, error_messages = @client.send_request(path, :get)
 
         logger.debug "##{__method__.to_s} => Completed"
+>>>>>>> develop
         return budget_models, error_messages
       end
 
       # @param [Integer] budget_model_id
       def show(budget_model_id)
-        logger.debug "##{__method__.to_s} => Started"
-
         raise MissingArgumentsError.new 'Missing argument: budget_model_id.' if budget_model_id.blank?
         logger.debug "##{__method__.to_s} => budget_model_id: #{budget_model_id}"
 
@@ -32,9 +32,13 @@ module FinApps
         path = end_point.sub ':budget_model_id', ERB::Util.url_encode(budget_model_id)
         logger.debug "##{__method__.to_s} => path: #{path}"
 
+<<<<<<< HEAD
+        budget_model, error_messages = @client.send(path, :get) { |r| BudgetModel.new(r.body) }
+=======
         budget_model, error_messages = @client.send_request(path, :get) { |r| BudgetModel.new(r.body) }
 
         logger.debug "##{__method__.to_s} => Completed"
+>>>>>>> develop
         return budget_model, error_messages
       end
 

data/lib/finapps/rest/budgets.rb

@@ -10,10 +10,9 @@ module FinApps
       # @param [Date] end_date
       # @return [Hash, Array<String>]
       def show(start_date, end_date)
-        logger.debug "##{__method__.to_s} => Started"
-
         raise MissingArgumentsError.new 'Missing argument: start_date.' if start_date.blank?
         logger.debug "##{__method__.to_s} => start_date: #{start_date}"
+
         raise MissingArgumentsError.new 'Missing argument: end_date.' if end_date.blank?
         logger.debug "##{__method__.to_s} => end_date: #{end_date}"
 
@@ -34,23 +33,24 @@ module FinApps
           categories.each { |category| budget.details << result_category_to_budget_detail(category, transactions) }
         end
 
-        logger.debug "##{__method__.to_s} => Completed"
         return budget, error_messages
       end
 
       # @param [Hash] params
       # @return [Array<Hash>, Array<String>]
       def update(params={})
-        logger.debug "##{__method__.to_s} => Started"
-
         raise MissingArgumentsError.new 'Missing argument: params.' if params.blank?
 
         end_point = Defaults::END_POINTS[:budget_update]
         logger.debug "##{__method__.to_s} => end_point: #{end_point}"
 
+<<<<<<< HEAD
+        budget, error_messages = @client.send(end_point, :put, params)
+=======
         budget, error_messages = @client.send_request(end_point, :put, params)
         logger.debug "##{__method__.to_s} => Completed"
 
+>>>>>>> develop
         return budget, error_messages
       end
 

data/lib/finapps/rest/cashflows.rb

@@ -10,10 +10,9 @@ module FinApps
       # @param [Date] end_date
       # @return [Hash, Array<String>]
       def show(start_date, end_date)
-        logger.debug "##{__method__.to_s} => Started"
-
         raise MissingArgumentsError.new 'Missing argument: start_date.' if start_date.blank?
         logger.debug "##{__method__.to_s} => start_date: #{start_date}"
+
         raise MissingArgumentsError.new 'Missing argument: end_date.' if end_date.blank?
         logger.debug "##{__method__.to_s} => end_date: #{end_date}"
 
@@ -52,7 +51,6 @@ module FinApps
           categories.each { |category| cashflow.details << result_category_to_cashflow_detail(category) }
         end
 
-        logger.debug "##{__method__.to_s} => Completed"
         return cashflow, error_messages
       end
 

data/lib/finapps/rest/categories.rb

@@ -5,17 +5,19 @@ module FinApps
 
       # @return [Array<Hash>, Array<String>]
       def list
-        logger.debug "##{__method__.to_s} => Started"
-
         end_point = Defaults::END_POINTS[:categories_list]
         logger.debug "##{__method__.to_s} => end_point: #{end_point}"
 
         path = end_point
         logger.debug "##{__method__.to_s} => path: #{path}"
 
+<<<<<<< HEAD
+        categories, error_messages = @client.send(path, :get)
+=======
         categories, error_messages = @client.send_request(path, :get)
 
         logger.debug "##{__method__.to_s} => Completed"
+>>>>>>> develop
         return categories, error_messages
       end
 

data/lib/finapps/rest/client.rb

@@ -10,8 +10,6 @@ module FinApps
       # @param [Hash] options
       # @return [FinApps::REST::Client]
       def initialize(company_identifier, company_token, options = {})
-        logger.debug "##{__method__.to_s} => Started"
-
         @config = DEFAULTS.merge! options
         logger_config @config
 
@@ -21,6 +19,10 @@ module FinApps
         logger.debug "##{__method__.to_s} => Completed"
       end
 
+<<<<<<< HEAD
+        set_up_resources
+        logger.debug "##{__method__.to_s} => All resources initialized"
+=======
       def connection
         @connection ||= set_up_connection(@company_credentials, @config)
       end
@@ -79,6 +81,7 @@ module FinApps
 
       def rule_sets
         @rule_sets ||= FinApps::REST::Relevance::Rulesets.new self
+>>>>>>> develop
       end
 
       # Performs HTTP GET, POST, UPDATE and DELETE requests.
@@ -89,8 +92,14 @@ module FinApps
       # @param [String] method
       # @param [Proc] proc
       # @return [Hash,Array<String>]
+<<<<<<< HEAD
+      def send(path, method, params = {}, &proc)
+        raise MissingArgumentsError.new 'Missing argument: method.' if method.blank?
+        result, error_messages = nil, nil
+=======
       def send_request(path, method, params = {}, &proc)
         logger.debug "##{__method__.to_s} => Started"
+>>>>>>> develop
 
         raise FinApps::REST::MissingArgumentsError.new 'Missing argument: path.' if path.blank?
         raise FinApps::REST::MissingArgumentsError.new 'Missing argument: method.' if method.blank?
@@ -131,24 +140,18 @@ module FinApps
         ensure
           logger.debug "##{__method__.to_s} => Failed, error_messages: #{error_messages.pretty_inspect}" if error_messages.present?
         end
-
-        logger.debug "##{__method__.to_s} => Completed"
         return result, error_messages
       end
 
       # @param [String] user_identifier
       # @param [String] user_token
       def user_credentials!(user_identifier, user_token)
-        logger.debug "##{__method__.to_s} => Started"
-
         {:user_identifier => user_identifier, :user_token => user_token}.validate_required_strings!
         logger.debug "##{__method__.to_s} => Credentials passed validation. Attempting to set user credentials on current connection."
 
         @config[:user_identifier] = user_identifier
         @config[:user_token] = user_token
         @connection = set_up_connection(@company_credentials, @config)
-
-        logger.debug "##{__method__.to_s} => Completed"
       end
 
       private
@@ -160,16 +163,19 @@ module FinApps
       # @param [String] path
       # @return [Hash,Array<String>]
       def get(path)
-        logger.debug "##{__method__.to_s} => Started"
         raise MissingArgumentsError.new 'Missing argument: path.' if path.blank?
 
         logger.debug "##{__method__.to_s} => GET path:#{path}"
+<<<<<<< HEAD
+        @connection.get { |req| req.url path }
+=======
         response = connection.get do |req|
           req.url path
         end
 
         logger.debug "##{__method__.to_s} => Completed"
         response
+>>>>>>> develop
       end
 
       # Performs an HTTP POST request.
@@ -180,17 +186,17 @@ module FinApps
       # @param [Hash] params
       # @return [Hash,Array<String>]
       def post(path, params = {})
-        logger.debug "##{__method__.to_s} => Started"
         raise MissingArgumentsError.new 'Missing argument: path.' if path.blank?
 
         logger.debug "##{__method__.to_s} => POST path:#{path} params:#{skip_sensitive_data params }"
+<<<<<<< HEAD
+        @connection.post do |req|
+=======
         response = connection.post do |req|
+>>>>>>> develop
           req.url path
           req.body = params
         end
-
-        logger.debug "##{__method__.to_s} => Completed"
-        response
       end
 
       # Performs an HTTP PUT request.
@@ -201,17 +207,17 @@ module FinApps
       # @param [Hash] params
       # @return [Hash,Array<String>]
       def put(path, params = {})
-        logger.debug "##{__method__.to_s} => Started"
         raise MissingArgumentsError.new 'Missing argument: path.' if path.blank?
 
         logger.debug "##{__method__.to_s} => PUT path:#{path} params:#{skip_sensitive_data(params)}"
+<<<<<<< HEAD
+        @connection.put do |req|
+=======
         response = connection.put do |req|
+>>>>>>> develop
           req.url path
           req.body = params
         end
-
-        logger.debug "##{__method__.to_s} => Completed"
-        response
       end
 
       # Performs an HTTP DELETE request.
@@ -222,19 +228,41 @@ module FinApps
       # @param [Hash] params
       # @return [Hash,Array<String>]
       def delete(path, params = {})
-        logger.debug "##{__method__.to_s} => Started"
         raise MissingArgumentsError.new 'Missing argument: path.' if path.blank?
 
         logger.debug "##{__method__.to_s} => DELETE path:#{path} params:#{skip_sensitive_data(params)}"
+<<<<<<< HEAD
+        @connection.delete do |req|
+=======
         response = connection.delete do |req|
+>>>>>>> develop
           req.url path
           req.body = params
         end
+      end
 
-        logger.debug "##{__method__.to_s} => Completed"
-        response
+<<<<<<< HEAD
+      # Initialize resources.
+      #
+      def set_up_resources
+        @users ||= FinApps::REST::Users.new self
+        @institutions ||= FinApps::REST::Institutions.new self
+        @user_institutions ||= FinApps::REST::UserInstitutions.new self
+        @transactions ||= FinApps::REST::Transactions.new self
+        @categories ||= FinApps::REST::Categories.new self
+        @budget_models ||= FinApps::REST::BudgetModels.new self
+        @budget_calculation ||= FinApps::REST::BudgetCalculation.new self
+        @budgets ||= FinApps::REST::Budgets.new self
+        @cashflows ||= FinApps::REST::Cashflows.new self
+        @alert ||= FinApps::REST::Alert.new self
+        @alert_definition ||= FinApps::REST::AlertDefinition.new self
+        @alert_settings ||= FinApps::REST::AlertSettings.new self
+        @alert_preferences ||= FinApps::REST::AlertPreferences.new self
+        @rule_sets ||= FinApps::REST::Relevance::Rulesets.new self
       end
 
+=======
+>>>>>>> develop
     end
   end
 end

data/lib/finapps/rest/connection.rb

@@ -47,4 +47,4 @@ module FinApps
 
     end
   end
-end
+end

data/lib/finapps/rest/defaults.rb

@@ -11,7 +11,7 @@ module FinApps
 
       # noinspection SpellCheckingInspection
       DEFAULTS = {
-          :host => 'https://www.financialapps.com',
+          :host => 'https://api.financialapps.com',
           :timeout => 30,
           :proxy_addr => nil,
           :proxy_port => nil,
@@ -27,6 +27,7 @@ module FinApps
           :users_update => 'user',
           :users_update_password => 'user/password',
           :users_delete => 'users/:public_id',
+          :users_show => 'users/:public_id',
           :users_login => 'users/login',
 
           :relevance_rulesets_list => 'relevance/ruleset/names',

data/lib/finapps/rest/institutions.rb

@@ -9,8 +9,6 @@ module FinApps
       # @param [String] term
       # @return [Array<FinApps::REST::Institution>, Array<String>]
       def search(term)
-        logger.debug "##{__method__.to_s} => Started"
-
         raise MissingArgumentsError.new 'Missing argument: term.' if term.blank?
         logger.debug "##{__method__.to_s} => term: #{term}"
 
@@ -20,16 +18,18 @@ module FinApps
         path = end_point.sub ':search_term', ERB::Util.url_encode(term)
         logger.debug "##{__method__.to_s} => path: #{path}"
 
+<<<<<<< HEAD
+        institutions, error_messages = @client.send(path, :get)
+=======
         institutions, error_messages = @client.send_request(path, :get)
 
         logger.debug "##{__method__.to_s} => Completed"
+>>>>>>> develop
         return institutions, error_messages
       end
 
       # @param [Integer] site_id
       def form(site_id)
-        logger.debug "##{__method__.to_s} => Started"
-
         raise MissingArgumentsError.new 'Missing argument: site_id.' if site_id.blank?
         logger.debug "##{__method__.to_s} => site_id: #{site_id}"
 
@@ -39,9 +39,13 @@ module FinApps
         path = end_point.sub ':site_id', ERB::Util.url_encode(site_id)
         logger.debug "##{__method__.to_s} => path: #{path}"
 
+<<<<<<< HEAD
+        institution, error_messages = @client.send(path, :get) { |r| Institution.new(r.body) }
+=======
         institution, error_messages = @client.send_request(path, :get) { |r| Institution.new(r.body) }
 
         logger.debug "##{__method__.to_s} => Completed"
+>>>>>>> develop
         return institution, error_messages
       end
 

data/lib/finapps/rest/relevance/rulesets.rb

@@ -7,7 +7,7 @@ module FinApps
       class Rulesets < FinApps::REST::Resources
 
         def list
-          logger.debug "##{__method__.to_s} => Started"
+
 
           end_point = Defaults::END_POINTS[:relevance_rulesets_list]
           logger.debug "##{__method__.to_s} => end_point: #{end_point}"
@@ -17,12 +17,12 @@ module FinApps
 
           results, error_messages = @client.send_request(path, :get)
 
-          logger.debug "##{__method__.to_s} => Completed"
+
           return results, error_messages
         end
 
         def show(ruleset_name)
-          logger.debug "##{__method__.to_s} => Started"
+
 
           raise MissingArgumentsError.new 'Missing argument: ruleset_name.' if ruleset_name.blank?
           logger.debug "##{__method__.to_s} => ruleset_name: #{ruleset_name}"
@@ -35,12 +35,12 @@ module FinApps
 
           results, error_messages = @client.send_request(path, :get)
 
-          logger.debug "##{__method__.to_s} => Completed"
+
           return results, error_messages
         end
 
         def run(params = {})
-          logger.debug "##{__method__.to_s} => Started"
+
 
           raise MissingArgumentsError.new 'Missing argument: params.' if params.blank?
           logger.debug "##{__method__.to_s} => params: #{params.inspect}"
@@ -53,7 +53,7 @@ module FinApps
 
           results, error_messages = @client.send_request(path, :post, params)
 
-          logger.debug "##{__method__.to_s} => Completed"
+
           return results, error_messages
         end
 

data/lib/finapps/rest/transactions.rb

@@ -7,45 +7,51 @@ module FinApps
       # @transaction_id [String]
       # # @return [Hash, Array<String>]
       def show(transaction_id)
-        logger.debug "##{__method__.to_s} => Started"
-
         end_point = Defaults::END_POINTS[:transactions_show]
         logger.debug "##{__method__.to_s} => end_point: #{end_point}"
 
         path = end_point.sub ':transaction_id', ERB::Util.url_encode(transaction_id)
         logger.debug "##{__method__.to_s} => path: #{path}"
 
+<<<<<<< HEAD
+        transaction, error_messages = @client.send(path, :get)
+=======
         transaction, error_messages =  @client.send_request(path, :get)
 
         logger.debug "##{__method__.to_s} => Completed"
+>>>>>>> develop
         return transaction, error_messages
       end
 
       # @param [Hash] params
       # @return [Array<Hash>, Array<String>]
       def search(params={})
-        logger.debug "##{__method__.to_s} => Started"
-
         path = Defaults::END_POINTS[:transactions_list]
         logger.debug "##{__method__.to_s} => path: #{path}"
 
+<<<<<<< HEAD
+        transactions, error_messages = @client.send(path, :post, params.compact)
+=======
         transactions, error_messages = @client.send_request(path, :post, params.compact)
 
         logger.debug "##{__method__.to_s} => Completed"
+>>>>>>> develop
         return transactions, error_messages
       end
 
       # @param [Hash] params
       # @return [Array<Hash>, Array<String>]
       def update(params={})
-        logger.debug "##{__method__.to_s} => Started"
-
         path = Defaults::END_POINTS[:transactions_update]
         logger.debug "##{__method__.to_s} => path: #{path}"
 
+<<<<<<< HEAD
+        _, error_messages = @client.send(path, :put, params.compact)
+=======
         _, error_messages = @client.send_request(path, :put, params.compact)
 
         logger.debug "##{__method__.to_s} => Completed"
+>>>>>>> develop
         error_messages
       end
 

data/lib/finapps/rest/user_institutions.rb

@@ -7,19 +7,15 @@ module FinApps
       include FinApps::REST::Defaults
 
       def list
-        logger.debug "##{__method__.to_s} => Started"
-
         path = Defaults::END_POINTS[:user_institutions_list]
         logger.debug "##{__method__.to_s} => path: #{path}"
 
         user_institutions, error_messages = @client.send_request(path, :get)
 
-        logger.debug "##{__method__.to_s} => Completed"
         return user_institutions, error_messages
       end
 
       def add(site_id, parameters)
-        logger.debug "##{__method__.to_s} => Started"
 
         raise MissingArgumentsError.new 'Missing argument: site_id.' if site_id.blank?
         logger.debug "##{__method__.to_s} => site_id: #{site_id}"
@@ -35,12 +31,10 @@ module FinApps
 
         user_institution, error_messages = @client.send_request(path, :post, :parameters => parameters)
 
-        logger.debug "##{__method__.to_s} => Completed"
         return user_institution, error_messages
       end
 
       def show(user_institution_id)
-        logger.debug "##{__method__.to_s} => Started"
 
         raise MissingArgumentsError.new 'Missing argument: user_institution_id.' if user_institution_id.blank?
         logger.debug "##{__method__.to_s} => user_institution_id: #{user_institution_id}"
@@ -53,13 +47,10 @@ module FinApps
 
         user_institution, error_messages = @client.send_request(path, :get)
 
-        logger.debug "##{__method__.to_s} => Completed"
         return user_institution, error_messages
       end
 
       def form(user_institution_id)
-        logger.debug "##{__method__.to_s} => Started"
-
         raise MissingArgumentsError.new 'Missing argument: user_institution_id.' if user_institution_id.blank?
         logger.debug "##{__method__.to_s} => user_institution_id: #{user_institution_id}"
 
@@ -71,13 +62,10 @@ module FinApps
 
         user_institution, error_messages = @client.send_request(path, :get)
 
-        logger.debug "##{__method__.to_s} => Completed"
         return user_institution, error_messages
       end
 
       def status(user_institution_id)
-        logger.debug "##{__method__.to_s} => Started"
-
         raise MissingArgumentsError.new 'Missing argument: user_institution_id.' if user_institution_id.blank?
         logger.debug "##{__method__.to_s} => user_institution_id: #{user_institution_id}"
 
@@ -89,13 +77,10 @@ module FinApps
 
         user_institution, error_messages = @client.send_request(path, :get)
 
-        logger.debug "##{__method__.to_s} => Completed"
         return user_institution, error_messages
       end
 
       def mfa(user_institution_id, parameters)
-        logger.debug "##{__method__.to_s} => Started"
-
         raise MissingArgumentsError.new 'Missing argument: user_institution_id.' if user_institution_id.blank?
         logger.debug "##{__method__.to_s} => user_institution_id: #{user_institution_id}"
 
@@ -110,13 +95,10 @@ module FinApps
 
         user_institution, error_messages = @client.send_request(path, :put, :parameters => parameters)
 
-        logger.debug "##{__method__.to_s} => Completed"
         return user_institution, error_messages
       end
 
       def update(user_institution_id, parameters)
-        logger.debug "##{__method__.to_s} => Started"
-
         raise MissingArgumentsError.new 'Missing argument: user_institution_id.' if user_institution_id.blank?
         logger.debug "##{__method__.to_s} => user_institution_id: #{user_institution_id}"
 
@@ -131,26 +113,20 @@ module FinApps
 
         user_institution, error_messages = @client.send_request(path, :put, :parameters => parameters)
 
-        logger.debug "##{__method__.to_s} => Completed"
         return user_institution, error_messages
       end
 
       def refresh
-        logger.debug "##{__method__.to_s} => Started"
-
         path = Defaults::END_POINTS[:user_institutions_refresh]
         logger.debug "##{__method__.to_s} => path: #{path}"
 
         user_institutions, error_messages = @client.send_request(path, :get)
 
-        logger.debug "##{__method__.to_s} => Completed"
         return user_institutions, error_messages
       end
 
       # @return [Hash, Array<String>]
       def delete(user_institution_id)
-        logger.debug "##{__method__.to_s} => Started"
-
         raise MissingArgumentsError.new 'Missing argument: user_institution_id.' if user_institution_id.blank?
         logger.debug "##{__method__.to_s} => user_institution_id: #{user_institution_id.inspect}"
 
@@ -162,7 +138,6 @@ module FinApps
 
         _, error_messages = @client.send_request(path, :delete)
 
-        logger.debug "##{__method__.to_s} => Completed"
         error_messages
       end
 

data/lib/finapps/rest/users.rb

@@ -7,6 +7,23 @@ module FinApps
       include FinApps::Logging
       include FinApps::REST::Defaults
 
+      # @param [String] public_id
+      # @return [FinApps::REST::User, Array<String>]
+      def show(public_id)
+        raise MissingArgumentsError.new 'Missing argument: public_id.' if public_id.blank?
+        logger.debug "##{__method__.to_s} => public_id: #{public_id}"
+
+        end_point = Defaults::END_POINTS[:users_show]
+        logger.debug "##{__method__.to_s} => end_point: #{end_point}"
+
+        path = end_point.sub ':public_id', ERB::Util.url_encode(public_id)
+        logger.debug "##{__method__.to_s} => path: #{path}"
+
+        user, error_messages = @client.send_request(path, :get) { |r| User.new(r.body) }
+
+        return user, error_messages
+      end
+
       # @param [Hash] params
       # @return [FinApps::REST::User, Array<String>]
       def create(params = {})
@@ -24,6 +41,8 @@ module FinApps
         return user, error_messages
       end
 
+      # @param [Hash] params
+      # @return [Array<String>]
       def update(params = {})
         logger.debug "##{__method__.to_s} => Started"
 
@@ -38,6 +57,8 @@ module FinApps
         error_messages
       end
 
+      # @param [Hash] params
+      # @return [FinApps::REST::User, Array<String>]
       def update_password(params = {})
         logger.debug "##{__method__.to_s} => Started"
 
@@ -96,4 +117,4 @@ module FinApps
     end
 
   end
-end
+end

data/lib/finapps/utils/logging.rb

@@ -35,9 +35,17 @@ module FinApps
 
     end
 
+<<<<<<< HEAD
+    def set_up_logger_level(logger_level)
+      unless logger_level.blank? || logger.level == logger_level
+        logger.info "##{__method__.to_s} => Setting logger level to #{SEVERITY_LABEL[logger_level]}"
+        logger.level = logger_level
+      end
+=======
     def logger_config(config)
       Logging.tag= config[:logger_tag] if config[:logger_tag].present?
       Logging.level = config[:log_level] if config[:log_level].present?
+>>>>>>> develop
     end
 
     # noinspection SpellCheckingInspection

data/lib/finapps/version.rb

@@ -1,3 +1,3 @@
 module FinApps
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/spec/rest/client_spec.rb

@@ -22,6 +22,15 @@ RSpec.describe FinApps::REST::Client do
       it { expect { FinApps::REST::Client.new :company_identifier, :company_token }.not_to raise_error }
     end
 
+<<<<<<< HEAD
+    it 'responds to public api methods' do
+      [:alert, :alert_definition, :alert_settings, :alert_preferences,
+       :budgets, :budget_calculation, :budget_models, :cashflows,
+       :categories, :institutions, :transactions,
+       :user_institutions, :users,
+       :rule_sets].each do |method|
+        expect(@client).to respond_to(method)
+=======
   end
 
   context 'after initialized' do
@@ -33,6 +42,7 @@ RSpec.describe FinApps::REST::Client do
      :alert_definition, :alert_preferences, :alert_settings, :rule_sets, :user_credentials!].each do |method|
       it "responds to #{method}" do
         expect(client).to respond_to(method)
+>>>>>>> develop
       end
     end
 

data/spec/rest/users_spec.rb

@@ -0,0 +1,24 @@
+RSpec.describe FinApps::REST::Users do
+
+  context 'after initialized' do
+    let(:users) { FinApps::REST::Users.new(FinApps::REST::Client.new(:id, :token)) }
+
+    [:show, :create, :update, :update_password, :login, :delete].each do |method|
+      it "responds to #{method}" do
+        expect(users).to respond_to(method)
+      end
+    end
+
+    describe '#show' do
+
+      context 'when public_id is NOT provided' do
+        it { expect { users.show(nil) }.to raise_error(FinApps::REST::MissingArgumentsError) }
+      end
+
+      it { expect(users.show(1)[0]).to be_an_instance_of(FinApps::REST::User) }
+
+    end
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -2,22 +2,9 @@ require 'bundler/setup'
 Bundler.setup
 
 require 'finapps'
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# The generated `.rspec` file contains `--require spec_helper` which will cause this
-# file to always be loaded, without a need to explicitly require it in any files.
-#
-# Given that it is always loaded, you are encouraged to keep this file as
-# light-weight as possible. Requiring heavyweight dependencies from this file
-# will add to the boot time of your test suite on EVERY test run, even for an
-# individual file that may not need all of that loaded. Instead, make a
-# separate helper file that requires this one and then use it only in the specs
-# that actually need it.
-#
-# The `.rspec` file also contains a few flags that are not defaults but that
-# users commonly want.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+require 'webmock/rspec'
+require File.join(File.dirname(__dir__),  'spec/support/fake_api')
+
 RSpec.configure do |config|
   config.expect_with(:rspec) do |expectations|
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
@@ -33,6 +20,8 @@ RSpec.configure do |config|
   config.warnings = true
   config.profile_examples = 5
   Kernel.srand config.seed
-end
 
-require 'webmock/rspec'
+  config.before(:each) do
+    stub_request(:any, /api.financialapps.com/).to_rack(::FakeApi )
+  end
+end

data/spec/support/fake_api.rb

@@ -0,0 +1,14 @@
+require 'sinatra/base'
+
+class FakeApi < Sinatra::Base
+  # users
+  get('/v1/users/:id') { json_response 200, 'user.json' }
+
+  private
+
+  def json_response(response_code, file_name)
+    content_type :json
+    status response_code
+    File.open(File.dirname(__FILE__) + '/fixtures/' + file_name, 'rb').read
+  end
+end

data/spec/support/fixtures/user.json

@@ -0,0 +1,8 @@
+{
+  "public_id":"83e6c55a-9883-40bb-45f9-fc70d70731c9",
+  "first_name":"Erich",
+  "last_name":"{\"phone_number\":\"3052224444\", \"first_name\":\"John\", \"last_name\":\"Smith\", \"savings_plan_id\":1}",
+  "email":"erich.1440775160085@example.com",
+  "postal_code":"00000",
+  "token":"XkI8MORAlR5m2DvF+QuSkrWGsVrBfZUI3mRToYzZ494="
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: finapps
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Erich Quintero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -190,6 +190,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.24.2
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.7
 description: A simple library for communicating with the FinApps REST API.
 email:
 - erich@financialapps.com
@@ -238,7 +258,10 @@ files:
 - spec/middleware/api_token_spec.rb
 - spec/rest/client_spec.rb
 - spec/rest/connection_spec.rb
+- spec/rest/users_spec.rb
 - spec/spec_helper.rb
+- spec/support/fake_api.rb
+- spec/support/fixtures/user.json
 - spec/utils/logging_spec.rb
 homepage: http://github.com/finapps/finapps-ruby
 licenses:
@@ -266,13 +289,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: FinApps REST API ruby client.
 test_files:
 - spec/spec_helper.rb
-- spec/rest/connection_spec.rb
-- spec/rest/client_spec.rb
+- spec/support/fake_api.rb
 - spec/utils/logging_spec.rb
 - spec/middleware/api_token_spec.rb
+- spec/rest/connection_spec.rb
+- spec/rest/client_spec.rb
+- spec/rest/users_spec.rb