social_stream 0.2.2 → 0.2.3

data/lib/social_stream.rb

@@ -1,7 +1,8 @@
 # Provides your Rails application with social network and activity stream support
 module SocialStream
-  autoload :Ability, 'social_stream/ability'
-  autoload :Seed, 'social_stream/seed'
+  autoload :Ability,  'social_stream/ability'
+  autoload :Populate, 'social_stream/populate'
+  autoload :Seed,     'social_stream/seed'
 
   module Models
     autoload :Supertype, 'social_stream/models/supertype'

data/lib/social_stream/models/activity_object.rb

@@ -60,7 +60,7 @@ module SocialStream
 
         def create_activity(verb)
           activity_object.activities.create! :verb      => verb,
-                                             :tie       => _activity_tie,
+                                             :_tie      => _activity_tie,
                                              :parent_id => _activity_parent_id
         end
       end

data/lib/social_stream/rails.rb

@@ -20,10 +20,10 @@ require 'paperclip/social_stream'
 # Pagination
 require 'will_paginate'
 
-require 'social_stream/rails/common'
-File.expand_path(__FILE__) =~ /#{ File.join('vendor', 'plugins') }/ ?
-  require('social_stream/rails/railtie') :
-  require('social_stream/rails/engine')
+# FIXME: deprecate plugin
+Gem.path.map{ |p| File.expand_path(__FILE__) =~ /^#{ p }/ }.compact.present? ?
+  require('social_stream/rails/engine') :
+  require('social_stream/rails/railtie')
 
 module SocialStream
   module Rails #:nodoc:

data/lib/social_stream/rails/engine.rb

@@ -1,3 +1,5 @@
+require 'social_stream/rails/common'
+
 module SocialStream
   module Rails
     class Engine < ::Rails::Engine #:nodoc:

data/lib/social_stream/rails/railtie.rb

@@ -1,3 +1,5 @@
+require 'social_stream/rails/common'
+
 module SocialStream
   module Rails
     class Railtie < ::Rails::Railtie #:nodoc:

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.2.2".freeze
+  VERSION = "0.2.3".freeze
 end

data/lib/tasks/db/populate.rake

@@ -27,18 +27,18 @@ namespace :db do
       # = Users
 
       # Create demo user if not present
-      if User.find_by_name('demo').blank?
-        User.create! :name => 'demostration',
-                     :email => 'demostration@test.com',
-                     :password => 'demostration',
-                     :password_confirmation => 'demostration'
+      if User.find_by_name('demonstration').blank?
+        User.create! :name => 'demonstration',
+                     :email => 'demonstration@social-stream.dit.upm.es',
+                     :password => 'demonstration',
+                     :password_confirmation => 'demonstration'
       end
 
       9.times do
         User.create! :name => Forgery::Name.full_name,
                      :email => Forgery::Internet.email_address,
-                     :password => 'demostration',
-                     :password_confirmation => 'demostration'
+                     :password => 'demonstration',
+                     :password_confirmation => 'demonstration'
       end
 
       set_logos(User)

data/spec/factories/activity.rb

@@ -1,10 +1,10 @@
 Factory.define :activity do |a|
-  a.association :tie
+  a.association :_tie, :factory => :tie
   a.activity_verb { ActivityVerb["post"] }
 end
 
 Factory.define :like_activity, :parent => :activity do |a|
   a.association :parent, :factory => :activity
   a.activity_verb { ActivityVerb["like"] }
-  a.tie { |tie| tie.association(:tie, :receiver => tie.parent.tie.receiver) }
+  a._tie { |tie| tie.association(:tie, :receiver => tie.parent.tie.receiver) }
 end

data/spec/models/activity_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 module ActivityTestHelper
   def create_activity_assigned_to(tie)
     @tie = tie
-    @activity = Factory(:activity, :tie => tie)
+    @activity = Factory(:activity, :_tie => tie)
   end
 
   def create_ability_accessed_by(tie_type)

data/spec/spec_helper.rb

@@ -19,15 +19,9 @@ Capybara.default_selector = :css
 # FIXME orm
 ActiveRecord::Migration.verbose = false
 
-# Base migration
-#require 'lib/generators/social_stream/templates/migration'
-#CreateSocialStream.up
-
 # Run any available migration
 ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
 
-#require File.expand_path("../dummy/db/seeds", __FILE__)
-
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Antonio Tapiador
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-24 00:00:00 +01:00
+date: 2010-12-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -334,6 +334,7 @@ files:
 - app/models/relation.rb
 - app/models/relation_permission.rb
 - app/models/tie.rb
+- app/models/tie_activity.rb
 - app/models/user.rb
 - app/views/activities/_activities.html.erb
 - app/views/activities/_activity.html.erb
@@ -417,6 +418,8 @@ files:
 - app/views/users/edit.html.erb
 - app/views/users/index.html.erb
 - app/views/users/show.html.erb
+- app/views/users/update.js.erb
+- bin/social_stream
 - config/locales/en.yml
 - config/routes.rb
 - init.rb
@@ -550,6 +553,7 @@ files:
 - lib/generators/social_stream/templates/public/javascripts/jquery-ui.min.js
 - lib/generators/social_stream/templates/public/javascripts/jquery.boxy.js
 - lib/generators/social_stream/templates/public/javascripts/jquery.livequery.js
+- lib/generators/social_stream/templates/public/javascripts/jquery.validate.js
 - lib/generators/social_stream/templates/public/javascripts/menu.js
 - lib/generators/social_stream/templates/public/javascripts/ui.dropdownchecklist.js
 - lib/generators/social_stream/templates/public/stylesheets/activities.css
@@ -562,6 +566,7 @@ files:
 - lib/generators/social_stream/templates/public/stylesheets/header.css
 - lib/generators/social_stream/templates/public/stylesheets/home.css
 - lib/generators/social_stream/templates/public/stylesheets/index.css
+- lib/generators/social_stream/templates/public/stylesheets/jquery-ui.css
 - lib/generators/social_stream/templates/public/stylesheets/menu.css
 - lib/generators/social_stream/templates/public/stylesheets/message.css
 - lib/generators/social_stream/templates/public/stylesheets/middle.css
@@ -599,8 +604,6 @@ files:
 - lib/social_stream/version.rb
 - lib/tasks/db/populate.rake
 - social_stream.gemspec
-- spec/controllers/.groups_controller_spec.rb.swp
-- spec/controllers/.users_controller_spec.rb.swp
 - spec/controllers/frontpage_controller_spec.rb
 - spec/controllers/groups_controller_spec.rb
 - spec/controllers/home_controller_spec.rb
@@ -627,7 +630,6 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/db/.gitignore
 - spec/dummy/db/migrate/.gitkeep
-- spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/db/seeds/social_stream.yml
 - spec/dummy/log/.gitignore

data/spec/dummy/db/schema.rb

@@ -1,116 +0,0 @@
-# This file is auto-generated from the current state of the database. Instead of editing this file, 
-# please use the migrations feature of Active Record to incrementally modify your database, and
-# then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your database schema. If you need
-# to create the application database on another system, you should be using db:schema:load, not running
-# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 0) do
-
-  create_table "activities", :force => true do |t|
-    t.integer  "activity_verb_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "parent_id"
-    t.integer  "tie_id"
-  end
-
-  add_index "activities", ["activity_verb_id"], :name => "fk_activity_verb"
-  add_index "activities", ["tie_id"], :name => "fk_activities_tie"
-
-  create_table "activity_object_activities", :force => true do |t|
-    t.integer  "activity_id"
-    t.integer  "activity_object_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "type",               :limit => 45
-  end
-
-  add_index "activity_object_activities", ["activity_id"], :name => "fk_activity_object_activities_1"
-  add_index "activity_object_activities", ["activity_object_id"], :name => "fk_activity_object_activities_2"
-
-  create_table "activity_objects", :force => true do |t|
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "object_type", :limit => 45
-  end
-
-  create_table "activity_verbs", :force => true do |t|
-    t.string   "name",       :limit => 45
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "actors", :force => true do |t|
-    t.string   "name",               :limit => 45
-    t.string   "email",                            :default => "", :null => false
-    t.string   "permalink",          :limit => 45
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "activity_object_id"
-  end
-
-  add_index "actors", ["activity_object_id"], :name => "fk_actors_activity_object"
-  add_index "actors", ["email"], :name => "index_actors_on_email"
-  add_index "actors", ["permalink"], :name => "index_actors_on_permalink", :unique => true
-
-  create_table "permissions", :force => true do |t|
-    t.string   "action"
-    t.string   "object"
-    t.string   "parameter"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "relation_permissions", :force => true do |t|
-    t.integer  "relation_id"
-    t.integer  "permission_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "relation_id"
-  end
-
-  add_index "relation_permissions", ["relation_id"], :name => "fk_relation_permissions_relation"
-  add_index "relation_permissions", ["permission_id"], :name => "fk_relation_permissions_permission"
-
-  create_table "relations", :force => true do |t|
-    t.string   "name",       :limit => 45
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "mode"
-    t.string   "ancestry"
-  end
-
-  add_index "relations", ["ancestry"]
-
-  create_table "tags", :force => true do |t|
-    t.string   "name",       :limit => 45
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "tags_activity_objects", :force => true do |t|
-    t.integer "tag_id"
-    t.integer "activity_object_id"
-  end
-
-  add_index "tags_activity_objects", ["activity_object_id"], :name => "fk_tags_activity_objects_2"
-  add_index "tags_activity_objects", ["tag_id"], :name => "fk_tags_activity_objects_1"
-
-  create_table "ties", :force => true do |t|
-    t.integer  "sender_id"
-    t.integer  "receiver_id"
-    t.integer  "relation_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "ties", ["receiver_id"], :name => "fk_tie_receiver"
-  add_index "ties", ["relation_id"], :name => "fk_tie_relation"
-  add_index "ties", ["sender_id"], :name => "fk_tie_sender"
-
-end