event_calendar_engine 0.1.11 → 0.2.0

data/spec/models/event_revision_spec.rb

@@ -6,15 +6,16 @@ describe EventRevision do
     @valid_attributes = {
       :name => "value for name",
       :event_type => "Meeting",
-      :start_on => Date.today,
-      :end_on => Date.today,
+      :start_on => Time.now,
+      :end_on => Time.now,
+      :timezone => 'Pacific Time (US & Canada)',
       :location => "value for location",
       :description => "value for description"
     }
-    @event = Event.create!(@valid_attributes)
-    @event.name = 'other value'
-    @event.save
-    @event_revision = @event.find_revision(:previous)
+    #@event = Event.create!(@valid_attributes)
+    #@event.name = 'other value'
+    #@event.save
+    #@event_revision = @event.find_revision(:previous)
     
     # pending
     #@contact = mock_model(Contact)
@@ -23,14 +24,14 @@ describe EventRevision do
   
   it "should have an attendee collection" do
     pending
-    @event_revision.attendees.count.should == 0
+    #@event_revision.attendees.count.should == 0
   end
   
   it "should instantiate Contacts as attendees" do
     pending
-    Contact.should_receive(:find).and_return([@contact])
-    @event_revision.attendee_roster = "#{@contact.id}"
-    @event_revision.attendees.should == [@contact]
+    #Contact.should_receive(:find).and_return([@contact])
+    #@event_revision.attendee_roster = "#{@contact.id}"
+    #@event_revision.attendees.should == [@contact]
   end  
   
 end

data/spec/models/event_spec.rb

@@ -12,12 +12,12 @@ describe Event do
     }
     @may_2010 = Event.create!(@valid_attributes)
     @mar_2100 = Event.create!(@valid_attributes.merge!({
-      :start_on => Date.new(2100,3,12),
-      :end_on => Date.new(2100,3,13)
+      :start_on => (365 * 24 * 5).hours.from_now,
+      :end_on => ((365 * 24 * 5) + 72).hours.from_now
     }))
     @current = Event.create!(@valid_attributes.merge!({
-      :start_on => Date.yesterday,
-      :end_on => Date.tomorrow
+      :start_on => 72.hours.ago,
+      :end_on => 48.hours.from_now
     }))
   end
   
@@ -35,7 +35,7 @@ describe Event do
   end
   
   it "Event.between finds events between limits" do
-    Event.between(Date.new(2100,3,1), Date.new(2100,3,30)).first.should eql @mar_2100
+    Event.between((362 * 24 * 5).hours.from_now, ((365 * 24 * 5) + 72).hours.from_now).first.should eql @mar_2100
   end
 
   it "should create a new instance given valid attributes" do
@@ -44,9 +44,34 @@ describe Event do
   
   it "must start before it can end" do
     event = Event.new(@valid_attributes)
-    event.end_on = Date.new(2010,5,3)
+    event.end_on = 6.months.ago
     event.should_not be_valid
   end
+  
+  context "setting default end_on of start_on + 1.hour if start_on is present and" do
+    before(:each) do
+      Time.zone = 'Pacific Time (US & Canada)'
+    end
+    let(:event) do
+      Event.new(@valid_attributes.merge!({
+        :timezone => 'Pacific Time (US & Canada)',
+        :start_on => 1.hour.from_now,
+        :end_on => nil
+      }))
+    end
+    
+    it "end_on is blank" do
+      event.one_day?.should be_true
+      event.valid?
+      event.end_on.should eq event.start_on + 1.hour
+    end
+    it "end_on <= start_on" do
+      event.end_on = 4.hours.ago
+      event.one_day?.should be_true
+      event.valid?
+      event.end_on.should eq event.start_on + 1.hour
+    end
+  end
 
   it "should find event types" do
     Event.create!(@valid_attributes)
@@ -77,63 +102,4 @@ describe Event do
     event.revision_number.should == 0
   end
   
-  context "with attendees" do
-    
-    before(:each) do
-      @event = Event.create!(@valid_attributes)
-      # pending
-      #@contact = mock_model(Contact)
-      #@event.add_attendees([@contact.id])
-      #@event.save
-      #Contact.stub(:find).and_return([@contact])
-    end
-
-    context "adding an attendee" do
-      
-      it "should update attendee_roster" do
-        pending
-        @event.attendee_roster.should == @contact.id.to_s
-      end
-
-      it "should create a new version" do
-        pending
-        @event.revision_number.should == 1
-      end
-
-      it "should have previous set of attendees available through the previous revision" do
-        pending
-        @event.find_revision(:previous).attendees.count.should == 0
-        @event.add_attendees([@contact.id])
-        @event.find_revision(:previous).attendees.count.should == 1
-        @event.attendees.count.should == 2
-      end
-    end
-
-    context "removing an attendee" do
-
-      before(:each) do
-        # pending
-        #@event.attendees.count.should == 1
-        #@attendee = @event.attendees.first
-        #@event.drop_attendees(@attendee.contact_id)
-      end
-      
-      it "should not include the removed attendee in the current collection" do
-        pending
-        @event.attendees.count.should == 0
-      end
-      
-      it "should create a new version" do
-        pending
-        @event.revision_number.should == 2
-      end
-      
-      it "should have previous set of attendees available through the previous revision" do
-        pending
-        @event.find_revision(:previous).attendees.should == @attendee.contact
-      end
-
-    end
-  end
-  
 end

