social_stream-base 0.15.2 → 0.16.0

data/config/locales/en.yml

@@ -380,29 +380,39 @@ en:
     other: "Everybody"
   permission:
     description:
-      brief:
-        create: 
-          activity: "Post to wall"
-        follow:
-          nil: "Follow their activity"
-        read:
-          activity: "Read wall"
-        represent:
-          nil: "Administrate"
-        notify:
-          nil: "Notify via email"
-      detailed:
-        create:
-          activity: "Post to \"%{relation}\" wall"
-        follow:
-          nil: "Activities of the contacts at %{relation} will appear in our home wall"
-        read:
-          activity: "Read posts in \"%{relation}\" wall"
-          tie: "See contacts in levels: %{relations} and %{public}"
-        represent:
-          nil: "Change session to act as %{subject}"
-        notify:
-          nil: "Updates of contacts at %{relation} will be sent to your email"
+      default:
+        brief:
+          create: 
+            activity: "Post to your wall"
+          follow:
+            nil: "Follow their activity"
+          read:
+            activity: "Read your wall"
+          represent:
+            nil: "Administrate"
+          notify:
+            nil: "Notify"
+        detailed:
+          create:
+            activity:
+              positive: "They WILL BE ABLE to post new activities to your wall"
+              negative: "They WILL NOT BE ABLE to post new activities to your wall"
+          follow:
+            nil:
+              positive: "Activities of the contacts at %{relation} WILL APPEAR in your home wall"
+              negative: "Activities of the contacts at %{relation} WILL APPEAR in your home wall"
+          read:
+            activity:
+              positive: "They WILL BE ABLE to read posts in your wall, except those shared with specific contacts"
+              negative: "They WILL NOT BE ABLE to read posts in your wall, except those marked as public"
+          represent:
+            nil:
+              positive: "They WILL BE ABLE to change session and act as %{subject}"
+              negative: "They WILL NOT BE ABLE to change session and act as %{subject}"
+          notify:
+            nil:
+              positive: "Activities WILL BE notified to contacts at %{name}"
+              negative: "Activities WILL NOT BE notified to contacts at %{name}"
     of_relation:
       choose: "2. Permissions in <strong>%{name}</strong> sphere"
   privacy:

data/config/locales/es.yml

@@ -379,33 +379,62 @@ es:
     other: "Todo el mundo"
   permission:
     description:
-      brief:
-        create: 
-          activity: "Publicar en el muro"
-        follow:
-          nil: "Seguir su actividad"
-        read:
-          activity: "Leer muro"
-        represent:
-          nil: "Administrar"
-        notify:
-          nil: "Notificar por email"
-      detailed:
-        create:
-          activity: "Publicar en el muro de\"%{relation}\""
-        follow:
-          nil: "Las actividades de los contactos en %{relation} aparecerán en tu página de inicio"
-        read:
-          activity: "Leer publicaciones en el muro de \"%{relation}\""
-          tie: "Ver contactos en los niveles: %{relations} y %{public}"
-        represent:
-          nil: "Cambiar sesión para actuar en nombre de %{subject}"
-        notify:
-          nil: "Las actividades de los contactos en %{relation} se te enviarán al email"
+      default:
+        brief:
+          create: 
+            activity: "Publicar en vuestro muro"
+          follow:
+            nil: "Seguir su actividad"
+          read:
+            activity: "Leer vuestro muro"
+          represent:
+            nil: "Administrar"
+          notify:
+            nil: "Notificar"
+        detailed:
+          create:
+            activity:
+              positive: "PODRÁN publicar actividades en vuestro muro"
+              negative: "NO PODRÁN publicar actividades en vuestro muro"
+          follow:
+            nil:
+              positive: "Las actividades de los contactos en %{relation} APARECERÁN en vuestra página de inicio"
+              negative: "Las actividades de los contactos en %{relation} NO APARECERÁN en vuestra página de inicio"
+          read:
+            activity:
+              positive: "PODRÁN leer las publicaciones que aparezcan en vuestro muro, salvo las que compartas solo ciertas personas"
+              negative: "NO PODRÁN leer las publicaciones que aparezcan en vuestro muro, salvo las que marques como públicas"
+          represent:
+            nil:
+              positive: "PODRÁN cambiar sesión para actuar en nombre de %{name}"
+              negative: "NO PODRÁN cambiar sesión para actuar en nombre de %{name}"
+          notify:
+            nil:
+              positive: "Las actividades SE NOTIFICARÁN a los contactos en %{relation}"
+              negative: "Las actividades NO SE NOTIFICARÁN a los contactos en %{relation}"
+      user:
+        brief:
+          create: 
+            activity: "Publicar en tu muro"
+          read:
+            activity: "Leer tu muro"
+        detailed:
+          create:
+            activity:
+              positive: "PODRÁN publicar actividades en tu muro"
+              negative: "NO PODRÁN publicar actividades en tu muro"
+          follow:
+            nil:
+              positive: "Las actividades de los contactos en %{relation} APARECERÁN en tu página de inicio"
+              negative: "Las actividades de los contactos en %{relation} NO APARECERÁN en tu página de inicio"
+          read:
+            activity:
+              positive: "PODRÁN leer las publicaciones que aparezcan en tu muro, salvo las que compartas solo con ciertas personas"
+              negative: "NO PODRÁN leer las publicaciones que aparezcan en tu muro, salvo las que marques como públicas"
     of_relation:
       choose: "2. Permisos para <strong>%{name}</strong>"
   privacy:
-    intro: "Los contactos en <strong>%{relation}</strong> solo pueden:"
+    intro: "Los contactos en <strong>%{relation}</strong>:"
     rule:
       add: "Añadir"
       title: "Reglas de privacidad"

data/db/migrate/20120208135718_group_title_and_description_in_activity_object.rb

@@ -0,0 +1,52 @@
+class GroupTitleAndDescriptionInActivityObject < ActiveRecord::Migration
+  def up
+    ao_ts = ActivityObject.record_timestamps
+    ActivityObject.record_timestamps = false
+
+    change_table :activity_objects do |t|
+      t.string :title, :default => ""
+      t.text :description
+    end
+
+    # Fix 'comments' table
+    c_ts = Comment.record_timestamps
+    Comment.record_timestamps = false
+
+    Comment.all.each do |c|
+      # Remove comments that are not properly deleted
+      # https://github.com/ging/social_stream/issues/213
+      if c.activity_object.activities.blank?
+        c.destroy
+        next
+      end
+
+      c.activity_object.description = c.read_attribute(:text)
+      c.save!
+    end
+    change_table :comments do |t|
+      t.remove :text
+    end
+    Comment.reset_column_information
+    Comment.record_timestamps = c_ts
+
+    # Fix 'posts' table
+    p_ts = Post.record_timestamps
+    Post.record_timestamps = false
+
+    Post.all.each do |p|
+      p.activity_object.description = p.read_attribute(:text)
+      p.save!
+    end
+    change_table :posts do |t|
+      t.remove :text
+    end
+    Post.reset_column_information
+    Post.record_timestamps = p_ts
+
+    ActivityObject.record_timestamps = ao_ts
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration # Due to trans-gem oddities
+  end
+end

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.15.2".freeze
+    VERSION = "0.16.0".freeze
   end
 end

data/spec/factories/activity.rb

@@ -12,11 +12,11 @@ end
 
 Factory.define :activity_object_spec_helper do |a|
   a.object_type "Post"
+  a.description "Post spec helper"
 end
 
 Factory.define :post_spec_helper do |p|
   p.association :activity_object_spec_helper
-  p.text "Post spec helper"
 end
 
 #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.16.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-08 00:00:00.000000000Z
+date: 2012-02-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &88091570 !ruby/object:Gem::Requirement
+  requirement: &81549840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *88091570
+  version_requirements: *81549840
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &88091310 !ruby/object:Gem::Requirement
+  requirement: &81549340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *88091310
+  version_requirements: *81549340
 - !ruby/object:Gem::Dependency
   name: foreigner
-  requirement: &88091050 !ruby/object:Gem::Requirement
+  requirement: &81549050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *88091050
+  version_requirements: *81549050
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &88090800 !ruby/object:Gem::Requirement
+  requirement: &81548420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *88090800
+  version_requirements: *81548420
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &88090570 !ruby/object:Gem::Requirement
+  requirement: &81548060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *88090570
+  version_requirements: *81548060
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &88090340 !ruby/object:Gem::Requirement
+  requirement: &81547700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *88090340
+  version_requirements: *81547700
 - !ruby/object:Gem::Dependency
   name: avatars_for_rails
-  requirement: &88090110 !ruby/object:Gem::Requirement
+  requirement: &81547210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *88090110
+  version_requirements: *81547210
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &88089880 !ruby/object:Gem::Requirement
+  requirement: &81546790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *88089880
+  version_requirements: *81546790
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &88089650 !ruby/object:Gem::Requirement
+  requirement: &81546460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *88089650
+  version_requirements: *81546460
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &88089420 !ruby/object:Gem::Requirement
+  requirement: &81546060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *88089420
+  version_requirements: *81546060
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &88089180 !ruby/object:Gem::Requirement
+  requirement: &81533900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *88089180
+  version_requirements: *81533900
 - !ruby/object:Gem::Dependency
   name: omniauth-facebook
-  requirement: &88088100 !ruby/object:Gem::Requirement
+  requirement: &81533670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,10 +143,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *88088100
+  version_requirements: *81533670
 - !ruby/object:Gem::Dependency
   name: omniauth-linkedin
-  requirement: &88087740 !ruby/object:Gem::Requirement
+  requirement: &81533430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -154,10 +154,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *88087740
+  version_requirements: *81533430
 - !ruby/object:Gem::Dependency
   name: mailboxer
