compensate 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c411851f74bb6205ee7d30bd6aee6c58e717e9d
-  data.tar.gz: 71b4a38d37f1a5899fd10c9a624d8ea8f87a9c41
+  metadata.gz: 949fc8bf33efa35797a6375ceaf9e43cec2e9b0d
+  data.tar.gz: 577722fd3834171ed51631da7f71b71dd23521ee
 SHA512:
-  metadata.gz: 759c60c4802829ee9e3afc9c6fcb7feeecb44e3c6b0ac57d82ae42b37ddb4f3ec6e995699da05a4ba258f0ac96c263a0f7e0734d981e3724399c4329f3e2d7d0
-  data.tar.gz: 93896f66aea9da7fbce60dc5d42553ecc72e63bd8b7e0028721b85b47bba34dee256086d25c335f67b5cfdc25206d12c722b068980ce9306b0a64735a748fbe8
+  metadata.gz: 7b42aa22b8bcb64d910008e6a4770f99923894e1b2e99237f3cf246679979594033d955db657cb1a9a0c8b448a11f2973db639783412cea1b15f31413d43c8b1
+  data.tar.gz: f6ce6c77b05f9e8c8d7df66518b55f4bc8ff3a986f0bde84d4dc64f4d800231305e6cd9192a61103899935d79cc6bdeca48e6b798c483d1ccfbcb88fff754e00

data/Gemfile

