active_metadata 0.7.0 → 0.7.1

data/app/controllers/active_metadata/attachments_controller.rb

@@ -12,7 +12,7 @@ module ActiveMetadata
 
     def create
       @document = params[:model_name].to_class.find(params[:model_id])
-      @document.save_attachment_for(params[:field_name], params[:file])
+      @document.save_attachment_for(params[:field_name], params[:file], params[:starred], params[:group])
       
       #todo: if errors send back the correct answer
       respond_to do |format|

data/app/controllers/active_metadata/notes_controller.rb

@@ -22,7 +22,7 @@ module ActiveMetadata
 
     def create
       @document = params[:model_name].to_class.find(params[:model_id])
-      @document.create_note_for(params[:field_name], params[:note])
+      @document.create_note_for(params[:field_name], params[:note], params[:starred], params[:group])
       respond_to do |format|
         # TODO redirect to edit
         format.js       

data/app/controllers/active_metadata/stream_controller.rb

@@ -8,5 +8,14 @@ module ActiveMetadata
       @stream = @document.stream_for params[:field_name]
     end
 
+    def index_by_group
+      @stream = ActiveMetadata::Stream.by_group params[:group], starred_condition
+      render :index
+    end
+
+    private
+    def starred_condition
+      params[:starred].nil? ? nil : {:starred => true}
+    end
   end
 end

data/app/models/active_metadata/attachment.rb

@@ -2,7 +2,6 @@ module ActiveMetadata
 
   class Attachment < ActiveRecord::Base
     self.table_name = "active_metadata_attachments"
-
     include ::Paperclip
     include ::Paperclip::Glue
 
@@ -21,7 +20,13 @@ module ActiveMetadata
     Paperclip.interpolates :document_class do |attachment, style|
       attachment.instance.document_class
     end
+    class << self
 
+      def by_group(group, *args)
+        options = args.extract_options!
+        order_by = options.delete(:order_by) || "created_at DESC"
+        ActiveMetadata::Attachment.all(:conditions => options.merge(:group => group), :order => order_by)
+      end
+    end
   end
-
 end

data/app/models/active_metadata/note.rb

@@ -1,5 +1,16 @@
 module ActiveMetadata
   class Note < ActiveRecord::Base
     self.table_name = "active_metadata_notes"
+
+    class << self
+
+      def by_group(group, *args)
+        options = args.extract_options!
+        order_by = options.delete(:order_by) || "created_at DESC"
+        ActiveMetadata::Note.all(:conditions => options.merge(:group => group), :order => order_by)
+      end
+
+    end
+
   end
 end

data/app/views/active_metadata/attachments/_attachment.html.erb

@@ -3,5 +3,5 @@
     <%= "Path: #{attachment.attach.path}"%>
     <%= "Size: #{attachment.attach.size}"%>
     <%= "Updated at: #{attachment.attach.instance_read(:updated_at)}"%> <br/>
-    <%= link_to "Elimina", active_metadata_destroy_attachment_path(@document.class,@document.id,attachment.label,attachment.id), :method => :delete, :remote => true %>
+    <%= link_to "Elimina", active_metadata_destroy_attachment_path(attachment.document_class, attachment.document_id,attachment.label,attachment.id), :method => :delete, :remote => true %>
 </li>

data/config/routes.rb

@@ -3,29 +3,30 @@ Rails.application.routes.draw do
   namespace :active_metadata do
     #stream
     get ":model_name/:model_id/:field_name/stream" => 'stream#index', :as => 'stream'
+    get "groups/:group/stream" => 'stream#index_by_group', :as => 'group_stream'
 
     #notes
