Weekend 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f18d168acca7f5b6af5d68d0bdd622ee8101ccbe
-  data.tar.gz: 53b58871762aa9910cf228e25b9db08f8818835e
+  metadata.gz: 764b187f3258268b232b250e9db4ade1269db689
+  data.tar.gz: fab87db4c0f28764f3134282591a829e2385d6ac
 SHA512:
-  metadata.gz: d4dd890d935ac94f1f21b629b0d4b03f65398f26a8b4fdbc18324d478f5920901083a0797a34fd887eda20ab9245bb518586ae28282db68caa860573b3605fee
-  data.tar.gz: f9bcaebfae57c6fc91ba4e9997ec261aa84cb1c3792a63d44d0f1c68a0b55ed18721d8dd23f1181b8e4ed0fa81facde47b80bbb921d3a02604760ba33233e420
+  metadata.gz: 0ecd3139e16a98ddb43bace743c3a807b81a53e39856d6ee9f9166984616c8bacf029782958192b03859d191068de43064e1d24d3158640878a7a50c7aa70778
+  data.tar.gz: 6c932c42a9aaf27bcdf725a1a0490230b629aead715ee3009f40d3e62f43e95f9b229c00647e803c7d4b4f8d9618df25b6453686a878546c7a139259178bde53

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+lib/.DS_Store

data/README.md

@@ -22,13 +22,53 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+Weekend::Base is base class.
 
-## Development
+1) For filtering weekends(only weekdays) :
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/console` for an interactive prompt that will allow you to experiment.
+```Weekend::Base.filter_weekends(start_date, end_date)```
+
+e.g. ```Weekend::Base.filter_weekends(Date.today, Date.today + 6) => [#<Date: 2015-07-07 ((2457211j,0s,0n),+0s,2299161j)>, #<Date: 2015-07-08 ((2457212j,0s,0n),+0s,2299161j)>, #<Date: 2015-07-09 ((2457213j,0s,0n),+0s,2299161j)>, #<Date: 2015-07-10 ((2457214j,0s,0n),+0s,2299161j)>, #<Date: 2015-07-13 ((2457217j,0s,0n),+0s,2299161j)>]```
+
+2) For filtering weekdays(only weekends) :
+
+```Weekend::Base.filter_weekdays(start_date, end_date)```
+
+e.g. ```Weekend::Base.filter_weekdays(Date.today, Date.today + 6) => [#<Date: 2015-07-11 ((2457215j,0s,0n),+0s,2299161j)>, #<Date: 2015-07-12 ((2457216j,0s,0n),+0s,2299161j)>]```
+
+3) For total no of working days :
+
+```Weekend::Base.no_of_working_days(start_date, end_date)```
+
+e.g. ```Weekend::Base.no_of_working_days(Date.today, Date.today + 6) => 5```
+
+4) For total no of weekends :
+
+```Weekend::Base.no_of_weekends(start_date, end_date)```
+
+e.g. ```Weekend::Base.no_of_weekends(Date.today, Date.today + 6) => 2```
+
+5) Similarly for getting no. of sundays, mondays & so on....we have :
+
+```Weekend::Base.no_of_sundays(start_date, end_date)```
+
+```Weekend::Base.no_of_mondays(start_date, end_date)```
+
+```Weekend::Base.no_of_tuesdays(start_date, end_date)```
+
+```Weekend::Base.no_of_wednesdays(start_date, end_date)```
+
+```Weekend::Base.no_of_thursdays(start_date, end_date)```
+
+```Weekend::Base.no_of_fridays(start_date, end_date)```
+
+```Weekend::Base.no_of_saturdays(start_date, end_date)```
+
+
+## Future Enhancements
+
+1. Add concept of holidays, so that one can get actual no. of working days
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 

data/Weekend.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Gem for basic but helpful week days related queries.}
   spec.description   = %q{}
-  spec.homepage      = "http://www.tusharmaroo.com"
+  spec.homepage      = "https://github.com/tusharmaroo/weekend"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }

data/lib/Weekend.rb

@@ -1,81 +1,7 @@
 require "Weekend/version"
+require "Weekend/base"
 require 'date'
 
 module Weekend
-    # Your code goes here...
-  	# filter weekends
-  	def self.filter_weekends start_date, end_date
-  		result(start_date,end_date,[1,2,3,4,5])
-    end
-
-  	#filter weekdays
-  	def self.filter_weekdays start_date, end_date
-  		result(start_date,end_date,[0,6])
-  	end
-
-  	# total working days(except weekends)
-  	def self.no_of_working_days start_date, end_date
-  		filter_weekends(start_date,end_date).count
-  	end
-
-  	# no of weekends
-  	def self.no_of_weekends start_date, end_date
-  		filter_weekdays(start_date,end_date).count
-  	end
-
-    def self.result start_date, end_date, arr_of_days
-          ((start_date.to_date)..(end_date.to_date)).to_a.select {|k| arr_of_days.include?(k.wday)}
-    end
-  		# no of sundays/mondays/tuesdays etc
-
-      # all_days = ["Sunday", "Monday", "Tuesday","Wednesday","Thrusday","Friday","Saturday"]
-
-  		# def self.all_days 
-  	 #    ["Sunday", "Monday", "Tuesday","Wednesday","Thrusday","Friday","Saturday"]
-  	 #  end
-      # def self.included(base)
-      #   base.extend ClassMethods
-      # end
-
-      # module ClassMethods
-      #   all_days = ["Sunday", "Monday", "Tuesday","Wednesday","Thrusday","Friday","Saturday"]
-
-    	 #  def no_of_days(day)
-    	 #    Weekend.tushar
-    	 #  end
-
-      def self.no_of_sundays start_date, end_date
-        result(start_date,end_date,[0]).count
-      end
-
-     def self.no_of_mondays start_date, end_date
-       result(start_date,end_date,[1]).count
-     end
-
-     def self.no_of_tuesdays start_date, end_date
-       result(start_date,end_date,[2]).count
-     end
-
-     def self.no_of_wednesdays start_date, end_date
-       result(start_date,end_date,[3]).count
-     end
-
-     def self.no_of_thrusdays start_date, end_date
-       result(start_date,end_date,[4]).count
-     end
-
-     def self.no_of_fridays start_date, end_date
-       result(start_date,end_date,[5]).count
-     end
-
-     def self.no_of_saturdays start_date, end_date
-       result(start_date,end_date,[6]).count
-     end
-
-    	  # ["Sunday", "Monday", "Tuesday","Wednesday","Thrusday","Friday","Saturday"].each do |day|
-    	  #   method_name = day.to_sym
-    	  #   define_method(method_name) { no_of_days }
-    	  # end 
-      # end 
-	
-end
+	#All logic placed inside base class
+end

data/lib/Weekend/base.rb

@@ -0,0 +1,34 @@
+class Weekend::Base
+  class << self
+    #Filtering weekends
+    def filter_weekends start_date, end_date
+      result(start_date,end_date,[1,2,3,4,5])
+    end
+
+    #filter weekdays
+    def filter_weekdays start_date, end_date
+      result(start_date,end_date,[0,6])
+    end
+
+    # total working days(except weekends)
+    def no_of_working_days start_date, end_date
+      filter_weekends(start_date,end_date).count
+    end
+
+    # no of weekends
+    def no_of_weekends start_date, end_date
+      filter_weekdays(start_date,end_date).count
+    end
+
+    def result start_date, end_date, arr_of_days
+      ((start_date.to_date)..(end_date.to_date)).to_a.select {|k| arr_of_days.include?(k.wday)}
+    end
+
+    #Generates methods like no_of_sundays, no_of_mondays etc
+    ["Sunday", "Monday", "Tuesday","Wednesday","Thursday","Friday","Saturday"].each_with_index do |day,index|
+      define_method("no_of_#{day.downcase}s") { |start_date,end_date| result(start_date,end_date,[index]).count }
+    end
+  end
+end
+	
+

data/lib/Weekend/version.rb

@@ -1,3 +1,3 @@
 module Weekend
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Weekend
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Tushar Maroo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,8 +71,9 @@ files:
 - bin/console
 - bin/setup
 - lib/Weekend.rb
+- lib/Weekend/base.rb
 - lib/Weekend/version.rb
-homepage: http://www.tusharmaroo.com
+homepage: https://github.com/tusharmaroo/weekend
 licenses:
 - MIT
 metadata: {}
@@ -92,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Gem for basic but helpful week days related queries.