carender 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88e0c15f59567a53434dd82e22782af60a5a39f49fc3bf83a972dfb05e954b69
-  data.tar.gz: efbe7f96ea6f269c3f5675337b002889496919f44a5c2ecdf7fcc6f91e3b81eb
+  metadata.gz: 7379eda822195f2ef52d2ac57b570d17377e657cd3d04d6c255444c5e9ee3cdc
+  data.tar.gz: de4daaf6023e59a2a1de788bdbcfd8797277afaa5609427625cc80bddfdd50c2
 SHA512:
-  metadata.gz: 47d6ca78188311e16aed2bfbf22435403f6f8e2db8180c0bafe8e341603717e7eef957627f92e870653c56ce17fdefcf97bea57de2c3efcd8f6d30b31db888b1
-  data.tar.gz: af6874f2e6600f1ecc3ed6295cd9718f270dd53c00dd5ddfe0e237056ef0c0c4f01afe97564287df86252d0b7d3c940a9e7c832ceaa9f2267aa4521936eed3b8
+  metadata.gz: 508865b87955b57885f00126df9753a3221de3d2dcdfb39794686c900c5aab62178c560f04ed670797e1e03c72472a7b8794343e447747ce73e4766c610a98a1
+  data.tar.gz: 4b23d027758b708d5cc56163748b18b684225c556088625e857366b454e7f93612f373e6c536445d759e542fae63b072361fa3a535b7cf743add128977879ab2

data/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2018 kami-zh
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,12 +1,12 @@
 # Carender
 
-[WIP] A simple calendar gem for Rails application.
+A simple calendar gem for Rails application.
 
-## Synopsis
+## Usage
 
-This library automatically renders the calendar by reading `params[:year]` and `params[:month]`.
+This library automatically renders the calendar as HTML table by reading `params[:year]` and `params[:month]`.
 
-A simple calendar:
+A code of simple calendar:
 
 ```erb
 <%= carender do |date| %>
@@ -14,6 +14,20 @@ A simple calendar:
 <% end %>
 ```
 
+Above code renders following table.
+The string passed as a block is rendered in each cell.
+
+```html
+<table>
+  <tr><th>Sun</th><th>Mon</th><th>Tue</th><th>Wed</th><th>Thu</th><th>Fri</th><th>Sat</th></tr>
+  <tr><td></td><td>1</td><td>2</td><td>3</td><td>4</td><td>5</td><td>6</td></tr>
+  <tr><td>7</td><td>8</td><td>9</td><td>10</td><td>11</td><td>12</td><td>13</td></tr>
+  <tr><td>14</td><td>15</td><td>16</td><td>17</td><td>18</td><td>19</td><td>20</td></tr>
+  <tr><td>21</td><td>22</td><td>23</td><td>24</td><td>25</td><td>26</td><td>27</td></tr>
+  <tr><td>28</td><td>29</td><td>30</td><td>31</td><td></td><td></td><td></td></tr>
+</table>
+```
+
 With a collection which is grouped by specified column:
 
 ```erb
@@ -38,6 +52,10 @@ And then execute:
 $ bundle
 ```
 
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/kami-zh/carender. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/Rakefile

@@ -1,27 +1,10 @@
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-require 'rdoc/task'
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Carender'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.md')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
 require 'bundler/gem_tasks'
-
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
+  t.warning = false
 end
 
 task default: :test

data/lib/carender.rb

@@ -1,5 +1,7 @@
 require 'carender/calendar'
-require 'carender/collection'
 require 'carender/core'
 require 'carender/helper'
-require 'carender/railtie'
+
+if defined?(Rails)
+  require 'carender/railtie'
+end

data/lib/carender/calendar.rb

@@ -1,13 +1,16 @@
+require 'date'
+require 'active_support/core_ext/date'
+require 'active_support/core_ext/time'
+
 module Carender
   class Calendar