-    match ':model_name/:model_id/:field_name/notes' => 'notes#index', :via => :get, :as => "notes"
-    match ':model_name/:model_id/:field_name/notes' => 'notes#create', :via => :post, :as => "create_note"
-    match ':model_name/:model_id/:field_name/notes/:id' => 'notes#destroy', :via => :delete, :as => "destroy_note"
-    match ':model_name/:model_id/:field_name/notes/:id/edit' => 'notes#edit', :via => :get, :as => "edit_note"
-    match ':model_name/:model_id/:field_name/notes/:id' => 'notes#update', :via => :put, :as => "update_note"
-    match ':model_name/:model_id/:field_name/notes/:id' => 'notes#show', :via => :get, :as => "show_note"
-    match ':model_name/:model_id/:field_name/notes/starred' => 'notes#starred', :via => :get, :as => "starred_notes"
-    match ':model_name/:model_id/:field_name/notes/:id/star' => 'notes#star', :via => :put, :as => "star_note"
-    match ':model_name/:model_id/:field_name/notes/:id/unstar' => 'notes#unstar', :via => :put, :as => "unstar_note"
+    get ':model_name/:model_id/:field_name/notes' => 'notes#index', :as => "notes"
+    post ':model_name/:model_id/:field_name/notes' => 'notes#create', :as => "create_note"
+    delete ':model_name/:model_id/:field_name/notes/:id' => 'notes#destroy', :as => "destroy_note"
+    get ':model_name/:model_id/:field_name/notes/:id/edit' => 'notes#edit', :as => "edit_note"
+    put ':model_name/:model_id/:field_name/notes/:id' => 'notes#update', :as => "update_note"
+    get ':model_name/:model_id/:field_name/notes/:id' => 'notes#show', :as => "show_note"
+    get ':model_name/:model_id/:field_name/notes/starred' => 'notes#starred', :as => "starred_notes"
+    put ':model_name/:model_id/:field_name/notes/:id/star' => 'notes#star', :as => "star_note"
+    put ':model_name/:model_id/:field_name/notes/:id/unstar' => 'notes#unstar', :as => "unstar_note"
 
     #history
     match ':model_name/:model_id/:field_name/histories' => 'histories#index', :via => :get, :as => "histories"
 
     #attachments
-    match ':model_name/:model_id/:field_name/attachments' => 'attachments#index', :via => :get, :as => "attachments"
-    match ':model_name/:model_id/:field_name/attachments' => 'attachments#create', :via => :post, :as => "create_attachment"
-    match ':model_name/:model_id/:field_name/attachments/:id' => 'attachments#destroy', :via => :delete, :as => "destroy_attachment"
-    match ':model_name/:model_id/:field_name/attachments/:id' => 'attachments#update', :via => :put, :as => "update_attachment"
-    match ':model_name/:model_id/:field_name/attachments/starred' => 'attachments#starred', :via => :get, :as => "starred_attachments"
-    match ':model_name/:model_id/:field_name/attachments/:id/star' => 'attachments#star', :via => :put, :as => "star_attachment"
-    match ':model_name/:model_id/:field_name/attachments/:id/unstar' => 'attachments#unstar', :via => :put, :as => "unstar_attachment"
+    get ':model_name/:model_id/:field_name/attachments' => 'attachments#index', :as => "attachments"
+    post ':model_name/:model_id/:field_name/attachments' => 'attachments#create', :as => "create_attachment"
+    delete ':model_name/:model_id/:field_name/attachments/:id' => 'attachments#destroy', :as => "destroy_attachment"
+    put ':model_name/:model_id/:field_name/attachments/:id' => 'attachments#update', :as => "update_attachment"
+    get ':model_name/:model_id/:field_name/attachments/starred' => 'attachments#starred', :as => "starred_attachments"
+    put ':model_name/:model_id/:field_name/attachments/:id/star' => 'attachments#star', :as => "star_attachments"
+    put ':model_name/:model_id/:field_name/attachments/:id/unstar' => 'attachments#unstar', :as => "unstar_attachments"
 
     #alerts
     get ':model_name/:model_id/:field_name/watchers' => 'watchers#index', :as => "watchers"

data/db/migrate/01_create_test_resources.rb

@@ -13,6 +13,11 @@ class CreateTestResources < ActiveRecord::Migration
       t.timestamps
     end
 
+    create_table :chapters do |t|
+      t.string :title
+      t.timestamps
+    end
+
     create_table :users do |t|
       t.string :email
       t.string :firstname
@@ -23,8 +28,9 @@ class CreateTestResources < ActiveRecord::Migration
   end
 
   def self.down
-    drop_table :documents
-    drop_table :sections
     drop_table :users
+    drop_table :chapters
+    drop_table :sections
+    drop_table :documents
   end
 end

data/db/migrate/02_active_metadata_migrations.rb

@@ -9,6 +9,7 @@ class ActiveMetadataMigrations < ActiveRecord::Migration
       t.integer :created_by
       t.integer :updated_by
       t.boolean :starred
+      t.string :group
       t.timestamps
     end
 
@@ -43,6 +44,7 @@ class ActiveMetadataMigrations < ActiveRecord::Migration
       t.integer :attach_file_size
       t.datetime :attach_updated_at
       t.boolean :starred
+      t.string :group
       t.timestamps
     end
 

data/lib/active_metadata/base.rb

@@ -7,7 +7,7 @@ module ActiveMetadata
   module Base
 
     require 'active_metadata/helpers'
-    require 'active_metadata/streamable'
+    require 'active_metadata/stream'
     require 'paperclip'
     require 'active_metadata/persistence/persistence'
 
@@ -29,7 +29,7 @@ module ActiveMetadata
 
         include ActiveMetadata::Base::InstanceMethods
         include ActiveMetadata::Persistence
-        include ActiveMetadata::Streamable
+        include ActiveMetadata::Stream
 
       end
 

data/lib/active_metadata/persistence/attachment.rb

@@ -6,9 +6,16 @@ module ActiveMetadata::Persistence::Attachment
 
   module InstanceMethods
 
-    def save_attachment_for(field, file, starred=false)
-      attachment = ActiveMetadata::Attachment.create! :document_class => metadata_class, :document_id => metadata_id, :label => field, :attach => file,
-                                                      :starred => starred, :created_by => current_user_id
+    def save_attachment_for(field, file, starred=false, group=nil)
+      attachment = ActiveMetadata::Attachment.create!(
+              :document_class => metadata_class,
+              :document_id => metadata_id,
+              :label => field,
+              :attach => file,
+              :starred => !!starred,
+              :created_by => current_user_id,
+              :group => group)
+
       reload_attachments_cache_for field
       self.send(:send_notification, field, "", attachment.attach.original_filename, :attachment_message, current_user_id)
     end
@@ -29,11 +36,12 @@ 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
       a.starred = starred if !starred.nil?
-      a.save
+      a.save!
       new_filename = a.attach.original_filename
 
       reload_attachments_cache_for a.label

data/lib/active_metadata/persistence/note.rb

@@ -1,13 +1,20 @@
 module ActiveMetadata::Persistence::Note
 
-  def self.included(receiver)
+  def self.included receiver
     receiver.send :include, InstanceMethods
   end
 
   module InstanceMethods
 
-    def create_note_for(field, note, starred=false)
-      ActiveMetadata::Note.create! :document_id => metadata_id, :document_class => metadata_class, :label => field.to_s, :note => note, :created_by => current_user_id, :starred => starred
+    def create_note_for(field, note, starred=nil, group=nil)
+      ActiveMetadata::Note.create!(
+          :document_id => metadata_id,
+          :document_class => metadata_class,
+          :label => field.to_s,
+          :note => note,
+          :created_by => current_user_id,
+          :starred => !!starred,
+          :group => group)
 
       reload_notes_cache_for field
       self.send(:send_notification, field, "", note, :note_message, current_user_id)

data/lib/active_metadata/stream.rb

