gb_work_day 0.0.1 → 0.0.2

data/lib/gb_work_day/core_ext/date.rb

@@ -15,7 +15,7 @@ class Date
     if GBWorkDay::Duration === other
       plus_with_work_duration(- other)
     elsif GBWorkDay::Date === other
-      other - self
+      - (other - self)
     else
       minus_without_work_duration(other)
     end

data/lib/gb_work_day/core_ext/time.rb

@@ -15,7 +15,7 @@ class Time
     if GBWorkDay::Duration === other
       plus_with_work_duration(-other)
     elsif GBWorkDay::Time === other
-      other - self
+      - (other - self)
     else
       minus_without_work_duration(other)
     end

data/lib/gb_work_day/helpers/date.rb

@@ -5,7 +5,7 @@ module GBWorkDay
 
     def -(other)
       if other.is_a?(::Date) || other.is_a?(::Time)
-        Interval.new(self, other, week: self.work_week).work_days
+        Interval.new(other, self, week: self.work_week).work_days
       else
         super
       end

data/lib/gb_work_day/version.rb

@@ -1,3 +1,3 @@
 module GBWorkDay
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/spec/helpers/date_spec.rb

@@ -20,6 +20,7 @@ describe GBWorkDay::Date do
     wednesday = monday + 2.days
     expect(GBWorkDay::Date.from_date(wednesday) - monday).to be_kind_of GBWorkDay::Duration
     expect(GBWorkDay::Date.from_date(wednesday) - GBWorkDay::Date.from_date(monday)).to be_kind_of GBWorkDay::Duration
+    expect((GBWorkDay::Date.from_date(wednesday) - GBWorkDay::Date.from_date(monday)).work_days).to eq 2
     expect(GBWorkDay::Date.from_date(monday) - 1).to be_kind_of Date
     expect((wednesday - GBWorkDay::Date.from_date(monday))).to be_kind_of GBWorkDay::Duration
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gb_work_day
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Kacper Kawecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,8 +97,6 @@ files:
 - ".idea/runConfigurations/specs.xml"
 - ".idea/workspace.xml"
 - Gemfile
-- LICENSE.txt
-- README.md
 - Rakefile
 - gb_work_day.gemspec
 - lib/gb_work_day.rb

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2016 Kacper Kawecki
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,119 +0,0 @@
-# GBWorkDay
-
-Library to make calculation on work days.
-Unlike others libraries like [`business_time`](https://github.com/bokmann/business_time), 
-[`working_hours`](https://github.com/Intrepidd/working_hours), [`biz`](https://github.com/zendesk/biz)
-it operates on whole days, not hours. 
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'gb_work_day'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install gb_work_day
-
-## Usage
-
-### Work week
-
-Set default work week for current thread
-
-```ruby
-beginning_of_week = 1 #Monday 
-work_days = 5 #wrokd days are Monday-Friday
-GBWorkDay::WorkWeek.current = GBWorkWeek.new(work_days, beginning_of_week)
-```
-
-or if you want to setup per instance
-
-```ruby
-beginning_of_week = 1 #Monday 
-work_days = 5 #wrokd days are Monday-Friday
-week = GBWorkWeek.new(work_days, beginning_of_week)
-my_date = Date.today.to_work_date(week)
-```
-
-or 
-
-```ruby
-beginning_of_week = 1 #Monday 
-work_days = 5 #wrokd days are Monday-Friday
-week = GBWorkWeek.new(work_days, beginning_of_week)
-my_date = my_date
-#some code here
-my_date.week = week
-```
-
-### Date and Time operation
-
-Check if today is a work day
- 
-```ruby
-Date.today.work?
-```
-
-or
-
-```ruby
-Time.now.work?
-```
-
-Check if today is holiday
-
-```ruby
-Date.today.free?
-```
-
-or
-
-```ruby
-Time.now.free?
-```
-
-Get next working day
-
-```ruby
-Date.today.next_work_day
-```
-
-or
-
-```ruby
-Time.now.next_work_day
-```
-
-
-You can also make more complicated calculations
-
-```ruby
-delivery_date = Date.today + 10.work_days
-```
-
-or 
-
-```ruby
-amount_of_work = (start_date.to_work_date - end_date).work_days
-```
-
-## Contributing
-
-1. Fork it ( https://github.com/GenieBelt/gb-works-day/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request
-
-## Alternatives
-
-* [`business_time`](https://github.com/bokmann/business_time)
-* [`working_hours`](https://github.com/Intrepidd/working_hours)
-* [`biz`](https://github.com/zendesk/biz)