event-calendar 2.3.1 → 2.3.2

data/README.rdoc

@@ -21,6 +21,16 @@ To generate the necessary static files AND the example below:
 
 === Rails 3
 
+As a gem:
+
+  gem install event-calendar
+  
+Add this to your Gemfile:
+  
+  gem 'event-calendar', :require => 'event_calendar'
+  
+Or as a plugin:
+
   rails plugin install git://github.com/elevation/event_calendar.git
 
 To generate the necessary static files AND the example below:
@@ -90,8 +100,14 @@ An event can also have a *color* field (any string which is a valid CSS color) w
   end
 
 ====config/routes.rb
-
+  
+Rails 2:
+  
   map.calendar '/calendar/:year/:month', :controller => 'calendar', :action => 'index', :requirements => {:year => /\d{4}/, :month => /\d{1,2}/}, :year => nil, :month => nil
+  
+Rails 3:
+  
+  match '/calendar(/:year(/:month))' => 'calendar#index', :as => :calendar, :constraints => {:year => /\d{4}/, :month => /\d{1,2}/}
 
 ====app/controllers/calendar_controller.rb
   
@@ -130,7 +146,7 @@ Some helper methods are created, but you could put this in the view. The key is
         :month => @month,
         :event_strips => @event_strips,
         :month_name_text => I18n.localize(@shown_month, :format => "%B %Y"),
-        :previous_month_text => "<< " + month_link(@shown_month.last_month),
+        :previous_month_text => "<< " + month_link(@shown_month.prev_month),
         :next_month_text => month_link(@shown_month.next_month) + " >>"
       }
     end

data/Rakefile

@@ -5,9 +5,9 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "event-calendar"
-    gem.summary = "Rails helper for generating a calendar of events."
+    gem.summary = "Rails helper for showing multiple, overlapping events across calendar days and rows."
     gem.email = ""
-    gem.description = "Rails helper for generating a calendar of events. These events can optionally span multiple days."
+    gem.description = "Rails helper for showing multiple, overlapping events across calendar days and rows."
     gem.authors = ["Jeff Schuil"]
     gem.homepage = "http://github.com/elevation/event_calendar"
     gem.require_path = 'lib'
@@ -18,12 +18,28 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-task :default => :spec
-desc "Run all specs"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = ['--options', 'spec/spec.opts']
+begin
+  # Rspec 1.3
+  require 'spec/rake/spectask'
+  task :default => :spec
+  desc "Run all specs"
+  Spec::Rake::SpecTask.new do |t|
+    t.spec_files = FileList['spec/**/*_spec.rb']
+    t.spec_opts = ['--options', 'spec/spec.opts']
+  end
+  
+rescue LoadError
+  # RSpec 2
+  require 'rspec/core/rake_task'
+  task :default => :spec
+  desc "Run all specs"
+  RSpec::Core::RakeTask.new do |t|
+    t.pattern = "spec/**/*_spec.rb"
+    t.rspec_opts = %w(-fs --color)
+  end
+  
+rescue LoadError
+  puts "Rspec not available. Install it with: gem install rspec"
 end
 
 require 'rake/rdoctask'

data/VERSION

@@ -1 +1 @@
-2.3.1
+2.3.2

data/event-calendar.gemspec