-  requirement: &88087400 !ruby/object:Gem::Requirement
+  requirement: &81533200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -165,10 +165,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *88087400
+  version_requirements: *81533200
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
-  requirement: &88087040 !ruby/object:Gem::Requirement
+  requirement: &81532970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -176,10 +176,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *88087040
+  version_requirements: *81532970
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &88086710 !ruby/object:Gem::Requirement
+  requirement: &81532740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -187,10 +187,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *88086710
+  version_requirements: *81532740
 - !ruby/object:Gem::Dependency
   name: simple-navigation
-  requirement: &88086360 !ruby/object:Gem::Requirement
+  requirement: &81532510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -198,10 +198,10 @@ dependencies:
         version: 3.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *88086360
+  version_requirements: *81532510
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &88086030 !ruby/object:Gem::Requirement
+  requirement: &81532250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -209,10 +209,10 @@ dependencies:
         version: 1.19.0
   type: :runtime
   prerelease: false
-  version_requirements: *88086030
+  version_requirements: *81532250
 - !ruby/object:Gem::Dependency
   name: modernizr-rails
-  requirement: &88085690 !ruby/object:Gem::Requirement
+  requirement: &81531970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -220,10 +220,10 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *88085690
+  version_requirements: *81531970
 - !ruby/object:Gem::Dependency
   name: thinking-sphinx
-  requirement: &88085330 !ruby/object:Gem::Requirement
+  requirement: &81531650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -231,10 +231,10 @@ dependencies:
         version: 2.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *88085330
+  version_requirements: *81531650
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &88084990 !ruby/object:Gem::Requirement
+  requirement: &81531240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -242,10 +242,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *88084990
+  version_requirements: *81531240
 - !ruby/object:Gem::Dependency
   name: rails_autolink
-  requirement: &88084630 !ruby/object:Gem::Requirement
+  requirement: &81530810 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -253,10 +253,10 @@ dependencies:
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *88084630
+  version_requirements: *81530810
 - !ruby/object:Gem::Dependency
   name: social_cheesecake
-  requirement: &88084300 !ruby/object:Gem::Requirement
+  requirement: &81530350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -264,10 +264,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *88084300
+  version_requirements: *81530350
 - !ruby/object:Gem::Dependency
   name: i18n-js
-  requirement: &88083950 !ruby/object:Gem::Requirement
+  requirement: &81530080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -275,10 +275,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *88083950
+  version_requirements: *81530080
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &88083610 !ruby/object:Gem::Requirement
+  requirement: &81529620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -286,10 +286,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *88083610
+  version_requirements: *81529620
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &88083320 !ruby/object:Gem::Requirement
+  requirement: &81529180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -297,10 +297,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *88083320
+  version_requirements: *81529180
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &88082950 !ruby/object:Gem::Requirement
+  requirement: &81528760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -308,10 +308,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *88082950
+  version_requirements: *81528760
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &88082590 !ruby/object:Gem::Requirement
+  requirement: &81528370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -319,10 +319,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *88082590
+  version_requirements: *81528370
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &88082210 !ruby/object:Gem::Requirement
+  requirement: &81527960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -330,10 +330,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *88082210
+  version_requirements: *81527960
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &88081870 !ruby/object:Gem::Requirement
+  requirement: &81527710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -341,10 +341,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *88081870
+  version_requirements: *81527710
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &88081510 !ruby/object:Gem::Requirement
+  requirement: &81527480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -352,10 +352,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *88081510
+  version_requirements: *81527480
 - !ruby/object:Gem::Dependency
   name: nifty-generators
-  requirement: &88081180 !ruby/object:Gem::Requirement
+  requirement: &81527220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -363,7 +363,7 @@ dependencies:
         version: 0.4.5
   type: :development
   prerelease: false
-  version_requirements: *88081180
+  version_requirements: *81527220
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.
 
@@ -470,6 +470,8 @@ files:
 - app/assets/images/btn/next_space.png
 - app/assets/images/btn/nolike.png
 - app/assets/images/btn/notifications.png
+- app/assets/images/btn/permission_negative.png
+- app/assets/images/btn/permission_positive.png
 - app/assets/images/btn/pixel.png
 - app/assets/images/btn/point_blue.png
 - app/assets/images/btn/point_gray.png
@@ -553,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.timeline.js
+- app/assets/javascripts/social_stream.wall.js.erb
 - app/assets/javascripts/ties.js
 - app/assets/javascripts/toolbar.js
 - app/assets/javascripts/users.js
@@ -662,7 +666,6 @@ files:
 - app/views/activities/_activity.html.erb
 - app/views/activities/_child.html.erb
 - app/views/activities/_comments.html.erb
-- app/views/activities/_filter.html.erb
 - app/views/activities/_index.html.erb
 - app/views/activities/_new.html.erb
 - app/views/activities/_options.html.erb
@@ -866,6 +869,7 @@ files:
 - db/migrate/20120111120920_remove_language_default.rb
 - db/migrate/20120111141717_activity_channels.rb
 - db/migrate/20120201185454_singleton_single_relations.rb
+- db/migrate/20120208135718_group_title_and_description_in_activity_object.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