Stream 0.1.13 → 0.1.14

data/lib/stream/fires.rb

@@ -42,9 +42,10 @@ module Stream
               gallery = activity.subject.gallery
               photo = activity.subject
               # Find recent photo activity
-              last_activity = ActivityItem.find(:first, :conditions => ["subject_type = ? AND subject_id = ? AND DATE(updated_at) = current_date",
-                                                photo.class,photo.id])
-
+              last_activity = ActivityItem.find(:first, 
+                                                :conditions => ["subject_type = ? AND photos.gallery_id = ? AND DATE(activity_items.updated_at) = current_date",
+                                                self.class,gallery_id],:include=>[:photos])
+                                                
               unless last_activity && (gallery.eql?(last_activity.subject.gallery))
                 ([activity.actor] + gallery.allowed_contacts).each do |p| 
                   activity.is_hidden = activity.subject.approval_status==true ? true : false 
@@ -54,8 +55,8 @@ module Stream
                   send(:"after_#{opts[:on]}", method_name, :if => opts[:if])
                 end
               else
-                last_activity.photos << activity.subject
-                last_activity.save
+                last_activity.photos << self
+                last_activity.update_attribute(:updated_at,Time.now)
               end
             else
               activity.save  

data/stream.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{Stream}
-  s.version = "0.1.13"
+  s.version = "0.1.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gretchen Gapol"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Stream
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
   prerelease: 
 platform: ruby
 authors: