jpcalendar 0.0.1 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 68bf30b1d48aef42c55dcc3619525727f1604acb
+  data.tar.gz: 45790eedac9b6174d6b6f5ac039d1ce3bef95648
+SHA512:
+  metadata.gz: f34f792b91ebd0ee9ee8c6e4c53a8f5807db3d9d3d571fdd829e99afcc4e2c4d6d269ed2cf895e2e28ac6f02d18d409f71674eae67ff5878ab348807ad9659a6
+  data.tar.gz: 0a8093ba67346c86bc4aa74016e7784dea6f3c13c42c48c41ce0c3bd472b6b99ea03ce31c758c6a8fd5b8665987b137c87721c5412b01f954a496392d0726bfb

data/.rbenv-gemsets

@@ -0,0 +1 @@
+jpcalendar

data/Gemfile

@@ -3,13 +3,11 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in jpcalendar.gemspec
 gemspec
 
-gem 'holiday_jp',              :git => 'git://github.com/komagata/holiday_jp.git'
+gem 'holiday_jp', :github => "komagata/holiday_jp"
 
 group :development, :test do
   gem 'jeweler'
   gem 'rails'
-  gem 'rspec'
-  gem 'rspec-rails'
-  gem 'ruby-debug19'
+  gem 'rspec', '~> 2.99'
 end
 

data/README.md

@@ -3,15 +3,12 @@ Jpcalendar
 日本の祝日に対応したカレンダーを出力します。
 
 install
-------
+------  
+`gem install jpcalendar`
 
-```zsh
-gem build jpcalendar.gemspec
-rake install
-```
+もしくはGemfileに記載  
+`gem 'jpcalendar'`
 
-もしくはGemfileに追記で使用  
-``gem 'jpcalendar',              :git => 'git://github.com/YoshitsuguFujii/jpcalendar.git'``
 usage
 ------
 
@@ -303,6 +300,9 @@ Options
 * 休日を含まない  
 `holiday_off: (true または false)`
 
+* 前後の月も含めて表示する  
+`fill_other_days: (true または false)`
+
 * 一桁の日付を何でパディングするか  
 `padding: 任意の文字列`
 

data/jpcalendar.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "holiday_jp", "~>0.3.1"
+  s.add_dependency "holiday_jp"
 end

data/lib/jpcalendar/generator.rb

@@ -1,5 +1,6 @@
 # coding: utf-8
 require 'json'
+require 'date'
 
 module Jpcalendar
   #
@@ -57,7 +58,7 @@ module Jpcalendar
             if calendar_weekday.find_by_number(d.wday).number == weekday.number
               #TODO こことなんとかしたい
               # class 作成部分
-              holiday = (calendar_weekday.find_by_number(d.wday).enname == "sun" || ::HolidayJp::HOLIDAYS[d].try(:name))? "holiday" : ""
+              holiday = (calendar_weekday.find_by_number(d.wday).enname == "sun" || ::HolidayJp.holiday?(d)) ? "holiday" : ""
               class_hash = { class: "row_#{date_feed.size} col_#{week_arr.size} #{calendar_weekday.find_by_number(d.wday).enname} #{holiday} day_#{d.day}"}
 
               # id 作成部分
@@ -68,9 +69,10 @@ module Jpcalendar
 
               # 押し込む
               week_arr << CalenderDate.new(
+                                            d,
                                             date_format(d.day, options),
                                             event_name,
-                                            ::HolidayJp::HOLIDAYS[d].try(:name),
+                                            ::HolidayJp.holiday?(d).try(:name),
                                             id_hash.merge(class_hash)
                                           )
 
@@ -89,7 +91,7 @@ module Jpcalendar
         else
           #TODO ここをなんとかしたい
           # class 作成部分