data/spec/models/link_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+associations = {
+  :has_and_belongs_to_many => %w(events)
+}
+
+describe Link do
+  subject{ Link }
+  
+  let(:link){ Link.new }
+  
+  spec_associations(associations, :class => Link)
+  
+  describe "a valid Link" do
+    before(:all) do
+      link.valid?
+    end
+    it "has a name" do
+      link.should have(1).error_on(:name)
+    end
+    it "has a url" do
+      link.errors[:url].should include('can\'t be blank')
+    end
+    it "has a /valid/ url but will prepend 'http://' by default if no protocol is detected and url is not blank" do
+      link.name = 'Test'
+      link.url = 'test.com'
+      link.valid?.should be_true
+      link.url.should eq 'http://test.com'
+    end
+  end
+end

data/spec/spec_helpers/helpers.rb

@@ -0,0 +1,15 @@
+def spec_associations(associations, options={})
+  subject = options[:class] unless subject.present?
+  if subject.blank?
+    raise ArgumentError, "spec_associations expects a subject to be set to the target class; eg subject{ YourActiveRecordModel }"
+  end
+  it_prefix = options[:it_prefix]
+  it_prefix += " " unless it_prefix.blank?
+  associations.each do |type, names|
+    names.each do |name|
+      it "#{it_prefix}#{type} #{name}" do
+        subject.to_s.constantize.reflections.should include(name.to_sym)
+      end
+    end
+  end  
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: event_calendar_engine
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 11
-  version: 0.1.11
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jason LaPier
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-27 00:00:00 -08:00
+date: 2011-02-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -398,6 +398,7 @@ files:
 - app/controllers/event_calendar/application_controller.rb
 - app/controllers/event_revisions_controller.rb
 - app/controllers/events_controller.rb
+- app/controllers/links_controller.rb
 - app/helpers/event_calendar/application_helper.rb
 - app/helpers/events_helper.rb
 - app/models/attendee.rb
@@ -405,6 +406,7 @@ files:
 - app/models/event.rb
 - app/models/event_instance_methods.rb
 - app/models/event_revision.rb
+- app/models/link.rb
 - app/models/participant.rb
 - app/models/participator.rb
 - app/views/attendees/_add_attendees.html.erb
@@ -428,7 +430,6 @@ files:
 - app/views/events/_list_group.html.erb
 - app/views/events/_multi_day_list_event.html.erb
 - app/views/events/_one_day_list_event.html.erb
-- app/views/events/_times.html.erb
 - app/views/events/attendees.html.erb
 - app/views/events/edit.html.erb
 - app/views/events/index.html.erb
@@ -436,6 +437,14 @@ files:
 - app/views/events/search.html.erb
 - app/views/events/show.html.erb
 - app/views/layouts/application.html.erb
+- app/views/links/_form.html.erb
+- app/views/links/_link.html.erb
+- app/views/links/_links.html.erb
+- app/views/links/create.js.rjs
+- app/views/links/edit.html.erb
+- app/views/links/new.html.erb
+- app/views/links/show.html.erb
+- app/views/links/update.js.rjs
 - config/application.rb
 - config/blueprint_settings.yml
 - config/boot.rb
@@ -459,6 +468,8 @@ files:
 - db/migrate/20101011200048_make_events_revisable.rb
 - db/migrate/20101223221015_change_start_on_end_on_to_timestamp.rb
 - db/migrate/20101223233354_add_timezone_to_events.rb
+- db/migrate/20110204223256_add_presenters_facilitators_to_events.rb
+- db/migrate/20110206000427_create_event_calendar_links.rb
 - db/schema.rb
 - db/seeds.rb
 - lib/event_calendar.rb
@@ -547,12 +558,18 @@ files:
 - spec/controllers/attendees_controller_spec.rb
 - spec/controllers/event_revisions_controller_spec.rb
 - spec/controllers/events_controller_spec.rb
+- spec/controllers/links_controller_spec.rb
 - spec/fixtures/event_calendar_events.yml
+- spec/fixtures/event_calendar_events_links.yml
+- spec/fixtures/event_calendar_links.yml
 - spec/helpers/event_calendar/application_helper_spec.rb
 - spec/models/deletable_instance_methods_spec.rb
+- spec/models/event_instance_methods_spec.rb
 - spec/models/event_revision_spec.rb
 - spec/models/event_spec.rb
+- spec/models/link_spec.rb
 - spec/spec_helper.rb
+- spec/spec_helpers/helpers.rb
 - spec/spec_helpers/mocks.rb
 has_rdoc: true
 homepage: http://github.com/inertialbit/event_calendar
@@ -592,10 +609,16 @@ test_files:
 - spec/controllers/attendees_controller_spec.rb
 - spec/controllers/event_revisions_controller_spec.rb
 - spec/controllers/events_controller_spec.rb
+- spec/controllers/links_controller_spec.rb
 - spec/fixtures/event_calendar_events.yml
+- spec/fixtures/event_calendar_events_links.yml
+- spec/fixtures/event_calendar_links.yml
 - spec/helpers/event_calendar/application_helper_spec.rb
 - spec/models/deletable_instance_methods_spec.rb
+- spec/models/event_instance_methods_spec.rb
 - spec/models/event_revision_spec.rb
 - spec/models/event_spec.rb
+- spec/models/link_spec.rb
 - spec/spec_helper.rb
+- spec/spec_helpers/helpers.rb
 - spec/spec_helpers/mocks.rb

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

@@ -1,5 +0,0 @@
-<%- t = [] -%>
-<% times.first.each_with_index do |z_t, i| %>
-  <% t << "#{z_t.last} - #{times.last[i].last} " + content_tag(:em, z_t.first) %>
-<% end %>
-<p><%= t.join(" / ").html_safe %></p>