@@ -0,0 +1,50 @@
+module ActiveMetadata
+  module Stream
+
+    def self.included(base)
+      base.send :include, InstanceMethods
+    end
+    class << self
+      # same as #stream_for but not filtered by field
+      def by_group group, *args
+        options = args.extract_options!
+        order_by = options.delete(:order_by) || :created_at
+        sort_stream(collect_stream_items_by_group(group, options), order_by)
+      end
+
+      def sort_stream stream, order_by
+        stream.sort { |a, b| a.send(order_by) <=> b.send(order_by) }
+      end
+
+      def collect_stream_items_by_group group, options
+        res = []
+        ActiveMetadata::CONFIG['streamables'].each do |model|
+          res.concat "ActiveMetadata::#{model.to_s.capitalize}".to_class.send(:by_group, group, options).collect { |el| el }
+        end
+        res
+      end
+    end
+
+    module InstanceMethods
+
+      # return the streamables items by field in an ordered array
+      # ActiveMetadata::CONFIG['streamables'] defines what models will be retrieved
+      def stream_for(field, order_by = :created_at)
+        ActiveMetadata::Stream.sort_stream(collect_stream_data(field), order_by)
+      end
+
+      def collect_stream_data field
+        res = []
+        ActiveMetadata::CONFIG['streamables'].each do |model|
+          res.concat self.send(stream_collect_method(model.to_s), field).collect { |el| el }
+        end
+        res
+      end
+
+      def stream_collect_method model
+        model.to_s == 'note' ? 'notes_for' : 'attachments_for'
+      end
+
+    end
+  end
+end

data/lib/active_metadata/version.rb

@@ -1,3 +1,3 @@
 module ActiveMetadata
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/spec/controllers/active_metadata/attachments_controller_spec.rb

@@ -2,36 +2,54 @@ require 'spec_helper'
 
 describe ActiveMetadata::AttachmentsController do
 
-  context "given 2 attachments for @document#name" do
+  render_views
+
+  before(:each) do
+    @document = Document.create! { |d| d.name = "John" }
+  end
 
-    render_views
+
+  describe "GET 'index'" do
 
     before(:each) do
-      @document = Document.create! { |d| d.name = "John" }
       (1..2).each do |i|
-        @document.save_attachment_for(:name,test_pdf("pdf_test_#{i}"))
-     end
+        @document.save_attachment_for(:name, test_pdf("pdf_test_#{i}"))
+      end
     end
 
-    describe "GET 'index'" do
+    it "should success" do
+      get 'index', :model_name => 'document', :model_id => @document.id, :field_name => 'name'
+      response.should be_success
+    end
 
-      it "should success" do
-        get 'index', :model_name => 'document', :model_id => @document.id, :field_name => 'name'
-        response.should be_success
-      end
+    it "should assign attachments" do
+      get 'index', :model_name => 'document', :model_id => @document.id, :field_name => 'name'
+      assigns(:attachments).should_not be_nil
+      assigns(:attachments).size.should eq 2
+    end
 
-      it "should assign attachments" do
-        get 'index', :model_name => 'document', :model_id => @document.id, :field_name => 'name'
-        assigns(:attachments).should_not be_nil
-        assigns(:attachments).size.should eq 2
-      end
+    it "should display 3 notes" do
+      get 'index', :model_name => 'document', :model_id => @document.id, :field_name => 'name'
+      response.body.should match(/pdf_test_1.pdf/)
+      response.body.should match(/pdf_test_2.pdf/)
+    end
 
-      it "should display 3 notes" do
-        get 'index', :model_name => 'document', :model_id => @document.id, :field_name => 'name'
-        response.body.should match(/pdf_test_1.pdf/)
-        response.body.should match(/pdf_test_2.pdf/)
-      end
+  end
+
+  describe "#create" do
+
+    it "should create an attachment for a passed group" do
+      post :create, :model_name => 'document', :model_id => @document.id, :field_name => 'name', :group => "my_group", :format => :js,
+           :file => test_pdf
+      response.should be_success
+      ActiveMetadata::Stream.by_group("my_group").count.should eq 1
+    end
 
+    it "should create a starred attachment" do
+      post :create, :model_name => 'document', :model_id => @document.id, :field_name => 'name', :starred => true, :format => :js,
+      :file => test_pdf
+      response.should be_success
+      @document.attachments_for(:name).last.should be_starred
     end
 
   end

data/spec/controllers/active_metadata/notes_controller_spec.rb

@@ -2,19 +2,21 @@ require 'spec_helper'
 
 describe ActiveMetadata::NotesController do
 