-          holiday = (calendar_weekday.find_by_number(d.wday).enname == "sun" || ::HolidayJp::HOLIDAYS[d].try(:name))? "holiday" : ""
+          holiday = (calendar_weekday.find_by_number(d.wday).enname == "sun" || ::HolidayJp.holiday?(d)) ? "holiday" : ""
           class_hash = { class: "row_#{date_feed.size} col_#{week_arr.size} #{calendar_weekday.find_by_number(d.wday).enname} #{holiday} day_#{d.day}"}
 
           # id 作成部分
@@ -100,9 +102,10 @@ module Jpcalendar
 
           # 押し込む
           week_arr << CalenderDate.new(
+                                        d,
                                         date_format(d.day, options),
                                         event_name,
-                                        ::HolidayJp::HOLIDAYS[d].try(:name),
+                                        ::HolidayJp.holiday?(d).try(:name),
                                         id_hash.merge(class_hash)
                                       )
           # 折り返し
@@ -111,6 +114,36 @@ module Jpcalendar
       end
 
       date_feed << week_arr if week_arr.present?
+
+
+      if options[:fill_other_days]
+        # 第1週の日付のないところに前月の日付をいれていく
+        blank_date =  date_feed[1].take_while{|first_week_day| first_week_day.date == "" }
+        blank_date.size.times do |idx|
+          prev_month_day = start_date - (idx + 1)
+          date_feed[1][idx].date = prev_month_day
+          date_feed[1][idx].text = date_format(prev_month_day.day, options)
+          date_feed[1][idx].attributes = {:class => "other-month-day prev-month-day"}
+          date_feed[1][idx].jp_holiday = ::HolidayJp.holiday?(prev_month_day).try(:name)
+        end
+
+        # 最終週の日付のないところに前月の日付をいれていく
+        index = 0
+        7.times do |idx|
+          if date_feed.last[idx].nil?
+            next_month_day = start_date.next_month + index
+            index += 1
+            date_feed.last << CalenderDate.new(
+                                                next_month_day,
+                                                date_format(next_month_day.day, options),
+                                                "",
+                                                ::HolidayJp.holiday?(next_month_day).try(:name),
+                                                {:class => "other-month-day prev-month-day"}
+                                              )
+          end
+        end
+      end
+
       date_feed
 
     end
@@ -122,7 +155,7 @@ module Jpcalendar
       def make_header(calendar_weekday)
         calendar_weekday.map.with_index(0) do |cal,idx|
           class_text = ["header header_#{idx}", cal.enname].join("\s")
-          CalenderDate.new(cal.jpname, nil, nil, { class: class_text })
+          CalenderDate.new("", cal.jpname, nil, nil, { class: class_text })
         end
       end
       #}}}
@@ -133,15 +166,16 @@ module Jpcalendar
       end #}}}
 
       class CalenderDate #{{{
-        attr_accessor :text, :event, :attributes, :jp_holiday
+        attr_accessor :date, :text, :event, :attributes, :jp_holiday
         class AttributeTypeError < StandardError
           def initialize(msg = "CalenderDate attributes is only accept hash")
             super(msg)
           end
         end
 
-        def initialize(_text = "", _event = nil, _jp_holiday = nil, _attributes = {})
+        def initialize(_date = "", _text = "", _event = nil, _jp_holiday = nil, _attributes = {})
           raise AttributeTypeError if _attributes.present? && !_attributes.is_a?(Hash)
+          self.date       = _date
           self.text       = _text
           self.event      = _event
           self.jp_holiday = _jp_holiday

data/lib/jpcalendar/version.rb

@@ -1,3 +1,3 @@
 module Jpcalendar
-  VERSION  =  "0.0.1"
+  VERSION  =  "1.0.0"
 end

data/spec/format_spec.rb

@@ -211,6 +211,10 @@ describe Jpcalendar::Format do
 
     context "対象月：2008年9月 (スペース詰め)" do
       before do
