social_stream 0.29.0 → 0.30.0

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

@@ -72,10 +72,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
-
   # ==> Configuration for :validatable
   # Range for password length. Default is 6..20.
   # config.password_length = 6..20
@@ -123,10 +119,6 @@ Devise.setup do |config|
   # 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
@@ -163,6 +155,10 @@ Devise.setup do |config|
   config.omniauth :linkedin, "ekxfXU8nueVSMQ9fc5KJAryBkyztUlCBYMW3DoQPzbE79WhivvzhQloRNHCHgPeB", "WYiHFT-KKFgjd45W3-pEAficmXRHmN6_6DGwj1C_ZILJlSO1gBvv6VNYXU9tybGY"
                       
   config.omniauth :facebook, "129571360447856","eef39dce5e20e76f77495c59623bdb38"
+
+  #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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.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: social_stream-base
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.0
 - !ruby/object:Gem::Dependency
   name: social_stream-documents
   requirement: !ruby/object:Gem::Requirement
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: social_stream-events
   requirement: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: social_stream-linkser
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: social_stream-presence
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,7 +91,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: social_stream-ostatus
   requirement: !ruby/object:Gem::Requirement
@@ -99,7 +99,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -107,7 +107,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -745,13 +745,7 @@ files:
 - base/config/locales/rails.es.yml
 - base/config/locales/rails.pt.yml
 - base/config/routes.rb
-- base/db/migrate/20120111141717_create_social_stream.rb
-- base/db/migrate/20120201185454_singleton_single_relations.rb
-- base/db/migrate/20120208135718_group_title_and_description_in_activity_object.rb
-- base/db/migrate/20120302215722_activity_object_properties.rb
-- base/db/migrate/20120316093946_create_activity_actions.rb
-- base/db/migrate/20120316113728_activity_action_follow.rb
-- base/db/migrate/20120326083509_object_channels_to_actions.rb
+- base/db/migrate/20120326083509_create_social_stream.rb
 - base/db/migrate/20120403175913_create_activity_object_audiences.rb
 - base/db/migrate/20120411132550_add_visit_count_to_activity_object.rb
 - base/db/migrate/20120411151413_relation_public_permissions.rb
@@ -833,6 +827,7 @@ files:
 - base/lib/social_stream/views/settings/base.rb
 - base/lib/social_stream/views/sidebar/base.rb
 - base/lib/social_stream/views/toolbar/base.rb
+- base/lib/tasks/attachments.rake
 - base/lib/tasks/db/populate.rake
 - base/lib/tasks/workers.rake
 - base/lib/thinking-sphinx/social_stream.rb
@@ -1075,11 +1070,10 @@ files:
 - documents/config/locales/en.yml
 - documents/config/locales/es.yml
 - documents/config/routes.rb
-- documents/db/migrate/20120109155431_create_social_stream_documents.rb
-- documents/db/migrate/20120208143721_documents_group_title_and_description_in_activity_object.rb
+- documents/db/migrate/20120208143721_create_social_stream_documents.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/generators/social_stream/documents/templates/initializer.rb
 - documents/lib/samples/car.jpg
 - documents/lib/samples/house.jpg
 - documents/lib/samples/loremipsum.odt
@@ -1200,9 +1194,6 @@ files:
 - events/config/locales/en.yml
 - events/config/locales/es.yml
 - events/config/routes.rb
-- events/db/migrate/20111218203314_create_events.rb
-- events/db/migrate/20120208143756_events_group_title_and_description_in_activity_object.rb
-- events/db/migrate/20120208144948_add_events_foreign_key.rb
 - events/db/migrate/20120330131859_create_social_stream_events.rb
 - events/lib/generators/social_stream/events/install_generator.rb
 - events/lib/social_stream-events.rb
@@ -1259,9 +1250,7 @@ files:
 - linkser/config/locales/en.yml
 - linkser/config/locales/es.yml
 - linkser/config/routes.rb
-- linkser/db/migrate/20111219122952_create_social_stream_linkser.rb
-- linkser/db/migrate/20120202104549_add_links_foreign_key.rb
-- linkser/db/migrate/20120208143739_linkser_group_title_and_description_in_activity_object.rb
+- linkser/db/migrate/20120208143739_create_social_stream_linkser.rb
 - linkser/lib/generators/social_stream/linkser/install_generator.rb
 - linkser/lib/social_stream-linkser.rb
 - linkser/lib/social_stream/linkser/engine.rb
@@ -1375,6 +1364,7 @@ files:
 - ostatus/app/decorators/social_stream/base/activity_decorator.rb
 - ostatus/app/decorators/social_stream/base/actor_decorator.rb
 - ostatus/app/decorators/social_stream/base/audience_decorator.rb
+- ostatus/app/decorators/social_stream/base/contact_decorator.rb
 - ostatus/app/decorators/social_stream/base/relation/custom_decorator.rb
 - ostatus/app/decorators/social_stream/base/tie_decorator.rb
 - ostatus/app/models/actor_key.rb
@@ -1395,6 +1385,7 @@ files:
 - ostatus/lib/social_stream/ostatus/models/activity.rb
 - ostatus/lib/social_stream/ostatus/models/actor.rb
 - ostatus/lib/social_stream/ostatus/models/audience.rb
+- ostatus/lib/social_stream/ostatus/models/contact.rb
 - ostatus/lib/social_stream/ostatus/models/object.rb
 - ostatus/lib/social_stream/ostatus/models/relation/custom.rb
 - ostatus/lib/social_stream/ostatus/models/tie.rb
@@ -1533,9 +1524,6 @@ files:
 - presence/config/locales/en.yml
 - presence/config/locales/es.yml
 - presence/config/routes.rb
-- presence/db/migrate/20110711111408_add_connected_column_to_user.rb
-- presence/db/migrate/20110928135031_add_status_column_to_user.rb
-- presence/db/migrate/20111116194112_add_chat_enabled_column_to_user.rb
 - presence/db/migrate/20120330132148_create_social_stream_presence.rb
 - presence/ejabberd/conf/ejabberd_example.cfg
 - presence/ejabberd/conf/ssconfig_example.cfg
@@ -1718,3 +1706,4 @@ signing_key:
 specification_version: 3
 summary: A core for building social network websites
 test_files: []
+has_rdoc: 

data/base/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/base/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/base/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/base/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/base/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/base/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