refinerycms-blog 1.8.0 → 2.0.0

data/db/migrate/20120223022021_add_access_count_to_posts.rb

@@ -0,0 +1,8 @@
+class AddAccessCountToPosts < ActiveRecord::Migration
+  def change
+    add_column Refinery::Blog::Post.table_name, :access_count, :integer, :default => 0
+    
+    add_index Refinery::Blog::Post.table_name, :access_count
+    
+  end
+end

data/db/migrate/20120227022021_add_slug_to_posts_and_categories.rb

@@ -0,0 +1,9 @@
+class AddSlugToPostsAndCategories < ActiveRecord::Migration
+  def change
+    add_column Refinery::Blog::Post.table_name, :slug, :string
+    add_index Refinery::Blog::Post.table_name, :slug
+
+    add_column Refinery::Blog::Category.table_name, :slug, :string
+    add_index Refinery::Blog::Category.table_name, :slug
+  end
+end

data/db/{seeds/refinerycms_blog.rb → seeds.rb}

@@ -1,20 +1,19 @@
-::User.find(:all).each do |user|
+Refinery::User.all.each do |user|
   if user.plugins.where(:name => 'refinerycms_blog').blank?
     user.plugins.create(:name => "refinerycms_blog",
                         :position => (user.plugins.maximum(:position) || -1) +1)
   end
-end if defined?(::User)
+end if defined?(Refinery::User)
 
