social_stream-base 0.23.0 → 0.24.0

data/app/models/like.rb

@@ -5,7 +5,8 @@ class Like
   class << self
     # Find the children activity of activity_id liked by subject
     def find(subject, object)
-      like = new(object.liked_by(subject).first)
+      like = new(object.liked_by(subject).readonly(false).first)
+      return nil if like.object.nil?
       # Cache object to make it available before it is destroyed
       like.object
       like
@@ -18,7 +19,9 @@ class Like
     end
 
     def build(subject, user, object)
-       new object.new_like(subject, user)
+       l = self.find(subject,object)
+       l = new object.new_like(subject, user) if l.nil?
+       l
     end
   end
 
@@ -34,7 +37,9 @@ class Like
   # The object that is liked. It can be an activity
   def object
     @object ||=
-      if @like.is_root?
+      if @like.nil?
+        nil
+      elsif @like.is_root?
         obj = @like.direct_object
         obj = obj.subject if obj.is_a?(Actor)
         obj

data/config/locales/en.yml

@@ -66,6 +66,7 @@ en:
       atom_title: "Activity Stream from %{subject}"
       title:
         follow: "%{author} added %{activity_object} as contact"
+        unfollow: "%{author} removed %{activity_object} as contact"
         like: "%{author} likes %{activity_object}"
         make-friend: "%{author} also added %{activity_object} as contact"
         post: "%{author} posted %{activity_object}"

data/config/locales/es.yml

@@ -65,6 +65,7 @@ es:
       atom_title: "Actividades de %{subject}"
       title:
         follow: "%{author} añadió a %{activity_object} como contacto"
+        unfollow: "%{author} eliminó a %{activity_object} como contacto"
         like: "A %{author} le gusta %{activity_object}"
         make-friend: "%{author} también añadió a %{activity_object} como contacto"
         post: "%{author} publicó %{activity_object}"

data/db/migrate/{20120111141717_create_social_stream.rb → 20120326083509_create_social_stream.rb}

@@ -11,6 +11,19 @@ class CreateSocialStream < ActiveRecord::Migration
     add_index "activities", ["activity_verb_id"], :name => "index_activities_on_activity_verb_id"
     add_index "activities", ["channel_id"], :name => "index_activities_on_channel_id"
 
+    create_table :activity_actions do |t|
+      t.references :actor
+      t.references :activity_object
+      t.boolean    :follow, :default => false
+      t.boolean    :author, :default => false
+      t.boolean    :user_author, :default => false
+      t.boolean    :owner,  :default => false
+
+      t.timestamps
+    end
+    add_index :activity_actions, :actor_id
+    add_index :activity_actions, :activity_object_id
+
     create_table "activity_object_activities", :force => true do |t|
       t.integer  "activity_id"
       t.integer  "activity_object_id"
@@ -23,14 +36,25 @@ class CreateSocialStream < ActiveRecord::Migration
     add_index "activity_object_activities", ["activity_object_id"], :name => "index_activity_object_activities_on_activity_object_id"
 
     create_table "activity_objects", :force => true do |t|
+      t.string   "title", :default => ""
+      t.text     "description"
       t.datetime "created_at"
       t.datetime "updated_at"
-      t.string   "object_type", :limit => 45
-      t.integer  "like_count",                :default => 0
-      t.integer  "channel_id"
+      t.string   "object_type",    :limit => 45
+      t.integer  "like_count",     :default => 0
+      t.integer  "follower_count", :default => 0
     end
 
-    add_index "activity_objects", ["channel_id"], :name => "index_activity_objects_on_channel_id"
+    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"
 
     create_table "activity_verbs", :force => true do |t|
       t.string   "name",       :limit => 45
@@ -47,7 +71,6 @@ class CreateSocialStream < ActiveRecord::Migration
       t.datetime "created_at"
       t.datetime "updated_at"
       t.integer  "activity_object_id"
-      t.integer  "follower_count",     :default => 0
     end
 
     add_index "actors", ["activity_object_id"], :name => "index_actors_on_activity_object_id"
@@ -97,7 +120,6 @@ class CreateSocialStream < ActiveRecord::Migration
 
     create_table "comments", :force => true do |t|
       t.integer  "activity_object_id"
-      t.text     "text"
       t.datetime "created_at"
       t.datetime "updated_at"
     end
@@ -136,7 +158,6 @@ class CreateSocialStream < ActiveRecord::Migration
       t.integer  "activity_object_id"
       t.datetime "created_at"
       t.datetime "updated_at"
-      t.text     "text"
     end
 
     add_index "posts", ["activity_object_id"], :name => "index_posts_on_activity_object_id"
@@ -223,10 +244,14 @@ class CreateSocialStream < ActiveRecord::Migration
     add_foreign_key "activities", "activity_verbs", :name => "index_activities_on_activity_verb_id"
     add_foreign_key "activities", "channels", :name => "index_activities_on_channel_id"
 
+    add_foreign_key "activity_actions", "actors", :name => "index_activity_actions_on_actor_id"
+    add_foreign_key "activity_actions", "activity_objects", :name => "index_activity_actions_on_activity_object_id"
+
     add_foreign_key "activity_object_activities", "activities", :name => "index_activity_object_activities_on_activity_id"
     add_foreign_key "activity_object_activities", "activity_objects", :name => "activity_object_activities_on_activity_object_id"
 
-    add_foreign_key "activity_objects", "channels", :name => "index_activity_objects_on_channel_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
 
     add_foreign_key "actors", "activity_objects", :name => "actors_on_activity_object_id"
 

data/lib/generators/social_stream/base/install_generator.rb

@@ -13,7 +13,7 @@ class SocialStream::Base::InstallGenerator < Rails::Generators::Base #:nodoc:
                       \n  config.omniauth :facebook, \"129571360447856\",\"eef39dce5e20e76f77495c59623bdb38\"
                       \n  #config.omniauth :twitter, \"wgTxO0fTpjTeSnjKC9ZHA\",\"JepulVWwLcuAnGfWjwCu47yEP0TcJJfKtvISPBsilI\"
                       \n  config.token_authentication_key = :auth_token
-                      \n  config.stateless_token = true",
+                      \n  config.skip_session_storage << :token_auth",
                       :after => "  # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'"
   end
 

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.23.0".freeze
+    VERSION = "0.24.0".freeze
   end
 end

data/lib/social_stream/controllers/objects.rb

@@ -8,9 +8,11 @@ module SocialStream
 
         before_filter :set_author_ids, :only => [ :new, :create, :update ]
 
-	after_filter :increment_visit_count, :only => :show
+        before_filter :authenticate_user!, :only => [:new, :edit, :create, :update, :destroy]
 
-        load_and_authorize_resource :except => [ :index, :search ]
+        after_filter :increment_visit_count, :only => :show
+
+        load_and_authorize_resource :except => [ :new, :index, :search ]
 
         respond_to :html, :js
 

data/lib/tasks/attachments.rake

@@ -0,0 +1,22 @@
+namespace :social_stream do
+  namespace :avatars do
+    desc "Fix avatar's attachment path from paperclip < 3.0"
+    task :fix => :environment do
+      dir = "#{ Rails.root }/public/system/logos/"
+
+      Avatar.all.each do |a|
+        old_logo_dir = "#{ dir }#{ a.id }/"
+
+        old_logo_contents = Dir["#{ old_logo_dir }*"]
+
+        new_logo_dir = "#{ Rails.root }/public#{ a.logo.to_s.split('original').first }"
+
+        puts "Moving #{ old_logo_dir } to #{ new_logo_dir }"
+
+        FileUtils.mkdir_p new_logo_dir
+        FileUtils.mv old_logo_contents, new_logo_dir
+      end
+    end
+  end
+end
+

data/social_stream-base.gemspec

@@ -26,17 +26,17 @@ Gem::Specification.new do |s|
   # SQL foreign keys
   s.add_runtime_dependency('foreigner', '~> 1.1.1')
   # Authentication
-  s.add_runtime_dependency('devise', '~> 1.5.3')
+  s.add_runtime_dependency('devise', '~> 2.1.2')
   # CRUD controllers
   s.add_runtime_dependency('inherited_resources', '~> 1.3.0')
   # Slug generation
   s.add_runtime_dependency('stringex', '~> 1.3.0')
   # Avatar attachments
-  s.add_runtime_dependency('avatars_for_rails', '~> 0.2.5')
+  s.add_runtime_dependency('avatars_for_rails', '~> 0.2.8')
   # jQuery
   s.add_runtime_dependency('jquery-rails', '>= 1.0.9')
   # Authorization
-  s.add_runtime_dependency('cancan', '1.6.7')
+  s.add_runtime_dependency('cancan', '~> 1.6.7')
   # Pagination
   s.add_runtime_dependency('kaminari', '~> 0.13.0')
   # OAuth client
@@ -50,7 +50,7 @@ Gem::Specification.new do |s|
   # HTML Forms
   s.add_runtime_dependency('formtastic','>= 1.2.3')
   # Background jobs
-  s.add_runtime_dependency('resque','~> 1.20.0')
+  s.add_runtime_dependency('resque','~> 1.23.0')
   # Modernizr.js javascript library
   s.add_runtime_dependency('modernizr-rails', '~> 2.0.6')
   # Sphinx search engine

data/spec/controllers/relation_customs_controller_spec.rb

@@ -74,7 +74,8 @@ describe Relation::CustomsController do
 	begin
           post :create, :custom => { :name => 'Test', :actor_id => actor.id }
 
-          assert false
+          assigns(:custom).should_not be_new_record
+          assigns(:custom).actor_id.should eq(@user.actor_id)
         rescue CanCan::AccessDenied
           assigns(:custom).should be_new_record
 

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

@@ -93,10 +93,6 @@ Devise.setup do |config|
   # If true, extends the user's remember period when remembered via cookie.
   # config.extend_remember_period = false
 
-  # If true, uses the password salt as remember token. This should be turned
-  # to false if you are not using database authenticatable.
-  config.use_salt_as_remember_token = true
-
   # Options to be passed to the created cookie. For instance, you can set
   # :secure => true in order to force SSL only cookies.
   # config.cookie_options = {}
@@ -159,11 +155,7 @@ Devise.setup do |config|
   # ==> Configuration for :token_authenticatable
   # Defines name of the authentication token params key
   # config.token_authentication_key = :auth_token
-
-  # If true, authentication through token does not store user in session and needs
-  # to be supplied on each request. Useful if you are using the token as API token.
-  # config.stateless_token = false
-
+  
   # ==> Scopes configuration
   # Turn scoped views on. Before rendering "sessions/new", it will first check for
   # "users/sessions/new". It's turned off by default because it's slower if you
@@ -205,9 +197,11 @@ Devise.setup do |config|
   #config.omniauth :twitter, "wgTxO0fTpjTeSnjKC9ZHA","JepulVWwLcuAnGfWjwCu47yEP0TcJJfKtvISPBsilI"
                       
   config.token_authentication_key = :auth_token
-                      
-  config.stateless_token = true
 
+  #re state_less token removal 
+  #https://github.com/plataformatec/devise/issues/1499
+  config.skip_session_storage << :token_auth
+                      
   # ==> Warden configuration
   # If you want to use other strategies, that are not supported by Devise, or
   # change the failure app, you can configure them inside the config.warden block.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-03 00:00:00.000000000 Z
+date: 2012-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -99,7 +99,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -107,7 +107,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: inherited_resources
   requirement: !ruby/object:Gem::Requirement
@@ -147,7 +147,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -155,7 +155,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.2.8
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -177,7 +177,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.7
   type: :runtime
@@ -185,7 +185,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.7
 - !ruby/object:Gem::Dependency
@@ -307,7 +307,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.20.0
+        version: 1.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -315,7 +315,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.20.0
+        version: 1.23.0
 - !ruby/object:Gem::Dependency
   name: modernizr-rails
   requirement: !ruby/object:Gem::Requirement
@@ -1061,13 +1061,7 @@ files:
 - config/locales/rails.es.yml
 - config/locales/rails.pt.yml
 - config/routes.rb
-- db/migrate/20120111141717_create_social_stream.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
-- db/migrate/20120316093946_create_activity_actions.rb
-- db/migrate/20120316113728_activity_action_follow.rb
-- db/migrate/20120326083509_object_channels_to_actions.rb
+- db/migrate/20120326083509_create_social_stream.rb
 - db/migrate/20120403175913_create_activity_object_audiences.rb
 - db/migrate/20120411132550_add_visit_count_to_activity_object.rb
 - db/migrate/20120411151413_relation_public_permissions.rb
@@ -1149,6 +1143,7 @@ files:
 - lib/social_stream/views/settings/base.rb
 - lib/social_stream/views/sidebar/base.rb
 - lib/social_stream/views/toolbar/base.rb
+- lib/tasks/attachments.rake
 - lib/tasks/db/populate.rake
 - lib/tasks/workers.rake
 - lib/thinking-sphinx/social_stream.rb
@@ -1305,3 +1300,4 @@ signing_key:
 specification_version: 3
 summary: Basic features for Social Stream, the core for building social network websites
 test_files: []
+has_rdoc: 

data/db/migrate/20120201185454_singleton_single_relations.rb

@@ -1,46 +0,0 @@
-class SingletonSingleRelations < ActiveRecord::Migration
-  def up
-    Tie.record_timestamps = false
-    Audience.record_timestamps = false
-
-    r_new = Relation::Public.instance
-
-    Relation::Public.all.each do |r|
-      next if r == r_new
-
-      # Reassign r -> r_new
-      r.ties.each do |t|
-        t.update_column(:relation_id, r_new.id)
-      end
-
-      r.audiences.each do |a|
-        a.update_column(:relation_id, r_new.id)
-      end
-
-      # Delete r
-      r.delete
-    end
-
-    r_new = Relation::Reject.instance
-
-    Relation::Reject.all.each do |r|
-      next if r == r_new
-
-      # Reassign r -> r_new
-      r.ties.each do |t|
-        t.update_column(:relation_id, r_new.id)
-      end
-
-      r.audiences.each do |a|
-        a.update_column(:relation_id, r_new.id)
-      end
-
-      # Delete r
-      r.delete
-    end
-  end
-
-  def down
-    raise ActiveRecord::IrreversibleMigration
-  end
-end

data/db/migrate/20120208135718_group_title_and_description_in_activity_object.rb

@@ -1,54 +0,0 @@
-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
-
-    ActivityObject.reset_column_information
-
-    # 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/db/migrate/20120302215722_activity_object_properties.rb

@@ -1,24 +0,0 @@
-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/db/migrate/20120316093946_create_activity_actions.rb

@@ -1,15 +0,0 @@
-class CreateActivityActions < ActiveRecord::Migration
-  def change
-    create_table :activity_actions do |t|
-      t.references :actor
-      t.references :activity_object
-
-      t.timestamps
-    end
-    add_index :activity_actions, :actor_id
-    add_index :activity_actions, :activity_object_id
-
-    add_foreign_key "activity_actions", "actors", :name => "index_activity_actions_on_actor_id"
-    add_foreign_key "activity_actions", "activity_objects", :name => "index_activity_actions_on_activity_object_id"
-  end
-end

data/db/migrate/20120316113728_activity_action_follow.rb

@@ -1,23 +0,0 @@
-class ActivityActionFollow < ActiveRecord::Migration
-  def up
-    add_column :activity_actions, :follow, :boolean, :default => false
-    add_column :activity_objects, :follower_count, :integer, :default => 0
-    remove_column :actors, :follower_count
-
-    ActivityObject.reset_column_information
-    Actor.reset_column_information
-
-    Tie.
-      joins(:relation).
-      with_permissions('follow', nil).
-      each do |t|
-        t.set_follow_action
-      end
-  end
-
-  def down
-    remove_column :activity_actions, :follow
-    remove_column :activity_objects, :follower_count
-    add_column :actors, :follower_count, :integer, :default => 0
-  end
-end

data/db/migrate/20120326083509_object_channels_to_actions.rb

@@ -1,47 +0,0 @@
-class ObjectChannelsToActions < ActiveRecord::Migration
-  class Channel < ActiveRecord::Base; end
-
-  def up
-    add_column :activity_actions, :author, :boolean, :default => false
-    add_column :activity_actions, :user_author, :boolean, :default => false
-    add_column :activity_actions, :owner, :boolean, :default => false
-
-    ActivityAction.reset_column_information
-    ActivityAction.record_timestamps = false
-    ActivityObject.record_timestamps = false
-
-    ActivityObject.all.each do |ao|
-      channel = Channel.find ao.channel_id
-
-      %w{ author user_author owner }.each do |role|
-        next unless channel.__send__ "#{ role }_id"
-
-        ao.__send__"#{ role }_id=", channel.__send__("#{ role }_id")
-      end
-
-      ao.received_actions.each do |a|
-        a.created_at = a.updated_at = ao.created_at
-      end
-
-      ao.save!
-    end
-
-    remove_foreign_key :activity_objects, :name => "index_activity_objects_on_channel_id"
-    remove_column :activity_objects, :channel_id
-
-    ActivityObject.reset_column_information
-
-    ActivityAction.record_timestamps = true
-    ActivityObject.record_timestamps = true
-  end
-
-  def down
-    remove_column :activity_actions, :author
-    remove_column :activity_actions, :user_author
-    remove_column :activity_actions, :owner
-
-    add_column :activity_objects, :channel_id, :integer
-    add_index  :activity_objects, :channel_id
-    add_foreign_key :activity_actions, :channel_id, :name => "index_activity_objects_on_channel_id"
-  end
-end