refinerycms-blog 2.0.5 → 2.1.0

data/db/migrate/20110803223523_add_user_id_to_blog_posts.rb

@@ -1,7 +1,7 @@
 class AddUserIdToBlogPosts < ActiveRecord::Migration
 
   def change
-    add_column Refinery::Blog::Post.table_name, :user_id, :integer
+    add_column :refinery_blog_posts, :user_id, :integer
   end
 
-end
+end

data/db/migrate/20110803223526_add_cached_slugs.rb

@@ -1,6 +1,6 @@
 class AddCachedSlugs < ActiveRecord::Migration
   def change
-    add_column Refinery::Blog::Category.table_name, :cached_slug, :string
-    add_column Refinery::Blog::Post.table_name, :cached_slug, :string
+    add_column :refinery_blog_categories, :cached_slug, :string
+    add_column :refinery_blog_posts, :cached_slug, :string
   end
 end

data/db/migrate/20110803223527_add_custom_url_field_to_blog_posts.rb

@@ -1,5 +1,5 @@
 class AddCustomUrlFieldToBlogPosts < ActiveRecord::Migration
   def change
-    add_column Refinery::Blog::Post.table_name, :custom_url, :string
+    add_column :refinery_blog_posts, :custom_url, :string
   end
 end

data/db/migrate/20110803223528_add_custom_teaser_field_to_blog_posts.rb

@@ -1,6 +1,6 @@
 class AddCustomTeaserFieldToBlogPosts < ActiveRecord::Migration
   def change
-    add_column Refinery::Blog::Post.table_name, :custom_teaser, :text
+    add_column :refinery_blog_posts, :custom_teaser, :text
   end
 end
 

data/db/migrate/20110803223529_add_primary_key_to_categorizations.rb

@@ -1,13 +1,13 @@
 class AddPrimaryKeyToCategorizations < ActiveRecord::Migration
   def up
-    unless Refinery::Categorization.column_names.include?("id")
-      add_column Refinery::Categorization.table_name, :id, :primary_key
+    unless Refinery::Blog::Categorization.column_names.include?("id")
+      add_column Refinery::Blog::Categorization.table_name, :id, :primary_key
     end
   end
 
   def down
-    if Refinery::Categorization.column_names.include?("id")
-      remove_column Refinery::Categorization.table_name, :id
+    if Refinery::Blog::Categorization.column_names.include?("id")
+      remove_column Refinery::Blog::Categorization.table_name, :id
     end
   end
 end

data/db/migrate/20120530102901_create_blog_translations.rb

@@ -0,0 +1,17 @@
+class CreateBlogTranslations < ActiveRecord::Migration
+  def up
+    Refinery::Blog::Post.create_translation_table!({
+      :body => :text,
+      :custom_teaser => :text,
+      :custom_url => :string,
+      :slug => :string,
+      :title => :string
+    }, {
+      :migrate_data => true
+    })
+  end
+
+  def down
+    Refinery::Blog::Post.drop_translation_table! :migrate_data => true
+  end
+end

data/db/migrate/20120531113632_delete_cached_slugs.rb

@@ -0,0 +1,6 @@
+class DeleteCachedSlugs < ActiveRecord::Migration
+  def change
+    remove_column Refinery::Blog::Category.table_name, :cached_slug
+    remove_column Refinery::Blog::Post.table_name, :cached_slug
+  end
+end

data/db/migrate/20120601151114_create_category_translations.rb

@@ -0,0 +1,14 @@
+class CreateCategoryTranslations < ActiveRecord::Migration
+  def up
+    Refinery::Blog::Category.create_translation_table!({
+      :title => :string,
+      :slug => :string
+    }, {
+      :migrate_data => true
+    })
+  end
+
+  def down
+    Refinery::Blog::Category.drop_translation_table! :migrate_data => true
+  end
+end

data/db/seeds.rb

@@ -13,7 +13,7 @@ if defined?(Refinery::Page) and !Refinery::Page.exists?(:link_url => '/blog')
     :menu_match => "^/blogs?(\/|\/.+?|)$"
   )
 
-  Refinery::Pages.default_parts.each do |default_page_part|
-    page.parts.create(:title => default_page_part, :body => nil)
+  Refinery::Pages.default_parts.each_with_index do |default_page_part, index|
+    page.parts.create(:title => default_page_part, :body => nil, :position => index)
   end
 end

data/lib/generators/refinery/blog/templates/config/initializers/refinery/blog.rb.erb

@@ -10,4 +10,7 @@ Refinery::Blog.configure do |config|
   # config.share_this_key = <%= Refinery::Blog.share_this_key.inspect %>
 
   # config.page_url = <%= Refinery::Blog.page_url.inspect %>
+  
+  # If you're grafting onto an existing app, change this to your User class
+  # Refinery::Blog.user_class = <%= Refinery::Blog.user_class.to_s.inspect %>
 end

data/lib/refinery/blog.rb

@@ -2,6 +2,7 @@ require 'refinerycms-core'
 require 'refinerycms-settings'
 require 'filters_spam'
 require 'rails_autolink'
+require 'friendly_id'
 
 module Refinery
   autoload :BlogGenerator, 'generators/refinery/blog/blog_generator'

data/lib/refinery/blog/configuration.rb

@@ -11,5 +11,28 @@ module Refinery
     self.post_teaser_length = 250
     self.share_this_key = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
     self.page_url = "/blog"
+  
+    # Refinery::User isn't available when this line gets hit, so we use static methods instead
+    @@user_class_name = nil
+    class << self
+      def user_class=(class_name)
+        if class_name.is_a?(Class)
+          raise TypeError, "You can't set user_class to be a class, e.g., User.  Instead, please use a string like 'User'"
+        elsif class_name.is_a?(String)
+          @@user_class_name = class_name
+        else
+          raise TypeError, "Invalid type for user_class.  Please use a string like 'User'"
+        end
+      end
+
+      def user_class
+        class_name = @@user_class_name || 'Refinery::User'
+        begin
+          Object.const_get(class_name)
+        rescue NameError
+          class_name.constantize
+        end
+      end
+    end
   end
 end

data/readme.md

@@ -2,7 +2,7 @@
 
 Simple blog engine for [Refinery CMS](http://refinerycms.com). It supports posts, categories and comments.
 
-This version of `refinerycms-blog` supports Rails 3.2.x. To use Rails 2.3.x use the [refinerycms-blog "Rails 2.3.x stable branch"](http://github.com/resolve/refinerycms-blog/tree/rails2-stable).
+This version of `refinerycms-blog` supports Rails 3.2.x. To use Rails 2.3.x use the [refinerycms-blog "Rails 2.3.x stable branch"](http://github.com/refinery/refinerycms-blog/tree/rails2-stable).
 
 Options:
 
@@ -11,14 +11,14 @@ Options:
 
 ## Requirements
 
-Refinery CMS version 2.0.0 or above.
+Refinery CMS version 2.1.0 or above.
 
 ## Install
 
 Open up your ``Gemfile`` and add at the bottom this line:
 
 ```ruby
-gem 'refinerycms-blog', '~> 2.0.0'
+gem 'refinerycms-blog', '~> 2.1.0'
 ```
 
 Now, run ``bundle install``

data/refinerycms-blog.gemspec

@@ -1,31 +1,25 @@
 # Encoding: UTF-8
-$:.push File.expand_path('../lib', __FILE__)
-require 'refinery/blog/version'
-
-version = Refinery::Blog::Version.to_s
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-blog}
-  s.version           = version
+  s.version           = %q{2.1.0}
   s.description       = %q{A really straightforward open source Ruby on Rails blog engine designed for integration with Refinery CMS.}
   s.summary           = %q{Ruby on Rails blogging engine for Refinery CMS.}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com/blog}
-  s.authors           = ['Resolve Digital', 'Neoteric Design']
+  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'Joe Sak']
   s.require_paths     = %w(lib)
-  s.licenses          = %q{MIT}
+  s.license           = %q{MIT}
 
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
   # Runtime dependencies
-  s.add_dependency    'refinerycms-core',     '~> 2.0.3'
-  s.add_dependency    'refinerycms-settings', '~> 2.0.1'
+  s.add_dependency    'refinerycms-core',     '~> 2.1.0'
+  s.add_dependency    'refinerycms-settings', '~> 2.1.0'
   s.add_dependency    'filters_spam',         '~> 0.2'
   s.add_dependency    'acts-as-taggable-on'
-  s.add_dependency    'seo_meta',             '~> 1.3.0'
-  s.add_dependency    'rails_autolink'
-
-  # Development dependencies
-  s.add_development_dependency 'refinerycms-testing', '~> 2.0.0'
+  s.add_dependency    'seo_meta',             '~> 1.4.0'
+  s.add_dependency    'rails_autolink',       '~> 1.0.7'
+  s.add_dependency    'friendly_id',          '~> 4.0.4'
 end

data/spec/controllers/refinery/blog/admin/comments_controller_spec.rb

@@ -0,0 +1,84 @@
+require "spec_helper"
+
+module Refinery
+  module Blog
+    module Admin
+      describe CommentsController do
+        refinery_login_with :refinery_user
+
+        describe "#index" do
+          let!(:comment) { FactoryGirl.create(:blog_comment) }
+          
+          it "succeeds" do
+            get :index
+            response.should be_success
+            response.should render_template(:index)
+          end
+
+          it "assigns unmoderated comments" do
+            get :index
+            assigns(:comments).first.should eq(comment)
+          end
+        end
+
+        describe "#approved" do
+          let!(:comment) { FactoryGirl.create(:approved_comment) }
+
+          it "succeeds" do
+            get :approved
+            response.should be_success
+            response.should render_template(:index)
+          end
+
+          it "assigns approved comments" do
+            get :approved
+            assigns(:comments).first.should eq(comment)
+          end
+        end
+
+        describe "#approve" do
+          let!(:comment) { FactoryGirl.create(:blog_comment) }
+
+          it "redirects on success" do
+            post :approve, :id => comment.id
+            response.should be_redirect
+          end
+          
+          it "approves the comment" do
+            post :approve, :id => comment.id
+            Refinery::Blog::Comment.approved.count.should eq(1)
+          end
+        end
+        
+        describe "#rejected" do
+          let!(:comment) { FactoryGirl.create(:rejected_comment) }
+
+          it "succeeds" do
+            get :rejected
+            response.should be_success
+            response.should render_template(:index)
+          end
+
+          it "assigns rejected comments" do
+            get :rejected
+            assigns(:comments).first.should eq(comment)
+          end
+        end
+
+        describe "#reject" do
+          let!(:comment) { FactoryGirl.create(:blog_comment) }
+
+          it "redirects on success" do
+            post :reject, :id => comment.id
+            response.should be_redirect
+          end
+          
+          it "rejects the comment" do
+            post :reject, :id => comment.id
+            Refinery::Blog::Comment.rejected.count.should eq(1)
+          end
+        end
+      end
+    end
+  end
+end

data/spec/controllers/refinery/blog/posts_controller_spec.rb

@@ -3,8 +3,6 @@ require "spec_helper"
 module Refinery
   module Blog
     describe PostsController do
-      login_refinery_user
-
       before do
         FactoryGirl.create(:blog_post, :title => "blogpost_one")
         FactoryGirl.create(:blog_post, :title => "blogpost_two")

data/spec/factories/blog_posts.rb