-if defined?(::Page)
-  page = ::Page.create(
+if defined?(Refinery::Page) and !Refinery::Page.exists?(:link_url => '/blog')
+  page = Refinery::Page.create(
     :title => "Blog",
     :link_url => "/blog",
     :deletable => false,
-    :position => ((Page.maximum(:position, :conditions => {:parent_id => nil}) || -1)+1),
     :menu_match => "^/blogs?(\/|\/.+?|)$"
   )
 
-  ::Page.default_parts.each do |default_page_part|
+  Refinery::Pages.default_parts.each do |default_page_part|
     page.parts.create(:title => default_page_part, :body => nil)
   end
-end
+end

data/lib/generators/refinery/blog/blog_generator.rb

@@ -0,0 +1,27 @@
+module Refinery
+  class BlogGenerator < Rails::Generators::Base
+
+    source_root File.expand_path("../templates", __FILE__)
+
+    def generate_blog_initializer
+      template "config/initializers/refinery/blog.rb.erb", File.join(destination_root, "config", "initializers", "refinery", "blog.rb")
+    end
+
+    def rake_db
+      rake("refinery_blog:install:migrations")
+      rake("refinery_settings:install:migrations")
+    end
+
+    def append_load_seed_data
+      create_file 'db/seeds.rb' unless File.exists?(File.join(destination_root, 'db', 'seeds.rb'))
+      append_file 'db/seeds.rb', :verbose => true do
+        <<-EOH
+
+# Added by Refinery CMS Blog engine
+Refinery::Blog::Engine.load_seed
+        EOH
+      end
+    end
+
+  end
+end

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

@@ -0,0 +1,11 @@
+Refinery::Blog.configure do |config|
+  # config.validate_source_url = <%= Refinery::Blog.validate_source_url.inspect %>
+
+  # config.comments_per_page = <%= Refinery::Blog.comments_per_page.inspect %>
+
+  # config.posts_per_page = <%= Refinery::Blog.posts_per_page.inspect %>
+
+  # config.post_teaser_length = <%= Refinery::Blog.post_teaser_length.inspect %>
+
+  # config.share_this_key = <%= Refinery::Blog.share_this_key.inspect %>
+end

data/lib/refinery/blog.rb

@@ -0,0 +1,37 @@
+require 'refinerycms-core'
+require 'refinerycms-settings'
+require 'filters_spam'
+require 'rails_autolink'
+
+module Refinery
+  autoload :BlogGenerator, 'generators/refinery/blog/blog_generator'
+
+  module Blog
+    require 'refinery/blog/engine'
+    require 'refinery/blog/configuration'
+
+    autoload :Version, 'refinery/blog/version'
+    autoload :Tab, 'refinery/blog/tabs'
+
+    class << self
+      attr_writer :root
+      attr_writer :tabs
+
+      def root
+        @root ||= Pathname.new(File.expand_path('../../../', __FILE__))
+      end
+
+      def tabs
+        @tabs ||= []
+      end
+
+      def version
+        ::Refinery::Blog::Version.to_s
+      end
+
+      def factory_paths
+        @factory_paths ||= [ root.join("spec/factories").to_s ]
+      end
+    end
+  end
+end

data/lib/refinery/blog/configuration.rb

@@ -0,0 +1,14 @@
+module Refinery
+  module Blog
+    include ActiveSupport::Configurable
+
+    config_accessor :validate_source_url, :comments_per_page, :posts_per_page,
+      :post_teaser_length, :share_this_key
+
+    self.validate_source_url = false
+    self.comments_per_page = 10
+    self.posts_per_page = 10
+    self.post_teaser_length = 250
+    self.share_this_key = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+  end
+end

data/lib/refinery/blog/engine.rb

@@ -0,0 +1,25 @@
+module Refinery
+  module Blog
+    class Engine < Rails::Engine
+      include Refinery::Engine
+
+      isolate_namespace Refinery::Blog
+
+      initializer "register refinerycms_blog plugin" do
+        Refinery::Plugin.register do |plugin|
+          plugin.pathname = root
+          plugin.name = "refinerycms_blog"
+          plugin.url = {:controller => 'refinery/blog/admin/posts'}
+          plugin.menu_match = /refinery\/blog\/?(posts|comments|categories)?/
+          plugin.activity = {
+            :class_name => :'refinery/blog/post'
+          }
+        end
+      end
+
+      config.after_initialize do
+        Refinery.register_engine(Refinery::Blog)
+      end
+    end
+  end
+end

data/lib/refinery/blog/tabs.rb

@@ -1,11 +1,5 @@
 module Refinery
-  module Blog
-    attr_accessor :tabs
-
-    def self.tabs
-      @tabs ||= []
-    end
-    
+  module Blog    
     class Tab
       attr_accessor :name, :partial
 
@@ -18,11 +12,11 @@ module Refinery
         raise "A tab MUST have a partial!: #{tab.inspect}" if tab.partial.blank?
       end
 
-    protected
+      protected
 
-      def initialize
-        ::Refinery::Blog.tabs << self # add me to the collection of registered page tabs
-      end
+        def initialize
+          ::Refinery::Blog.tabs << self # add me to the collection of registered page tabs
+        end
     end
   end
 end

data/lib/refinery/blog/version.rb

@@ -1,8 +1,8 @@
 module Refinery
   module Blog
     class Version
-      @major = 1
-      @minor = 8
+      @major = 2
+      @minor = 0
       @tiny  = 0
 
       class << self
@@ -14,4 +14,4 @@ module Refinery
       end
     end
   end
-end
+end

data/lib/refinerycms-blog.rb

@@ -1,41 +1 @@
-require 'filters_spam'
-
-module Refinery
-  module Blog
-    autoload :Version, File.expand_path('../refinery/blog/version', __FILE__)
-    autoload :Tab, File.expand_path("../refinery/blog/tabs", __FILE__)
-
-    class << self
-      attr_accessor :root
-      def root
-        @root ||= Pathname.new(File.expand_path('../../', __FILE__))
-      end
-
-      def version
-        ::Refinery::Blog::Version.to_s
-      end
-    end
-
-    class Engine < Rails::Engine
-      initializer 'blog serves assets' do |app|
-        app.middleware.insert_after ::ActionDispatch::Static, ::ActionDispatch::Static, "#{root}/public"
-      end
-
-      config.to_prepare do
-        require File.expand_path('../refinery/blog/tabs', __FILE__)
-      end
-
-      config.after_initialize do
-        Refinery::Plugin.register do |plugin|
-          plugin.pathname = root
-          plugin.name = "refinerycms_blog"
-          plugin.url = {:controller => '/admin/blog/posts', :action => 'index'}
-          plugin.menu_match = /^\/?(admin|refinery)\/blog\/?(posts|comments|categories)?/
-          plugin.activity = {
-            :class => BlogPost
-          }
-        end
-      end
-    end if defined?(Rails::Engine)
-  end
-end
+require 'refinery/blog'

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.0.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.1.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).
 
 Options:
 
@@ -11,31 +11,40 @@ Options:
 
 ## Requirements
 
-Refinery CMS version 1.0.0 or above.
-Your Rails 3 application should not be called "blog"
+Refinery CMS version 2.0.0 or above.
 
 ## Install
 
 Open up your ``Gemfile`` and add at the bottom this line:
 
-# You now have two options:
-
-## Take the blue pill and stay on 1.7.x
-
-    gem 'refinerycms-blog', '~> 1.7.0'
-
-## Take the red pill and head up to 1.8.x
-## Where the previous shared/_post.html.erb partial was moved directly into show.html.erb
-## *MEANING:* If you depend on that partial, you'll have to check the changes and merge your customizations back in!
-
-    gem 'refinerycms-blog', '~> 1.8.0'
+```ruby
+gem 'refinerycms-blog', '~> 2.0.0'
+```
 
 Now, run ``bundle install``
 
 Next, to install the blog plugin run:
 
-    rails generate refinerycms_blog
+    rails generate refinery:blog
 
 Finally migrate your database and you're done.
 
     rake db:migrate
+    
+## Developing & Contributing
+
+The version of Refinery to develop this engine against is defined in the gemspec. To override the version of refinery to develop against, edit the project Gemfile to point to a local path containing a clone of refinerycms.
+
+### Testing
+
+Generate the dummy application to test against
+
+    $ bundle exec rake refinery:testing:dummy_app
+
+Run the test suite with [Guard](https://github.com/guard/guard)
+
+    $ bundle exec guard start
+
+Or just with rake spec
+
+    $ bundle exec rake spec

data/refinerycms-blog.gemspec

@@ -1,207 +1,30 @@
+# 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           = %q{1.8.0}
-  s.description       = %q{A really straightforward open source Ruby on Rails blog engine designed for integration with RefineryCMS.}
-  s.date              = %q{2012-01-19}
-  s.summary           = %q{Ruby on Rails blogging engine for RefineryCMS.}
+  s.version           = version
+  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.require_paths     = %w(lib)
 
+  s.files             = `git ls-files`.split("\n")
+  s.test_files        = `git ls-files -- spec/*`.split("\n")
+
   # Runtime dependencies
-  s.add_dependency    'refinerycms-core',   '~> 1.0.3'
-  s.add_dependency    'filters_spam',       '~> 0.2'
+  s.add_dependency    'refinerycms-core',     '~> 2.0.0'
+  s.add_dependency    'refinerycms-settings', '~> 2.0.0'
+  s.add_dependency    'filters_spam',         '~> 0.2'
   s.add_dependency    'acts-as-taggable-on'
-  s.add_dependency    'seo_meta',           '~> 1.1.0'
+  s.add_dependency    'seo_meta',             '~> 1.2.0'
+  s.add_dependency    'rails_autolink'
 
   # Development dependencies
-  s.add_development_dependency 'factory_girl'
-
-  s.files             = %w(
-    app
-    app/controllers
-    app/controllers/admin
-    app/controllers/admin/blog
-    app/controllers/admin/blog/categories_controller.rb
-    app/controllers/admin/blog/comments_controller.rb
-    app/controllers/admin/blog/posts_controller.rb
-    app/controllers/admin/blog/settings_controller.rb
-    app/controllers/blog
-    app/controllers/blog/categories_controller.rb
-    app/controllers/blog/posts_controller.rb
-    app/controllers/blog_controller.rb
-    app/helpers
-    app/helpers/blog_posts_helper.rb
-    app/mailers
-    app/mailers/blog
-    app/mailers/blog/comment_mailer.rb
-    app/models
-    app/models/blog
-    app/models/blog/comment_mailer.rb
-    app/models/blog_category.rb
-    app/models/blog_comment.rb
-    app/models/blog_post.rb
-    app/models/categorization.rb
-    app/views
-    app/views/admin
-    app/views/admin/blog
-    app/views/admin/blog/_submenu.html.erb
-    app/views/admin/blog/categories
-    app/views/admin/blog/categories/_category.html.erb
-    app/views/admin/blog/categories/_form.html.erb
-    app/views/admin/blog/categories/_sortable_list.html.erb
-    app/views/admin/blog/categories/edit.html.erb
-    app/views/admin/blog/categories/index.html.erb
-    app/views/admin/blog/categories/new.html.erb
-    app/views/admin/blog/comments
-    app/views/admin/blog/comments/_comment.html.erb
-    app/views/admin/blog/comments/_sortable_list.html.erb
-    app/views/admin/blog/comments/index.html.erb
-    app/views/admin/blog/comments/show.html.erb
-    app/views/admin/blog/posts
-    app/views/admin/blog/posts/_form.css.erb
-    app/views/admin/blog/posts/_form.html.erb
-    app/views/admin/blog/posts/_form.js.erb
-    app/views/admin/blog/posts/_form_part.html.erb
-    app/views/admin/blog/posts/_post.html.erb
-    app/views/admin/blog/posts/_sortable_list.html.erb
-    app/views/admin/blog/posts/_teaser_part.html.erb
-    app/views/admin/blog/posts/edit.html.erb
-    app/views/admin/blog/posts/index.html.erb
-    app/views/admin/blog/posts/new.html.erb
-    app/views/admin/blog/posts/uncategorized.html.erb
-    app/views/admin/blog/settings
-    app/views/admin/blog/settings/notification_recipients.html.erb
-    app/views/blog
-    app/views/blog/categories
-    app/views/blog/categories/show.html.erb
-    app/views/blog/comment_mailer
-    app/views/blog/comment_mailer/notification.html.erb
-    app/views/blog/posts
-    app/views/blog/posts/_comment.html.erb
-    app/views/blog/posts/_nav.html.erb
-    app/views/blog/posts/archive.html.erb
-    app/views/blog/posts/index.html.erb
-    app/views/blog/posts/index.rss.builder
-    app/views/blog/posts/show.html.erb
-    app/views/blog/posts/tagged.html.erb
-    app/views/blog/shared
-    app/views/blog/shared/_archive_list.html.erb
-    app/views/blog/shared/_categories.html.erb
-    app/views/blog/shared/_post.html.erb
-    app/views/blog/shared/_related_posts.html.erb
-    app/views/blog/shared/_rss_feed.html.erb
-    app/views/blog/shared/_tags.html.erb
-    app/views/shared
-    app/views/shared/admin
-    app/views/shared/admin/_autocomplete.html.erb
-    changelog.md
-    config
-    config/locales
-    config/locales/bg.yml
-    config/locales/cs.yml
-    config/locales/de.yml
-    config/locales/en.yml
-    config/locales/es.yml
-    config/locales/fr.yml
-    config/locales/it.yml
-    config/locales/ja.yml
-    config/locales/nb.yml
-    config/locales/nl.yml
-    config/locales/pl.yml
-    config/locales/pt-BR.yml
-    config/locales/ru.yml
-    config/locales/sk.yml
-    config/locales/zh-CN.yml
-    config/routes.rb
-    db
-    db/migrate
-    db/migrate/1_create_blog_structure.rb
-    db/migrate/2_add_user_id_to_blog_posts.rb
-    db/migrate/3_acts_as_taggable_on_migration.rb
-    db/migrate/4_create_seo_meta_for_blog.rb
-    db/migrate/5_add_cached_slugs.rb
-    db/migrate/6_add_custom_url_field_to_blog_posts.rb
-    db/migrate/7_add_custom_teaser_field_to_blog_posts.rb
-    db/migrate/8_add_primary_key_to_categorizations.rb
-    db/seeds
-    db/seeds/refinerycms_blog.rb
-    features
-    features/authors.feature
-    features/category.feature
-    features/support
-    features/support/factories
-    features/support/factories/blog_categories.rb
-    features/support/factories/blog_comments.rb
-    features/support/factories/blog_posts.rb
-    features/support/paths.rb
-    features/support/step_definitions
-    features/support/step_definitions/authors_steps.rb
-    features/support/step_definitions/category_steps.rb
-    features/support/step_definitions/tags_steps.rb
-    features/tags.feature
-    Gemfile
-    lib
-    lib/gemspec.rb
-    lib/generators
-    lib/generators/refinerycms_blog_generator.rb
-    lib/refinery
-    lib/refinery/blog
-    lib/refinery/blog/tabs.rb
-    lib/refinery/blog/version.rb
-    lib/refinerycms-blog.rb
-    public
-    public/images
-    public/images/refinerycms-blog
-    public/images/refinerycms-blog/icons
-    public/images/refinerycms-blog/icons/cog.png
-    public/images/refinerycms-blog/icons/comment.png
-    public/images/refinerycms-blog/icons/comment_cross.png
-    public/images/refinerycms-blog/icons/comment_tick.png
-    public/images/refinerycms-blog/icons/comments.png
-    public/images/refinerycms-blog/icons/down.gif
-    public/images/refinerycms-blog/icons/folder.png
-    public/images/refinerycms-blog/icons/folder_add.png
-    public/images/refinerycms-blog/icons/folder_edit.png
-    public/images/refinerycms-blog/icons/page.png
-    public/images/refinerycms-blog/icons/page_add.png
-    public/images/refinerycms-blog/icons/page_copy.png
-    public/images/refinerycms-blog/icons/up.gif
-    public/images/refinerycms-blog/rss-feed.png
-    public/javascripts
-    public/javascripts/refinery
-    public/javascripts/refinery/refinerycms-blog.js
-    public/javascripts/refinerycms-blog.js
-    public/stylesheets
-    public/stylesheets/refinery
-    public/stylesheets/refinery/refinerycms-blog.css
-    public/stylesheets/refinerycms-blog.css
-    public/stylesheets/ui-lightness
-    public/stylesheets/ui-lightness/images
-    public/stylesheets/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
-    public/stylesheets/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
-    public/stylesheets/ui-lightness/images/ui-bg_flat_10_000000_40x100.png
-    public/stylesheets/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png
-    public/stylesheets/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png
-    public/stylesheets/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png
-    public/stylesheets/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
-    public/stylesheets/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
-    public/stylesheets/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
-    public/stylesheets/ui-lightness/images/ui-icons_222222_256x240.png
-    public/stylesheets/ui-lightness/images/ui-icons_228ef1_256x240.png
-    public/stylesheets/ui-lightness/images/ui-icons_ef8c08_256x240.png
-    public/stylesheets/ui-lightness/images/ui-icons_ffd27a_256x240.png
-    public/stylesheets/ui-lightness/images/ui-icons_ffffff_256x240.png
-    public/stylesheets/ui-lightness/jquery-ui-1.8.13.custom.css
-    readme.md
-    refinerycms-blog.gemspec
-    spec
-    spec/models
-    spec/models/blog_category_spec.rb
-    spec/models/blog_comment_spec.rb
-    spec/models/blog_post_spec.rb
-    todo.md
-  )
-  
-end
+  s.add_development_dependency 'refinerycms-testing', '~> 2.0.0'
+end