finapps 0.14.5.pre → 0.15.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95b98812a0e128e3d789ccd2f95e60bbb4e945c1
-  data.tar.gz: 19fb4b9b938ea074f749f202cf33519b86d75b4c
+  metadata.gz: e9f7148284d896dd04a58e18089ace00226d5ad4
+  data.tar.gz: f4e7fe20e55f81774ff535adf4ae90829b8f85cc
 SHA512:
-  metadata.gz: 1260e687e2c864124ea761a5769ae782e6b9d221cf407ccda68b3058185cab19b3309dd9ad9ce7328b183544abe02cb03673dd42c3348f0474d4b91a39684efc
-  data.tar.gz: 261c9c70d7154955a5d56f5e8cc8f309b7db9bd6f715fbbd3d93a66e70a24f87a0eeaa307f43c1929317ac16ff5f24837416ae523199ce99ee6ea9134f2fdc49
+  metadata.gz: 7e7dab72ef0663b55c48077bd94820222c1a4c2459633930d4b1fe6cc7c02059975c7484b4a4bfc09132e879faa2525409ef95cf804f0271ec2823b3f49bae00
+  data.tar.gz: c3d117ae24215b6e9c0c7b4382a1a6ce4133ba552440c765c6a94df1d1ee25dabdc9ccc25c01e544839bcc722c75bad05011065a0de433213a261d37f1df71a0

data/lib/finapps/rest/alert.rb

@@ -32,8 +32,8 @@ module FinApps
 
         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: alert_id.' if read.blank?
-        logger.debug "##{__method__.to_s} => alert_id: #{read.inspect}"
+        raise MissingArgumentsError.new 'Missing argument: read.' if read.blank?
+        logger.debug "##{__method__.to_s} => read: #{read.inspect}"
 
         end_point = Defaults::END_POINTS[:alert_update]
         logger.debug "##{__method__.to_s} => end_point: #{end_point}"
@@ -54,14 +54,11 @@ module FinApps
 
         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: alert_id.' if read.blank?
-        logger.debug "##{__method__.to_s} => alert_id: #{read.inspect}"
 
         end_point = Defaults::END_POINTS[:alert_delete]
         logger.debug "##{__method__.to_s} => end_point: #{end_point}"
 
         path = end_point.sub ':alert_id', ERB::Util.url_encode(alert_id)
-        path = path.sub ':read', ERB::Util.url_encode(read)
         logger.debug "##{__method__.to_s} => path: #{path}"
 
         _, error_messages = @client.send(path, :delete)

data/lib/finapps/rest/budgets.rb

@@ -0,0 +1,97 @@
+module FinApps
+  module REST
+
+    require 'erb'
+
+    class Budgets < FinApps::REST::Resources
+      include FinApps::REST::Defaults
+
+      # @param [Date] start_date
+      # @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}"
+
+        budget = Budget.new({:start_date => start_date, :end_date => end_date, :details => []})
+
+        end_point = Defaults::END_POINTS[:budget_show]
+        logger.debug "##{__method__.to_s} => end_point: #{end_point}"
+
+        path = end_point.sub(':start_date', ERB::Util.url_encode(start_date)).sub(':end_date', ERB::Util.url_encode(end_date))
+        logger.debug "##{__method__.to_s} => path: #{path}"
+
+        result, error_messages = @client.send(path, :get)
+        if result.present? && error_messages.blank?
+          transactions = result.find { |r| r.has_key?('trans') }
+          categories = result.find { |r| r.has_key?('cats') }
+
+          raise 'Category results set for budget is not an array.' unless categories.respond_to?(:each)
+          categories['cats'].each do |c|
+
+            raise 'Unable to locate category id for current category record.' unless c.key?['cat_id']
+            category_id = c['cat_id']
+
+            raise 'Unable to locate budget_amount for current category record.' unless c.key?['budget_amount'] && c.key?['days']
+            raise 'Unable to locate number of days for current category record.' unless c.key?['days']
+            budget_amount = c['budget_amount'].to_f * c['days'].to_i
+
+            raise 'Unable to locate category name for current category record.' unless c.key?['name']
+            category_name = c['name']
+
+            budget.details << BudgetDetail.new({:category_id => category_id,
+                                                :category_name => category_name,
+                                                :budget_amount => budget_amount,
+                                                :expense_amount => expense_amount(category_id, transactions)})
+          end
+        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}"
+
+        budget, error_messages = @client.send(end_point, :put, params)
+        logger.debug "##{__method__.to_s} => Completed"
+
+        return budget, error_messages
+      end
+
+      private
+      def expense_amount(category_id, transactions)
+        amount = 0
+        if category_id.present? && transactions.respond_to?(:find)
+          transaction = transactions.find { |t| t['category_id'] == category_id }
+          if transaction.present? && transaction.key?['expense']
+            amount = transaction['expense'].to_f
+          end
+        end
+        amount
+      end
+
+    end
+
+    class Budget < FinApps::REST::Resource
+      attr_accessor :start_date, :end_date, :details
+    end
+
+    class BudgetDetail < FinApps::REST::Resource
+      attr_accessor :category_id, :category_name, :budget_amount, :expense_amount
+    end
+
+  end
+end

data/lib/finapps/rest/client.rb

@@ -7,7 +7,7 @@ module FinApps
 
       attr_reader :connection, :users, :institutions, :user_institutions,
                   :transactions, :categories,
-                  :budget_models, :budget_calculation, :budget, :cashflow,
+                  :budget_models, :budget_calculation, :budgets, :cashflow,
                   :alert, :alert_definition, :alert_setting,
                   :rule_sets
 
@@ -201,7 +201,7 @@ module FinApps
         @categories ||= FinApps::REST::Categories.new self
         @budget_models ||= FinApps::REST::BudgetModels.new self
         @budget_calculation ||= FinApps::REST::BudgetCalculation.new self
-        @budget ||= FinApps::REST::Budget.new self
+        @budgets ||= FinApps::REST::Budgets.new self
         @cashflow ||= FinApps::REST::Cashflow.new self
         @alert ||= FinApps::REST::Alert.new self
         @alert_definition ||= FinApps::REST::AlertDefinition.new self

data/lib/finapps/version.rb

@@ -1,3 +1,3 @@
 module FinApps
-  VERSION = '0.14.5.pre'
+  VERSION = '0.15.0.pre'
 end

data/lib/finapps.rb

@@ -26,7 +26,7 @@ require 'finapps/rest/transactions'
 require 'finapps/rest/categories'
 require 'finapps/rest/budget_models'
 require 'finapps/rest/budget_calculation'
-require 'finapps/rest/budget'
+require 'finapps/rest/budgets'
 require 'finapps/rest/cashflow'
 require 'finapps/rest/alert'
 require 'finapps/rest/alert_definition'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: finapps
 version: !ruby/object:Gem::Version
-  version: 0.14.5.pre
+  version: 0.15.0.pre
 platform: ruby
 authors:
 - Erich Quintero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -200,9 +200,9 @@ files:
 - lib/finapps/rest/alert.rb
 - lib/finapps/rest/alert_definition.rb
 - lib/finapps/rest/alert_setting.rb
-- lib/finapps/rest/budget.rb
 - lib/finapps/rest/budget_calculation.rb
 - lib/finapps/rest/budget_models.rb
+- lib/finapps/rest/budgets.rb
 - lib/finapps/rest/cashflow.rb
 - lib/finapps/rest/categories.rb
 - lib/finapps/rest/client.rb

data/lib/finapps/rest/budget.rb

@@ -1,50 +0,0 @@
-module FinApps
-  module REST
-
-    require 'erb'
-
-    class Budget < FinApps::REST::Resources
-      include FinApps::REST::Defaults
-
-      # @param [Date] start_date
-      # @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}"
-
-        end_point = Defaults::END_POINTS[:budget_show]
-        logger.debug "##{__method__.to_s} => end_point: #{end_point}"
-
-        path = end_point.sub(':start_date', ERB::Util.url_encode(start_date)).sub(':end_date', ERB::Util.url_encode(end_date))
-        logger.debug "##{__method__.to_s} => path: #{path}"
-
-        budget, error_messages = @client.send(path, :get)
-
-        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}"
-
-        budget, error_messages = @client.send(end_point, :put, params)
-        logger.debug "##{__method__.to_s} => Completed"
-
-        return budget, error_messages
-      end
-
-    end
-  end
-end