month_date 0.1.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c2a76e34d43f16f82237f77c4bfae70ee79026c
-  data.tar.gz: 229e8aeb4e30e631bf635c3f18bbc291739e837c
+  metadata.gz: 8b66c962610a78457f3f9f750c8a1de3bd768fdd
+  data.tar.gz: 0e73047dd74fdc392700b34f14672a805a9323f3
 SHA512:
-  metadata.gz: eb74af0d088cd213346469271783b798161e5df44f33a1db804a88ffb49887e3a6932c6f7787ca873d7189ee6c2ff4a6f2f4f2207a381fd87a6dc8241528b51c
-  data.tar.gz: 0204125466500cf4a91d9b0aa84d6f10eceb60ed071ab8ec08a8823956155e74fb8c56689cdd1ef6679eb07f1d151a99ce6094f8815ec24f2b487f9230dffc68
+  metadata.gz: b449d975963651e21831fc1f10b45ec6c02d65c42aa7603ee0a89cae861f5f7f206a21f73b3b13fb7995ae085d859b5edf0557d953ee9ab5786d6c5c368e1dfa
+  data.tar.gz: bda76c5e338e66b5777316cf8fdb099102f26a0aecf0103f50964069d7d77575d3dbc44e21493a257dc55aee296291d3cdb32a5c331ecd25153bfbdf80215028

data/Gemfile

@@ -2,3 +2,18 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in month_date.gemspec
 gemspec
+group :test do
+  gem 'rake'
+  gem 'rspec'
+end
+
+group :development do
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'pry'
+
+  # Adds debugging steps to Pry
+  # continue, step, next
+  gem 'pry-remote'
+  gem 'pry-nav'
+end

data/Guardfile

@@ -0,0 +1,15 @@
+guard 'rspec', cmd: 'rspec --color --format doc'  do
+  # watch /lib/ files
+  watch(%r{^lib/(.+)\.rb$}) do |m|
+    "spec/#{m[1]}_spec.rb"
+  end
+
+  watch(%r{^lib/bike_system/(.+)\.rb$}) do |m|
+    "spec/#{m[1]}_spec.rb"
+  end
+
+  # watch /spec/ files
+  watch(%r{^spec/(.+)\.rb$}) do |m|
+    "spec/#{m[1]}.rb"
+  end
+end

data/README.md

@@ -31,9 +31,18 @@ MonthDate.dates_in_range("20141230", "20150102")
 ```
 ### get all dates in month
 
-    MonthDate.date_in_month(year, month)
+you can get all dates in specific month
 
-example:
+    MonthDate.date_in_month(year, month, format, day_type)
+    
+#### parameter
+
+* year: year
+* month: month
+* format: **default: %Y%m%d** ; the date output format
+* day_type: **default: false**; whether you want to seperate the weekday and weekend
+
+**example:**
 
 ```ruby
 MonthDate.date_in_month(2014, 1)
