social_stream 0.18.2 → 0.19.0

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

@@ -7,6 +7,47 @@
 
 @import "colors";
 
+.event_date {
+  cursor: pointer;
+  display: block;
+  float: left;
+  font-weight: bold;
+  text-align: center;
+  vertical-align: middle;
+  padding: 10px;
+}
+
+
+a.event_date {
+  color: $details-color;
+}
+
+div.event_date {
+    margin-left: 5px;
+    margin-right: 7px;
+    width: 64px;
+}
+
+.event_day {
+  font-size: 3em;
+  line-height: 90%;
+}
+
+.event_month {
+  font-size: 2em;
+  line-height: 70%;
+}
+
+.event_hour {
+  font-size: 1.2em;
+  min-height: 20px;
+  min-width: 30px;
+}
+
+.event_details {
+  padding-top: 10px;
+}
+
 #calendar {
 	margin-top: 20px;
 }

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

@@ -1 +1,23 @@
-<%= raw t('event.wall_post', :title => link_to(h(event.title), event)) %>
+<%= 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 class="event_details">
+  <div class="title">
+  <%= link_to event.title, event %>
+  </div>
+</div>
+
+<div class="clearfloat"></div>

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

@@ -8,10 +8,8 @@ module SocialStream
           has_many :rooms
         end
 
-        module InstanceMethods
-          def events
-            Event.authored_by(self)
-          end
+        def events
+          Event.authored_by(self)
         end
       end
     end

data/events/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.5.0".freeze
+    VERSION = "0.6.0".freeze
   end
 end

data/events/social_stream-events.gemspec

@@ -12,9 +12,9 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.13.0')
-  s.add_runtime_dependency('rails-scheduler', '~> 0.0.5')
-  s.add_runtime_dependency('coffee-rails', '> 3.1.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.14.0')
+  s.add_runtime_dependency('rails-scheduler', '~> 0.0.6')
+  s.add_runtime_dependency('coffee-rails', '>= 3.1.0')
 
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.18.2".freeze
+  VERSION = "0.19.0".freeze
 end

data/linkser/app/assets/javascripts/linkser.js.erb

@@ -28,7 +28,7 @@ SocialStream.Linkser.initiate = function() {
           },
           error : function(xhr, ajaxOptions, thrownError) {
             if($("#input_activities").val() == url) {//Only show if input value is still the same
-              $("#link_preview").html($('<div>').addClass('loading').html("<%= I18n.t('link.errors.loading') %> " + url));
+              $("#link_preview").html($('<div>').addClass('loading').html(I18n.t('link.errors.loading') + " " + url));
             }
           }
         });

data/linkser/lib/social_stream/linkser/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Linkser
-    VERSION = "0.3.0".freeze
+    VERSION = "0.4.0".freeze
   end
 end

data/linkser/social_stream-linkser.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.13.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.14.0')
   s.add_runtime_dependency('linkser', '~> 0.0.10')
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')

data/linkser/spec/dummy/config/initializers/devise.rb

@@ -160,7 +160,7 @@ Devise.setup do |config|
   # Add a new OmniAuth provider. Check the wiki for more information on setting
   # up on your models and hooks.
   # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
-  config.omniauth :linked_in, "ekxfXU8nueVSMQ9fc5KJAryBkyztUlCBYMW3DoQPzbE79WhivvzhQloRNHCHgPeB", "WYiHFT-KKFgjd45W3-pEAficmXRHmN6_6DGwj1C_ZILJlSO1gBvv6VNYXU9tybGY"
+  config.omniauth :linkedin, "ekxfXU8nueVSMQ9fc5KJAryBkyztUlCBYMW3DoQPzbE79WhivvzhQloRNHCHgPeB", "WYiHFT-KKFgjd45W3-pEAficmXRHmN6_6DGwj1C_ZILJlSO1gBvv6VNYXU9tybGY"
                       
   config.omniauth :facebook, "129571360447856","eef39dce5e20e76f77495c59623bdb38"
  

data/presence/app/assets/javascripts/chat_interface_manager.js.erb

@@ -24,7 +24,7 @@ function connectButtonTimerFunction(){
 		connectButtonTimerCounter++;
 		if (connectButtonTimerCounter > (periodBetweenAttempts-1)) {
 			clearTimeout(connectButtonTimer);
-			$("#chat_header_title").html('<%=I18n.t('chat.disconnected')%>')
+			$("#chat_header_title").html(I18n.t('chat.disconnected'))
 		}
 }
 
@@ -32,7 +32,7 @@ function requestConnectToChat(){
   if (connectButtonTimerCounter > (periodBetweenAttempts-1)) {
     connectButtonTimerCounter=0;
 		connectButtonTimer = setInterval("connectButtonTimerFunction()", 1000) 
-		$("#chat_header_title").html('<%=I18n.t('chat.connecting')%>')
+		$("#chat_header_title").html(I18n.t('chat.connecting'))
     return true
   } else {
     return false
@@ -108,7 +108,7 @@ function setStatusWidgetTitle(status){
 	}
 	
 	if(status=="default"){
-    var defaultTitle = '<%=I18n.t('chat.status.choose')%>'
+    var defaultTitle = I18n.t('chat.status.choose');
     $(".dropdown dt a span").html(defaultTitle);
 		return;
   }
@@ -324,11 +324,11 @@ function hideChatNotification(notification){
 
 function notifyWhenUsersDisconnect(){
 	var notification = $("div.ui-chatbox-notify");
-	var msg = '<%=I18n.t('chat.notify.offline')%>';
+	var msg = I18n.t('chat.notify.offline');
 	showChatNotification(notification,msg);
 }
 
 function hideAllNotifications(){
 	var notification = $("div.ui-chatbox-notify");
   hideChatNotification(notification);
-}
+}

data/presence/app/assets/javascripts/xmpp_client_management.js.erb

@@ -187,7 +187,7 @@ function onReconnect(){
 		if (reconnectAttempts>0) {
 			reconnectAttempts--;
 			
-			$("#chat_header_title").html('<%=I18n.t('chat.reconnecting')%>')
+			$("#chat_header_title").html(I18n.t('chat.reconnecting'))
 			
 			if (authByCookie()){
         //Authentication by cookie
@@ -198,7 +198,7 @@ function onReconnect(){
       }
       reconnectTimer = setTimeout ("onReconnect()", 9000);
 		} else {
-			$("#chat_header_title").html('<%=I18n.t('chat.unableconnect')%>')
+			$("#chat_header_title").html(I18n.t('chat.unableconnect'))
 			//Notify issue to Rails App Server?
 		}
 		
@@ -323,4 +323,4 @@ function sendStatus(status){
        connection.send(pres.tree());
 			 setStatusWidgetTitle(status);
     }
-}
+}

data/presence/lib/social_stream/presence/models/buddy_manager.rb

@@ -9,57 +9,55 @@ module SocialStream
           after_destroy :remove_buddy
         end
         
-        module InstanceMethods
+        def save_buddy
           
-          def save_buddy
-            
-            unless SocialStream::Presence.enable
-              return
-            end
-            
-            unless self.receiver and self.sender
-              return
-            end
-            
-            unless self.receiver.subject_type == "User" and self.sender.subject_type == "User"
-              return
-            end
- 
-            #XMPP DOMAIN
-            domain = SocialStream::Presence.domain
-            user_sid = self.sender.slug + "@" + domain
-            user_name =  self.sender.name  
-            buddy_sid = self.receiver.slug + "@" + domain
-            buddy_name =  self.receiver.name
-            site_name = I18n.t('site.name').delete(' ')
+          unless SocialStream::Presence.enable
+            return
+          end
+          
+          unless self.receiver and self.sender
+            return
+          end
+          
+          unless self.receiver.subject_type == "User" and self.sender.subject_type == "User"
+            return
+          end
+
+          #XMPP DOMAIN
+          domain = SocialStream::Presence.domain
+          user_sid = self.sender.slug + "@" + domain
+          user_name =  self.sender.name  
+          buddy_sid = self.receiver.slug + "@" + domain
+          buddy_name =  self.receiver.name
+          site_name = I18n.t('site.name').delete(' ')
+          
+          #Check if is a positive and replied tie         
+          if self.bidirectional?
+            #Execute setRosterForBidirectionalTie(userASid,userBSid,userANick,userBNick,groupForA,groupForB)
+            SocialStream::Presence::XmppServerOrder::setRosterForBidirectionalTie(user_sid,buddy_sid,user_name,buddy_name,site_name,site_name)
+          elsif self.positive?
+            #Case: Possitive tie unidirectional
+            #Execute addBuddyToRoster(userSID,buddySID,buddyNick,buddyGroup,subscription_type)
+            subscription_type = "from"
+            SocialStream::Presence::XmppServerOrder::addBuddyToRoster(user_sid,buddy_sid,buddy_name,site_name,subscription_type)
+          else
+            #Negative Tie
             
-            #Check if is a positive and replied tie         
-            if self.bidirectional?
-              #Execute setRosterForBidirectionalTie(userASid,userBSid,userANick,userBNick,groupForA,groupForB)
-              SocialStream::Presence::XmppServerOrder::setRosterForBidirectionalTie(user_sid,buddy_sid,user_name,buddy_name,site_name,site_name)
-            elsif self.positive?
-              #Case: Possitive tie unidirectional
-              #Execute addBuddyToRoster(userSID,buddySID,buddyNick,buddyGroup,subscription_type)
-              subscription_type = "from"
-              SocialStream::Presence::XmppServerOrder::addBuddyToRoster(user_sid,buddy_sid,buddy_name,site_name,subscription_type)
+            if self.contact.positive_replied?
+              #Bidirectional contacts
+              #Execute unsetRosterForBidirectionalTie(user_sid,oldfriend_sid,oldfriendNick,oldfriendGroup)
+              SocialStream::Presence::XmppServerOrder::unsetRosterForBidirectionalTie(buddy_sid,user_sid,user_name,site_name)
             else
-              #Negative Tie
-              
-              if self.contact.positive_replied?
-                #Bidirectional contacts
-                #Execute unsetRosterForBidirectionalTie(user_sid,oldfriend_sid,oldfriendNick,oldfriendGroup)
-                SocialStream::Presence::XmppServerOrder::unsetRosterForBidirectionalTie(buddy_sid,user_sid,user_name,site_name)
-              else
-                SocialStream::Presence::XmppServerOrder::removeBuddyFromRoster(user_sid,buddy_sid)
-              end
-              
-              return  
+              SocialStream::Presence::XmppServerOrder::removeBuddyFromRoster(user_sid,buddy_sid)
             end
             
+            return  
           end
           
-          
-          def remove_buddy 
+        end
+        
+        
+        def remove_buddy 
 #            
 #            unless SocialStream::Presence.enable
 #              return
@@ -95,10 +93,8 @@ module SocialStream
 #              return  
 #            end
 #            
-          end
-          
         end
       end
     end
   end
-end
+end

data/presence/lib/social_stream/presence/version.rb

@@ -1,5 +1,5 @@
 module Socialstream
   module Presence
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
   end
 end

data/presence/social_stream-presence.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.13.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.14.0')
   
   s.add_runtime_dependency "xmpp4r"
 

data/social_stream.gemspec

@@ -11,11 +11,11 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.13.2')
-  s.add_runtime_dependency('social_stream-documents', '~> 0.8.2')
-  s.add_runtime_dependency('social_stream-events', '~> 0.5.0')
-  s.add_runtime_dependency('social_stream-linkser', '~> 0.3.0')
-  s.add_runtime_dependency('social_stream-presence', '~> 0.4.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.14.0')
+  s.add_runtime_dependency('social_stream-documents', '~> 0.9.0')
+  s.add_runtime_dependency('social_stream-events', '~> 0.6.0')
+  s.add_runtime_dependency('social_stream-linkser', '~> 0.4.0')
+  s.add_runtime_dependency('social_stream-presence', '~> 0.5.0')
  
   # Development Gem dependencies
   #
@@ -35,7 +35,9 @@ Gem::Specification.new do |s|
   # Debugging
   unless ENV["CI"]
     if RUBY_VERSION < '1.9'
-      s.add_development_dependency('ruby-debug', '~> 0.10.3')
+      s.add_development_dependency('ruby-debug')
+    else
+      s.add_development_dependency('ruby-debug19')
     end
   end
   # Specs

data/spec/dummy/config/initializers/devise.rb

@@ -160,7 +160,7 @@ Devise.setup do |config|
   # Add a new OmniAuth provider. Check the wiki for more information on setting
   # up on your models and hooks.
   # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
-  config.omniauth :linked_in, "ekxfXU8nueVSMQ9fc5KJAryBkyztUlCBYMW3DoQPzbE79WhivvzhQloRNHCHgPeB", "WYiHFT-KKFgjd45W3-pEAficmXRHmN6_6DGwj1C_ZILJlSO1gBvv6VNYXU9tybGY"
+  config.omniauth :linkedin, "ekxfXU8nueVSMQ9fc5KJAryBkyztUlCBYMW3DoQPzbE79WhivvzhQloRNHCHgPeB", "WYiHFT-KKFgjd45W3-pEAficmXRHmN6_6DGwj1C_ZILJlSO1gBvv6VNYXU9tybGY"
                       
   config.omniauth :facebook, "129571360447856","eef39dce5e20e76f77495c59623bdb38"
  

data/spec/support/db.rb

@@ -13,3 +13,9 @@ end
 gems.each do |g|
   "SocialStream::Migrations::#{ g.camelize }".constantize.new.up
 end
+
+# In Rails 3.2.0, we need to reload the database schema
+#
+# Some models are loaded before the database is created,
+# reporting their table does not exist in specs
+ActiveRecord::Base.connection.schema_cache.clear!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream
 version: !ruby/object:Gem::Version
-  version: 0.18.2
+  version: 0.19.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,66 +10,66 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-24 00:00:00.000000000Z
+date: 2012-01-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
-  requirement: &78562910 !ruby/object:Gem::Requirement
+  requirement: &72653720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.14.0
   type: :runtime
   prerelease: false
-  version_requirements: *78562910
+  version_requirements: *72653720
 - !ruby/object:Gem::Dependency
   name: social_stream-documents
-  requirement: &78562660 !ruby/object:Gem::Requirement
+  requirement: &72653470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *78562660
+  version_requirements: *72653470
 - !ruby/object:Gem::Dependency
   name: social_stream-events
-  requirement: &78562430 !ruby/object:Gem::Requirement
+  requirement: &72692360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *78562430
+  version_requirements: *72692360
 - !ruby/object:Gem::Dependency
   name: social_stream-linkser
-  requirement: &78562200 !ruby/object:Gem::Requirement
+  requirement: &72692130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *78562200
+  version_requirements: *72692130
 - !ruby/object:Gem::Dependency
   name: social_stream-presence
-  requirement: &78561970 !ruby/object:Gem::Requirement
+  requirement: &72691900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *78561970
+  version_requirements: *72691900
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &78561740 !ruby/object:Gem::Requirement
+  requirement: &72691670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,21 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *78561740
+  version_requirements: *72691670
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &78561540 !ruby/object:Gem::Requirement
+  requirement: &72691470 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *72691470
+- !ruby/object:Gem::Dependency
+  name: ruby-debug19
+  requirement: &72691220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *78561540
+  version_requirements: *72691220
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &78561250 !ruby/object:Gem::Requirement
+  requirement: &72690970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +110,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *78561250
+  version_requirements: *72690970
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &78561000 !ruby/object:Gem::Requirement
+  requirement: &72690720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +121,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *78561000
+  version_requirements: *72690720
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &78560770 !ruby/object:Gem::Requirement
+  requirement: &72690490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +132,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *78560770
+  version_requirements: *72690490
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &78560540 !ruby/object:Gem::Requirement
+  requirement: &72690260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,7 +143,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *78560540
+  version_requirements: *72690260
 description: Social Stream is a Ruby on Rails engine for building social network websites.
   It supports contacts, posts, file uploads, private messages and many more.
 email: 
@@ -641,6 +652,7 @@ files:
 - base/lib/generators/social_stream/base/templates/navigation.rb
 - base/lib/generators/social_stream/base/templates/relations.yml
 - base/lib/generators/social_stream/base/templates/sphinx.yml
+- base/lib/i18n-js/social_stream-base.rb
 - base/lib/paperclip/social_stream.rb
 - base/lib/social_stream-base.rb
 - base/lib/social_stream/ability.rb
@@ -900,8 +912,11 @@ files:
 - documents/db/migrate/20110922173707_add_file_processing_to_document.rb
 - documents/db/migrate/20111005112707_add_title_and_description_to_document.rb
 - documents/db/migrate/20120109155431_document_object_type.rb
+- documents/lib/delayed_paperclip/social_stream-documents.rb
 - documents/lib/generators/social_stream/documents/install_generator.rb
+- documents/lib/paperclip/social_stream-documents.rb
 - documents/lib/social_stream-documents.rb
+- documents/lib/social_stream/documents/dependencies.rb
 - documents/lib/social_stream/documents/engine.rb
 - documents/lib/social_stream/documents/version.rb
 - documents/lib/social_stream/migrations/documents.rb