-    def initialize(year, month, collection)
+    def initialize(year, month)
       @year = year
       @month = month
-      @collection = collection
     end
 
-    def render(view_context, &block)
-      html = <<-EOS
+    def render(view_context, collection, &block)
+      html = <<-HTML
         <table>
           <tr>
             <th>Sun</th>
@@ -18,10 +21,10 @@ module Carender
             <th>Fri</th>
             <th>Sat</th>
           </tr>
-      EOS
+      HTML
 
       (date..date.end_of_month).each do |d|
-        if d.wday == 0
+        if d.wday == 0 || (d == date && d.wday != 0)
           html += '<tr>'
         end
 
@@ -30,14 +33,18 @@ module Carender
         end
 
         html += '<td>'
-        html += view_context.capture { block.call(d, collection[d] || []) }
+
+        if block
+          html += view_context.capture { block.call(d, collection[d]) }.to_s
+        end
+
         html += '</td>'
 
         if d == date.end_of_month
           (6 - d.wday).times { html += '<td></td>' }
         end
 
-        if d.wday == 6
+        if d.wday == 6 || (d == date.end_of_month && d.wday != 6)
           html += '</tr>'
         end
       end
@@ -48,7 +55,7 @@ module Carender
 
     private
 
-    attr_reader :year, :month, :collection
+    attr_reader :year, :month
 
     def date
       @date ||= Date.new(year, month)

data/lib/carender/core.rb

@@ -2,16 +2,35 @@ module Carender
   class Core
     def initialize(view_context, options)
       @view_context = view_context
-      @collection = Carender::Collection.new(*options.values_at(:collection, :column)).grouped
+      @collection = options[:collection] || []
+      @column = options[:column]
     end
 
     def render(&block)
-      calendar = Carender::Calendar.new(*view_context.params.values_at(:year, :month).map(&:to_i), collection)
-      calendar.render(view_context, &block).html_safe
+      calendar = Carender::Calendar.new(year, month)
+      calendar.render(view_context, grouped_collection, &block).html_safe
     end
 
     private
 
-    attr_reader :view_context, :collection
+    attr_reader :view_context, :collection, :column
+
+    def year
+      view_context.params[:year].to_i
+    end
+
+    def month
+      view_context.params[:month].to_i
+    end
+
+    def grouped_collection
+      Hash.new([]).tap do |hash|
+        collection.each do |c|
+          date = c.send(column).to_date
+          hash[date] = [] if hash[date].empty?
+          hash[date] << c
+        end
+      end
+    end
   end
 end

data/lib/carender/version.rb

@@ -1,3 +1,3 @@
 module Carender
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,31 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: carender
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - kami-zh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-17 00:00:00.000000000 Z
+date: 2018-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0.beta2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: actionview
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0.beta2
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: oga
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -45,17 +59,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- MIT-LICENSE
+- LICENSE.txt
 - README.md
 - Rakefile
 - lib/carender.rb
 - lib/carender/calendar.rb
-- lib/carender/collection.rb
 - lib/carender/core.rb
 - lib/carender/helper.rb
 - lib/carender/railtie.rb
 - lib/carender/version.rb
-- lib/tasks/carender_tasks.rake
 homepage: https://github.com/kami-zh/carender
 licenses:
 - MIT

data/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright 2018 kami-zh
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/carender/collection.rb

@@ -1,25 +0,0 @@
-module Carender
-  class Collection
-    def initialize(collection, column)
-      @collection = collection || []
-      @column = column
-      @grouped = {}
-    end
-
-    def grouped
-      return @grouped unless @grouped.empty?
-
-      collection.each do |c|
-        date = c.send(column).to_date
-        @grouped[date] = [] unless @grouped[date]
-        @grouped[date] << c
-      end
-
-      @grouped
-    end
-
-    private
-
-    attr_reader :collection, :column
-  end
-end

data/lib/tasks/carender_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :carender do
-#   # Task goes here
-# end