@@ -41,6 +50,21 @@ MonthDate.date_in_month(2014, 1)
 => ["20140101", "20140102", "20140103", "20140104", "20140105", "20140106", "20140107", "20140108", "20140109", "20140110", "20140111", "20140112", "20140113", "20140114", "20140115", "20140116", "20140117", "20140118", "20140119", "20140120", "20140121", "20140122", "20140123", "20140124", "20140125", "20140126", "20140127", "20140128", "20140129", "20140130", "20140131"]
 ```
 
+**example: day_type=true**
+
+```ruby
+MonthDate.date_in_month(2014, 1, %Y%m%d, true)
+
+=>{:weekend=>["20140104", "20140105", "20140111", "20140112", "20140118", "20140119", "20140125", "20140126"], :weekday=>["20140101", "20140102", "20140103", "20140106", "20140107", "20140108", "20140109", "20140110", "20140113", "20140114", "20140115", "20140116", "20140117", "20140120", "20140121", "20140122", "20140123", "20140124", "20140127", "20140128", "20140129", "20140130", "20140131"]}
+```
+### date_in_month_weekday
+	
+	MonthDate.date_in_month_weekday(year, month, format)
+	
+### date_in_month_weekend
+
+	MonthDate.date_in_month_weekend(year, month, format)
+
 #### parameter
 ##### week
 | 0 | Sunday    |
@@ -67,6 +91,14 @@ Or install it yourself as:
 
     $ gem install month_date
 
+## Development
+
+### Test
+
+    guard
+
+## Todo
 
+* Need to refactor!
 ## License 
-MIT 
+MIT [@ctxhou](http://github.com/ctxhou)

data/lib/month_date/version.rb

@@ -1,3 +1,3 @@
 module MonthDate
-  VERSION = "0.1.0"
+  VERSION = "0.5.0"
 end

data/lib/month_date.rb

@@ -19,54 +19,127 @@ module MonthDate
         Date.new(year, month, -1).day
     end
 
-    def MonthDate.dates_in_range(start_date, end_date, format="%Y%m%d")
+    def MonthDate.dates_in_range(start_date, end_date, format="%Y%m%d", day_type=false)
         start_date = Time.parse(start_date.to_s)
         end_date = Time.parse(end_date.to_s)
-        result = []
+        weekend = []
+        weekday = []
         if start_date.mon == end_date.mon && start_date.year == end_date.year
             (start_date.day..end_date.day).to_a.each do |day|
                 date = Date.new(start_date.year, start_date.mon, day)
-                result << date.strftime(format)
+                if self.weekend?(date)
+                    weekend << date.strftime(format)
+                else
+                    weekday << date.strftime(format)
+                end
             end
         elsif start_date.year == end_date.year
             # first count the start date month date.
             (start_date.day..self.days_in_month(start_date.year, start_date.mon)).to_a.each do |day|
                 date = Date.new(start_date.year, start_date.mon, day)
-                result << date.strftime(format)
+                if self.weekend?(date)
+                    weekend << date.strftime(format)
+                else
+                    weekday << date.strftime(format)
+                end
             end
             (start_date.mon+1..end_date.mon-1).to_a.each do |month|
-                result += self.date_in_month(start_date.year, month)
+                tmp = self.date_in_month(start_date.year, month, true)
+                weekend += tmp[:weekend]
+                weekday += tmp[:weekday]
             end
             (1..end_date.day).each do |day|
                 date = Date.new(end_date.year, end_date.mon, day)
-                result << date.strftime(format)
+                if self.weekend?(date)
+                    weekend << date.strftime(format)
+                else
+                    weekday << date.strftime(format)
+                end
             end
         else
             (start_date.day..self.days_in_month(start_date.year, start_date.mon)).to_a.each do |day|
                 date = Date.new(start_date.year, start_date.mon, day)
-                result << date.strftime(format)
+                if self.weekend?(date)
+                    weekend << date.strftime(format)
+                else
+                    weekday << date.strftime(format)
+                end
             end
             (start_date.mon+1..12).to_a.each do |month|
-                result += self.date_in_month(start_date.year, month)
+                tmp = self.date_in_month(start_date.year, month, format, true)
+                weekend += tmp[:weekend]
+                weekday += tmp[:weekday]
             end
             (1..end_date.mon-1).to_a.each do |month|
-                result += self.date_in_month(end_date.year, month)
+                tmp = self.date_in_month(end_date.year, month, format, true)
+                weekend += tmp[:weekend]
+                weekday += tmp[:weekday]
             end
             (1..end_date.day).each do |day|
                 date = Date.new(end_date.year, end_date.mon, day)
-                result << date.strftime(format)
+                if self.weekend?(date)
+                    weekend << date.strftime(format)
+                else
+                    weekday << date.strftime(format)
+                end
             end
         end
-        return result
+        if day_type
+            return {:weekday=>weekday, :weekend=>weekend}
+        else
+            return (weekday + weekend).sort
+        end
     end
 
-    def MonthDate.date_in_month(year, month, format="%Y%m%d")
+    def MonthDate.date_in_month(year, month, format="%Y%m%d", day_type=false)
         days = self.days_in_month(year, month)
         ary = []
+        result = {:weekend=>[], :weekday=>[]}
+        if day_type
+            1.upto(days) do |day|
+                date = Date.new(year, month, day)
+                if self.weekend?(date)
+                    result[:weekend] << date.strftime(format)
+                else
+                    result[:weekday] << date.strftime(format)
+                end
+            end
+            return result
+        else
+            1.upto(days) do |day|
+                date = Date.new(year, month, day)
+                ary << date.strftime(format)
+            end
+            return ary
+        end
+    end
+
+    def MonthDate.date_in_month_weekend(year, month, format="%Y%m%d")
+        days = self.days_in_month(year, month)
+        result = []
         1.upto(days) do |day|
             date = Date.new(year, month, day)
-            ary << date.strftime(format)
+            result << date.strftime(format) if self.weekend?(date)
+        end
+        return result
+    end
+
+    def MonthDate.date_in_month_weekday(year, month, format="%Y%m%d")
+        days = self.days_in_month(year, month)
+        result = []
+        1.upto(days) do |day|
+            date = Date.new(year, month, day)
+            result << date.strftime(format) unless self.weekend?(date)
+        end
+        return result
+    end
+
+    def self.weekend?(date)
+        wday = date.wday
+        if wday == 0 || wday == 6
+            return true
+        else
+            return false
         end
-        return ary
     end
 end

data/spec/month_date_spec.rb

@@ -5,4 +5,27 @@ describe MonthDate do
         expect(MonthDate.week_date_in_month(2014, 1, 1)).to eq ["20140106", "20140113", "20140120", "20140127"]
         expect(MonthDate.week_date_in_month(2014, 1, 1, "%F")).to eq ["2014-01-06", "2014-01-13", "2014-01-20", "2014-01-27"]
     end
+
+    it "test dates_in_range" do
+        result = MonthDate.dates_in_range(20140101, 20150205, "%Y%m%d", true)
+    end
+
+    it "test date_in_month" do 
+        answer = {:weekend=>["20140104", "20140105", "20140111", "20140112", "20140118", "20140119", "20140125", "20140126"], :weekday=>["20140101", "20140102", "20140103", "20140106", "20140107", "20140108", "20140109", "20140110", "20140113", "20140114", "20140115", "20140116", "20140117", "20140120", "20140121", "20140122", "20140123", "20140124", "20140127", "20140128", "20140129", "20140130", "20140131"]}
+        result = MonthDate.date_in_month(2014, 1, "%Y%m%d", true)
+        expect(result).to eq answer
+    end
+
+    it "test date_in_month_weekend" do 
+        answer = ["20140104", "20140105", "20140111", "20140112", "20140118", "20140119", "20140125", "20140126"]
+        result = MonthDate.date_in_month_weekend(2014, 1, "%Y%m%d")
+        expect(result).to eq answer
+    end
+
+    it "test date_in_month_weekend" do 
+        answer = ["20140101", "20140102", "20140103", "20140106", "20140107", "20140108", "20140109", "20140110", "20140113", "20140114", "20140115", "20140116", "20140117", "20140120", "20140121", "20140122", "20140123", "20140124", "20140127", "20140128", "20140129", "20140130", "20140131"]
+        result = MonthDate.date_in_month_weekday(2014, 1, "%Y%m%d")
+        expect(result).to eq answer
+    end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: month_date
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.5.0
 platform: ruby
 authors:
 - ctxhou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-21 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -47,6 +47,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile