roi_calculator 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fc2392c4737370ff704dbddb3da2cdeb70a242645cef016dd3850eed816e476
-  data.tar.gz: d14f14694ae62288b6386c361a3b1c1cccc1b30cf8f8e9700da666712bec0a85
+  metadata.gz: fc63825e0b9a50e16646d8a1b918ade35e0a507ae2b5da79a53d0b9759acd010
+  data.tar.gz: 8e2cde87e2205d49f98f372c07797bbc2764699c9f77f5e07c8c44daac7178c1
 SHA512:
-  metadata.gz: 9611b5bd0bbcb170314b02b79cc315beeb5d2d38661d1722c30d4c941096b128c14c6ddba4a54615ad35bad9427c930e171073eddc0cc10965ee3038dfe8826e
-  data.tar.gz: 7060394e2cf7022ac6aebcf8d66405c25f5a6854d53d5e6c31ced1246bbbfdc092956229a2a4d50d506f7428f2cf8f77782ee6922bd08d06ea3f83ef7e877afc
+  metadata.gz: edba4d7742f9cc1e5903a6d4d141e4be39a5cf9c21aa888e041cfa49953adf41819e41cb6b96785362602cfc48b8f3c9bceaf0b74334bfe8492e3f39dd7b1c11
+  data.tar.gz: e09f232462b96ee5b2fc964447210322551b8c5b34959dfdbb7468cc4a7beb5a73c68fb8372b56e19961eda3c577cddea7db74dcfe0d6f563bc5fcf5b2927112

data/.ruby-version

@@ -1 +1 @@
-ruby-2.2.5
+ruby-2.5.0

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    roi_calculator (1.0.0)
+    roi_calculator (2.0.0)
       math_util (~> 0.1.0)
       memoist (~> 0.15)
-      work_day (~> 0.3.0)
+      work_day (~> 1.0.0)
 
 GEM
   remote: https://rubygems.org/
@@ -21,23 +21,23 @@ GEM
     math_util (0.1.0)
     memoist (0.16.0)
     minitest (5.11.3)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    work_day (0.3.1)
+    work_day (1.0.0)
       activesupport (>= 4.0)
 
 PLATFORMS

data/bitbucket-pipelines.yml

@@ -1,22 +1,20 @@
-# This is a sample build configuration for Ruby.
-# Check our guides at https://confluence.atlassian.com/x/8r-5Mw for more examples.
-# Only use spaces to indent your .yml configuration.
-# -----
-# You can specify a custom docker image from Docker Hub as your build environment.
 image: ruby:2.5.0
 
 pipelines:
   default:
     - step:
-        caches:
-          - bundler
-        script: # Modify the commands below to build your repository.
-          - gem install rubocop
+        script:
+          - git archive --remote=git@bitbucket.org:guideinvestimentos/rails_defaults.git HEAD .rubocop.yml | tar -x
           - bundle install
-          - rspec
-          - rubocop
-          - 
+          - gem install rubocop
+          - rspec -fdoc
+          - rubocop .
 
-definitions:
-  caches:
-    bundler: ./vendor
+  branches:
+    master:
+      - step:
+          script:
+            - gem build roi_calculator.gemspec
+            - 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

@@ -1,7 +1,9 @@
-require "roi/rentability"
-require "roi/rentability_line"
-require "roi/rentability_periods"
-require "roi/financial_result"
+# frozen_string_literal: true
+
+require 'roi/rentability'
+require 'roi/rentability_line'
+require 'roi/rentability_periods'
+require 'roi/financial_result'
 
 module ROI
 end

data/lib/roi/financial_result.rb

@@ -1,6 +1,8 @@
-require "work_day"
-require "active_support"
-require "active_support/core_ext/date"
+# frozen_string_literal: true
+
+require 'work_day'
+require 'active_support'
+require 'active_support/core_ext/date'
 
 module ROI
   class FinancialResult
@@ -38,6 +40,7 @@ module ROI
     end
 
     private
+
     def scoped_rentabilities(scope_start, scope_end)
       rentabilities.values.select.each do |line|
         line.date.between?(scope_start, scope_end)
@@ -53,12 +56,11 @@ module ROI
     end
 
     def check_gaps_and_format(scope_start, scope_end)
-      if scope_start >= start_date
-        scoped_rentabilities(scope_start, scope_end).each do |line|
-          return if line.try(:have_position) == false
-        end
-        format_financial(scope_start, scope_end)
+      return unless scope_start >= start_date
+      scoped_rentabilities(scope_start, scope_end).each do |line|
+        return nil if line.try(:have_position) == false
       end
+      format_financial(scope_start, scope_end)
     end
   end
 end

data/lib/roi/rentability.rb

@@ -1,9 +1,11 @@
-require "memoist"
-require "roi/financial_result"
-require "roi/rentability_periods"
-require "math_util"
-require "active_support"
-require "active_support/core_ext"
+# frozen_string_literal: true
+
+require 'memoist'
+require 'roi/financial_result'
+require 'roi/rentability_periods'
+require 'math_util'
+require 'active_support'
+require 'active_support/core_ext'
 
 module ROI
   class Rentability
@@ -20,14 +22,14 @@ module ROI
       post_initialize(options)
     end
 
-    def post_initialize(options)
-    end
+    def post_initialize(options); end
 
     def calculate
       parse_rentabilities
-      if @rentabilities.count > 0
+      if @rentabilities.count.positive?
         dates = @rentabilities.keys
-        @start_date, @end_date = [dates[0], dates[-1]]
+        @start_date = dates[0]
+        @end_date = dates[-1]
       end
       self
     end
@@ -51,9 +53,10 @@ module ROI
     end
 
     def volatility(months_ago = nil)
-      _start = months_ago ?
-        (end_date - months_ago.months + 1.month).beginning_of_month : nil
-      (volatility_in_window(nil, _start).first || [])[1]
+      if months_ago
+        start = (end_date - months_ago.months + 1.month).beginning_of_month
+      end
+      (volatility_in_window(nil, start).first || [])[1]
     end
 
     def volatility_in_window(days = nil, start_date = nil)
@@ -62,23 +65,23 @@ module ROI
 
       0.upto(filtered.size - days).map do |low|
         series = filtered.slice(low, days + 1)
-        vol = MathUtil.volatility(series)
-        date = dates_with_position.fetch(low + days) { dates_with_position.last }
-        [date, vol] if date
+        date =
+          dates_with_position.fetch(low + days) { dates_with_position.last }
+        [date, MathUtil.volatility(series)] if date
       end
     end
 
     def to_a
       dates_with_position.map do |date|
         if @rentabilities[date]
-          [date.strftime("%Y-%m-%d"), @rentabilities[date].share - 1]
+          [date.strftime('%Y-%m-%d'), @rentabilities[date].quota - 1]
         end
       end.compact
     end
 
     protected
-    def before_parse_rentabilities
-    end
+
+    def before_parse_rentabilities; end
 
     def work_days
       start_date && end_date ? WorkDay.between(start_date, end_date) : []
@@ -86,6 +89,7 @@ module ROI
     memoize :work_days
 
     private
+
     def parse_rentabilities
       @rentabilities = {}
       before_parse_rentabilities
@@ -99,10 +103,10 @@ module ROI
       last_value = rentabilities_source(last_date)
       return rentabilities unless this_value && last_value
 
-      last_share = rentabilities[last_date].try(:share) || 1
+      last_quota = rentabilities[last_date].try(:quota) || 1
       rentability = (this_value / last_value - 1).round(8)
-      new_share = (last_share * (1 + rentability)).round(8)
-      line = RentabilityLine.new(this_date, rentability, nil, new_share, true)
+      new_quota = (last_quota * (1 + rentability)).round(8)
+      line = RentabilityLine.new(this_date, rentability, new_quota, true)
       after_parse(this_date, last_date, rentabilities, line)
     end
   end

data/lib/roi/rentability_line.rb

@@ -1,21 +1,14 @@
-module ROI
-  class RentabilityLine < Struct.new(
-    :date, :rentability, :daily_result, :share, :have_position, :total_balance)
+# frozen_string_literal: true
 
-    def self.build(date: nil, share: 1, have_position: false)
-      self.new(date, nil, nil, share, have_position, nil)
-    end
+module ROI
+  class RentabilityLine
+    attr_reader :date, :rentability, :daily_result, :quota, :have_position
 
-    def self.create(date, assets, last_balance, last_share)
-      line = build(date: date, share: last_share || 1)
-      line.total_balance = assets.map(&:value).inject(:+)
-      if last_balance.to_f > 0
-        line.daily_result = assets.map(&:daily_result).inject(:+)
-        line.rentability = line.daily_result / last_balance
-        line.share = (last_share * (1 + line.rentability)).round(8)
-        line.have_position = true
-      end
-      line
+    def initialize(date, rentability, quota, have_position)
+      @date = date
+      @rentability = rentability
+      @quota = quota
+      @have_position = have_position
     end
   end
 end

data/lib/roi/rentability_periods.rb

@@ -1,4 +1,6 @@
-require "work_day"
+# frozen_string_literal: true
+
+require 'work_day'
 
 module ROI
   module RentabilityPeriods
@@ -34,29 +36,35 @@ module ROI
     end
 
     private
+
     def adjust_start_date(date)
       [start_date, date].compact.max
     end
 
     def adjust_end_date(date)
-      WorkDay.last_until(date.strftime("%Y-%m") == end_date.strftime("%Y-%m") ?
-        end_date : date.end_of_month)
+      scoped_end =
+        if date.strftime('%Y-%m') == end_date.strftime('%Y-%m')
+          end_date
+        else
+          date.end_of_month
+        end
+      WorkDay.last_until(scoped_end)
     end
 
     def format(start_date, end_date)
       scoped_start, scoped_end = rentabilities.values_at(start_date, end_date)
       if scoped_start && scoped_end
-        ((scoped_end.share / scoped_start.share - 1) * 100).round(8)
+        ((scoped_end.quota / scoped_start.quota - 1) * 100).round(8)
       end
     end
 
     def check_gaps_and_format(scoped_start, scoped_end)
-      _start, _end = rentabilities.values_at(scoped_start, scoped_end)
-      return unless _start && _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 if line.date.between?(_start.date, _end.date) &&
-            !line.have_position
+          return nil if line.date.between?(local_start.date, local_end.date) &&
+                        !line.have_position
         end
       end
       format(scoped_start, scoped_end)

data/lib/roi/version.rb

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

data/roi_calculator.gemspec

@@ -1,25 +1,27 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'roi/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "roi_calculator"
+  spec.name          = 'roi_calculator'
   spec.version       = ROI::VERSION
-  spec.authors       = ["Adriano Bacha"]
-  spec.email         = ["abacha@gmail.com"]
+  spec.authors       = ['Adriano Bacha']
+  spec.email         = ['abacha@gmail.com']
 
-  spec.summary       = %q{Rentability and financial calculations}
-  spec.license       = "MIT"
+  spec.summary       = 'Rentability and financial calculations'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_runtime_dependency "memoist", "~> 0.15"
-  spec.add_runtime_dependency "math_util", "~> 0.1.0"
-  spec.add_runtime_dependency "work_day", "~> 0.3.0"
+  spec.add_development_dependency 'bundler', '~> 1.13'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_runtime_dependency 'math_util', '~> 0.1.0'
+  spec.add_runtime_dependency 'memoist', '~> 0.15'
+  spec.add_runtime_dependency 'work_day', '~> 1.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roi_calculator
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Adriano Bacha
@@ -39,47 +39,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: memoist
+  name: math_util
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
-  name: math_util
+  name: memoist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: work_day
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.0.0
 description: 
 email:
 - abacha@gmail.com
@@ -89,7 +89,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
@@ -97,7 +96,6 @@ files:
 - LICENSE.txt
 - README.md
 - bitbucket-pipelines.yml
-- circle.yml
 - lib/roi.rb
 - lib/roi/financial_result.rb
 - lib/roi/rentability.rb

data/.ruby-gemset

@@ -1 +0,0 @@
-bigbang_services

data/circle.yml

@@ -1,3 +0,0 @@
-dependencies:
-  pre:
-    - gem install bundler