gb_work_day 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72786d75440945859cc671242a9413de0905461d
-  data.tar.gz: 5253d99feed1c3cc620dc5b5c77eff242988a116
+  metadata.gz: 310aaaee9f37fe3ccdbe077d1ed7dc7eb9768728
+  data.tar.gz: 031751336c41a70bde3ac7313a9050f929e11932
 SHA512:
-  metadata.gz: 70ee87050fdd169e48012cafcaf67d737f3368db20e7fa5ca618b442b1f272a431d3bb5d50b2826c32791ca977e626a8baa8e9a2ee2d690d15b233fe867af43f
-  data.tar.gz: e82fc2e1e223349fac3754c08a5c29d05206a703ecb1b37c75f30b4a9f5b0afd13c201fbbd406a6ee69ce78117608240b61a6151e15fb8a7ec2d6029c777b864
+  metadata.gz: adc76599cf592b96a78431284a4f36ba2b329b434daa0fbda77a9e2d3d32a1b65860935ff2aadd47509b08ad8f1139c545a386ba95dd90071e0564bfb8cda098
+  data.tar.gz: b74120d209b3f7021aed67e69e817a896c75aa5a7b9c93c59b7250dfcff5747dfd9bcda4bed8239c26c17b7fdc49b0f54c00d77087167b5d18461f20425d05d3

data/README.md

@@ -0,0 +1,119 @@
+# 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)

data/lib/gb_work_day/core_ext/date.rb

@@ -38,7 +38,15 @@ class Date
   # Return next working day
   # @return [Time]
   def next_work_day
-    self + GBWorkDay::Duration.new(1, default_week)
+    if default_week.free_day? self
+      next_day = self
+      while default_week.free_day? next_day
+        next_day += 1
+      end
+      next_day
+    else
+      self + GBWorkDay::Duration.new(1, default_week)
+    end
   end
 
   # Get date object for calculating working days

data/lib/gb_work_day/core_ext/time.rb

@@ -39,7 +39,15 @@ class Time
   # Return next working day
   # @return [Time]
   def next_work_day
-    self + GBWorkDay::Duration.new(1, default_week)
+    if default_week.free_day? self
+      next_day = self
+      while default_week.free_day? next_day
+        next_day += GBWorkDay::Duration::SEC_IN_DAY
+      end
+      next_day
+    else
+      self + GBWorkDay::Duration.new(1, default_week)
+    end
   end
 
   # Get time object for calculating working days

data/lib/gb_work_day/duration.rb

@@ -97,15 +97,23 @@ module GBWorkDay
         symbol *= -1
         work_days_left *= -1
       end
+      while @week.free_day? time
+        time = sum_normal_days time, symbol
+      end
       while work_days_left > 0
-        if time.is_a? ::Date
-          time += symbol * 1
-        else
-          time += (symbol * SEC_IN_DAY)
-        end
+        time = sum_normal_days time, symbol
         work_days_left -= 1 if @week.work_day? time
       end
       time
     end
+
+    def sum_normal_days(time, days)
+      if time.is_a? ::Date
+        time += days * 1
+      else
+        time += (days * SEC_IN_DAY)
+      end
+      time
+    end
   end
 end

data/lib/gb_work_day/version.rb

@@ -1,3 +1,3 @@
 module GBWorkDay
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/core_ext/date_spec.rb

@@ -57,8 +57,12 @@ describe 'Date extensions' do
 
   it 'should properly add work duration' do
     monday = Date.today.beginning_of_week
+    sunday = monday - 1
     wednesday = monday + 2.days
     friday = monday + 4.days
+    expect(sunday + 1.work_day).to eq (monday + 1.days)
+    expect(sunday + 1.work_day - 1.work_day).to eq monday
+    expect(sunday + 6.work_day).to eq (monday + 8.days)
     expect(monday + 1.work_day).to eq (monday + 1.days)
     expect(friday + 1.work_day).to eq (friday + 3.days)
     expect(wednesday + 2.work_day).to eq (wednesday + 2.days)

data/spec/core_ext/time_spec.rb

@@ -57,8 +57,11 @@ describe 'Time extensions' do
 
   it 'should properly add work duration' do
     monday = Time.now.beginning_of_week
+    sunday = monday - 1.day
     wednesday = monday + 2.days
     friday = monday + 4.days
+    expect(sunday + 1.work_day).to eq (monday + 1.days)
+    expect(sunday + 1.work_day - 1.work_day).to eq monday
     expect(monday + 1.work_day).to eq (monday + 1.days)
     expect(friday + 1.work_day).to eq (friday + 3.days)
     expect(wednesday + 2.work_day).to eq (wednesday + 2.days)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gb_work_day
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Kacper Kawecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,6 +96,7 @@ files:
 - ".idea/modules.xml"
 - ".idea/runConfigurations/specs.xml"
 - Gemfile
+- README.md
 - Rakefile
 - gb_work_day.gemspec
 - lib/gb_work_day.rb