event_calendar_engine 0.2.13 → 0.2.14

data/Gemfile

@@ -1,8 +1,12 @@
 source 'http://rubygems.org'
-gem 'formtastic'
-gem 'RedCloth'
-gem 'prarupa'
-gem 'will_paginate', '~> 3.0.pre2'
+group :development, :test do
+  gem 'formtastic'
+  gem 'RedCloth'
+  gem 'prarupa'
+  gem 'will_paginate', '~> 3.0.pre2'
+  gem 'database_cleaner'
+  gem 'capybara'
+end
 
 gemspec :path => File.expand_path("..", __FILE__)
 

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/inertialbit/acts_as_revisable.git
-  revision: ac928ff786fbf0deb415ee9d8e7034b4d4b031ac
+  revision: 8f119c9cc7355756a763649c591a543d04e73bda
   branch: rails3
   specs:
     acts_as_revisable (1.1.2)
@@ -8,18 +8,14 @@ GIT
 PATH
   remote: .
   specs:
-    event_calendar_engine (0.2.13)
-      RedCloth
+    event_calendar_engine (0.2.14)
       RedCloth
       acts_as_revisable
       acts_as_revisable
       event_calendar_engine
       formtastic
-      formtastic
       prarupa
-      prarupa
-      rails (= 3.0.3)
-      will_paginate (~> 3.0.pre2)
+      rails (~> 3.0.7)
       will_paginate (~> 3.0.pre2)
 
 GEM
@@ -27,80 +23,79 @@ GEM
   specs:
     RedCloth (4.2.7)
     abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    actionmailer (3.0.7)
+      actionpack (= 3.0.7)
+      mail (~> 2.2.15)
+    actionpack (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4)
+      i18n (~> 0.5.0)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+      i18n (~> 0.5.0)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
+    activeresource (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+    activesupport (3.0.7)
     acts_as_fu (0.0.7.2)
       activerecord
       sqlite3-ruby
-    arel (2.0.8)
+    arel (2.0.9)
     builder (2.1.2)
-    capybara (0.4.1.1)
-      celerity (>= 0.7.9)
-      culerity (>= 0.2.4)
+    capybara (1.0.0.beta1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (>= 0.0.27)
-      xpath (~> 0.1.3)
-    celerity (0.8.7)
-    childprocess (0.1.6)
-      ffi (~> 0.6.3)
-    cucumber (0.10.0)
+      xpath (~> 0.1.4)
+    childprocess (0.1.9)
+      ffi (~> 1.0.6)
+    cucumber (0.10.2)
       builder (>= 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.3.2)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-    cucumber-rails (0.3.2)
-      cucumber (>= 0.8.0)
-    culerity (0.2.15)
+      diff-lcs (>= 1.1.2)
+      gherkin (>= 2.3.5)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
+    cucumber-rails (0.5.0)
+      capybara (>= 1.0.0.beta1)
+      cucumber (>= 0.10.2)
+      nokogiri (>= 1.4.4)
+      rack-test (>= 0.5.7)
+    database_cleaner (0.6.7)
     diff-lcs (1.1.2)
     engineer (0.2.3)
       jeweler (>= 1.4.0)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    ffi (0.6.3)
-      rake (>= 0.8.7)
+    ffi (1.0.8)
     formtastic (1.2.3)
       actionpack (>= 2.3.7)
       activesupport (>= 2.3.7)
       i18n (~> 0.4)
-    gherkin (2.3.3)
-      json (~> 1.4.6)
+    gherkin (2.3.8)
+      json (>= 1.4.6)
     git (1.2.5)
     i18n (0.5.0)
-    jeweler (1.5.2)
+    jeweler (1.6.0)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    json (1.4.6)
+    json (1.5.1)
     json_pure (1.5.1)
-    mail (2.2.15)
+    mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -111,44 +106,44 @@ GEM
     prarupa (0.1.2)
       RedCloth (~> 4.2)
       rdiscount (~> 1.6)
-    rack (1.2.1)
-    rack-mount (0.6.13)
+    rack (1.2.2)
+    rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.3)
-      actionmailer (= 3.0.3)
-      actionpack (= 3.0.3)
-      activerecord (= 3.0.3)
-      activeresource (= 3.0.3)
-      activesupport (= 3.0.3)
+    rails (3.0.7)
+      actionmailer (= 3.0.7)
+      actionpack (= 3.0.7)
+      activerecord (= 3.0.7)
+      activeresource (= 3.0.7)
+      activesupport (= 3.0.7)
       bundler (~> 1.0)
-      railties (= 3.0.3)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
+      railties (= 3.0.7)
+    railties (3.0.7)
+      actionpack (= 3.0.7)
+      activesupport (= 3.0.7)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
     rcov (0.9.9)
     rdiscount (1.6.8)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.0)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    rspec-rails (2.5.0)
+    rspec-mocks (2.6.0)
+    rspec-rails (2.6.0)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.5.0)
+      rspec (~> 2.6.0)
     rubyzip (0.9.4)
-    selenium-webdriver (0.1.2)
-      childprocess (~> 0.1.5)
-      ffi (~> 0.6.3)
+    selenium-webdriver (0.2.0)
+      childprocess (>= 0.1.7)
+      ffi (>= 1.0.7)
       json_pure
       rubyzip
     sqlite3 (1.3.3)
@@ -158,9 +153,9 @@ GEM
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.24)
+    tzinfo (0.3.27)
     will_paginate (3.0.pre2)
-    xpath (0.1.3)
+    xpath (0.1.4)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -172,6 +167,7 @@ DEPENDENCIES
   acts_as_revisable!
   capybara
   cucumber-rails
+  database_cleaner
   engineer
   event_calendar_engine!
   formtastic

data/Rakefile

@@ -24,7 +24,7 @@ Jeweler::Tasks.new do |gem|
   gem.test_files = FileList["spec/**/*"]
   excluded_files.each{|f| gem.files.exclude(f)}
 
-  gem.add_dependency 'rails', '3.0.3'
+  gem.add_dependency 'rails', '~> 3.0.7'
   gem.add_dependency 'RedCloth'
   gem.add_dependency 'prarupa'
   gem.add_dependency 'formtastic'
@@ -36,6 +36,7 @@ Jeweler::Tasks.new do |gem|
   gem.add_development_dependency 'cucumber-rails'
   gem.add_development_dependency 'capybara'
   gem.add_development_dependency 'acts_as_fu'
+  gem.add_development_dependency 'database_cleaner'
   gem.add_development_dependency 'rcov'
   gem.add_development_dependency 'sqlite3'
 

data/VERSION

@@ -1 +1 @@
-0.2.13
+0.2.14

data/app/helpers/event_calendar/application_helper.rb

@@ -156,7 +156,7 @@ module EventCalendar::ApplicationHelper
     link_wrapper(edit_event_link_path(event, link), {
       :no_wrapper => true
     }.merge!(wrapper_options), {
-      :link_text => "edit"
+      :link_text => "update"
     }.merge!(link_options))
   end
   
@@ -187,7 +187,7 @@ module EventCalendar::ApplicationHelper
     link_to_edit_event(event, {
       :no_wrapper => true
     }.merge!(wrapper_options), {
-      :link_text => 'edit'
+      :link_text => 'update'
     }.merge!(link_options)) + " " +
     link_to_delete_event(event, {
       :no_wrapper => true

data/app/helpers/events_helper.rb

@@ -37,7 +37,9 @@ module EventsHelper
     content_tag :ul, :class => "#{wrapper_css_class} legend", :style => wrapper_css_style do
       @event_types.map do |event_type|
         css_class = event_type_css_class(event_type)
-        content_tag :li, h(event_type), :class => "#{css_class} category_label"
+        content_tag :li, :class => "#{css_class} category_label" do
+          link_to h(event_type), events_path(:event_type => event_type)
+        end
       end.join("\n").html_safe
     end
   end

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

@@ -4,7 +4,7 @@
 
 <div style="clear:both"></div>
 
-<div id="event_quick_description" class="span-16" style="display:none"></div>
+<div id="event_quick_description" class="span-12" style="display:none"></div>
 
 <% content_for :javascript do %>
 <script type="text/javascript">

data/app/views/events/index.html.erb

@@ -22,18 +22,8 @@
   <%= render :partial => 'calendar' %>
 </div>
 
-<div style="clear: both; float: right;">
+<div style="float: right;">
+  <h2>Event Types</h2>
   <%= event_type_legend("event_list") %>
   <%= event_type_legend('event_calendar', 'display: none;') %>
 </div>
-
-<div>
-  Events filter: 
-  <%= form_tag events_path, :method => :get, :style => 'display:inline' do %>
-    <%= select_tag :event_type, '<option value="">all</option>'.html_safe + options_for_select(@event_types, params[:event_type]) %>
-    <%= submit_tag "go" %>
-  <% end %>
-</div>
-
-<div style="clear:both;"></div>
-

data/config/cucumber.yml

@@ -1,7 +1,7 @@
 <%
 rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
 rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
-std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} --strict --tags ~@wip"
+std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} --strict --tags ~@wip"
 %>
 default: <%= std_opts %> features
 wip: --tags @wip:3 --wip features

data/lib/tasks/cucumber.rake

@@ -43,6 +43,10 @@ begin
   task :features => :cucumber do
     STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
   end
+
+  # In case we don't have ActiveRecord, append a no-op task that we can depend upon.
+  task 'db:test:prepare' do
+  end
 rescue LoadError
   desc 'cucumber rake task not available (cucumber not installed)'
   task :cucumber do