active_metadata 0.7.2 → 0.7.3

data/lib/active_metadata/persistence/attachment.rb

@@ -36,7 +36,6 @@ module ActiveMetadata::Persistence::Attachment
 
     def update_attachment(id, newfile, starred=nil)
       a = ActiveMetadata::Attachment.find(id)
-      puts a
       old_filename = a.attach.original_filename
       a.attach = newfile
       a.updated_by = current_user_id

data/lib/active_metadata/persistence/watcher.rb

@@ -10,8 +10,14 @@ module ActiveMetadata::Persistence::Watcher
       ActiveMetadata::Watcher.create! :document_class => metadata_class, :document_id => metadata_id, :label => field, :owner_id => owner.id
     end                      
 
+    # return all the watches related to a passed field.
+    # query always match for the current model
+    # matches are returned grouped by owner and contains records that define or not a particular model instance watching
     def watchers_for(field)
-      ActiveMetadata::Watcher.all(:conditions => {:document_class => metadata_class, :label => field, :document_id => metadata_id})
+      ActiveMetadata::Watcher.where(
+          "document_class = :document_class AND label = :label AND (document_id = :document_id OR document_id IS NULL)",
+          { :document_class => metadata_class, :label => field, :document_id => metadata_id }
+          ).group("owner_id").all
     end
 
     def delete_watcher_for(field, owner)

data/lib/active_metadata/version.rb

@@ -1,3 +1,3 @@
 module ActiveMetadata
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

data/spec/lib/watchers_spec.rb

@@ -57,4 +57,32 @@ describe ActiveMetadata do
 
   end
 
+  describe "#watchers_for" do
+
+    context "when some record does not relate to a specific model instance" do
+
+      before do
+        @user = User.create!(:email => "email@email.it", :firstname => 'John', :lastname => 'smith' )
+        @another_user = User.create!(:email => "email2@email.it", :firstname => 'George', :lastname => 'Washington' )
+        @document.create_watcher_for(:name, @user)
+        ActiveMetadata::Watcher.create! :document_class => "Document", :label => :name, :owner_id => @another_user.id
+      end
+
+      it "should return all the records that match model/field" do
+        docs = @document.watchers_for(:name)
+        docs.count.should eq 2
+      end
+
+      it "should group result by owner" do
+        @document.create_watcher_for(:name, @another_user)
+        ActiveMetadata::Watcher.create! :document_class => "Document", :label => :name, :owner_id => @user.id
+        docs = @document.watchers_for(:name)
+        docs.count.should eq 2
+      end
+
+    end
+
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_metadata
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-03 00:00:00.000000000 Z
+date: 2012-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -165,7 +165,6 @@ files:
 - config/cucumber.yml
 - config/database.yml
 - config/routes.rb
-- db/development.sqlite3
 - db/migrate/01_create_test_resources.rb
 - db/migrate/02_active_metadata_migrations.rb
 - lib/active_metadata/base.rb
@@ -263,7 +262,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 381801808842961274
+      hash: -4307170871527026867
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -272,10 +271,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 381801808842961274
+      hash: -4307170871527026867
 requirements: []
 rubyforge_project: active_metadata
-rubygems_version: 1.8.21
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Add metadata to fields in an active record model