social_stream-events 0.8.2 → 0.9.0

data/app/assets/javascripts/social_stream-events.js

@@ -1 +1,8 @@
+//= require social_stream-base
+//
+//= require_self
 //= require_tree .
+
+SocialStream.Events = SocialStream.Events || {};
+SocialStream.Events.current = SocialStream.Events.current || {};
+

data/app/assets/javascripts/social_stream.events.poster.js

@@ -0,0 +1,21 @@
+SocialStream.Events.Poster = (function(SS, $, undefined){
+	var init = function(){
+		$('.event_poster_update').hide();
+
+		$('.event_poster').hover(
+			function(){
+				$(this).find(".event_poster_update").fadeIn("slow");
+			        
+			},
+			function(){
+				$(this).find(".event_poster_update").fadeOut("slow");
+			});
+	}
+
+	SS.Timeline.addInitCallback(init);
+
+	return {
+		init: init
+	};
+
+})(SocialStream, jQuery);

data/app/assets/stylesheets/events.css.scss

@@ -15,6 +15,7 @@
   text-align: center;
   vertical-align: middle;
   padding: 10px;
+  width: 40px;
 }
 
 
@@ -48,6 +49,30 @@ div.event_date {
   padding-top: 10px;
 }
 
+.event_poster {
+	width: 80px;
+	height: 113px;
+	margin-right: 10px;
+	float: left;
+	position: relative;
+}
+
+.event_poster_update {
+	top: 95px;
+	left: 10px;
+	float: left;
+	position: absolute;
+	background: $secondary-color;
+	text-align: center;
+	opacity: 0.8;
+	width: 80;
+	height: 18px;
+	/* For IE 5-7 */
+	filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=80);
+	/* For IE 8 */
+	-MS-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
+}
+
 #calendar {
 	margin-top: 20px;
 }

data/app/helpers/events_helper.rb

@@ -0,0 +1,9 @@
+module EventsHelper
+  def event_timeline_thumb(event)
+    if event.poster.new_record?
+      image_tag("poster.png")
+    else
+      thumb_for(event.poster, 80)
+    end
+  end
+end

data/app/models/activity_object_property/poster.rb

@@ -0,0 +1,2 @@
+class ActivityObjectProperty::Poster < ActivityObjectProperty
+end

data/app/models/event.rb

@@ -27,6 +27,18 @@ class Event < ActiveRecord::Base
     end
   end
 
+  def poster_object
+    object_properties.
+      where('activity_object_properties.type' => 'ActivityObjectProperty::Poster').
+      first
+  end
+
+  def poster
+    @poster ||=
+      poster_object.try(:document) ||
+      build_poster
+  end
+
   protected
 
   def build_json(start_time = start_at, end_time = end_at)
@@ -41,6 +53,12 @@ class Event < ActiveRecord::Base
 
   end
 
+  def build_poster
+    Document.new(:event_property_object_id => activity_object_id,
+                 :owner_id => owner_id)
+  end
+
+
   private
 
   def room_belongs_to_receiver

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

@@ -1,34 +1,46 @@
-<%= link_to event, :class => "event_date" do %>
-<div id="event-<%= event.id %>" class="event_date_image">
-  <div class="event_day">
-    <%= event.start_at.day %>
-  </div>
-  <div class="event_month">
-    <%= l event.start_at, :format => "%b" %>
-  </div>
-  <% unless event.all_day? %>
-    <div class="event_hour">
-      <%= l event.start_at, :format => "%H:%M" %>
+<%= div_for event do %>
+  <%= link_to event, :class => "event_date" do %>
+    <div class="event_date_image">
+      <div class="event_day">
+        <%= event.start_at.day %>
+      </div>
+      <div class="event_month">
+        <%= l event.start_at, :format => "%b" %>
+      </div>
+      <% unless event.all_day? %>
+        <div class="event_hour">
+          <%= l event.start_at, :format => "%H:%M" %>
+        </div>
+      <% end %>
     </div>
   <% end %>
-</div>
-<% end %>
 
-<%= javascript_tag do %>
-var d = new Date(<%= 1000*event.start_at.to_i %>);
-$("#event-<%= event.id %> .event_day").text($.datepicker.formatDate('d', d));
-$("#event-<%= event.id %> .event_month").text($.datepicker.formatDate('M', d));
-if($("#event-<%= event.id %> .event_hour").length) {
- var minutes = d.getMinutes();
- if (minutes<10) minutes = "0" + minutes;
- $("#event-<%= event.id %> .event_hour").text(d.getHours() + ':' + minutes);
-}
-<% end %>
+  <%= javascript_tag do %>
+  var d = new Date(<%= 1000*event.start_at.to_i %>);
+  $("#<%= dom_id event %> .event_day").text($.datepicker.formatDate('d', d));
+  $("#<%= dom_id event %> .event_month").text($.datepicker.formatDate('M', d));
+  if($("#<%= dom_id event %> .event_hour").length) {
+   var minutes = d.getMinutes();
+   if (minutes<10) minutes = "0" + minutes;
+   $("#<%= dom_id event %> .event_hour").text(d.getHours() + ':' + minutes);
+  }
+  <% end %>
 
-<div class="event_details">
-  <div class="title">
-  <%= link_to event.title, event %>
+  <div class="event_poster">
+    <%= event_timeline_thumb(event) %>
+
+    <% if can? :update, event %>
+      <div class="event_poster_update">
+        <%= link_to t('event.poster.update'), edit_event_path(event, :poster => true), :remote => true %>
+      </div>
+    <% end %>
   </div>
-</div>
+
+  <div class="event_details">
+    <div class="title">
+    <%= link_to event.title, event %>
+    </div>
+  </div>
+<% end %>
 
 <div class="clearfloat"></div>

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