@@ -1,6 +1,6 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in compensate.gemspec
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    compensate (0.1.0)
+    compensate (0.1.3)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -6,17 +6,7 @@ Completed as a technical exercise during interview process for [Simple Thread](h
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'compensate'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
+Install this gem directly with:
 
     $ gem install compensate
 
@@ -24,7 +14,7 @@ Or install it yourself as:
 
 Inputs accepted are .csv files with the following headers: `Rate, Start, End` where `Rate` is either `high` or `low`, and `Start, End` are dates in the format of `MM/DD/YY`. Ensure the header rows exist on a given CSV.
 
-This gem is packaged with an executable script. Use the following command to process a CSV named `test.csv`:
+This gem is packaged with an executable command-line script. Use the following shell command to process a CSV named `test.csv`:
 
   `compensate test.csv`
 
@@ -36,7 +26,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/kfrz/compensate. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitLab at https://gitlab.com/kfrz/compensate. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 
@@ -44,4 +34,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the Compensate project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/kfrz/compensate/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Compensate project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://gitlab.com/kfrz/compensate/blob/master/CODE_OF_CONDUCT.md).

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "compensate"
+require 'bundler/setup'
+require 'compensate'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "compensate"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/compensate.gemspec

@@ -1,27 +1,27 @@
 
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "compensate/version"
+require 'compensate/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "compensate"
+  spec.name          = 'compensate'
   spec.version       = Compensate::VERSION
-  spec.authors       = ["Keifer Furzland"]
-  spec.email         = ["kfrz.code@gmail.com"]
+  spec.authors       = ['Keifer Furzland']
+  spec.email         = ['kfrz.code@gmail.com']
 
-  spec.summary       = "Calculate total reimbursement amount for a given CSV of project date ranges"
-  spec.homepage      = "https://gitlab.com/kfrz/compensate"
-  spec.license       = "MIT"
+  spec.summary       = 'Calculate total reimbursement amount for a given CSV of project date ranges'
+  spec.homepage      = 'https://gitlab.com/kfrz/compensate'
+  spec.license       = 'MIT'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.executables << 'compensate'
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
 end

data/lib/compensate/version.rb

@@ -1,3 +1,3 @@
 module Compensate
-  VERSION = "0.1.2"
+  VERSION = '0.1.3'.freeze
 end

data/lib/compensate.rb

@@ -1,53 +1,38 @@
-require "compensate/version"
-require "csv"
+require 'compensate/version'
+require 'csv'
 
 module Compensate
   class ProjectSet
-    RATE_HIGH = '85'
-    RATE_LOW  = '75'
-    TRAVEL_RATE_HIGH = '55'
-    TRAVEL_RATE_LOW  = '45'
-
+    RATE_HIGH = '85'.freeze
+    RATE_LOW  = '75'.freeze
+    TRAVEL_RATE_HIGH = '55'.freeze
+    TRAVEL_RATE_LOW  = '45'.freeze
 
     def initialize(csv)
       @projects = projects_from_csv(csv)
     end
 
     def total
-      build_billing_hash
+      parse_projects_and_handle_duplicates
+      apply_billing_rates_to_hash
       calculate_total
     end
 
     private
 
-    def has_been_logged?(day)
-      billing_hash.key?(date_to_string(day))
-    end
-
-    def hash_entry_for(day)
-      billing_hash[date_to_string(day)].to_sym
-    end
-
-    def build_billing_hash
+    def parse_projects_and_handle_duplicates
       # Split projects up and determine what rate to bill at
       @projects.each do |project|
         rate = project[:rate]
         days_in(project).each do |day|
           date = date_to_string(day)
-          if has_been_logged?(day)
-             billing_hash[date] = if billing_hash[date] == 'high'
-                                    'high'
-                                  else
-                                    billing_hash[date]
-                                  end
-          else
-            billing_hash[date] = rate
-          end
+          billing_hash[date] = rate unless has_been_logged?(day)
         end
       end
     end
 
-    def calculate_total
+    def apply_billing_rates_to_hash
+      # splice in the correct billing rate
       billing_hash.each do |k, v|
         billing_hash[k] = if v == 'low'
                             RATE_LOW
@@ -55,33 +40,53 @@ module Compensate
                             RATE_HIGH
                           end
       end
+    end
+
+    def calculate_total
+      total = all_project_sums.map(&:sum)
+      "Total is $#{total.sum}.00"
+    end
+
+    def all_project_sums
+      ranges = split_projects_into_ranges
+
+      # Apply travel rate to first and last days in each range
+      ranges.each do |range|
+        range.each_with_index do |r, i|
+          r[1] = travel_rate_for(r) if (i == 0) || (i == range.size - 1)
+        end
+      end
 
+      # Sum each range's billing amount
+      ranges.map do |range|
+        range.map { |r| total = + r[1].to_i }
+      end
+    end
+
+    def split_projects_into_ranges
       date_array = billing_hash.to_a
       previous = date_array[0]
 
+      # Calculate where project ranges have gaps
       ranges = date_array.slice_before do |e|
         subsequent = previous
         previous = e
         to_date(subsequent[0]).next_day != to_date(e[0])
       end
+    end
 
-      ranges.each do |range|
-        range.each_with_index do |r, i|
-          if (i == 0) || (i == range.size - 1)
-  				  r[1] = travel_rate(r)
-          end
-        end
-      end
+    def days_in(project)
+      start_date = to_date(project[:start])
+      end_date = to_date(project[:end])
 
-      sums = ranges.map do |range|
-        range.map { |r| total =+ r[1].to_i }
-      end
+      (start_date..end_date)
+    end
 
-      total = sums.map(&:sum)
-      "Total is $#{total.sum}.00"
+    def has_been_logged?(day)
+      billing_hash.key?(date_to_string(day))
     end
 
-  	def travel_rate(day)
+    def travel_rate_for(day)
       case day[1]
       when RATE_HIGH
         TRAVEL_RATE_HIGH
@@ -90,13 +95,6 @@ module Compensate
       end
     end
 
-    def days_in(project)
-      start = to_date(project[:start])
-      end_date = to_date(project[:end])
-
-      (start..end_date)
-    end
-
     def to_date(string)
       DateTime.strptime(string.to_s, date_format)
     end
@@ -105,14 +103,14 @@ module Compensate
       date.strftime(date_format)
     end
 
-  	def date_format
+    def date_format
       '%m/%d/%y'
     end
 
     def projects_from_csv(csv)
       project_array = []
       CSV.foreach(csv, headers: true) do |row|
-        project_array << {rate: row[0], start: row[1], end: row[2]}
+        project_array << { rate: row[0], start: row[1], end: row[2] }
       end
       project_array
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compensate
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Keifer Furzland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-04 00:00:00.000000000 Z
+date: 2018-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler