Changeset 1126

Timestamp:

08/19/07 00:38:43 (1 year ago)

Author:

alban

Message:

remove Author class

Files:

• trunk/app/controllers/document_controller.rb (modified) (1 diff)
• trunk/app/controllers/documents_controller.rb (modified) (6 diffs)
• trunk/app/controllers/podcasts_controller.rb (modified) (3 diffs)
• trunk/app/controllers/subscriptions_controller.rb (modified) (2 diffs)
• trunk/app/controllers/users_controller.rb (modified) (3 diffs)
• trunk/app/models/author.rb (deleted)
• trunk/app/models/document.rb (modified) (1 diff)
• trunk/app/models/podcast.rb (modified) (1 diff)
• trunk/app/models/subscription.rb (modified) (1 diff)
• trunk/app/models/user.rb (modified) (1 diff)
• trunk/test/functional/document_api_test.rb (modified) (1 diff)
• trunk/test/unit/user_test.rb (modified) (1 diff)

trunk/app/controllers/document_controller.rb

@@ -50 +50 @@
-  
-  def current_author
-Autho
+Use
-  end
-  

trunk/app/controllers/documents_controller.rb

@@ -11 +11 @@
-    @document = AudioDocument.new(params[:document])
-    if request.post?
-Autho
+Use
-        @document.tag_with(params[:labels])
-      if @document.save
@@ -23 +23 @@
-  
-  def show 
-Autho
+Use
-        @review = Review.new(params[:review])
-        if request.post?
@@ -40 +40 @@
-    
-  def edit
-Autho
+Use
-    if request.post?
-        @document.tag_with(params[:labels])
@@ -53 +53 @@
-
-        def manage
-Autho
-Autho
+Use
+Use
-        end
-  
-  def upload
-Autho
+Use
-        unless @document.upload
-                @document.upload = Upload.new
@@ -100 +100 @@
-  
-  def download
-Autho
+Use
-        send_file @document.path, :type => @document.format, :filename => @document.filename
-  end
-  
-  def destroy
-Autho
+Use
-    redirect_to :action => 'manage'
-  end
-
-  def share
-Autho
+Use
-          flash[:warning] = "Votre document n'est lié à aucun fichier" unless @document.uploaded?
-        end
-        
-        def tag
-Autho
-Autho
+Use
+Use
-        end
-        
@@ -124 +124 @@
-        
-  def listen
-Autho
+Use
-        end
-

trunk/app/controllers/podcasts_controller.rb

@@ -9 +9 @@
-    @podcast = Podcast.new(params[:podcast])
-    if request.post?
-Autho
+Use
-        @podcast.tag_with(params[:labels])
-        @podcast.name = StringRandom.alphanumeric(8).downcase
@@ -22 +22 @@
-  
-  def show 
-Autho
+Use
-  end
-    
-  def edit
-Autho
+Use
-    if request.post?
-        @podcast.tag_with(params[:labels])
@@ -39 +39 @@
-
-        def manage
-Autho
-Autho
+Use
+Use
-        end
-    
-  def destroy
-Autho
+Use
-    redirect_to :action => 'manage'
-  end

trunk/app/controllers/subscriptions_controller.rb

@@ -30 +30 @@
-        def add
-                @subscription = Subscription.new do |subscription|
-Autho
+Use
-        subscription.document = subscription.author.documents.find(params[:document])
-        subscription.subscriber = Subscriber.find(params[:id].split("_")[1])
@@ -39 +39 @@
-  
-  def remove
-Autho
+Use
-    @subscription.destroy
-    render :action => "update"

trunk/app/controllers/users_controller.rb

