event_calendar_engine 0.2.10 → 0.2.11

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    event_calendar_engine (0.2.10)
+    event_calendar_engine (0.2.11)
       RedCloth
       RedCloth
       acts_as_revisable

data/VERSION

@@ -1 +1 @@
-0.2.10
+0.2.11

data/app/helpers/event_calendar/application_helper.rb

@@ -19,6 +19,13 @@ module EventCalendar::ApplicationHelper
     end
   end
   
+  def open_if_current_month(month, closed_or_open)
+    # setting closed_or_open='closed' in args does not seem to work when a
+    # nil val is passed as the closed_or_open arg
+    closed_or_open = closed_or_open.blank? ? 'closed' : closed_or_open
+    Date.current.strftime("%B") == month ? 'open' : closed_or_open
+  end
+  
   def time_with_zones(time=Time.now)
     out = []
     ActiveSupport::TimeZone.us_zones.map(&:name).each do |us_zone|

data/app/helpers/events_helper.rb

@@ -1,6 +1,12 @@
 module EventsHelper
   def event_one_liner(event)
-    "#{h(event.name)} #{event_abbrev_date(event)} #{event_details_link(event)}".html_safe
+    [
+      h(event.name),
+      event_abbrev_date(event),
+      event_type_label(event),
+      event_details_link(event)
+    ].
+    join(" ").html_safe
   end
   
   def event_abbrev_date(event)
@@ -13,6 +19,12 @@ module EventsHelper
   
   def event_details_link(event)
     path = event.deleted? ? 'event_revision_path' : 'event_path'
-    "<span class=\"fake_button\">#{link_to('details', send(path, event))}</span>".html_safe
+    "<span class=\"fake_button\">#{link_to('Details', send(path, event))}</span>".html_safe
+  end
+  
+  def event_type_label(event)
+    event_type_css_class = event.event_type.parameterize('_').downcase +
+                           "_category_label"
+    "<span class=\"category_label #{h(event_type_css_class)}\">#{h(event.event_type)}</span>".html_safe
   end
 end

data/app/views/event-calendar-shared/_navigation.html.erb

@@ -1,6 +1,5 @@
   <h4>Manage Events</h4>
   
-  <%= link_to_new_event %>
   <%= link_to_deleted_events %>
   
   <% if defined?(event) && !event.nil? && !event.new_record? %>

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

@@ -1,10 +1,14 @@
-<%- closed_or_open = closed_or_open.present? ? closed_or_open : 'closed' -%>
+<% closed_or_open = closed_or_open.presence %>
 <ul class="events">
   <% events.group_by(&:start_year).each do |year, years_events| %>
   <li><span class="collapsible open"><%= year %></span>
     <ul>
       <% years_events.group_by(&:start_month).each do |month, months_events| %>
-      <li><span class="collapsible <%= closed_or_open %>"><%= month %></span>
+      <li>
+        <span class="collapsible <%= open_if_current_month(month,
+                                                          closed_or_open) %>">
+          <%= month %>
+        </span>
         <ul>
           <% months_events.each do |event| %>
           <li>

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

@@ -6,9 +6,10 @@
 
 <div class="span-16 last">
   <div style="float:left"><%= render :partial => 'search_form' %></div>
-  <p style="float: right;">
+  <p style="float: right; text-align: center;">
     <a href="#" class="fake_button view_events calendar">Calendar</a>
     <a href="#" class="fake_button view_events list">List</a>
+    <%= link_to_new_event({}, {:class => 'fake_button'}) %>
   </p>
 </div>
 

data/public/stylesheets/event_calendar/blueprint/screen.css

@@ -390,6 +390,7 @@ div.select_popper_box ul li:hover {background:#EEE;}
 #event_end_on {width:50%
 ;}
 .enlarge {font-size:115%;}
+.category_label {background:#999;color:#FFF;border:1px solid #333;font-size:12px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;padding:0 3px;}
 
 /* fancy-type */
 p + p {text-indent:2em;margin-top:-1.5em;}

data/spec/helpers/event_calendar/application_helper_spec.rb

@@ -12,4 +12,25 @@ describe EventCalendar::ApplicationHelper do
       ]
     end
   end
+  
+  describe "open_if_current_month..." do
+    let(:month_names) do
+      %w(January February March April May June July August September October
+        November December)
+    end
+    let(:current_month){Date.current.strftime("%B")}
+    let(:non_current_month){month_names.select{|m| m != current_month}.first}
+    it "returns 'closed' given a non-current-month and nil open_or_closed" do
+      helper.open_if_current_month(non_current_month, nil).should eq 'closed'
+    end
+    it "returns 'open' given a current-month and any open_or_closed" do
+      helper.open_if_current_month(current_month, nil).should eq 'open'
+      helper.open_if_current_month(current_month, 'closed').should eq 'open'
+      helper.open_if_current_month(current_month, 'open').should eq 'open'
+    end
+    it "returns given open_or_closed when it is not nil and a non-current-month" do
+      helper.open_if_current_month(non_current_month, 'open').should eq 'open'
+      helper.open_if_current_month(non_current_month, 'closed').should eq 'closed'
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: event_calendar_engine
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 2
-  - 10
-  version: 0.2.10
+  - 11
+  version: 0.2.11
 platform: ruby
 authors: 
 - Jason LaPier
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-03 00:00:00 -08:00
+date: 2011-04-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -1143,8 +1143,106 @@ dependencies:
   type: :development
   requirement: *id080
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: jeweler
   version_requirements: &id081 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id081
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  version_requirements: &id082 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id082
+- !ruby/object:Gem::Dependency 
+  name: cucumber-rails
+  version_requirements: &id083 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id083
+- !ruby/object:Gem::Dependency 
+  name: capybara
+  version_requirements: &id084 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id084
+- !ruby/object:Gem::Dependency 
+  name: acts_as_fu
+  version_requirements: &id085 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id085
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  version_requirements: &id086 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id086
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  version_requirements: &id087 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :development
+  requirement: *id087
+- !ruby/object:Gem::Dependency 
+  name: rails
+  version_requirements: &id088 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -1157,10 +1255,10 @@ dependencies:
         version: 3.0.3
   prerelease: false
   type: :runtime
-  requirement: *id081
+  requirement: *id088
 - !ruby/object:Gem::Dependency 
   name: RedCloth
-  version_requirements: &id082 !ruby/object:Gem::Requirement 
+  version_requirements: &id089 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -1171,10 +1269,10 @@ dependencies:
         version: "0"
   prerelease: false
   type: :runtime
-  requirement: *id082
+  requirement: *id089
 - !ruby/object:Gem::Dependency 
   name: prarupa
-  version_requirements: &id083 !ruby/object:Gem::Requirement 
+  version_requirements: &id090 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -1185,10 +1283,10 @@ dependencies:
         version: "0"
   prerelease: false
   type: :runtime
-  requirement: *id083
+  requirement: *id090
 - !ruby/object:Gem::Dependency 
   name: formtastic
-  version_requirements: &id084 !ruby/object:Gem::Requirement 
+  version_requirements: &id091 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -1199,10 +1297,10 @@ dependencies:
         version: "0"
   prerelease: false
   type: :runtime
-  requirement: *id084
+  requirement: *id091
 - !ruby/object:Gem::Dependency 
   name: acts_as_revisable
-  version_requirements: &id085 !ruby/object:Gem::Requirement 
+  version_requirements: &id092 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -1213,10 +1311,10 @@ dependencies:
         version: "0"
   prerelease: false
   type: :runtime
-  requirement: *id085
+  requirement: *id092
 - !ruby/object:Gem::Dependency 
   name: will_paginate
-  version_requirements: &id086 !ruby/object:Gem::Requirement 
+  version_requirements: &id093 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -1230,10 +1328,10 @@ dependencies:
         version: 3.0.pre2
   prerelease: false
   type: :runtime
-  requirement: *id086
+  requirement: *id093
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  version_requirements: &id087 !ruby/object:Gem::Requirement 
+  version_requirements: &id094 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -1244,10 +1342,10 @@ dependencies:
         version: "0"
   prerelease: false
   type: :development
-  requirement: *id087
+  requirement: *id094
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
-  version_requirements: &id088 !ruby/object:Gem::Requirement 
+  version_requirements: &id095 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -1258,10 +1356,10 @@ dependencies:
         version: "0"
   prerelease: false
   type: :development
-  requirement: *id088
+  requirement: *id095
 - !ruby/object:Gem::Dependency 
   name: cucumber-rails
-  version_requirements: &id089 !ruby/object:Gem::Requirement 
+  version_requirements: &id096 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -1272,10 +1370,10 @@ dependencies:
         version: "0"
   prerelease: false
   type: :development
-  requirement: *id089
+  requirement: *id096
 - !ruby/object:Gem::Dependency 
   name: capybara
-  version_requirements: &id090 !ruby/object:Gem::Requirement 
+  version_requirements: &id097 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -1286,10 +1384,10 @@ dependencies:
         version: "0"
   prerelease: false
   type: :development
-  requirement: *id090
+  requirement: *id097
 - !ruby/object:Gem::Dependency 
   name: acts_as_fu
-  version_requirements: &id091 !ruby/object:Gem::Requirement 
+  version_requirements: &id098 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -1300,10 +1398,10 @@ dependencies:
         version: "0"
   prerelease: false
   type: :development
-  requirement: *id091
+  requirement: *id098
 - !ruby/object:Gem::Dependency 
   name: rcov
-  version_requirements: &id092 !ruby/object:Gem::Requirement 
+  version_requirements: &id099 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -1314,10 +1412,10 @@ dependencies:
         version: "0"
   prerelease: false
   type: :development
-  requirement: *id092
+  requirement: *id099
 - !ruby/object:Gem::Dependency 
   name: sqlite3
-  version_requirements: &id093 !ruby/object:Gem::Requirement 
+  version_requirements: &id100 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -1328,7 +1426,7 @@ dependencies:
         version: "0"
   prerelease: false
   type: :development
-  requirement: *id093
+  requirement: *id100
 description: Provides basic event management features with versioned history of changes.
 email: 
 - jason.lapier@gmail.com