salary_calc 0.1.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODM2NTIwNWM4MmI4NzFmZmNkM2Q4YjNiNTQ4YWNlOTFlOTIzZmM1Mw==
-  data.tar.gz: !binary |-
-    YTQ3YmRiYTgxZTNhODllNWY0ZmZjZDQ3ZDFjNGY0MWFlMTk5NjQzZQ==
+SHA1:
+  metadata.gz: d1cb72657797ce3318b9e8ef7e21e29e22be6f36
+  data.tar.gz: 350f5e94cc80069e636919a0028a18c3fd1f83cb
 SHA512:
-  metadata.gz: !binary |-
-    MGYzYzAxZjIxOWQzOTgxZTM4MzE5OWZhNDVlZjA0ZDI0M2EwYWY0NjdiMzBi
-    NjZiNDU2ZjhmYTcwZTNiMTljZGQwZTY3NDc2NDYxMmZjZjRiMzk3NTQyZThk
-    NjcxZTExNGNiZGQ5NGM3NTkyODI0YjliNDg5YmE5ZjRkZmE0OWU=
-  data.tar.gz: !binary |-
-    NTcwZWFlMmMxOTQ3MjQzNTFiYzBhZjVmMzgyMjBhZWM5Y2U4OTg2NjdhNWFk
-    N2FiYzMwNTg1ZTY2N2ZhZjc5NDgxZDFlMzE5OGVmYWMxZmFlMGRkYTA3YTRk
-    ZTIxNzQ0ZmYzZTYzN2EzMjQ5NTkzOWFkM2NhYWZkOTJlZDI1ZmE=
+  metadata.gz: 70a71932e0f8e7e0633fdbe036897329ab33ded9c683fb0e301fa465efe7055e5a07524130e0d95dbdb1fd6191230de29808b7c83bd18e26722d2a53f914b553
+  data.tar.gz: 5c36968b42e44074bb1e0cb4002e06a94a2da4bad9738a77382f70df496549fc2206dda491827d20890364410e6a1f212b987f22a75ae142a460f95c6cca1105

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 1.9.3

data/README.md

@@ -1,5 +1,7 @@
 # SalaryCalc
 
+[![Gem Version](https://badge.fury.io/rb/salary_calc.png)](http://badge.fury.io/rb/salary_calc) [![Build Status](https://travis-ci.org/blackxored/salary_calc.rb.png)](https://travis-ci.org/blackxored/salary-calc.rb) [![Coverage Status](https://coveralls.io/repos/blackxored/salary_calc.rb/badge.png?branch=master)](https://coveralls.io/r/blackxored/salary_calc.rb) [![Dependency Status](https://gemnasium.com/blackxored/salary_calc.rb.png)](https://gemnasium.com/blackxored/salary_calc.rb) [![Code Climate](https://codeclimate.com/github/blackxored/salary_calc.rb.png)](https://codeclimate.com/github/blackxored/salary_calc.rb)
+
 A very simple salary calculator.
 
 ## Installation

data/lib/salary_calc.rb

@@ -16,5 +16,9 @@ module SalaryCalc
     def to_hourly
       amount
     end
+
+    def rounded(result)
+      result.round(2)
+    end
   end
 end

data/lib/salary_calc/conversions/from_hourly.rb

@@ -1,19 +1,27 @@
 module SalaryCalc::Conversions
   module FromHourly
     def to_yearly
-      to_monthly * 12
+      rounded(to_weekly * 52)
     end
 
+    # Does not calculate monthly salary based on a 4 week month.
+    # Some people define a month as 4 weeks. Use {#to_monthly_alternate}
+    # for a version using this assumption.
+    # This might be removed in the future.
     def to_monthly
-      to_weekly * 4
+      rounded(amount.to_f * (billable_hours * 5) * 52 / 12)
+    end
+
+    def to_monthly_alternate
+      rounded(to_weekly * 4)
     end
 
     def to_weekly
-      to_daily * 5
+      rounded(to_daily * 5.0)
     end
 
     def to_daily
-      billable_hours * amount
+      rounded(billable_hours * amount.to_f)
     end
   end
 end

data/lib/salary_calc/conversions/to_hourly.rb

@@ -1,19 +1,19 @@
 module SalaryCalc::Conversions
   module ToHourly
     def from_yearly(yearly)
-      from_monthly(yearly.to_f / 12)
+      rounded(yearly.to_f / 52 / (billable_hours * 5))
     end
 
     def from_monthly(monthly)
-      from_weekly(monthly.to_f / 4)
+      rounded(monthly.to_f * 12 / 52 / (billable_hours * 5))
     end
 
     def from_weekly(weekly)
-      from_daily(weekly.to_f / 5)
+      rounded(weekly.to_f / (billable_hours * 5))
     end
 
     def from_daily(daily)
-      daily / billable_hours.to_f
+      rounded(daily.to_f / billable_hours)
     end
 
     [:yearly, :monthly, :weekly, :daily].each do |period|

data/lib/salary_calc/version.rb

@@ -1,3 +1,3 @@
 module SalaryCalc
-  VERSION = "0.1.0"
+  VERSION = "1.0.1"
 end

data/salary_calc.gemspec

@@ -20,5 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 2.14.1"
+  spec.add_development_dependency "rspec", "~> 3.2"
+  spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "pry"
 end

data/spec/salary_calc_spec.rb

@@ -16,68 +16,74 @@ module SalaryCalc
     end
 
     context "calculations" do
-      let(:amount)     { 10                          } # the easiest number for math
+      let(:amount)     { 60                          }
       let(:calculator) { described_class.new(amount) }
 
       describe "#to_yearly" do
         it "calculates the yearly salary from an hourly rate" do
-          expect(calculator.to_yearly).to eq(19_200)
+          expect(calculator.to_yearly).to eq(124_800)
         end
       end
 
       describe "#to_monthly" do
         it "calculates the monthly salary from an hourly rate" do
-          expect(calculator.to_monthly).to eq(1_600)
+          expect(calculator.to_monthly).to eq(10_400)
+        end
+      end
+
+      describe "#to_monthly_alternate" do
+        it "calculates the monthly salary taking a month as 4 weeks (no overtime)" do
+          expect(calculator.to_monthly_alternate).to eq(9_600)
         end
       end
 
       describe "#to_weekly" do
-        it "calculates teh weekly salary from an hourly rate" do
-          expect(calculator.to_weekly).to eq(400)
+        it "calculates the weekly salary from an hourly rate" do
+          expect(calculator.to_weekly).to eq(2_400)
         end
       end
 
       describe "#to_daily" do
         it "calculates the daily salary for an hourly rate" do
-          expect(calculator.to_daily).to eq(80)
+          expect(calculator.to_daily).to eq(480)
         end
       end
 
       describe "#from_yearly" do
         it "returns the hourly rate from a yearly salary" do
-          expect(calculator.from_yearly(19_200)).to eq(10)
+          expect(calculator.from_yearly(124_800)).to eq(60)
         end
       end
 
       describe "#from_monthly" do
         it "returns the hourly rate from a monthly salary" do
-          expect(calculator.from_monthly(1_600)).to eq(10)
+          expect(calculator.from_monthly(10_400)).to eq(60)
         end
       end
 
       describe "#from_weekly" do
         it "returns the hourly rate from a weekly salary" do
-          expect(calculator.from_weekly(400)).to eq(10)
+          expect(calculator.from_weekly(2_400)).to eq(60)
         end
       end
 
       describe "#from_daily" do
         it "returns the hourly rate from a daily salary" do
-          expect(calculator.from_daily(80)).to eq(10)
+          expect(calculator.from_daily(480)).to eq(60)
         end
       end
 
       describe "#from_*_!" do
         it "modifies the calculator's amount to reflect hourly rate" do
-          expect(calculator.amount).to eq(10)
-          calculator.from_monthly!(2400)
-          expect(calculator.amount).to eq(15)
+          expect(calculator.amount).to eq(60)
+          calculator.from_monthly!(6_000)
+          expect(calculator.amount).to eq(34.62)
         end
 
         it "uses the amount from the calculator if none specified" do
-          calculator.amount = 2400
+          calculator.amount = 6000
           calculator.from_monthly!
-          expect(calculator.amount).to eq(15)
+          expect(calculator.amount).to eq(34.62)
         end
       end
     end

data/spec/spec_helper.rb

@@ -1,11 +1,7 @@
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# Require this file using `require "spec_helper"` to ensure that it is only
-# loaded once.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+require 'coveralls'
+Coveralls.wear!
+
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   #config.filter_run :focus
 

metadata

@@ -1,57 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: salary_calc
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Adrian Perez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2015-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A very simple salary calculator
 email:
 - adrianperez.deb@gmail.com
@@ -59,8 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -82,17 +111,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A very simple salary calculator