social_stream 0.0.1 → 0.0.2

data/Gemfile

@@ -9,6 +9,7 @@ if RUBY_VERSION < '1.9'
 end
 
 gem 'atd-ancestry', :require => 'ancestry'
+gem 'devise'
 gem 'cancan'
 
 gem "rspec-rails", ">= 2.0.0.beta"

data/Gemfile.lock

@@ -31,8 +31,9 @@ GEM
     arel (1.0.1)
       activesupport (~> 3.0.0)
     atd-ancestry (1.3.0)
+    bcrypt-ruby (2.1.2)
     builder (2.1.2)
-    cancan (1.3.4)
+    cancan (1.4.0)
     capybara (0.3.9)
       culerity (>= 0.2.4)
       mime-types (>= 1.16)
@@ -40,8 +41,13 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (>= 0.0.3)
+    childprocess (0.1.3)
+      ffi (~> 0.6.3)
     columnize (0.3.1)
     culerity (0.2.12)
+    devise (1.1.3)
+      bcrypt-ruby (~> 2.1.2)
+      warden (~> 0.10.7)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
@@ -51,7 +57,7 @@ GEM
     i18n (0.4.1)
     json_pure (1.4.6)
     linecache (0.43)
-    mail (2.2.5)
+    mail (2.2.7)
       activesupport (>= 2.3.6)
       mime-types
       treetop (>= 1.4.5)
@@ -61,7 +67,7 @@ GEM
     rack (1.2.1)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
-    rack-test (0.5.4)
+    rack-test (0.5.6)
       rack (>= 1.0)
     rails (3.0.0)
       actionmailer (= 3.0.0)
@@ -77,31 +83,36 @@ GEM
       rake (>= 0.8.4)
       thor (~> 0.14.0)
     rake (0.8.7)
-    rspec (2.0.0.beta.20)
-      rspec-core (= 2.0.0.beta.20)
-      rspec-expectations (= 2.0.0.beta.20)
-      rspec-mocks (= 2.0.0.beta.20)
-    rspec-core (2.0.0.beta.20)
-    rspec-expectations (2.0.0.beta.20)
+    rspec (2.0.0)
+      rspec-core (= 2.0.0)
+      rspec-expectations (= 2.0.0)
+      rspec-mocks (= 2.0.0)
+    rspec-core (2.0.0)
+    rspec-expectations (2.0.0)
       diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.20)
-    rspec-rails (2.0.0.beta.20)
-      rspec (= 2.0.0.beta.20)
+    rspec-mocks (2.0.0)
+      rspec-core (= 2.0.0)
+      rspec-expectations (= 2.0.0)
+    rspec-rails (2.0.1)
+      rspec (~> 2.0.0)
     ruby-debug (0.10.3)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.3.0)
     ruby-debug-base (0.10.3)
       linecache (>= 0.3)
     rubyzip (0.9.4)
-    selenium-webdriver (0.0.28)
-      ffi (>= 0.6.1)
+    selenium-webdriver (0.0.29)
+      childprocess (>= 0.0.7)
+      ffi (~> 0.6.3)
       json_pure
       rubyzip
     sqlite3-ruby (1.3.1)
-    thor (0.14.0)
+    thor (0.14.3)
     treetop (1.4.8)
       polyglot (>= 0.3.1)
     tzinfo (0.3.23)
+    warden (0.10.7)
+      rack (>= 1.0.0)
 
 PLATFORMS
   ruby
@@ -110,6 +121,7 @@ DEPENDENCIES
   atd-ancestry
   cancan
   capybara (>= 0.3.9)
+  devise
   factory_girl
   rails (= 3.0.0)
   rspec-rails (>= 2.0.0.beta)

data/app/models/actor.rb

@@ -23,9 +23,40 @@ class Actor < ActiveRecord::Base
     Tie.sent_or_received_by(self)
   end
 
+  # All the subject actors of class type that have at least one tie
+  # with this actor
+  #
+  # Options::
+  # * relations: Restrict the relations of considered ties
+  def contacts(type, options = {})
+    type_class = type.to_s.classify.constantize
+
+    cs = type_class.
+           select("DISTINCT #{ type_class.quoted_table_name }.*").
+           with_received_ties &
+           Tie.sent_by(self)
+
+    if options[:relations].present?
+      cs &=
+        Tie.related_by(Tie.Relation(options[:relations], :mode => [ subject.class, type_class ]))
+    end
+
+    cs
+  end
+
+  # This is an scaffold for a recomendations engine
+  #
+  # By now, it returns another actor without any current relation
+  def suggestion(type = subject.class)
+    candidates = type.to_s.classify.constantize.all - contacts(type)
+
+    candidates[rand(candidates.size)]
+  end
+
   # The set of activities in the wall of this actor
   # TODO: authorization
   def wall
     Activity.wall ties
   end
 end
+

data/app/models/tie.rb

@@ -20,17 +20,17 @@
 # * sent_by(actor), ties whose sender is actor
 # * received_by(actor), ties whose receiver is actor
 # * sent_or_received_by(actor), the union of the former
+# * related_by(relation), ties with this relation. Accepts relation, relation_name, integer, array
+# * pending, ties whose relation grant other relations, like friendship requests.
 # * inverse(tie), the inverse of tie
 #
 class Tie < ActiveRecord::Base
-  # Avoids loops at create_inverse after save callback
-  attr_accessor :_without_inverse
-  attr_protected :_without_inverse
-
   # Facilitates relation assigment along with find_relation callback
   attr_accessor :relation_name
 
-  validates_presence_of :sender_id, :receiver_id, :relation_id
+  # Avoids loops at create_inverse after save callback
+  attr_accessor :_without_inverse
+  attr_protected :_without_inverse
 
   belongs_to :sender,
              :class_name => "Actor",
@@ -38,6 +38,7 @@ class Tie < ActiveRecord::Base
   belongs_to :receiver,
              :class_name => "Actor",
              :include => SocialStream.actors
+
   belongs_to :relation
 
   has_many :activities
@@ -56,12 +57,24 @@ class Tie < ActiveRecord::Base
 
   }
 
+  scope :related_by, lambda { |r|
+    where(:relation_id => Relation(r))
+  }
+
+  scope :pending, includes(:relation) & Relation.request
+
   scope :inverse, lambda { |t|
     sent_by(t.receiver).
       received_by(t.sender).
       where(:relation_id => t.relation.inverse_id)
   }
 
+  validates_presence_of :sender_id, :receiver_id, :relation_id
+
+  before_validation :find_relation
+
+  after_create :complete_weak_set, :create_inverse
+
   def sender_subject
     sender.try(:subject)
   end
@@ -70,33 +83,28 @@ class Tie < ActiveRecord::Base
     receiver.try(:subject)
   end
 
-  before_validation :find_relation
-
-  scope :pending, includes(:relation) & Relation.request
-
   # The set of ties between sender and receiver
   #
-  def relation_set(r = :nil)
+  # Options::
+  # * relations: Only ties with relations
+  def relation_set(options = {})
     set = self.class.where(:sender_id => sender_id,
                            :receiver_id => receiver_id)
 
-    case r
-    when :nil
-      set
-    when String
-      set.where(:relation_id => relation.mode.find_by_name(r))
-    else
-      set.where(:relation_id => r)
+    if options.key?(:relations)
+      set = 
+        set.related_by self.class.Relation(options[:relations],
+                                           :mode => relation.mode)
     end
+
+    set
   end
 
   # The tie with relation r inside this relation_set
   def related(r)
-    relation_set(r).first
+    relation_set(:relations => r).first
   end
 
-  after_create :complete_weak_set, :create_inverse
-
   # Access Control
 
   scope :with_permissions, lambda { |action, object|
@@ -172,7 +180,7 @@ class Tie < ActiveRecord::Base
   # Creates ties with a weaker relations in the strength hierarchy of this tie
   def complete_weak_set
     relation.weaker.each do |r|
-      if relation_set(r).blank?
+      if relation_set(:relations => r).blank?
         t = relation_set.build :relation => r
         t._without_inverse = true
         t.save!
@@ -203,5 +211,31 @@ class Tie < ActiveRecord::Base
         a.actor.id
       end
     end
+
+    # Normalize a relation for ActiveRecord query from relation_name, id or Array
+    #
+    # Options::
+    # mode:: Relation mode
+    def Relation(r, options = {})
+      case r
+      when Relation
+        r
+      when String
+        case options[:mode]
+        when Array
+          Relation.mode(*options[:mode]).find_by_name(r)
+        when ActiveRecord::Relation
+          options[:mode].find_by_name(r)
+        else
+          raise "Must provide a mode when looking up relations from name: #{ options[:mode] }"
+        end
+      when Integer
+        r
+      when Array
+        r.map{ |e| Relation(e, options) }
+      else
+        raise "Unable to normalize relation #{ r.inspect }"
+      end
+    end
   end
 end

data/app/models/user.rb

@@ -1,8 +1,5 @@
 class User < ActiveRecord::Base
-  # Include default devise modules. Others available are:
-  # :token_authenticatable, :confirmable, :lockable, :timeoutable, :validatable
-  devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :trackable
+  devise *SocialStream.devise_modules
 
   # Setup accessible (or protected) attributes for your model
   attr_accessible :name, :email, :password, :password_confirmation, :remember_me

data/lib/generators/social_stream/templates/initializer.rb

@@ -1,14 +1,17 @@
 SocialStream.setup do |config|
   # List the models that are social entities. These will have ties between them.
-  #
   # Remember you must add an "actor_id" foreign key column to your migration!
   #
-  config.actors = [:user ]
+  # config.actors = [:user ]
 
-  # Contents managed by actors
-  #
+  # Include devise modules in User. See devise documentation for details.
+  # Others available are:
+  # :token_authenticatable, :confirmable, :lockable, :timeoutable, :validatable
+  # config.devise_modules :database_authenticatable, :registerable,
+                        :recoverable, :rememberable, :trackable
+
+  # Type of activities managed by actors
   # Remember you must add an "activity_object_id" foreign key column to your migration!
   #
-  # Example: config.activity_objects = [ :post, :comment, :photo ]
-  config.activity_objects = []
+  # config.activity_objects = []
 end

data/lib/generators/social_stream/templates/migration.rb

@@ -76,6 +76,7 @@ class CreateSocialStream < ActiveRecord::Migration
       t.string   "ancestry"
       t.integer  "inverse_id"
       t.integer  "granted_id"
+      t.boolean  "default", :default => false
     end
 
     add_index "relations", ["ancestry"]

data/lib/social_stream.rb

@@ -9,7 +9,11 @@ module SocialStream
   end
 
   mattr_accessor :actors
-  @@actors = []
+  @@actors = [ :user ]
+
+  mattr_accessor :devise_modules
+  @@devise_modules = [ :database_authenticatable, :registerable, :recoverable,
+                       :rememberable, :trackable ]
 
   mattr_accessor :activity_objects
   @@activity_objects = []

data/lib/social_stream/models/actor.rb

@@ -16,14 +16,38 @@ module SocialStream
                  :permalink, :permalink=,
                  :disabled, :disabled=,
                  :ties, :sent_ties, :received_ties,
+                 :contacts, :suggestion,
                  :wall,
                  :to => :actor!
+
+        after_create :initialize_default_ties
       end
 
       module InstanceMethods
         def actor!
           actor || build_actor
         end
+
+        private
+
+        def initialize_default_ties
+          self.class.relations.where(:default => true).each do |r|
+            Tie.create! :sender => self.actor,
+                        :receiver => self.actor,
+                        :relation => r
+          end
+        end
+      end
+
+      module ClassMethods
+        # Relations defined for this actor model.
+        def relations(to = to_s)
+          Relation.mode(to_s, to)
+        end
+
+        def with_received_ties
+          joins(:actor => :received_ties)
+        end
       end
     end
   end

data/lib/social_stream/models/supertype.rb

@@ -20,8 +20,12 @@ module SocialStream #:nodoc:
           features = "SocialStream::Models::#{ to_s }".constantize
 
           subtypes.each do |s|
-            s = s.to_s.classify.constantize
-            s.__send__(:include, features) unless s.ancestors.include?(features)
+            begin
+              s = s.to_s.classify.constantize
+              s.__send__(:include, features) unless s.ancestors.include?(features)
+            rescue
+              puts "Warning: could not load #{ s }"
+            end
           end
         end
       end 

data/lib/social_stream/rails.rb

@@ -1,4 +1,5 @@
 # Load Devise constant
+require 'ancestry'
 require 'devise'
 require 'social_stream/rails/common'
 File.expand_path(__FILE__) =~ /#{ File.join('vendor', 'plugins') }/ ?

data/lib/social_stream/seed.rb

@@ -24,6 +24,8 @@ module SocialStream
           find_or_create_by_sender_type_and_receiver_type_and_name(r['sender_type'],
                                                                    r['receiver_type'],
                                                                    r['name'])
+        relations[name].update_attribute(:default, r['default'])
+
         # FIXME: optimize
         relations[name].relation_permissions.destroy_all
 

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.0.1".freeze
+  VERSION = "0.0.2".freeze
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Antonio Tapiador
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-18 00:00:00 +02:00
+date: 2010-10-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency