social_stream-base 0.16.4 → 0.17.0

data/app/views/comments/_new.html.erb

@@ -31,17 +31,3 @@
     </div>
   </div>
 <% end %>
-
-<%= javascript_tag do %>
-  $(function() {
-    $("#comment_text_<%= dom_id(activity) %>").Watermark("<%= I18n.t('comment.input') %>","#666");
- 
-    $("#comment_text_<%= dom_id(activity) %>")
-        .change(function(){autoSize("<%= dom_id(activity) %>");})
-        .keydown(function(){autoSize("<%= dom_id(activity) %>");})
-        .keyup(function(){autoSize("<%= dom_id(activity) %>");});
-    autoSize("<%= dom_id(activity) %>"); 
-
-    SocialStream.Wall.activateAntiRebounds();
-  });
-<% end %>

data/app/views/objects/_show.html.erb

@@ -1,3 +1,9 @@
 <% toolbar :profile => object.owner_subject %>
 
 <%= render object.post_activity %>
+
+<%= javascript_tag do %>
+  $(function() {
+    SocialStream.Objects.init();
+  });
+<% end %>

data/app/views/toolbar/_home.html.erb

@@ -8,7 +8,7 @@
 </div>
 
 <% if defined?(SocialStream::Presence) and SocialStream::Presence.enable %>
-  <%= render :partial => 'chat/index' , :locals => {:flow => false} %>
+  <%= render :partial => 'chat/index' , :locals => {:flow => false } %>
 <% end %>
 
 <div class="block space_center">

data/app/views/toolbar/_messages.html.erb

@@ -11,5 +11,5 @@
 </div>
 
 <% if defined?(SocialStream::Presence) and SocialStream::Presence.enable %>
-  <%= render :partial => 'chat/index' , :locals => {:flow => true} %>
+  <%= render :partial => 'chat/index' , :locals => {:flow => false } %>
 <% end %>

data/app/views/toolbar/_profile.html.erb

@@ -23,6 +23,6 @@
 </div>
 
 <% if defined?(SocialStream::Presence) and SocialStream::Presence.enable %>
-  <%= render :partial => 'chat/index' , :locals => {:flow => true} %>
+  <%= render :partial => 'chat/index' , :locals => {:flow => true , :group => @group } %>
 <% end %>
 

data/config/locales/es.yml

@@ -45,6 +45,13 @@ es:
     delete: "Borrar"
     last: "Últimas actividades"
     like: "Me gusta"
+    like_sentence:
+      few:
+        one: "A %{likers} le gusta esto"
+        other: "A %{likers} les gusta esto"
+      many:
+        one: "A %{likers} y %{count} persona más les gusta esto"
+        other: "A %{likers} y %{count} personas más les gusta esto"
     one: "Actividad"
     other: "Actividades"
     privacy:

data/db/migrate/20120302215722_activity_object_properties.rb

@@ -0,0 +1,24 @@
+class ActivityObjectProperties < ActiveRecord::Migration
+  def up
+    create_table :activity_object_properties do |t|
+      t.integer :activity_object_id
+      t.integer :property_id
+      t.string  :type
+      
+      t.timestamp
+    end
+
+    add_index "activity_object_properties", "activity_object_id"
+    add_index "activity_object_properties", "property_id"
+
+    add_foreign_key "activity_object_properties", "activity_objects", :name => "index_activity_object_properties_on_activity_object_id", :column => :activity_object_id
+    add_foreign_key "activity_object_properties", "activity_objects", :name => "index_activity_object_properties_on_property_id", :column => :property_id
+  end
+
+  def down
+    remove_foreign_key "activity_object_properties", :name => "index_activity_object_properties_on_activity_object_id"
+    remove_foreign_key "activity_object_properties", :name => "index_activity_object_properties_on_property_id"
+
+    drop_table :activity_object_properties
+  end
+end

data/lib/social_stream/ability/base.rb

@@ -22,11 +22,11 @@ module SocialStream
           end
 
           can :update, klass do |k| # can :update, Post do |post|
-            k.post_activity.allow?(subject, 'update')
+            [k.channel.author_id, k.channel.owner_id].include?(Actor.normalize_id(subject))
           end
 
           can :destroy, klass do |k| # can :destroy, Post do |post|
-            k.post_activity.allow?(subject, 'destroy')
+            [k.channel.author_id, k.channel.owner_id].include?(Actor.normalize_id(subject))
           end
         end
 

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.16.4".freeze
+    VERSION = "0.17.0".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 0.16.4
+  version: 0.17.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ 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: rails
-  requirement: &71125470 !ruby/object:Gem::Requirement
+  requirement: &74428340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *71125470
+  version_requirements: *74428340
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &71124250 !ruby/object:Gem::Requirement
+  requirement: &74428090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *71124250
+  version_requirements: *74428090
 - !ruby/object:Gem::Dependency
   name: foreigner
-  requirement: &71122600 !ruby/object:Gem::Requirement
+  requirement: &74427750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *71122600
+  version_requirements: *74427750
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &71119970 !ruby/object:Gem::Requirement
+  requirement: &74427340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *71119970
+  version_requirements: *74427340
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &71118640 !ruby/object:Gem::Requirement
+  requirement: &74426640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *71118640
+  version_requirements: *74426640
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &71116250 !ruby/object:Gem::Requirement
+  requirement: &74426260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *71116250
+  version_requirements: *74426260
 - !ruby/object:Gem::Dependency
   name: avatars_for_rails
-  requirement: &71111270 !ruby/object:Gem::Requirement
+  requirement: &74425800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *71111270
+  version_requirements: *74425800
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &71110400 !ruby/object:Gem::Requirement
+  requirement: &74425350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *71110400
+  version_requirements: *74425350
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &71109030 !ruby/object:Gem::Requirement
+  requirement: &74424660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *71109030
+  version_requirements: *74424660
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &71102380 !ruby/object:Gem::Requirement
+  requirement: &74424380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *71102380
+  version_requirements: *74424380
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &71099110 !ruby/object:Gem::Requirement
+  requirement: &74424150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *71099110
+  version_requirements: *74424150
 - !ruby/object:Gem::Dependency
   name: omniauth-facebook
-  requirement: &71097850 !ruby/object:Gem::Requirement
+  requirement: &74423780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,10 +143,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *71097850
+  version_requirements: *74423780
 - !ruby/object:Gem::Dependency
   name: omniauth-linkedin
-  requirement: &71075910 !ruby/object:Gem::Requirement
+  requirement: &74423440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -154,10 +154,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *71075910
+  version_requirements: *74423440
 - !ruby/object:Gem::Dependency
   name: mailboxer
-  requirement: &70750160 !ruby/object:Gem::Requirement
+  requirement: &74423070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -165,10 +165,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70750160
+  version_requirements: *74423070
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
-  requirement: &70749520 !ruby/object:Gem::Requirement
+  requirement: &74422790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -176,10 +176,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70749520
+  version_requirements: *74422790
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &70748700 !ruby/object:Gem::Requirement
+  requirement: &74422540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -187,10 +187,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70748700
+  version_requirements: *74422540
 - !ruby/object:Gem::Dependency
   name: simple-navigation
-  requirement: &70748130 !ruby/object:Gem::Requirement
+  requirement: &74409950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -198,10 +198,10 @@ dependencies:
         version: 3.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70748130
+  version_requirements: *74409950
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70747860 !ruby/object:Gem::Requirement
+  requirement: &74409710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -209,10 +209,10 @@ dependencies:
         version: 1.19.0
   type: :runtime
   prerelease: false
-  version_requirements: *70747860
+  version_requirements: *74409710
 - !ruby/object:Gem::Dependency
   name: modernizr-rails