+        def Date.today
+          Date.new(2013, 1, 8)
+        end
+
         @options = {padding: " ",wrap_tag: :section, row_tag: :ul, header_cell_tag: :li, body_cell_tag: :li}
         @expect_str="<section><ul class='header'><li class='header header_0 sun'>日</li><li class='header header_1 mon'>月</li><li class='header header_2 tue'>火</li><li class='header header_3 wed'>水</li><li class='header header_4 thu'>木</li><li class='header header_5 fri'>金</li><li class='header header_6 sat'>土</li></ul><ul class='row_0'><li><span class='day'></span></li><li><span class='day'></span></li><li class='row_1 col_2 tue holiday day_1'><span class='day'>&nbsp;1</span><span class='holiday_name'>元日</span></li><li class='row_1 col_3 wed  day_2'><span class='day'>&nbsp;2</span></li><li class='row_1 col_4 thu  day_3'><span class='day'>&nbsp;3</span></li><li class='row_1 col_5 fri  day_4'><span class='day'>&nbsp;4</span></li><li class='row_1 col_6 sat  day_5'><span class='day'>&nbsp;5</span></li></ul><ul class='row_1'><li class='row_2 col_0 sun holiday day_6'><span class='day'>&nbsp;6</span></li><li class='row_2 col_1 mon  day_7'><span class='day'>&nbsp;7</span></li><li id='today' class='row_2 col_2 tue  day_8'><span class='day'>&nbsp;8</span></li><li class='row_2 col_3 wed  day_9'><span class='day'>&nbsp;9</span></li><li class='row_2 col_4 thu  day_10'><span class='day'>10</span></li><li class='row_2 col_5 fri  day_11'><span class='day'>11</span></li><li class='row_2 col_6 sat  day_12'><span class='day'>12</span></li></ul><ul class='row_2'><li class='row_3 col_0 sun holiday day_13'><span class='day'>13</span></li><li class='row_3 col_1 mon holiday day_14'><span class='day'>14</span><span class='holiday_name'>成人の日</span></li><li class='row_3 col_2 tue  day_15'><span class='day'>15</span></li><li class='row_3 col_3 wed  day_16'><span class='day'>16</span></li><li class='row_3 col_4 thu  day_17'><span class='day'>17</span></li><li class='row_3 col_5 fri  day_18'><span class='day'>18</span></li><li class='row_3 col_6 sat  day_19'><span class='day'>19</span></li></ul><ul class='row_3'><li class='row_4 col_0 sun holiday day_20'><span class='day'>20</span></li><li class='row_4 col_1 mon  day_21'><span class='day'>21</span></li><li class='row_4 col_2 tue  day_22'><span class='day'>22</span></li><li class='row_4 col_3 wed  day_23'><span class='day'>23</span></li><li class='row_4 col_4 thu  day_24'><span class='day'>24</span></li><li class='row_4 col_5 fri  day_25'><span class='day'>25</span></li><li class='row_4 col_6 sat  day_26'><span class='day'>26</span></li></ul><ul class='row_4'><li class='row_5 col_0 sun holiday day_27'><span class='day'>27</span></li><li class='row_5 col_1 mon  day_28'><span class='day'>28</span></li><li class='row_5 col_2 tue  day_29'><span class='day'>29</span></li><li class='row_5 col_3 wed  day_30'><span class='day'>30</span></li><li class='row_5 col_4 thu  day_31'><span class='day'>31</span></li></ul></section>"
       end

metadata

@@ -1,40 +1,39 @@
 --- !ruby/object:Gem::Specification
 name: jpcalendar
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - yoshitsugu fujii
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: holiday_jp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
-description: 日本の祝祭日に対応したカレンダー
+        version: '0'
+description: "日本の祝祭日に対応したカレンダー"
 email:
 - ishikurasakura@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".DS_Store"
+- ".gitignore"
+- ".rbenv-gemsets"
 - Gemfile
 - LICENSE.md
 - README.md
@@ -53,27 +52,26 @@ files:
 - spec/weekday_scale_spec.rb
 homepage: https://github.com/YoshitsuguFujii/jpcalendar
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: jpcalendar
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: japanese calendar
 test_files:
 - spec/format_spec.rb