roi_calculator 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc63825e0b9a50e16646d8a1b918ade35e0a507ae2b5da79a53d0b9759acd010
-  data.tar.gz: 8e2cde87e2205d49f98f372c07797bbc2764699c9f77f5e07c8c44daac7178c1
+  metadata.gz: fab4bba02a55b0a795a0b1453bd57a2858da7a05d8f767d5d85466b451eac16f
+  data.tar.gz: e2f2c4c2340bdb57fb567935cc2954fa4b4c6f3712f7c57ed5541b0a8e926731
 SHA512:
-  metadata.gz: edba4d7742f9cc1e5903a6d4d141e4be39a5cf9c21aa888e041cfa49953adf41819e41cb6b96785362602cfc48b8f3c9bceaf0b74334bfe8492e3f39dd7b1c11
-  data.tar.gz: e09f232462b96ee5b2fc964447210322551b8c5b34959dfdbb7468cc4a7beb5a73c68fb8372b56e19961eda3c577cddea7db74dcfe0d6f563bc5fcf5b2927112
+  metadata.gz: 19dc72bde66f473b1fc81b34b8b24d5daa9884fde269675ce369047481bd4f8ce3e39774837c4d3f5d713185581c98de5f531dde9c75244eee6bf8f4b6128e51
+  data.tar.gz: 198e1273641593b270c8ea70707f55bbd5eaad8df0ed814dfc5ebea7d4072a7f52cbf60659fcfb669d0e0292c5d52931e9e4d63309381324c9312d78eb5ebe2b

data/bitbucket-pipelines.yml

@@ -15,6 +15,7 @@ pipelines:
       - step:
           script:
             - gem build roi_calculator.gemspec
+            - mkdir -p ~/.gem
             - curl -u $RUBYGEMS_USERNAME:$RUBYGEMS_PASSWORD https://rubygems.org/api/v1/api_key.yaml > ~/.gem/credentials
             - chmod 0600 ~/.gem/credentials
             - gem push $(ls *.gem)

data/lib/roi.rb

@@ -3,7 +3,7 @@
 require 'roi/rentability'
 require 'roi/rentability_line'
 require 'roi/rentability_periods'
-require 'roi/financial_result'
+require 'roi/gross_profit'
 
 module ROI
 end

data/lib/roi/{financial_result.rb → gross_profit.rb}

@@ -5,7 +5,7 @@ require 'active_support'
 require 'active_support/core_ext/date'
 
 module ROI
-  class FinancialResult
+  class GrossProfit
     attr_reader :start_date, :end_date, :rentabilities
 
     def initialize(rentabilities, start_date, end_date)
@@ -16,7 +16,7 @@ module ROI
 
     def current_month
       scope_start = WorkDay.next_after(end_date.beginning_of_month, 0)
-      format_financial(scope_start, end_date)
+      format_gross_profit(scope_start, end_date)
     end
 
     def months(amount)
@@ -26,31 +26,31 @@ module ROI
 
     def current_year
       scope_start = WorkDay.next_after(end_date.beginning_of_year, 0)
-      format_financial(scope_start, end_date)
+      format_gross_profit(scope_start, end_date)
     end
 
     def years_ago(amount)
       scope_end = (end_date - amount.year).end_of_year
       scope_start = scope_end.beginning_of_year
-      format_financial(scope_start, scope_end)
+      format_gross_profit(scope_start, scope_end)
     end
 
     def portfolio
-      format_financial(start_date, end_date)
+      format_gross_profit(start_date, end_date)
     end
 
     private
 
     def scoped_rentabilities(scope_start, scope_end)
       rentabilities.values.select.each do |line|
-        line.date.between?(scope_start, scope_end)
+        line.reference_date.between?(scope_start, scope_end)
       end
     end
 
-    def format_financial(scope_start, scope_end)
+    def format_gross_profit(scope_start, scope_end)
       return unless scope_start && scope_end
       total = scoped_rentabilities(scope_start, scope_end).sum do |line|
-        line.try(:daily_result) || 0
+        line.try(:gross_profit) || 0
       end.round(2)
       total != 0 ? total : nil
     end
@@ -60,7 +60,7 @@ module ROI
       scoped_rentabilities(scope_start, scope_end).each do |line|
         return nil if line.try(:have_position) == false
       end
-      format_financial(scope_start, scope_end)
+      format_gross_profit(scope_start, scope_end)
     end
   end
 end

data/lib/roi/rentability.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'memoist'
-require 'roi/financial_result'
+require 'roi/gross_profit'
 require 'roi/rentability_periods'
 require 'math_util'
 require 'active_support'
@@ -34,8 +34,8 @@ module ROI
       self
     end
 
-    def financial
-      FinancialResult.new(rentabilities, start_date, end_date)
+    def gross_profit
+      GrossProfit.new(rentabilities, start_date, end_date)
     end
 
     def dates_with_position
@@ -47,7 +47,7 @@ module ROI
       end_date ||= @end_date
 
       filtered = @rentabilities.values.select do |val|
-        val.date.between?(start_date, end_date)
+        val.reference_date.between?(start_date, end_date)
       end
       filtered.map(&:rentability).compact
     end

data/lib/roi/rentability_line.rb

@@ -2,10 +2,11 @@
 
 module ROI
   class RentabilityLine
-    attr_reader :date, :rentability, :daily_result, :quota, :have_position
+    attr_reader :reference_date, :rentability,
+                :gross_profit, :quota, :have_position
 
-    def initialize(date, rentability, quota, have_position)
-      @date = date
+    def initialize(reference_date, rentability, quota, have_position)
+      @reference_date = reference_date
       @rentability = rentability
       @quota = quota
       @have_position = have_position

data/lib/roi/rentability_periods.rb

@@ -61,13 +61,17 @@ module ROI
     def check_gaps_and_format(scoped_start, scoped_end)
       local_start, local_end = rentabilities.values_at(scoped_start, scoped_end)
       return unless local_start && local_end
-      if skip_on_gap
-        rentabilities.each_value do |line|
-          return nil if line.date.between?(local_start.date, local_end.date) &&
-                        !line.have_position
-        end
-      end
+      return if skip_on_gap && gap?(local_start, local_end)
       format(scoped_start, scoped_end)
     end
+
+    def gap?(start_date, end_date)
+      gap = rentabilities.values.detect do |line|
+        line.reference_date.between?(
+          start_date.reference_date, end_date.reference_date
+        ) && !line.have_position
+      end
+      !gap.nil?
+    end
   end
 end

data/lib/roi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ROI
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

data/roi_calculator.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Adriano Bacha']
   spec.email         = ['abacha@gmail.com']
 
-  spec.summary       = 'Rentability and financial calculations'
+  spec.summary       = 'Rentability and Gross Profit Calculations'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roi_calculator
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Adriano Bacha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2018-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,7 +97,7 @@ files:
 - README.md
 - bitbucket-pipelines.yml
 - lib/roi.rb
-- lib/roi/financial_result.rb
+- lib/roi/gross_profit.rb
 - lib/roi/rentability.rb
 - lib/roi/rentability_line.rb
 - lib/roi/rentability_periods.rb
@@ -123,8 +123,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
-summary: Rentability and financial calculations
+summary: Rentability and Gross Profit Calculations
 test_files: []