@@ -0,0 +1,78 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{event-calendar}
+  s.version = "2.3.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jeff Schuil"]
+  s.date = %q{2010-12-29}
+  s.description = %q{Rails helper for showing multiple, overlapping events across calendar days and rows.}
+  s.email = %q{}
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    "CHANGELOG.rdoc",
+    "MIT-LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "event-calendar.gemspec",
+    "generators/event_calendar/USAGE",
+    "generators/event_calendar/event_calendar_generator.rb",
+    "generators/event_calendar/lib/insert_routes.rb",
+    "generators/event_calendar/templates/controller.rb.erb",
+    "generators/event_calendar/templates/helper.rb.erb",
+    "generators/event_calendar/templates/javascript.js",
+    "generators/event_calendar/templates/jq_javascript.js",
+    "generators/event_calendar/templates/migration.rb.erb",
+    "generators/event_calendar/templates/model.rb.erb",
+    "generators/event_calendar/templates/stylesheet.css",
+    "generators/event_calendar/templates/view.html.erb",
+    "init.rb",
+    "install.rb",
+    "lib/event_calendar.rb",
+    "lib/event_calendar/calendar_helper.rb",
+    "lib/event_calendar/railtie.rb",
+    "lib/generators/event_calendar/USAGE",
+    "lib/generators/event_calendar/event_calendar_generator.rb",
+    "lib/generators/event_calendar/templates/controller.rb.erb",
+    "lib/generators/event_calendar/templates/helper.rb.erb",
+    "lib/generators/event_calendar/templates/javascript.js",
+    "lib/generators/event_calendar/templates/jq_javascript.js",
+    "lib/generators/event_calendar/templates/migration.rb.erb",
+    "lib/generators/event_calendar/templates/model.rb.erb",
+    "lib/generators/event_calendar/templates/stylesheet.css",
+    "lib/generators/event_calendar/templates/view.html.erb",
+    "lib/tasks/event_calendar_tasks.rake",
+    "spec/event_calendar_spec.rb",
+    "spec/fixtures/models.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "uninstall.rb"
+  ]
+  s.homepage = %q{http://github.com/elevation/event_calendar}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Rails helper for showing multiple, overlapping events across calendar days and rows.}
+  s.test_files = [
+    "spec/event_calendar_spec.rb",
+    "spec/fixtures/models.rb",
+    "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end
+

data/lib/event_calendar.rb

@@ -175,12 +175,13 @@ module EventCalendar
     end
 
     def adjust_all_day_dates
-      if self[:all_day]
-        self[:start_at] = self[:start_at].beginning_of_day
-        if self[:end_at]
-          self[:end_at] = self[:end_at].beginning_of_day + 1.day - 1.second
+      if self.all_day
+        self.start_at = self.start_at.beginning_of_day
+
+        if self.end_at
+          self.end_at = self.end_at.beginning_of_day + 1.day - 1.second
         else
-          self[:end_at] = self[:start_at].beginning_of_day + 1.day - 1.second
+          self.end_at = self.start_at + 1.day - 1.second
         end
       end
     end

data/lib/event_calendar/railtie.rb

@@ -5,8 +5,12 @@ require 'rails'
 module EventCalendar
   class Railtie < Rails::Engine
     initializer :after_initialize do
-      ActionController::Base.helper EventCalendar::CalendarHelper
-      ActiveRecord::Base.extend EventCalendar::ClassMethods
+      if defined?(ActionController::Base)
+        ActionController::Base.helper EventCalendar::CalendarHelper
+      end
+      if defined?(ActiveRecord::Base)
+        ActiveRecord::Base.extend EventCalendar::ClassMethods
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,20 +1,14 @@
-ENV["RAILS_ROOT"] ||= File.dirname(__FILE__) + '/../../../..'
-ENV["RAILS_ENV"]    = "test"
-
-#require File.expand_path(File.dirname(ENV['RAILS_ROOT']) + "/config/environment")
 require 'rubygems'
-require 'spec'
 
 require 'active_record'
 require 'action_controller'
 require 'action_view'
 
-
 require 'event_calendar'
 require 'event_calendar/calendar_helper'
 
 require File.dirname(__FILE__) + '/../init.rb'
-require 'spec/fixtures/models'
+require File.dirname(__FILE__) + "/fixtures/models"
 
 ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
 ActiveRecord::Migration.verbose = false

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: event-calendar
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 2
   - 3
-  - 1
-  version: 2.3.1
+  - 2
+  version: 2.3.2
 platform: ruby
 authors: 
 - Jeff Schuil
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 -08:00
+date: 2010-12-29 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
-description: Rails helper for generating a calendar of events. These events can optionally span multiple days.
+description: Rails helper for showing multiple, overlapping events across calendar days and rows.
 email: ""
 executables: []
 
@@ -33,6 +33,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- event-calendar.gemspec
 - generators/event_calendar/USAGE
 - generators/event_calendar/event_calendar_generator.rb
 - generators/event_calendar/lib/insert_routes.rb
@@ -98,7 +99,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Rails helper for generating a calendar of events.
+summary: Rails helper for showing multiple, overlapping events across calendar days and rows.
 test_files: 
 - spec/event_calendar_spec.rb
 - spec/fixtures/models.rb