@@ -3,9 +3,9 @@ FactoryGirl.define do
     sequence(:title) { |n| "Top #{n} Shopping Centers in Chicago" }
     body "These are the top ten shopping centers in Chicago. You're going to read a long blog post about them. Come to peace with it."
     draft false
-    tag_list "chicago, shopping, fun times"
     published_at Time.now
-    
+    author { FactoryGirl.create(:refinery_user) }
+
     factory :blog_post_draft do
       draft true
     end

data/spec/features/refinery/blog/admin/categories_spec.rb

@@ -0,0 +1,119 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe "Categories admin" do
+  refinery_login_with :refinery_user
+
+  let(:title) { "lol" }
+
+  it "can create categories" do
+    visit refinery.admin_root_path
+
+    within("nav#menu") { click_link "Blog" }
+    within("nav.multilist") { click_link "Create new category" }
+
+    fill_in "Title", :with => title
+    click_button "Save"
+
+    category = Refinery::Blog::Category.first
+    category.title.should eq(title)
+  end
+
+  context "with translations" do
+    before do
+      Refinery::I18n.stub(:frontend_locales).and_return([:en, :ru])
+      blog_page = Globalize.with_locale(:en) { FactoryGirl.create(:page, :link_url => "/blog", :title => "Blog") }
+      Globalize.with_locale(:ru) do
+        blog_page.title = 'блог'
+        blog_page.save
+      end
+    end
+
+    describe "add a category with title for default locale" do
+      before do
+        Globalize.locale = :en
+        visit refinery.blog_admin_posts_path
+        click_link "Create new category"
+        fill_in "Title", :with => "Testing Category"
+        click_button "Save"
+        @c = Refinery::Blog::Category.find_by_title("Testing Category")
+      end
+
+      it "suceeds" do
+        page.should have_content("'#{@c.title}' was successfully added.")
+        Refinery::Blog::Category.count.should eq(1)
+      end
+
+      it "shows locale flag for category" do
+        click_link "Manage"
+        within "#category_#{@c.id}" do
+          page.should have_css("img[src='/assets/refinery/icons/flags/en.png']")
+        end
+      end
+
+      it "shows up in blog page for default locale" do
+        visit refinery.blog_root_path
+        within "#categories" do
+          page.should have_selector('li')
+        end
+      end
+
+      it "does not show up in blog page for secondary locale" do
+        visit refinery.blog_root_path(:locale => :ru)
+        page.should_not have_selector('#categories')
+      end
+
+    end
+
+    describe "add a category with title for secondary locale" do
+
+      let(:ru_category_title) { 'категория' }
+
+      before do
+        visit refinery.blog_admin_posts_path
+        click_link "Create new category"
+        within "#switch_locale_picker" do
+          click_link "Ru"
+        end
+        fill_in "Title", :with => ru_category_title
+        click_button "Save"
+        @c = Refinery::Blog::Category.find_by_title(ru_category_title)
+      end
+
+      it "suceeds" do
+        page.should have_content("'#{@c.title}' was successfully added.")
+        Refinery::Blog::Category.count.should eq(1)
+      end
+
+      it "shows locale flag for category" do
+        click_link "Manage"
+        within "#category_#{@c.id}" do
+          page.should have_css("img[src='/assets/refinery/icons/flags/ru.png']")
+        end
+      end
+
+      it "does not show locale flag for primary locale" do
+        click_link "Manage"
+        within "#category_#{@c.id}" do
+          page.should_not have_css("img[src='/assets/refinery/icons/flags/en.png']")
+        end
+      end
+
+      it "does not shows up in blog page for default locale" do
+        visit refinery.blog_root_path
+        page.should_not have_selector('#categories')
+      end
+
+      it "shows up in blog page for secondary locale" do
+        visit refinery.blog_root_path(:locale => :ru)
+        within "#categories" do
+          page.should have_selector('li')
+        end
+      end
+
+
+    end
+
+
+  end
+end