Refactored everything (models, helpers) into proper namespace of Refinery::Blog. Requires refinery commit 25162b585b9c4023d39fd1a9796140bfa4ecb909

7 files changed, 267 insertions, 273 deletions

diff --git a/app/models/refinery/blog/category.rb b/app/models/refinery/blog/category.rb
new file mode 100644
index 0000000..dc85b50
--- /dev/null
+++ b/app/models/refinery/blog/category.rb
@@ -0,0 +1,26 @@
+module Refinery
+  module Blog
+    class Category < ActiveRecord::Base
+
+      has_many :categorizations, :dependent => :destroy, :foreign_key => :blog_category_id
+      has_many :posts, :through => :categorizations, :source => :blog_post
+
+      acts_as_indexed :fields => [:title]
+
+      validates :title, :presence => true, :uniqueness => true
+
+      has_friendly_id :title, :use_slug => true,
+                      :default_locale => (::Refinery::I18n.default_frontend_locale rescue :en),
+                      :approximate_ascii => Refinery::Setting.find_or_set(:approximate_ascii, false, :scoping => 'blog'),
+                      :strip_non_ascii => Refinery::Setting.find_or_set(:strip_non_ascii, false, :scoping => 'blog')
+
+      def post_count
+        posts.select(&:live?).count
+      end
+
+      # how many items to show per page
+      self.per_page = Refinery::Setting.find_or_set(:blog_posts_per_page, 10)
+
+    end
+  end
+end
\ No newline at end of file
diff --git a/app/models/refinery/blog/comment.rb b/app/models/refinery/blog/comment.rb
new file mode 100644
index 0000000..55a67ba
--- /dev/null
+++ b/app/models/refinery/blog/comment.rb
@@ -0,0 +1,125 @@
+module Refinery
+  module Blog
+    class Comment < ActiveRecord::Base
+
+      attr_accessible :name, :email, :message
+
+      filters_spam :author_field => :name,
+                   :email_field => :email,
+                   :message_field => :body
+
+      belongs_to :post, :class_name => 'Refinery::Blog::Post', :foreign_key => 'blog_post_id'
+
+      acts_as_indexed :fields => [:name, :email, :message]
+
+      alias_attribute :message, :body
+
+      validates :name, :message, :presence => true
+      validates :email, :format => { :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i }
+
+      scope :unmoderated, :conditions => {:state => nil}
+      scope :approved, :conditions => {:state => 'approved'}
+      scope :rejected, :conditions => {:state => 'rejected'}
+
+      self.per_page = Refinery::Setting.find_or_set(:blog_comments_per_page, 10)
+
+      def avatar_url(options = {})
+        options = {:size => 60}
+        require 'digest/md5'
+        size = ("?s=#{options[:size]}" if options[:size])
+        "http://gravatar.com/avatar/#{Digest::MD5.hexdigest(self.email.to_s.strip.downcase)}#{size}.jpg"
+      end
+
+      def approve!
+        self.update_attribute(:state, 'approved')
+      end
+
+      def reject!
+        self.update_attribute(:state, 'rejected')
+      end
+
+      def rejected?
+        self.state == 'rejected'
+      end
+
+      def approved?
+        self.state == 'approved'
+      end
+
+      def unmoderated?
+        self.state.nil?
+      end
+
+      def self.toggle!
+        currently = Refinery::Setting.find_or_set(:comments_allowed, true, {
+          :scoping => 'blog'
+        })
+        Refinery::Setting.set(:comments_allowed, {:value => !currently, :scoping => 'blog'})
+      end
+
+      before_create do |comment|
+        unless Moderation.enabled?
+          comment.state = comment.ham? ? 'approved' : 'rejected'
+        end
+      end
+
+      module Moderation
+        class << self
+          def enabled?
+            Refinery::Setting.find_or_set(:comment_moderation, true, {
+              :scoping => 'blog',
+              :restricted => false
+            })
+          end
+
+          def toggle!
+            new_value = {
+              :value => !Blog::Comment::Moderation.enabled?,
+              :scoping => 'blog',
+              :restricted => false
+            }
+            Refinery::Setting.set(:comment_moderation, new_value)
+          end
+        end
+      end
+
+      module Notification
+        class << self
+          def recipients
+            Refinery::Setting.find_or_set(:comment_notification_recipients, (Refinery::Role[:refinery].users.first.email rescue ''),
+            {
+              :scoping => 'blog',
+              :restricted => false
+            })
+          end
+
+          def recipients=(emails)
+            new_value = {
+              :value => emails,
+              :scoping => 'blog',
+              :restricted => false
+            }
+            Refinery::Setting.set(:comment_notification_recipients, new_value)
+          end
+
+          def subject
+            Refinery::Setting.find_or_set(:comment_notification_subject, "New inquiry from your website", {
+              :scoping => 'blog',
+              :restricted => false
+            })
+          end
+
+          def subject=(subject_line)
+            new_value = {
+              :value => subject_line,
+              :scoping => 'blog',
+              :restricted => false
+            }
+            Refinery::Setting.set(:comment_notification_subject, new_value)
+          end
+        end
+      end
+
+    end
+  end
+end
\ No newline at end of file
diff --git a/app/models/refinery/blog/post.rb b/app/models/refinery/blog/post.rb
new file mode 100644
index 0000000..883f4fc
--- /dev/null
+++ b/app/models/refinery/blog/post.rb
@@ -0,0 +1,114 @@
+require 'acts-as-taggable-on'
+require 'seo_meta'
+
+module Refinery
+  module Blog
+    class Post < ActiveRecord::Base
+
+      is_seo_meta if self.table_exists?
+
+      default_scope :order => 'published_at DESC'
+      #.first & .last will be reversed -- consider a with_exclusive_scope on these?
+
+      belongs_to :author, :class_name => 'Refinery::User', :foreign_key => :user_id, :readonly => true
+
+      has_many :comments, :class_name => 'Refinery::Blog::Comment', :dependent => :destroy, :foreign_key => :blog_post_id
+      acts_as_taggable
+
+      has_many :categorizations, :dependent => :destroy, :foreign_key => :blog_post_id
+      has_many :categories, :through => :categorizations, :source => :blog_category
+
+      acts_as_indexed :fields => [:title, :body]
+
+      validates :title, :presence => true, :uniqueness => true
+      validates :body,  :presence => true
+
+      has_friendly_id :friendly_id_source, :use_slug => true,
+                      :default_locale => (::Refinery::I18n.default_frontend_locale rescue :en),
+                      :approximate_ascii => Refinery::Setting.find_or_set(:approximate_ascii, false, :scoping => 'blog'),
+                      :strip_non_ascii => Refinery::Setting.find_or_set(:strip_non_ascii, false, :scoping => 'blog')
+
+      scope :by_archive, lambda { |archive_date|
+        where(['published_at between ? and ?', archive_date.beginning_of_month, archive_date.end_of_month])
+      }
+
+      scope :by_year, lambda { |archive_year|
+        where(['published_at between ? and ?', archive_year.beginning_of_year, archive_year.end_of_year])
+      }
+
+      scope :all_previous, lambda { where(['published_at <= ?', Time.now.beginning_of_month]) }
+
+      scope :live, lambda { where( "published_at <= ? and draft = ?", Time.now, false) }
+
+      scope :previous, lambda { |i| where(["published_at < ? and draft = ?", i.published_at, false]).limit(1) }
+
+      scope :uncategorized, lambda {
+        live.includes(:categories).where(:categories => { Refinery::Categorization.table_name => { :blog_category_id => nil } })
+      }
+
+      attr_accessible :title, :body, :custom_teaser, :tag_list, :draft, :published_at, :custom_url
+      attr_accessible :browser_title, :meta_keywords, :meta_description, :user_id, :category_ids
+
+      self.per_page = Refinery::Setting.find_or_set(:blog_posts_per_page, 10)
+
+      def next
+        self.class.next(self).first
+      end
+
+      def prev
+        self.class.previous(self).first
+      end
+
+      def live?
+        !draft and published_at <= Time.now
+      end
+
+      def category_ids=(ids)
+        self.categories = ids.reject{|id| id.blank?}.collect {|c_id|
+          Refinery::Blog::Category.find(c_id.to_i) rescue nil
+        }.compact
+      end
+
+      def friendly_id_source
+        custom_url.present? ? custom_url : title
+      end
+
+      class << self
+        def next(current_record)
+          self.send(:with_exclusive_scope) do
+            where(["published_at > ? and draft = ?", current_record.published_at, false]).order("published_at ASC")
+          end
+        end
+
+        def comments_allowed?
+          Refinery::Setting.find_or_set(:comments_allowed, true, :scoping => 'blog')
+        end
+
+        def teasers_enabled?
+          Refinery::Setting.find_or_set(:teasers_enabled, true, :scoping => 'blog')
+        end
+
+        def teaser_enabled_toggle!
+          currently = Refinery::Setting.find_or_set(:teasers_enabled, true, :scoping => 'blog')
+          Refinery::Setting.set(:teasers_enabled, :value => !currently, :scoping => 'blog')
+        end
+      end
+
+      module ShareThis
+        DEFAULT_KEY = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+
+        class << self
+          def key
+            Refinery::Setting.find_or_set(:share_this_key, Blog::Post::ShareThis::DEFAULT_KEY, :scoping => 'blog')
+          end
+
+          def enabled?
+            key = Blog::Post::ShareThis.key
+            key.present? and key != Blog::Post::ShareThis::DEFAULT_KEY
+          end
+        end
+      end
+
+    end
+  end
+end
\ No newline at end of file
diff --git a/app/models/refinery/blog_category.rb b/app/models/refinery/blog_category.rb
deleted file mode 100644
index 3f10d92..0000000
--- a/app/models/refinery/blog_category.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-module Refinery
-  class BlogCategory < ActiveRecord::Base
-
-    has_many :categorizations, :dependent => :destroy
-    has_many :posts, :through => :categorizations, :source => :blog_post
-
-    acts_as_indexed :fields => [:title]
-
-    validates :title, :presence => true, :uniqueness => true
-
-    has_friendly_id :title, :use_slug => true,
-                    :default_locale => (::Refinery::I18n.default_frontend_locale rescue :en),
-                    :approximate_ascii => Refinery::Setting.find_or_set(:approximate_ascii, false, :scoping => 'blog'),
-                    :strip_non_ascii => Refinery::Setting.find_or_set(:strip_non_ascii, false, :scoping => 'blog')
-
-    def post_count
-      posts.select(&:live?).count
-    end
-    
-    # how many items to show per page
-    self.per_page = Refinery::Setting.find_or_set(:blog_posts_per_page, 10)
-
-  end
-end
diff --git a/app/models/refinery/blog_comment.rb b/app/models/refinery/blog_comment.rb
deleted file mode 100644
index f7c1c84..0000000
--- a/app/models/refinery/blog_comment.rb
+++ /dev/null
@@ -1,135 +0,0 @@
-module Refinery
-  class BlogComment < ActiveRecord::Base
-
-    attr_accessible :name, :email, :message
-
-    filters_spam :author_field => :name,
-                 :email_field => :email,
-                 :message_field => :body
-
-    belongs_to :post, :class_name => 'Refinery::BlogPost', :foreign_key => 'blog_post_id'
-
-    acts_as_indexed :fields => [:name, :email, :message]
-
-    alias_attribute :message, :body
-
-    validates :name, :message, :presence => true
-    validates :email, :format => { :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i }
-
-    scope :unmoderated, :conditions => {:state => nil}
-    scope :approved, :conditions => {:state => 'approved'}
-    scope :rejected, :conditions => {:state => 'rejected'}
-    
-    self.per_page = Setting.find_or_set(:blog_comments_per_page, 10)
-
-    def avatar_url(options = {})
-      options = {:size => 60}
-      require 'digest/md5'
-      size = ("?s=#{options[:size]}" if options[:size])
-      "http://gravatar.com/avatar/#{Digest::MD5.hexdigest(self.email.to_s.strip.downcase)}#{size}.jpg"
-    end
-
-    def approve!
-      self.update_attribute(:state, 'approved')
-    end
-
-    def reject!
-      self.update_attribute(:state, 'rejected')
-    end
-
-    def rejected?
-      self.state == 'rejected'
-    end
-
-    def approved?
-      self.state == 'approved'
-    end
-
-    def unmoderated?
-      self.state.nil?
-    end
-
-    def self.toggle!
-      currently = Refinery::Setting.find_or_set(:comments_allowed, true, {
-        :scoping => 'blog'
-      })
-      Refinery::Setting.set(:comments_allowed, {:value => !currently, :scoping => 'blog'})
-    end
-
-    before_create do |comment|
-      unless Moderation.enabled?
-        comment.state = comment.ham? ? 'approved' : 'rejected'
-      end
-    end
-
-    module Moderation
-      class << self
-        def enabled?
-          Refinery::Setting.find_or_set(:comment_moderation, true, {
-            :scoping => 'blog',
-            :restricted => false
-          })
-        end
-
-        def toggle!
-          new_value = {
-            :value => !BlogComment::Moderation.enabled?,
-            :scoping => 'blog',
-            :restricted => false
-          }
-          if Refinery::Setting.respond_to?(:set)
-            Refinery::Setting.set(:comment_moderation, new_value)
-          else
-            Refinery::Setting[:comment_moderation] = new_value
-          end
-        end
-      end
-    end
-
-    module Notification
-      class << self
-        def recipients
-          Refinery::Setting.find_or_set(:comment_notification_recipients, (Refinery::Role[:refinery].users.first.email rescue ''),
-          {
-            :scoping => 'blog',
-            :restricted => false
-          })
-        end
-
-        def recipients=(emails)
-          new_value = {
-            :value => emails,
-            :scoping => 'blog',
-            :restricted => false
-          }
-          if Refinery::Setting.respond_to?(:set)
-            Refinery::Setting.set(:comment_notification_recipients, new_value)
-          else
-            Refinery::Setting[:comment_notification_recipients] = new_value
-          end
-        end
-
-        def subject
-          Refinery::Setting.find_or_set(:comment_notification_subject, "New inquiry from your website", {
-            :scoping => 'blog',
-            :restricted => false
-          })
-        end
-
-        def subject=(subject_line)
-          new_value = {
-            :value => subject_line,
-            :scoping => 'blog',
-            :restricted => false
-          }
-          if Refinery::Setting.respond_to?(:set)
-            Refinery::Setting.set(:comment_notification_subject, new_value)
-          else
-            Refinery::Setting[:comment_notification_subject] = new_value
-          end
-        end
-      end
-    end
-
-  end
-end
\ No newline at end of file
diff --git a/app/models/refinery/blog_post.rb b/app/models/refinery/blog_post.rb
deleted file mode 100644
index 8cd3dd9..0000000
--- a/app/models/refinery/blog_post.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-require 'acts-as-taggable-on'
-require 'seo_meta'
-
-module Refinery
-  class BlogPost < ActiveRecord::Base
-
-    is_seo_meta if self.table_exists?
-
-    default_scope :order => 'published_at DESC'
-    #.first & .last will be reversed -- consider a with_exclusive_scope on these?
-
-    belongs_to :author, :class_name => 'Refinery::User', :foreign_key => :user_id, :readonly => true
-
-    has_many :comments, :class_name => 'Refinery::BlogComment', :dependent => :destroy
-    acts_as_taggable
-
-    has_many :categorizations, :dependent => :destroy
-    has_many :categories, :through => :categorizations, :source => :blog_category
-
-    acts_as_indexed :fields => [:title, :body]
-
-    validates :title, :presence => true, :uniqueness => true
-    validates :body,  :presence => true
-
-    has_friendly_id :friendly_id_source, :use_slug => true,
-                    :default_locale => (::Refinery::I18n.default_frontend_locale rescue :en),
-                    :approximate_ascii => Refinery::Setting.find_or_set(:approximate_ascii, false, :scoping => 'blog'),
-                    :strip_non_ascii => Refinery::Setting.find_or_set(:strip_non_ascii, false, :scoping => 'blog')
-
-    scope :by_archive, lambda { |archive_date|
-      where(['published_at between ? and ?', archive_date.beginning_of_month, archive_date.end_of_month])
-    }
-
-    scope :by_year, lambda { |archive_year|
-      where(['published_at between ? and ?', archive_year.beginning_of_year, archive_year.end_of_year])
-    }
-
-    scope :all_previous, lambda { where(['published_at <= ?', Time.now.beginning_of_month]) }
-
-    scope :live, lambda { where( "published_at <= ? and draft = ?", Time.now, false) }
-
-    scope :previous, lambda { |i| where(["published_at < ? and draft = ?", i.published_at, false]).limit(1) }
-    
-    scope :uncategorized, lambda { 
-      live.includes(:categories).where(:categories => { Refinery::Categorization.table_name => { :blog_category_id => nil } })
-    }
-
-    attr_accessible :title, :body, :custom_teaser, :tag_list, :draft, :published_at, :custom_url
-    attr_accessible :browser_title, :meta_keywords, :meta_description, :user_id, :category_ids
-    
-    self.per_page = Refinery::Setting.find_or_set(:blog_posts_per_page, 10)
-    
-    def next
-      BlogPost.next(self).first
-    end
-
-    def prev
-      BlogPost.previous(self).first
-    end
-
-    def live?
-      !draft and published_at <= Time.now
-    end
-
-    def category_ids=(ids)
-      self.categories = ids.reject{|id| id.blank?}.collect {|c_id|
-        Refinery::BlogCategory.find(c_id.to_i) rescue nil
-      }.compact
-    end
-
-    def friendly_id_source
-      custom_url.present? ? custom_url : title
-    end
-
-    class << self
-      def next(current_record)
-        self.send(:with_exclusive_scope) do
-          where(["published_at > ? and draft = ?", current_record.published_at, false]).order("published_at ASC")
-        end
-      end
-
-      def comments_allowed?
-        Refinery::Setting.find_or_set(:comments_allowed, true, :scoping => 'blog')
-      end
-
-      def teasers_enabled?
-        Refinery::Setting.find_or_set(:teasers_enabled, true, :scoping => 'blog')
-      end
-
-      def teaser_enabled_toggle!
-        currently = Refinery::Setting.find_or_set(:teasers_enabled, true, :scoping => 'blog')
-        Refinery::Setting.set(:teasers_enabled, :value => !currently, :scoping => 'blog')
-      end
-    end
-
-    module ShareThis
-      DEFAULT_KEY = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
-
-      class << self
-        def key
-          Refinery::Setting.find_or_set(:share_this_key, BlogPost::ShareThis::DEFAULT_KEY, :scoping => 'blog')
-        end
-
-        def enabled?
-          key = BlogPost::ShareThis.key
-          key.present? and key != BlogPost::ShareThis::DEFAULT_KEY
-        end
-      end
-    end
-
-  end
-end
diff --git a/app/models/refinery/categorization.rb b/app/models/refinery/categorization.rb
index c4feaec..97f0928 100644
--- a/app/models/refinery/categorization.rb
+++ b/app/models/refinery/categorization.rb
@@ -2,8 +2,8 @@ module Refinery
   class Categorization < ActiveRecord::Base
 
     set_table_name 'refinery_blog_categories_blog_posts'
-    belongs_to :blog_post
-    belongs_to :blog_category
+    belongs_to :blog_post, :class_name => 'Refinery::Blog::Post', :foreign_key => :blog_post_id
+    belongs_to :blog_category, :class_name => 'Refinery::Blog::Category', :foreign_key => :blog_category_id
 
   end
 end
\ No newline at end of file