-  requirement: &70747470 !ruby/object:Gem::Requirement
+  requirement: &74409470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -220,10 +220,10 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70747470
+  version_requirements: *74409470
 - !ruby/object:Gem::Dependency
   name: thinking-sphinx
-  requirement: &70746790 !ruby/object:Gem::Requirement
+  requirement: &74409240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -231,10 +231,10 @@ dependencies:
         version: 2.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *70746790
+  version_requirements: *74409240
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &70746000 !ruby/object:Gem::Requirement
+  requirement: &74409010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -242,10 +242,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70746000
+  version_requirements: *74409010
 - !ruby/object:Gem::Dependency
   name: rails_autolink
-  requirement: &70745640 !ruby/object:Gem::Requirement
+  requirement: &74408770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -253,10 +253,10 @@ dependencies:
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70745640
+  version_requirements: *74408770
 - !ruby/object:Gem::Dependency
   name: social_cheesecake
-  requirement: &70745040 !ruby/object:Gem::Requirement
+  requirement: &74408430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -264,10 +264,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70745040
+  version_requirements: *74408430
 - !ruby/object:Gem::Dependency
   name: i18n-js
-  requirement: &70744670 !ruby/object:Gem::Requirement
+  requirement: &74408090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -275,10 +275,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70744670
+  version_requirements: *74408090
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70744240 !ruby/object:Gem::Requirement
+  requirement: &74407640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -286,10 +286,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *70744240
+  version_requirements: *74407640
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70743760 !ruby/object:Gem::Requirement
+  requirement: &74407370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -297,10 +297,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70743760
+  version_requirements: *74407370
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70738530 !ruby/object:Gem::Requirement
+  requirement: &74406550 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -308,10 +308,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70738530
+  version_requirements: *74406550
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70737640 !ruby/object:Gem::Requirement
+  requirement: &74405980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -319,10 +319,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *70737640
+  version_requirements: *74405980
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70736740 !ruby/object:Gem::Requirement
+  requirement: &74405540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -330,10 +330,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *70736740
+  version_requirements: *74405540
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &70736020 !ruby/object:Gem::Requirement
+  requirement: &74404890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -341,10 +341,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *70736020
+  version_requirements: *74404890
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &70734640 !ruby/object:Gem::Requirement
+  requirement: &74404410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -352,10 +352,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70734640
+  version_requirements: *74404410
 - !ruby/object:Gem::Dependency
   name: nifty-generators
-  requirement: &70734120 !ruby/object:Gem::Requirement
+  requirement: &74404050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -363,7 +363,7 @@ dependencies:
         version: 0.4.5
   type: :development
   prerelease: false
-  version_requirements: *70734120
+  version_requirements: *74404050
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.
 
@@ -555,6 +555,8 @@ files:
 - app/assets/javascripts/search.js.erb
 - app/assets/javascripts/settings.js
 - app/assets/javascripts/social_stream-base.js
+- app/assets/javascripts/social_stream.comments.js
+- app/assets/javascripts/social_stream.objects.js
 - app/assets/javascripts/social_stream.search.js.erb
 - app/assets/javascripts/social_stream.timeline.js
 - app/assets/javascripts/social_stream.wall.js.erb
@@ -644,6 +646,7 @@ files:
 - app/models/activity.rb
 - app/models/activity_object.rb
 - app/models/activity_object_activity.rb
+- app/models/activity_object_property.rb
 - app/models/activity_verb.rb
 - app/models/actor.rb
 - app/models/audience.rb
@@ -875,6 +878,7 @@ files:
 - db/migrate/20120111141717_activity_channels.rb
 - db/migrate/20120201185454_singleton_single_relations.rb
 - db/migrate/20120208135718_group_title_and_description_in_activity_object.rb
+- db/migrate/20120302215722_activity_object_properties.rb
 - lib/acts_as_taggable_on/acts_as_taggable_on/dirty.rb
 - lib/acts_as_taggable_on/social_stream.rb
 - lib/generators/social_stream/base/install_generator.rb