-  context "given 3 notes @document#name" do
-
-    render_views
 
     before(:each) do
       @document = Document.create! { |d| d.name = "John" }
-      (1..3).each do |i|
-        @document.create_note_for(:name, "note#{i}")
-      end
     end
 
     describe "GET 'index'" do
 
+      render_views
+
+      before(:each) do
+        (1..3).each do |i|
+          @document.create_note_for(:name, "note#{i}")
+        end
+      end
+
       it "should success" do
         get 'index', :model_name => 'document', :model_id => @document.id, :field_name => 'name'
         response.should be_success
@@ -35,7 +37,21 @@ describe ActiveMetadata::NotesController do
 
     end
 
-  end
+    describe "#create" do
+
+      it "should create a note for a passed group" do
+        post :create, :model_name => 'document', :model_id => @document.id, :field_name => 'name', :group => "my_group", :format => :js
+        response.should be_success
+        ActiveMetadata::Stream.by_group("my_group").count.should eq 1
+      end
+
+      it "should create a starred note" do
+        post :create, :model_name => 'document', :model_id => @document.id, :field_name => 'name', :starred => true, :format => :js
+        response.should be_success
+        @document.notes_for(:name).last.should be_starred
+      end
+
+    end
 
 
 end

data/spec/controllers/active_metadata/stream_controller_spec.rb

@@ -37,6 +37,28 @@ describe ActiveMetadata::StreamController do
         response.body.should match(/nota per name john/)
       end
 
+      describe "GET 'index by group'" do
+        before(:each) do
+          @chapter = Chapter.create! { |d| d.title = "Cool!" }
+          @document.save_attachment_for(:name, test_pdf("pdf_test_1"), false, 'my_group')
+          @chapter.save_attachment_for(:title, test_pdf("pdf_test_2"), true, 'my_group')
+          @document.create_note_for(:name, "grouped nota per name john", true, 'your_group')
+        end
+
+        it "should return the stream of a particular group" do
+          get 'index_by_group', :group => 'my_group'
+          response.body.should match(/pdf_test_1.pdf/)
+          response.body.should match(/pdf_test_2.pdf/)
+          response.body.should_not match(/grouped nota/)
+        end
+
+        it "should return the stream of a particular group filtered by starred" do
+          get 'index_by_group', :group => 'my_group', :starred => true
+          response.body.should_not match(/pdf_test_1.pdf/)
+          response.body.should match(/pdf_test_2.pdf/)
+          response.body.should_not match(/grouped nota/)
+        end
+      end
     end
 
   end

data/spec/dummy/db/schema.rb

@@ -25,6 +25,7 @@ ActiveRecord::Schema.define(:version => 2) do
     t.integer  "attach_file_size"
     t.datetime "attach_updated_at"
     t.boolean  "starred"
+    t.string   "group"
     t.datetime "created_at",          :null => false
     t.datetime "updated_at",          :null => false
   end
@@ -57,6 +58,7 @@ ActiveRecord::Schema.define(:version => 2) do
     t.integer  "created_by"
     t.integer  "updated_by"
     t.boolean  "starred"
+    t.string   "group"
     t.datetime "created_at",     :null => false
     t.datetime "updated_at",     :null => false
   end
@@ -80,6 +82,12 @@ ActiveRecord::Schema.define(:version => 2) do
   add_index "active_metadata_watchers", ["label"], :name => "index_active_metadata_watchers_on_label"
   add_index "active_metadata_watchers", ["owner_id"], :name => "index_active_metadata_watchers_on_owner_id"
 
+  create_table "chapters", :force => true do |t|
+    t.string   "title"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
   create_table "documents", :force => true do |t|
     t.string   "name"
     t.string   "surname"

data/spec/lib/attachments_spec.rb

@@ -187,11 +187,27 @@ describe ActiveMetadata do
         starred.count.should eq 2
         starred.find{|att| att.attach.instance_read(:file_name) == "pdf_test_2.pdf"}.should be_nil
       end
-
     end
 
+    describe "#group" do
+      it "should save the associated group when specified" do
+        @document.save_attachment_for(:name, @attachment, false, 'my_group')
+        @document.attachments_for(:name).last.group.should eq 'my_group'
+      end
 