@@ -0,0 +1,8 @@
+<%= form_for @event.poster do |f| %>
+  <%= f.hidden_field :event_property_object_id %>
+  <%= f.hidden_field :owner_id %>
+
+  <%= f.file_field :file %>
+
+  <%= f.submit %>
+<% end %>

data/app/views/events/edit.js.erb

@@ -0,0 +1,5 @@
+<% if params[:poster] %>
+  $("#<%= dom_id @event %> .event_poster").hide("slow");
+  $("#<%= dom_id @event %> .event_details").hide("slow");
+  $("#<%= dom_id @event %>").append("<%= escape_javascript render(:partial => 'events/form_poster', :locals => { :event => @event }) %>");
+<% end %>

data/config/locales/en.yml

@@ -24,6 +24,8 @@ en:
     new:
       title: "New event"
     one: "an event"
+    poster:
+      update: "Upload poster"
     title:
       one: "Event"
       other: "Events"

data/config/locales/es.yml

@@ -24,6 +24,8 @@ es:
     new:
       title: "Nuevo evento"
     one: "un evento"
+    poster:
+      update: "Subir cartel"
     title:
       one: "Evento"
       other: "Eventos"

data/lib/social_stream-events.rb

@@ -17,7 +17,8 @@ module SocialStream
     autoload :Ability, 'social_stream/events/ability'
 
     module Models
-      autoload  :Actor, 'social_stream/events/models/actor'
+      autoload  :Actor,    'social_stream/events/models/actor'
+      autoload  :Document, 'social_stream/events/models/document'
     end
 
     SocialStream.objects.push(:event) unless SocialStream.objects.include?(:event)

data/lib/social_stream/events/engine.rb

@@ -13,6 +13,12 @@ module SocialStream
         end
       end
 
+      initializer "social_stream-events.document" do
+        ActiveSupport.on_load(:document) do
+          include SocialStream::Events::Models::Document
+        end
+      end
+
       initializer "social_stream-events.views.settings" do
         SocialStream::Views::Settings.module_eval do
           include SocialStream::Views::Settings::Events

data/lib/social_stream/events/models/document.rb

@@ -0,0 +1,26 @@
+module SocialStream
+  module Events
+    module Models
+      module Document
+        extend ActiveSupport::Concern
+
+        included do
+          attr_accessor :event_property_object_id
+
+          before_validation(:on => :create) do
+            set_event
+          end
+        end
+
+        protected
+
+        def set_event
+          return if event_property_object_id.blank?
+
+          activity_object_holders <<
+            ActivityObjectProperty::Poster.new(:activity_object_id => event_property_object_id)
+        end
+      end
+    end
+  end
+end

data/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.8.2".freeze
+    VERSION = "0.9.0".freeze
   end
 end

data/social_stream-events.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.16.4')
+  s.add_runtime_dependency('social_stream-base', '~> 0.17.0')
   s.add_runtime_dependency('rails-scheduler', '~> 0.0.6')
   s.add_runtime_dependency('coffee-rails', '>= 3.1.0')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-events
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-01 00:00:00.000000000Z
+date: 2012-03-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &73637880 !ruby/object:Gem::Requirement
+  requirement: &87586580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.16.4
+        version: 0.17.0
   type: :runtime
   prerelease: false
-  version_requirements: *73637880
+  version_requirements: *87586580
 - !ruby/object:Gem::Dependency
   name: rails-scheduler
-  requirement: &73634100 !ruby/object:Gem::Requirement
+  requirement: &87586170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *73634100
+  version_requirements: *87586170
 - !ruby/object:Gem::Dependency
   name: coffee-rails
-  requirement: &73632270 !ruby/object:Gem::Requirement
+  requirement: &87585810 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *73632270
+  version_requirements: *87585810
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &73630440 !ruby/object:Gem::Requirement
+  requirement: &87585530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *73630440
+  version_requirements: *87585530
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.
 
@@ -71,21 +71,26 @@ files:
 - Gemfile
 - README.rdoc
 - Rakefile
-- app/assets/javascripts/0_init.js
+- app/assets/images/poster.png
 - app/assets/javascripts/events.js.coffee
 - app/assets/javascripts/social_stream-events.js
+- app/assets/javascripts/social_stream.events.poster.js
 - app/assets/stylesheets/events.css.scss
 - app/assets/stylesheets/social_stream-events.css
 - app/controllers/events_controller.rb
 - app/controllers/rooms_controller.rb
+- app/helpers/events_helper.rb
+- app/models/activity_object_property/poster.rb
 - app/models/event.rb
 - app/models/room.rb
 - app/views/events/_calendar_month.erb
 - app/views/events/_event.html.erb
+- app/views/events/_form_poster.html.erb
 - app/views/events/_new.html.erb
 - app/views/events/_sidebar_calendar.html.erb
 - app/views/events/create.js.erb
 - app/views/events/destroy.js.erb
+- app/views/events/edit.js.erb
 - app/views/events/index.html.erb
 - app/views/rooms/_form.html.erb
 - app/views/rooms/_index.html.erb
@@ -106,6 +111,7 @@ files:
 - lib/social_stream/events/ability.rb
 - lib/social_stream/events/engine.rb
 - lib/social_stream/events/models/actor.rb
+- lib/social_stream/events/models/document.rb
 - lib/social_stream/events/version.rb
 - lib/social_stream/migrations/events.rb
 - lib/social_stream/toolbar_config/events.rb

data/app/assets/javascripts/0_init.js

@@ -1,4 +0,0 @@
-var SocialStream = SocialStream || {};
-SocialStream.Events = SocialStream.Events || {};
-SocialStream.Events.current = SocialStream.Events.current || {};
-