simple_calendar 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dfc97c340a63812f227e879a6756c2802c50488
-  data.tar.gz: ebf3dad29eae132666ecc41060996ca812e59d9c
+  metadata.gz: 62254f5fef1e894c99a533e9e5254acbc5c9f1c5
+  data.tar.gz: 6095a62f0af5cf5e48b9b2cba01307ddd24abbe7
 SHA512:
-  metadata.gz: c7fcff14b9f734bd872120d693bd3b71434cf82d439d92a11767c3cc6fbc862a05d2b297b7937b3704b5c5adf5d0dee6a2390b1bbb0a58a0d9003ad53d0fa9d8
-  data.tar.gz: 32501ddee6d5535fd55a1af0487b66ba9a3b23c3e464e48181e1bb7956de0efacc599decff45c131b9f8ba9f7b4865eb81ea0b8bf7a9256a66d022894332942f
+  metadata.gz: f51067733929d0d1885c389285517e2864a2b34d5b13772f31ee13a342c53ef4250238a1019fda310fc308e010349efb4c81076ffdc0f72e8b8f40410a55c5a6
+  data.tar.gz: 28f2a049bcd185715bec4e18f3ce8bfb3c0ce144e698b7d1deb5e81ccdbd58b904fad908751a206e50deb0a2f0072c7fb633c983118a97f4ce9f9b61ac3f07a3

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2015 Chris Oliver
+
+MIT License
+
+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,4 +1,4 @@
-![travis ci](https://travis-ci.org/excid3/simple_calendar.svg?branch=2.0)
+![travis ci](https://travis-ci.org/excid3/simple_calendar.svg?branch=master)
 
 Simple Calendar
 ===============

data/app/views/simple_calendar/_calendar.html.erb

@@ -17,7 +17,7 @@
         <tr>
           <% week.each do |day| %>
             <%= content_tag :td, class: calendar.td_classes_for(day) do %>
-              <%= block.call day, sorted_events.fetch(day, []) %>
+              <% block.call day, sorted_events.fetch(day, []) %>
             <% end %>
           <% end %>
         </tr>

data/app/views/simple_calendar/_month_calendar.html.erb

@@ -17,7 +17,7 @@
         <tr>
           <% week.each do |day| %>
             <%= content_tag :td, class: calendar.td_classes_for(day) do %>
-              <%= block.call day, sorted_events.fetch(day, []) %>
+              <% block.call day, sorted_events.fetch(day, []) %>
             <% end %>
           <% end %>
         </tr>

data/app/views/simple_calendar/_week_calendar.html.erb

@@ -17,7 +17,7 @@
         <tr>
           <% week.each do |day| %>
             <%= content_tag :td, class: calendar.td_classes_for(day) do %>
-              <%= block.call day, sorted_events.fetch(day, []) %>
+              <% block.call day, sorted_events.fetch(day, []) %>
             <% end %>
           <% end %>
         </tr>

data/lib/simple_calendar/calendar.rb

@@ -50,7 +50,7 @@ module SimpleCalendar
       end
 
       def sorted_events
-        events = options.fetch(:events, [])
+        events = options.fetch(:events, []).sort_by(&attribute)
         sorted = {}
 
         events.each do |event|
@@ -59,12 +59,9 @@ module SimpleCalendar
             date = start_time.to_date
             sorted[date] ||= []
             sorted[date] << event
-            sorted[date] = sorted[date].sort_by(&attribute)
           end
         end
 
-        # TODO: move sorting by start_time to after the event loop
-
         sorted
       end
 

data/lib/simple_calendar/version.rb

@@ -1,3 +1,3 @@
 module SimpleCalendar
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/simple_calendar.gemspec

@@ -10,7 +10,8 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/excid3/simple_calendar"
   s.summary     = %q{A simple Rails 3 and Rails 4 calendar}
   s.description = %q{A simple Rails 3 and Rails 4 calendar}
-
+  s.license     = "MIT"
+  
   s.rubyforge_project = "simple_calendar"
 
   s.files         = `git ls-files`.split("\n")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_calendar
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Chris Oliver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-07 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -51,6 +51,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
+- LICENSE.txt
 - README.md
 - Rakefile
 - app/views/simple_calendar/_calendar.html.erb
@@ -73,7 +74,8 @@ files:
 - spec/spec_helper.rb
 - spec/views_generators_spec.rb
 homepage: https://github.com/excid3/simple_calendar
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []