refinerycms-blog 1.6.2 → 1.7.0

data/Gemfile

@@ -0,0 +1,7 @@
+source 'http://rubygems.org'
+
+group :development, :test do
+  gem 'sqlite3'
+  gem 'mysql2'
+  gem 'pg'
+end

data/Gemfile.lock

@@ -0,0 +1,293 @@
+GIT
+  remote: git://github.com/collectiveidea/awesome_nested_set.git
+  revision: 7f43579770dd42d00e34c0f09ed9a49f8a524bdc
+  specs:
+    awesome_nested_set (2.1.0)
+      activerecord (>= 3.0.0)
+
+GIT
+  remote: git://github.com/resolve/refinerycms.git
+  revision: 25162b585b9c4023d39fd1a9796140bfa4ecb909
+  specs:
+    refinerycms (2.0.0)
+      bundler (~> 1.0)
+      refinerycms-authentication (= 2.0.0)
+      refinerycms-core (= 2.0.0)
+      refinerycms-dashboard (= 2.0.0)
+      refinerycms-images (= 2.0.0)
+      refinerycms-pages (= 2.0.0)
+      refinerycms-resources (= 2.0.0)
+      refinerycms-settings (= 2.0.0)
+    refinerycms-authentication (2.0.0)
+      devise (~> 1.4.0)
+      friendly_id_globalize3 (~> 3.2.1)
+      refinerycms-core (= 2.0.0)
+    refinerycms-core (2.0.0)
+      acts_as_indexed (~> 0.7)
+      awesome_nested_set (~> 2.0)
+      coffee-rails (~> 3.1.0)
+      friendly_id_globalize3 (~> 3.2.1)
+      globalize3 (~> 0.2.0.beta3)
+      jquery-rails
+      rails (>= 3.1.1)
+      refinerycms-settings (= 2.0.0)
+      sass-rails (~> 3.1.0)
+      truncate_html (~> 0.5)
+      uglifier
+      will_paginate (~> 3.0.1)
+    refinerycms-dashboard (2.0.0)
+      refinerycms-core (= 2.0.0)
+    refinerycms-images (2.0.0)
+      dragonfly (~> 0.9.8)
+      rack-cache (>= 0.5.3)
+      refinerycms-core (= 2.0.0)
+    refinerycms-pages (2.0.0)
+      awesome_nested_set (~> 2.0)
+      friendly_id_globalize3 (~> 3.2.1)
+      refinerycms-core (= 2.0.0)
+      seo_meta (>= 1.2.0.rc2)
+    refinerycms-resources (2.0.0)
+      dragonfly (~> 0.9.8)
+      rack-cache (>= 0.5.3)
+      refinerycms-core (= 2.0.0)
+    refinerycms-settings (2.0.0)
+    refinerycms-testing (2.0.0)
+      capybara (~> 1.1.0)
+      database_cleaner
+      factory_girl_rails (~> 1.3.0)
+      fuubar
+      guard-rspec (~> 0.5.0)
+      json_pure
+      launchy
+      rack-test (~> 0.6.0)
+      refinerycms-core (= 2.0.0)
+      rspec-instafail
+      rspec-rails (~> 2.7.0)
+
+PATH
+  remote: .
+  specs:
+    refinerycms-blog (2.0.0)
+      acts-as-taggable-on
+      filters_spam (~> 0.2)
+      rails_autolink
+      refinerycms-core (~> 2.0.0)
+      seo_meta (~> 1.2.0.rc1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.1.1)
+      actionpack (= 3.1.1)
+      mail (~> 2.3.0)
+    actionpack (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.2)
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
+    acts-as-taggable-on (2.1.1)
+      rails
+    acts_as_indexed (0.7.6)
+    addressable (2.2.6)
+    arel (2.2.1)
+    babosa (0.3.5)
+    bcrypt-ruby (3.0.1)
+    builder (3.0.0)
+    capybara (1.1.1)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (~> 2.0)
+      xpath (~> 0.1.4)
+    childprocess (0.2.2)
+      ffi (~> 1.0.6)
+    coffee-rails (3.1.1)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.1.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.1.3)
+    database_cleaner (0.6.7)
+    devise (1.4.9)
+      bcrypt-ruby (~> 3.0)
+      orm_adapter (~> 0.0.3)
+      warden (~> 1.0.3)
+    diff-lcs (1.1.3)
+    dragonfly (0.9.8)
+      rack
+    erubis (2.7.0)
+    execjs (1.2.9)
+      multi_json (~> 1.0)
+    factory_girl (2.2.0)
+      activesupport
+    factory_girl_rails (1.3.0)
+      factory_girl (~> 2.2.0)
+      railties (>= 3.0.0)
+    ffi (1.0.9)
+    filters_spam (0.3)
+    friendly_id_globalize3 (3.2.1.5)
+      babosa (~> 0.3.0)
+    fuubar (0.0.6)
+      rspec (~> 2.0)
+      rspec-instafail (~> 0.1.8)
+      ruby-progressbar (~> 0.0.10)
+    globalize3 (0.2.0.beta4)
+      activemodel (>= 3.0.0)
+      activerecord (>= 3.0.0)
+      paper_trail (~> 2)
+    growl (1.0.3)
+    guard (0.8.8)
+      thor (~> 0.14.6)
+    guard-rspec (0.5.2)
+      guard (>= 0.8.4)
+    guard-spork (0.3.1)
+      guard (>= 0.8.4)
+      spork (>= 0.8.4)
+    hike (1.2.1)
+    i18n (0.6.0)
+    jquery-rails (1.0.16)
+      railties (~> 3.0)
+      thor (~> 0.14)
+    json (1.6.1)
+    json_pure (1.6.1)
+    launchy (2.0.5)
+      addressable (~> 2.2.6)
+    mail (2.3.0)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.17.2)
+    multi_json (1.0.3)
+    mysql2 (0.3.7)
+    nokogiri (1.5.0)
+    orm_adapter (0.0.5)
+    paper_trail (2.4.0)
+      rails (~> 3)
+    pg (0.11.0)
+    polyglot (0.3.3)
+    rack (1.3.5)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.1.1)
+      actionmailer (= 3.1.1)
+      actionpack (= 3.1.1)
+      activerecord (= 3.1.1)
+      activeresource (= 3.1.1)
+      activesupport (= 3.1.1)
+      bundler (~> 1.0)
+      railties (= 3.1.1)
+    rails_autolink (1.0.4)
+      rails (>= 3.1.0)
+    railties (3.1.1)
+      actionpack (= 3.1.1)
+      activesupport (= 3.1.1)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rb-fsevent (0.4.3.1)
+    rdoc (3.11)
+      json (~> 1.4)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
+      diff-lcs (~> 1.1.2)
+    rspec-instafail (0.1.9)
+    rspec-mocks (2.7.0)
+    rspec-rails (2.7.0)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.7.0)
+    ruby-progressbar (0.0.10)
+    rubyzip (0.9.4)
+    sass (3.1.10)
+    sass-rails (3.1.4)
+      actionpack (~> 3.1.0)
+      railties (~> 3.1.0)
+      sass (>= 3.1.4)
+      sprockets (~> 2.0.0)
+      tilt (~> 1.3.2)
+    selenium-webdriver (2.10.0)
+      childprocess (>= 0.2.1)
+      ffi (= 1.0.9)
+      json_pure
+      rubyzip
+    seo_meta (1.2.0.rc2)
+      rails (>= 3.0.0)
+    spork (0.9.0.rc9)
+    sprockets (2.0.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.4)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    truncate_html (0.5.1)
+    tzinfo (0.3.31)
+    uglifier (1.0.4)
+      execjs (>= 0.3.0)
+      multi_json (>= 1.0.2)
+    warden (1.0.6)
+      rack (>= 1.0)
+    will_paginate (3.0.2)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  awesome_nested_set!
+  coffee-rails (~> 3.1.0)
+  growl (~> 1.0.3)
+  guard-spork
+  jquery-rails
+  mysql2
+  pg
+  rb-fchange (~> 0.0.5)
+  rb-fsevent (>= 0.3.9)
+  rb-notifu (~> 0.0.4)
+  refinerycms!
+  refinerycms-blog!
+  refinerycms-testing (~> 2.0.0)
+  sass-rails (~> 3.1.0)
+  spork (= 0.9.0.rc9)
+  sqlite3
+  uglifier
+  win32console

data/app/controllers/admin/blog/categories_controller.rb

@@ -1,7 +1,11 @@
-class Admin::Blog::CategoriesController < Admin::BaseController
+module Admin
+  module Blog
+    class CategoriesController < Admin::BaseController
 
-  crudify :blog_category,
-          :title_attribute => :title,
-          :order => 'title ASC'
+      crudify :blog_category,
+              :title_attribute => :title,
+              :order => 'title ASC'
 
+    end
+  end
 end

data/app/controllers/admin/blog/comments_controller.rb

@@ -1,36 +1,40 @@
-class Admin::Blog::CommentsController < Admin::BaseController
+module Admin
+  module Blog
+    class CommentsController < Admin::BaseController
 
-  crudify :blog_comment,
-          :title_attribute => :name,
-          :order => 'published_at DESC'
+      crudify :blog_comment,
+              :title_attribute => :name,
+              :order => 'published_at DESC'
 
-  def index
-    @blog_comments = BlogComment.unmoderated
-    render :action => 'index'
-  end
+      def index
+        @blog_comments = BlogComment.unmoderated
+        render :action => 'index'
+      end
 
-  def approved
-    unless params[:id].present?
-      @blog_comments = BlogComment.approved
-      render :action => 'index'
-    else
-      @blog_comment = BlogComment.find(params[:id])
-      @blog_comment.approve!
-      flash[:notice] = t('admin.blog.comments.approved', :author => @blog_comment.name)
-      redirect_to :action => params[:return_to] || 'index'
-    end
-  end
+      def approved
+        unless params[:id].present?
+          @blog_comments = BlogComment.approved
+          render :action => 'index'
+        else
+          @blog_comment = BlogComment.find(params[:id])
+          @blog_comment.approve!
+          flash[:notice] = t('approved', :scope => 'admin.blog.comments', :author => @blog_comment.name)
+          redirect_to :action => params[:return_to] || 'index'
+        end
+      end
+
+      def rejected
+        unless params[:id].present?
+          @blog_comments = BlogComment.rejected
+          render :action => 'index'
+        else
+          @blog_comment = BlogComment.find(params[:id])
+          @blog_comment.reject!
+          flash[:notice] = t('rejected', :scope => 'admin.blog.comments', :author => @blog_comment.name)
+          redirect_to :action => params[:return_to] || 'index'
+        end
+      end
 
-  def rejected
-    unless params[:id].present?
-      @blog_comments = BlogComment.rejected
-      render :action => 'index'
-    else
-      @blog_comment = BlogComment.find(params[:id])
-      @blog_comment.reject!
-      flash[:notice] = t('admin.blog.comments.rejected', :author => @blog_comment.name)
-      redirect_to :action => params[:return_to] || 'index'
     end
   end
-
-end
+end

data/app/controllers/admin/blog/posts_controller.rb

@@ -1,86 +1,97 @@
-class Admin::Blog::PostsController < Admin::BaseController
-
-  crudify :blog_post,
-          :title_attribute => :title,
-          :order => 'published_at DESC'
+module Admin
+  module Blog
+    class PostsController < Admin::BaseController
+      require 'will_paginate/array'
+      
+      crudify :blog_post,
+              :title_attribute => :title,
+              :order => 'published_at DESC'
           
-  def uncategorized
-    @blog_posts = BlogPost.uncategorized.paginate({
-      :page => params[:page],
-      :per_page => BlogPost.per_page
-    })
-  end
+      def uncategorized
+        @blog_posts = BlogPost.uncategorized.paginate({
+          :page => params[:page],
+          :per_page => BlogPost.per_page
+        })
+      end
   
-  def tags
-    op =  case ActiveRecord::Base.connection.adapter_name.downcase
-          when 'postgresql'
-            '~*'
-          else
-            'LIKE'
-          end
-    wildcard =  case ActiveRecord::Base.connection.adapter_name.downcase
-                when 'postgresql'
-                  '.*'
-                else
-                  '%'
-                end
-    @tags = BlogPost.tag_counts_on(:tags).where(
-        ["tags.name #{op} ?", "#{wildcard}#{params[:term].to_s.downcase}#{wildcard}"]
-      ).map { |tag| {:id => tag.id, :value => tag.name}}
-    render :json => @tags.flatten
-  end
+      def tags
+        op =  case ActiveRecord::Base.connection.adapter_name.downcase
+              when 'postgresql'
+                '~*'
+              else
+                'LIKE'
+              end
+        wildcard =  case ActiveRecord::Base.connection.adapter_name.downcase
+                    when 'postgresql'
+                      '.*'
+                    else
+                      '%'
+                    end
+        @tags = BlogPost.tag_counts_on(:tags).where(
+            ["tags.name #{op} ?", "#{wildcard}#{params[:term].to_s.downcase}#{wildcard}"]
+          ).map { |tag| {:id => tag.id, :value => tag.name}}
+        render :json => @tags.flatten
+      end
   
-  def create
-    # if the position field exists, set this object as last object, given the conditions of this class.
-    if BlogPost.column_names.include?("position")
-      params[:blog_post].merge!({
-        :position => ((BlogPost.maximum(:position, :conditions => "")||-1) + 1)
-      })
-    end
+      def create
+        # if the position field exists, set this object as last object, given the conditions of this class.
+        if BlogPost.column_names.include?("position")
+          params[:blog_post].merge!({
+            :position => ((BlogPost.maximum(:position, :conditions => "")||-1) + 1)
+          })
+        end
     
-    if BlogPost.column_names.include?("user_id")
-      params[:blog_post].merge!({
-        :user_id => current_user.id
-      })
-    end
+        if BlogPost.column_names.include?("user_id")
+          params[:blog_post].merge!({
+            :user_id => current_user.id
+          })
+        end
 
-    if (@blog_post = BlogPost.create(params[:blog_post])).valid?
-      (request.xhr? ? flash.now : flash).notice = t(
-        'refinery.crudify.created',
-        :what => "'#{@blog_post.title}'"
-      )
+        if (@blog_post = BlogPost.create(params[:blog_post])).valid?
+          (request.xhr? ? flash.now : flash).notice = t(
+            'refinery.crudify.created',
+            :what => "'#{@blog_post.title}'"
+          )
 
-      unless from_dialog?
-        unless params[:continue_editing] =~ /true|on|1/
-          redirect_back_or_default(admin_blog_posts_url)
+          unless from_dialog?
+            unless params[:continue_editing] =~ /true|on|1/
+              redirect_back_or_default(admin_blog_posts_url)
+            else
+              unless request.xhr?
+                redirect_to :back
+              else
+                render :partial => "/shared/message"
+              end
+            end
+          else
+            render :text => "<script>parent.window.location = '#{admin_blog_posts_url}';</script>"
+          end
         else
           unless request.xhr?
-            redirect_to :back
+            render :action => 'new'
           else
-            render :partial => "/shared/message"
+            render :partial => "/shared/admin/error_messages",
+                   :locals => {
+                     :object => @blog_post,
+                     :include_object_name => true
+                   }
           end
         end
-      else
-        render :text => "<script>parent.window.location = '#{admin_blog_posts_url}';</script>"
-      end
-    else
-      unless request.xhr?
-        render :action => 'new'
-      else
-        render :partial => "/shared/admin/error_messages",
-               :locals => {
-                 :object => @blog_post,
-                 :include_object_name => true
-               }
       end
-    end
-  end
 
-  before_filter :find_all_categories,
-                :only => [:new, :edit, :create, :update]
+      before_filter :find_all_categories,
+                    :only => [:new, :edit, :create, :update]
 
-protected
-  def find_all_categories
-    @blog_categories = BlogCategory.find(:all)
+      before_filter :check_category_ids, :only => :update
+
+    protected
+      def find_all_categories
+        @blog_categories = BlogCategory.find(:all)
+      end
+
+      def check_category_ids
+        params[:blog_post][:category_ids] ||= []
+      end
+    end
   end
 end