+      describe ".by_group" do
 
-  end
+        it "should return all the starred notes of a particular group" do
+          @document.save_attachment_for :name, @attachment, false, 'my_group'
+          @document.save_attachment_for :title, @attachment, true, 'my_group'
+          @document.save_attachment_for :name, @attachment, true, 'my_group'
+          @document.save_attachment_for :name, @attachment, false, 'your_group'
+          @document.save_attachment_for :name, @attachment, true, 'your_group'
 
+          ActiveMetadata::Attachment.by_group('my_group', :starred => true).count.should eq 2
+          ActiveMetadata::Attachment.by_group('your_group', :starred => true).count.should eq 1
+        end
+      end
+    end
+  end
 end

data/spec/lib/notes_spec.rb

@@ -217,6 +217,26 @@ describe ActiveMetadata do
       end
 
     end
+    describe "#group" do
+      it "should save the associated group when specified" do
+        @document.create_note_for :name, "starred note for name", false, 'my_group'
+        @document.notes_for(:name).last.group.should eq 'my_group'
+      end
+
+      describe "notes_by_group" do
+        it "should return all the starred notes of a particular group" do
+          @document.create_note_for :name, "starred note for name", false, 'my_group'
+          @document.create_note_for :title, "to be returned", true, 'my_group'
+          @document.create_note_for :name, "to be returned", true, 'my_group'
+          @document.create_note_for :name, "starred note for name", false, 'your_group'
+          @document.create_note_for :name, "starred note for name", true, 'your_group'
+
+          ActiveMetadata::Note.by_group('my_group', :starred => true).count.should eq 2
+          ActiveMetadata::Note.by_group('your_group', :starred => true, :order_by => "created_at ASC").count.should eq 1
+        end
+      end
+
+    end
 
   end
 end

data/spec/lib/{streamable_spec.rb → stream_spec.rb}

@@ -1,16 +1,6 @@
 require "spec_helper"
 
-describe ActiveMetadata::Streamable do
-
-  describe "module" do
-
-    it "should respond to stream_for" do
-      ActiveMetadata::Streamable.instance_eval do
-        self.instance_methods.grep(/stream_for/).size.should == 1
-      end
-    end
-
-  end
+describe ActiveMetadata::Stream do
 
   describe "stream_for" do
 
@@ -40,12 +30,6 @@ describe ActiveMetadata::Streamable do
 
       describe "collect_data" do
 
-        it "should exists as private method" do
-          ActiveMetadata::Streamable.instance_eval do
-            self.private_instance_methods.grep(/collect_stream_data/).size.should == 1
-          end
-        end
-
         it "should return an array" do
           res = @document.send(:collect_stream_data, :name)
           res.should be_kind_of Array
@@ -69,14 +53,7 @@ describe ActiveMetadata::Streamable do
 
       describe "sort_stream" do
 
-        it "should exists as private method" do
-          ActiveMetadata::Streamable.instance_eval do
-            self.private_instance_methods.grep(/sort_stream/).size.should == 1
-          end
-        end
-
-
-        it "should sort the stream by updated_at DESC" do
+        it "should sort the stream by created_at DESC" do
           @document.save_attachment_for(:surname,test_pdf("pdf_test_1"))
           sleep 2.seconds
           @document.create_note_for(:surname, "surname note")
@@ -84,14 +61,14 @@ describe ActiveMetadata::Streamable do
           @document.save_attachment_for(:surname,test_pdf("pdf_test_2"))
 
           stream = @document.send(:collect_stream_data, :surname)
-          res = @document.send(:sort_stream, stream, :updated_at)
+          res = ActiveMetadata::Stream.sort_stream(stream, :updated_at)
 
-          res[0].attach_file_name.should eq 'pdf_test_2.pdf'
+          res[0].attach_file_name.should eq 'pdf_test_1.pdf'
           res[1].note.should eq 'surname note'
-          res[2].attach_file_name.should eq 'pdf_test_1.pdf'
+          res[2].attach_file_name.should eq 'pdf_test_2.pdf'
         end
 
-        it "should sort the stream by updated_at DESC" do
+        it "should sort the stream by created_at DESC" do
           @document.create_note_for(:surname, "surname note")
           sleep 2.seconds
           @document.save_attachment_for(:surname,test_pdf("pdf_test_2"))
@@ -99,11 +76,11 @@ describe ActiveMetadata::Streamable do
           @document.save_attachment_for(:surname,test_pdf("pdf_test_1"))
 
           stream = @document.send(:collect_stream_data, :surname)
-          res = @document.send(:sort_stream, stream, :created_at)
+          res = ActiveMetadata::Stream.sort_stream(stream, :created_at)
 
-          res[0].attach_file_name.should eq 'pdf_test_1.pdf'
+          res[0].note.should eq 'surname note'
           res[1].attach_file_name.should eq 'pdf_test_2.pdf'
-          res[2].note.should eq 'surname note'
+          res[2].attach_file_name.should eq 'pdf_test_1.pdf'
         end
 
       end
@@ -131,31 +108,30 @@ describe ActiveMetadata::Streamable do
 
   end
 
-  describe "#stream_all_starred" do
+  describe "#stream_all_starred_by_group" do
 
     context "given 2 notes (only one starred) and 2 attachments (only one starred)" do
 
       before(:each) do
         @document = Document.create! { |d| d.name = "John" }
         (1..2).each do |i|
-          @document.save_attachment_for(:name,test_pdf("pdf_test_#{i}"), i.odd? )
-          @document.create_note_for(:name, "note_#{i}", i.odd? )
+          @document.save_attachment_for(:name,test_pdf("pdf_test_#{i}"), i.odd?, 'my_group' )
+          @document.create_note_for(:name, "note_#{i}", i.odd?, 'my_group' )
         end
       end
 
       it "should return 2 elements" do
-        @document.stream_all_starred.count.should eq 2
+        ActiveMetadata::Stream.by_group('my_group', :starred => true).count.should eq 2
       end
 
       it "should return only the starred items" do
-        @document.stream_all_starred.collect{|el| el.starred? }.count.should eq 2
+        ActiveMetadata::Stream.by_group('my_group', :starred => true).collect{|el| el.starred? }.count.should eq 2
       end
 
-      it "should return the starred stream ordered by UPDATED_AT DESC" do
-        starred = @document.stream_all_starred
-        starred.first.should be_kind_of ActiveMetadata::Note
-        @document.update_attachment starred.last.id, starred.last.attach.to_file
-        @document.stream_all_starred.first.should be_kind_of ActiveMetadata::Attachment
+      it "should return the starred stream ordered by created_at DESC" do
+        items = ActiveMetadata::Stream.by_group('my_group', :starred => true)
+        items.first.should be_kind_of ActiveMetadata::Attachment
+        ActiveMetadata::Stream.by_group('my_group', :starred => true).first.id.should eq items.first.id
       end
 
     end

data/spec/routing/active_metadata/stream_controller_routing_spec.rb

@@ -7,8 +7,13 @@ describe ActiveMetadata::StreamController do
     before(:each) { @routes = Rails.application.routes }
 
     it "recognizes and generate :model_name/:model_id/:field_name/stream" do
-      { :get => "/active_metadata/model/12/field/stream" }.should route_to(:controller => 'active_metadata/stream', :action => 'index', :model_name => 'model', :model_id => '12',
-                                                           :field_name =>'field')
+      { :get => "/active_metadata/model/12/field/stream" }.should route_to(
+        :controller => 'active_metadata/stream', :action => 'index', :model_name => 'model', :model_id => '12', :field_name =>'field')
+    end
+
+    it "recognizes and generate group/:group/stream" do
+      { :get => "/active_metadata/groups/my_group/stream" }.should route_to(
+        :controller => 'active_metadata/stream', :action => 'index_by_group', :group =>'my_group')
     end
 
 

data/spec/support/chapter.rb

@@ -0,0 +1,4 @@
+# encoding: utf-8
+class Chapter < ActiveRecord::Base
+  acts_as_metadata
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_metadata
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000 Z
+date: 2012-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -145,10 +145,12 @@ files:
 - app/models/active_metadata/note.rb
 - app/models/active_metadata/watcher.rb
 - app/views/active_metadata/attachments/_attachment.html.erb
+- app/views/active_metadata/attachments/create.js.erb
 - app/views/active_metadata/attachments/index.html.erb
 - app/views/active_metadata/histories/index.html.erb
 - app/views/active_metadata/notes/_form.html.erb
 - app/views/active_metadata/notes/_note.html.erb
+- app/views/active_metadata/notes/create.js.erb
 - app/views/active_metadata/notes/edit.html.erb
 - app/views/active_metadata/notes/index.html.erb
 - app/views/active_metadata/notes/index.js.erb
@@ -163,6 +165,7 @@ 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
@@ -174,7 +177,7 @@ files:
 - lib/active_metadata/persistence/note.rb
 - lib/active_metadata/persistence/persistence.rb
 - lib/active_metadata/persistence/watcher.rb
-- lib/active_metadata/streamable.rb
+- lib/active_metadata/stream.rb
 - lib/active_metadata/version.rb
 - lib/active_metadata.rb
 - lib/tasks/active_metadata_tasks.rake
@@ -233,10 +236,11 @@ files:
 - spec/lib/concurrency_spec.rb
 - spec/lib/history_spec.rb
 - spec/lib/notes_spec.rb
-- spec/lib/streamable_spec.rb
+- spec/lib/stream_spec.rb
 - spec/lib/watchers_spec.rb
 - spec/routing/active_metadata/stream_controller_routing_spec.rb
 - spec/spec_helper.rb
+- spec/support/chapter.rb
 - spec/support/document.rb
 - spec/support/pdf_test.pdf
 - spec/support/pdf_test_1.pdf
@@ -259,7 +263,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2284098148828860317
+      hash: -1818248447479050482
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -268,10 +272,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2284098148828860317
+      hash: -1818248447479050482
 requirements: []
 rubyforge_project: active_metadata
-rubygems_version: 1.8.19
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Add metadata to fields in an active record model
@@ -328,10 +332,11 @@ test_files:
 - spec/lib/concurrency_spec.rb
 - spec/lib/history_spec.rb
 - spec/lib/notes_spec.rb
-- spec/lib/streamable_spec.rb
+- spec/lib/stream_spec.rb
 - spec/lib/watchers_spec.rb
 - spec/routing/active_metadata/stream_controller_routing_spec.rb
 - spec/spec_helper.rb
+- spec/support/chapter.rb
 - spec/support/document.rb
 - spec/support/pdf_test.pdf
 - spec/support/pdf_test_1.pdf

data/lib/active_metadata/streamable.rb

@@ -1,40 +0,0 @@
-module ActiveMetadata::Streamable
-
-  # return the streamables items by field in an ordered array
-  # ActiveMetadata::CONFIG['streamables'] defines what models will be retrieved
-  def stream_for(field, order_by = :updated_at)
-    sort_stream(collect_stream_data(field), order_by)
-  end
-
-  # same as #stream_for but not filtered by field
-  def stream_all_starred order_by = :updated_at
-    sort_stream(collect_starred_stream_data, order_by)
-  end
-
-  private
-  def sort_stream stream, order_by
-    stream.sort{ |a,b| b.send(order_by) <=> a.send(order_by) }
-  end
-
-  def collect_stream_data field
-    res = []
-    ActiveMetadata::CONFIG['streamables'].each do |model|
-      res.concat self.send(stream_collect_method(model.to_s),field).collect { |el| el }
-    end
-    res
-  end
-
-  def collect_starred_stream_data
-    res = []
-    ActiveMetadata::CONFIG['streamables'].each do |model|
-      res.concat self.send("starred_#{model.to_s.pluralize}".to_sym).collect { |el| el }
-    end
-    res
-  end
-
-  def stream_collect_method model
-    model.to_s == 'note' ? 'notes_for' : 'attachments_for'
-  end
-
-
-end