chinese-holidays 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7175f0c1499ebf562947ddfdfc0fd007bf09ca6
-  data.tar.gz: 0ee8987e658d976e5c3813bf6c9b649973ec84d7
+  metadata.gz: e91ed174fbc515deb9968ff9123487841f37c4c6
+  data.tar.gz: cf740064d2d87b680e972d0892284dcd83f78154
 SHA512:
-  metadata.gz: 6a931b69fe77e776f3f997c851d383f4776b43900867caa0d7c107148ba95efd6633d66b550dd22dd35e7055b5b5ddfe11e194972f59667cbf03e66f13aeeabd
-  data.tar.gz: ab42524ae5554f6ec6ef737ae37e3264af814018f9d0d7b5240c64dfd2df1b24db95c696ff29c1546bf5ce0e40ed3cf1a0c4285a703edf7d528d580531bfaccf
+  metadata.gz: 3c5d48dd8267ab78bcb999edc325f7879efdecea6066187e05426f4af75a42c41f182c5fab933a5afe4e462ef494e8c267ef99122cea93de42f1547b619d0331
+  data.tar.gz: a02370fa1dc9056210be2506cf1e376811ed8138d359eee704a03dc62d1fc66b4e094b35f48fe702c25fd57d3fdcd57baaef4871c9b6756c38fc8c91646cc2cc

data/lib/chinese/holidays.rb

@@ -46,7 +46,7 @@ module Chinese
     end
 
     def self.weekend?(date)
-      date.wday == 6 && date.wday == 0
+      date.wday == 6 || date.wday == 0
     end
 
     def self.events

data/lib/chinese/holidays/data/2016.json

@@ -1,69 +1,69 @@
 [
   {
     "name": "元旦",
-    "range": ["2016.01.01", "2016.01.03"],
+    "range": ["2016-01-01", "2016-01-03"],
     "type": "holiday"
   },
 
   {
     "name": "春节",
-    "range": ["2016.02.06"],
+    "range": ["2016-02-06"],
     "type": "workingday"
   },
   {
     "name": "春节",
-    "range": ["2016.02.07", "2016.02.13"],
+    "range": ["2016-02-07", "2016-02-13"],
     "type": "holiday"
   },
   {
     "name": "春节",
-    "range": ["2016.02.14"],
+    "range": ["2016-02-14"],
     "type": "workingday"
   },
 
   {
     "name": "清明节",
-    "range": ["2016.04.02", "2016.04.04"],
+    "range": ["2016-04-02", "2016-04-04"],
     "type": "holiday"
   },
 
   {
     "name": "劳动节",
-    "range": ["2016.04.30", "2016.05.02"],
+    "range": ["2016-04-30", "2016-05-02"],
     "type": "holiday"
   },
 
 
   {
     "name": "端午节",
-    "range": ["2016.06.09", "2016.06.11"],
+    "range": ["2016-06-09", "2016-06-11"],
     "type": "holiday"
   },
   {
     "name": "端午节",
-    "range": ["2016.06.12"],
+    "range": ["2016-06-12"],
     "type": "workingday"
   },
 
   {
     "name": "中秋节",
-    "range": ["2016.09.15", "2016.09.17"],
+    "range": ["2016-09-15", "2016-09-17"],
     "type": "holiday"
   },
   {
     "name": "中秋节",
-    "range": ["2016.09.18"],
+    "range": ["2016-09-18"],
     "type": "workingday"
   },
 
   {
     "name": "国庆节",
-    "range": ["2016.10.01", "2016.10.07"],
+    "range": ["2016-10-01", "2016-10-07"],
     "type": "holiday"
   },
   {
     "name": "国庆节",
-    "range": ["2016.10.08", "2016.10.09"],
+    "range": ["2016-10-08", "2016-10-09"],
     "type": "workingday"
   }
 ]

data/lib/chinese/holidays/days.rb

@@ -13,16 +13,16 @@ module Chinese
       def holiday?
         @type == 'holiday'
       end
-      
+
       def workingday?
         @type == 'workingday'
       end
 
       def days
         if @range.size == 1
-          [Date.strptime(@range[0], '%Y.%m.%d')]
+          [Date.strptime(@range[0], '%F')]
         elsif @range.size == 2
-          (Date.strptime(@range[0], '%Y.%m.%d')..Date.strptime(@range[1], '%Y.%m.%d')).to_a
+          (Date.strptime(@range[0], '%F')..Date.strptime(@range[1], '%F')).to_a
         end
       end
     end

data/lib/chinese/holidays/version.rb

@@ -1,5 +1,5 @@
 module Chinese
   module Holidays
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chinese-holidays
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - bastengao
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler