social_stream 0.3.4 → 0.3.5

data/app/models/activity.rb

@@ -96,7 +96,7 @@ class Activity < ActiveRecord::Base
   end
 
   def liked_by(user) #:nodoc:
-    likes.joins(:ties).where('tie_activities.original' => true) & Tie.received_by(user)
+    likes.joins(:ties).where('tie_activities.original' => true).merge(Tie.received_by(user))
   end
 
   # Does user like this activity?

data/app/models/actor.rb

@@ -66,7 +66,7 @@ class Actor < ActiveRecord::Base
 
   # Relations defined and managed by this actor
   def relations
-    Relation.includes(:ties) & Tie.sent_by(self)
+    Relation.includes(:ties).merge(Tie.sent_by(self))
   end
 
   # A given relation defined and managed by this actor
@@ -93,9 +93,9 @@ class Actor < ActiveRecord::Base
 
     case options[:direction]
     when :senders
-      as = as.joins(:sent_ties) & Tie.received_by(self)
+      as = as.joins(:sent_ties).merge(Tie.received_by(self))
     when :receivers
-      as = as.joins(:received_ties) & Tie.sent_by(self)
+      as = as.joins(:received_ties).merge(Tie.sent_by(self))
     else
       raise "actors in both directions is not supported yet"
     end

data/app/models/group.rb

@@ -9,10 +9,16 @@ class Group < ActiveRecord::Base
   after_create :create_founder
   after_create :create_participants
   
-  
+  def recent_groups
+    subjects(:subject_type => :group, :direction => :receivers) do |q|
+      q.select("ties.created_at").
+        merge(Tie.recent)
+    end
+  end
+ 
   private
 
-  #Creates the ties betwbeen the group and the founder
+  #Creates the ties between the group and the founder
   def create_founder
     founder =
       Actor.find_by_permalink(_founder) || raise("Cannot create group without founder")
@@ -28,11 +34,10 @@ class Group < ActiveRecord::Base
     
      @_participants.each do |participant|
       
-      participantActor = Actor.find_by_id(participant.to_i)
-      sent_ties.create! :receiver => participantActor,
+      participant_actor = Actor.find_by_id(participant.to_i)
+
+      sent_ties.create! :receiver => participant_actor,
                         :relation => relations.sort.first
      end
-    
   end
-  
-end
+end

data/app/models/tie.rb

@@ -70,7 +70,7 @@ class Tie < ActiveRecord::Base
 
   scope :following, lambda { |a|
     where(:receiver_id => Actor.normalize_id(a)).
-      joins(:relation => :permissions) & Permission.follow
+      joins(:relation => :permissions).merge(Permission.follow)
   }
 
   validates_presence_of :sender_id, :receiver_id, :relation_id

data/app/models/user.rb

@@ -25,14 +25,15 @@ class User < ActiveRecord::Base
 
   def recent_groups
     subjects(:subject_type => :group, :direction => :receivers) do |q|
-      q & Tie.recent
+      q.select("ties.created_at").
+        merge(Tie.recent)
     end
   end
 
   # Subjects this user can acts as
   def represented
     subjects(:direction => :senders) do |q|
-      q.joins(:sent_ties => { :relation => :permissions }) & Permission.represent
+      q.joins(:sent_ties => { :relation => :permissions }).merge(Permission.represent)
     end
   end
   

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.3.4".freeze
+  VERSION = "0.3.5".freeze
 end

data/social_stream.gemspec

@@ -19,13 +19,13 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('jquery-rails', '~> 0.2.5')
   s.add_runtime_dependency('cancan', '~> 1.5.1')
   s.add_runtime_dependency('will_paginate', '~> 3.0.pre2')
-  s.add_development_dependency('rails', '~> 3.0.4')
+  s.add_development_dependency('rails', '~> 3.0.5')
   s.add_development_dependency('capybara', '~> 0.3.9')
   s.add_development_dependency('sqlite3-ruby')
   if RUBY_VERSION < '1.9'
     s.add_development_dependency('ruby-debug', '~> 0.10.3')
   end
-  s.add_development_dependency('rspec-rails', '~> 2.4.1')
+  s.add_development_dependency('rspec-rails', '~> 2.5.0')
   s.add_development_dependency('factory_girl', '~> 1.3.2')
   s.add_development_dependency('forgery', '~> 0.3.6')
   s.add_development_dependency('ci_reporter', '~> 1.6.4')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-28 00:00:00 +01:00
+date: 2011-03-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -187,12 +187,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 13
         segments: 
         - 3
         - 0
-        - 4
-        version: 3.0.4
+        - 5
+        version: 3.0.5
   type: :development
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
@@ -249,12 +249,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 27
         segments: 
         - 2
-        - 4
-        - 1
-        version: 2.4.1
+        - 5
+        - 0
+        version: 2.5.0
   type: :development
   version_requirements: *id015
 - !ruby/object:Gem::Dependency