@@ -13 +13 @@
-
-        def dashboard
-Autho
+Use
-                @subscriber = Subscriber.find(session[:user])
-
+
+
-                @tag = @tag.flatten.uniq[0..15]
-        end
-        
-        def tags
-Autho
+Use
-                @subscriber = Subscriber.find(session[:user])
-          @tag = @subscriber.subscriptions.collect{ |s| s.document.tags } + @author.documents.collect{ |d| d.tags }
@@ -27 +28 @@
-        
-        def tag
-Autho
+Use
-                @subscription = Subscriber.find(session[:user]).subscriptions.find_by_tag(params[:name], { :limit => 5 })
-        end
-        
-        def find
-Autho
+Use
-                @subscription = Subscriber.find(session[:user]).subscriptions.find_by_keywords(params[:keywords])
-        end
@@ -84 +85 @@
-                
-                begin
-Autho
+Use
-          rescue ActiveRecord::RecordNotFound
-            logger.error("no welcome document found")

trunk/app/models/document.rb

@@ -2 +2 @@
-require 'taglib'
-class Document < ActiveRecord::Base
-
+, :class_name => "User", :foreign_key => "author_id"
-        has_one :upload, :dependent => :destroy
-        has_many :subscribers, :through => :subscriptions

trunk/app/models/podcast.rb

@@ -1 +1 @@
-class Podcast < ActiveRecord::Base
-        has_and_belongs_to_many :tags
-
+, :class_name => "User", :foreign_key => "author_id"
-
-  def tag_with(list)

trunk/app/models/subscription.rb

@@ -1 +1 @@
-class Subscription < ActiveRecord::Base
-
-
+, :class_name => "User", :foreign_key => "author_id"
+, :class_name => "User", :foreign_key => "subscriber_id"
-        belongs_to :document
-        

trunk/app/models/user.rb

@@ -2 +2 @@
-class User < ActiveRecord::Base
-        has_many :reviews, :dependent => :destroy
+        
+        has_many :documents, :dependent => :destroy, :order => "updated_at DESC", :foreign_key => "author_id" do
+                def find_by_tag(name, options = Hash.new)
+                        find_by_sql(["SELECT documents.* FROM documents, tags, documents_tags WHERE documents.id = documents_tags.document_id AND tags.id = documents_tags.tag_id AND documents.author_id = ? AND tags.name = ? OFFSET ? LIMIT ?", @owner.quoted_id, name, options[:offset], options[:limit]])
+                end
+                
+                def find_by_keywords(keywords)
+                        find(:all, :conditions => ["title ~* ?", keywords])
+                end
+        end
+        
+        has_many :subscriptions, :dependent => :destroy, :order => "created_at DESC" do 
+                def find_by_tag(name, options = Hash.new)
+                  options[:offset] = 0 if options[:offset]
+                        find_by_sql(["SELECT subscriptions.* FROM subscriptions, documents, tags, documents_tags WHERE subscriptions.document_id = documents.id AND documents.id = documents_tags.document_id AND tags.id = documents_tags.tag_id AND subscriptions.subscriber_id = ? AND tags.name = ? OFFSET ? LIMIT ?", @owner.quoted_id, name, options[:offset], options[:limit]])
+                end
+                
+                def find_by_keywords(keywords)
+                        find_by_sql(["SELECT subscriptions.* FROM subscriptions, documents WHERE subscriptions.document_id = documents.id AND subscriptions.subscriber_id = ? AND documents.title ~* ?", @owner.quoted_id, keywords])
+                end
+        end
+        
+        has_many :podcasts, :dependent => :destroy, :foreign_key => "author_id"
+        
-        has_and_belongs_to_many :groups
-        has_many :manageable_groups, :class_name => "Group", :foreign_key => "owner_id"

trunk/test/functional/document_api_test.rb

@@ -14 +14 @@
-    @user = users(:elmo)
-    @user_key = "#{@user.username}/#{@user.username}"
-Autho
+Use
-    assert_not_nil @document
-  end

trunk/test/unit/user_test.rb

@@ -32 +32 @@
-        assert_kind_of User, User.find(:first)
-  end
+  
+  def test_documents
+                user = users(:elmo)
+                assert ! user.documents.empty?
+                tags = user.documents.collect{ |d| d.tags }
+  end
+  
-end