holidays_in_month 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5da277bf2485dfff7687b9b69cc6412bec04eaf0
-  data.tar.gz: ed804e3612ccf900ccf7cf6920d9c15cb01100a9
+  metadata.gz: 32194ceaa55090daa2d8e39a007c60ab825e9302
+  data.tar.gz: 8aa28cdac1d28f10806a16e5c4a2596b05ef09e4
 SHA512:
-  metadata.gz: 693a365bc88064c71f2c2ceeba3ae8dedad7998d7090a3678e18a637ecc33a857b83ce052eb3e36dfb010315cbc90cd1d94c0b13edec4f89a7bc4818f6a281d3
-  data.tar.gz: 73e0cf31b8d7dbb87334296d0beb87d4a3c79ff8a88c4cae43584f96c32d006e74cb7ce413d9f88bbe289f60e1c4458231be09d541659ea5e952c8f1db273582
+  metadata.gz: 3e25c93bcb52b84372b577b39d06d72ad9ceb5bee602f78a20a7182779ac0732ee8c501755b6b738147d491d2b8090211c2ba3c12dbe94888cd8735b9198ceb4
+  data.tar.gz: c632be6dc22b691f19a2dd0a78729d626f18ca40d52c814ef46a4799532b472c8363dd31265e6293d00f1d36b8cbefbcabb50a64012c557b57c47392fd66ddc3

data/README.md

@@ -1,9 +1,9 @@
 # Holidays in Month
 
-This gem is return holidays(Saturday, Sunday, National) in month in Japan.
+This gem is return holidays(Saturday, Sunday, National) of month in Japan.
 
 ```ruby
-Holidays.holidays_in_month(1,2016)
+obj.get_in_month(2016, 1)
 => ["2016-1-2", "2016-1-3", "2016-1-9", "2016-1-10", "2016-1-16", "2016-1-17",
   "2016-1-23", "2016-1-24", "2016-1-30", "2016-1-31", {"2016-01-01"=>"元日", "2016-01-11"=>"成人の日"}]
 ```
@@ -18,7 +18,7 @@ gem 'holidays_in_month'
 
 And then execute:
 
-    $ bundle
+    $ bundle install
 
 Or install it yourself as:
 
@@ -26,13 +26,20 @@ Or install it yourself as:
 
 ## Usage
 
+Add this line to your application's Model or Controller:
+
 ```ruby
-Holidays.holidays_in_month(month,year)
+holidays = JP::Holidays.new
+holidays.get_in_month(year, month)
+```
 
 example:
-Holidays.holidays_in_month(12,2016)
-=> ["2016-12-3", "2016-12-4", "2016-12-10", "2016-12-11", "2016-12-17", "2016-12-18",
-  "2016-12-24", "2016-12-25", "2016-12-31", {"2016-12-23"=>"天皇誕生日"}]
+
+```ruby
+@holidays = JP::Holidays.new
+@holidays.get_in_month(2016, 1)
+@holidays => ["2016-1-2", "2016-1-3", "2016-1-9", "2016-1-10", "2016-1-16", "2016-1-17",
+  "2016-1-23", "2016-1-24", "2016-1-30", "2016-1-31", {"2016-01-01"=>"元日", "2016-01-11"=>"成人の日"}]
 ```
 
 ## License

data/lib/holidays_in_month/version.rb

@@ -1,3 +1,3 @@
 module Holidays
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/holidays_in_month.rb

@@ -4,32 +4,37 @@ require 'active_support/time'
 require 'time'
 require 'yaml'
 
-module Holidays
-  def self.holidays_in_month(month, year)
-    @national_holidays = {}
-    @holidays = []
-    d = 0
+module JP
+  class Holiday
+    def get_in_month(year, month)
+      init
+      #休日に祝日を追加
+      holidays(year, month) << nationaldays.select { |n| n.match(/#{year}-#{"%02d" % month}-*/) }
+    end
+
+    private
 
-    yaml = YAML.load_file(File.expand_path('./../../holidays.yml', __FILE__))
-    yaml.each do |date, name|
-      @national_holidays.store(date.strftime("%Y-%m-%d"), name)
+    def init
+      @nationaldays = {}
+      @holidays = []
     end
 
-    Time.days_in_month(month, year).times do
-      d += 1
-      wday = Date.new(year, month, d).wday
-      #Saturday => wday == 6, Sunday => wday == 0
-      @holidays << "#{year}-#{month}-#{d}" if wday == 6 || wday == 0
+    def nationaldays
+      yaml = YAML.load_file(File.expand_path('./../../holidays.yml', __FILE__))
+      yaml.each do |date, name|
+        @nationaldays.store(date.strftime("%Y-%m-%d"), name)
+      end
+      @nationaldays
     end
 
-    case month
-    when 1
-      @national_holidays = @national_holidays.select { |k| k.match(/#{year}-0#{month}-*/) }
-    when 2
-      @national_holidays = @national_holidays.select { |k| k.match(/#{year}-0#{month}-*/) }
-    else
-      @national_holidays = @national_holidays.select { |k| k.match(/#{year}-#{month}-*/) }
+    def holidays(year, month)
+      num_days_of_month = Date.new(year, month).end_of_month.day
+
+      1.upto(num_days_of_month) do |day|
+        wday = Date.new(year, month, day).wday
+        @holidays << "%04d-%02d-%02d" % [year, month, day] if wday == 6 || wday == 0
+      end
+      @holidays
     end
-    @holidays << @national_holidays
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: holidays_in_month
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Yuta Hasada
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2016-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport