refinerycms-blog 1.6.2 → 1.7.0

data/config/routes.rb

@@ -1,12 +1,12 @@
 ::Refinery::Application.routes.draw do
   scope(:path => 'blog', :module => 'blog') do
     root :to => 'posts#index', :as => 'blog_root'
-    match 'feed.rss', :to => 'posts#index.rss', :as => 'blog_rss_feed'
+    match 'feed.rss', :to => 'posts#index', :as => 'blog_rss_feed', :defaults => {:format => "rss"}
     match ':id', :to => 'posts#show', :as => 'blog_post'
     match 'categories/:id', :to => 'categories#show', :as => 'blog_category'
     match ':id/comments', :to => 'posts#comment', :as => 'blog_post_blog_comments'
     get 'archive/:year(/:month)', :to => 'posts#archive', :as => 'archive_blog_posts'
-    get 'tagged/:tag_id/:tag_name' => 'posts#tagged', :as => 'tagged_posts'
+    get 'tagged/:tag_id(/:tag_name)' => 'posts#tagged', :as => 'tagged_posts'
   end
 
   scope(:path => 'refinery', :as => 'admin', :module => 'admin') do
@@ -39,6 +39,7 @@
 
           get :moderation
           get :comments
+          get :teasers
         end
       end
     end

data/db/migrate/8_add_primary_key_to_categorizations.rb

@@ -0,0 +1,12 @@
+class AddPrimaryKeyToCategorizations < ActiveRecord::Migration
+  def self.up
+    unless ::Categorization.column_names.include?("id")
+      add_column :blog_categories_blog_posts, :id, :primary_key
+    end
+  end
+
+  def self.down
+    remove_column :blog_categories_blog_posts, :id
+  end
+end
+

data/lib/refinery/blog/version.rb

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

data/lib/refinerycms-blog.rb

@@ -6,6 +6,11 @@ module Refinery
     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
@@ -22,6 +27,7 @@ module Refinery
 
       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)?/
@@ -29,22 +35,6 @@ module Refinery
             :class => BlogPost
           }
         end
-
-        # refinery 0.9.8 had a bug that we later found through using this engine.
-        # the bug was that the plugin urls were not :controller => '/admin/whatever'
-        if Refinery.version == '0.9.8'
-          ::Refinery::Plugin.class_eval do
-            alias_method :old_url, :url
-
-            def url
-              if (plugin_url = self.old_url).is_a?(Hash) and plugin_url[:controller] =~ %r{^admin}
-                plugin_url[:controller] = "/#{plugin_url[:controller]}"
-              end
-
-              plugin_url
-            end
-          end
-        end
       end
     end if defined?(Rails::Engine)
   end

data/public/stylesheets/ui-lightness/jquery-ui-1.8.13.custom.css

@@ -56,13 +56,6 @@
 
 /* Interaction states
 ----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #f6f6f6 url(images/ui-bg_glass_100_f6f6f6_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #1c94c4; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #fbcb09; background: #fdf5ce url(images/ui-bg_glass_100_fdf5ce_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #c77405; }
-.ui-state-hover a, .ui-state-hover a:hover { color: #c77405; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #fbd850; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #eb8f00; }
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #eb8f00; text-decoration: none; }
-.ui-widget :active { outline: none; }
 
 /* Interaction Cues
 ----------------------------------*/
@@ -274,7 +267,6 @@
 .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; }
 .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
 .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
-.ui-corner-top { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; }
 .ui-corner-bottom { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
 .ui-corner-right {  -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
 .ui-corner-left { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
@@ -335,3 +327,4 @@
 	font-weight: normal;
 	margin: -1px;
 }
+

data/readme.md

@@ -12,12 +12,13 @@ Options:
 ## Requirements
 
 Refinery CMS version 1.0.0 or above.
+Your Rails 3 application should not be called "blog"
 
 ## Install
 
 Open up your ``Gemfile`` and add at the bottom this line:
 
-    gem 'refinerycms-blog', '~> 1.6.1'
+    gem 'refinerycms-blog', '~> 1.7.0'
 
 Now, run ``bundle install``
 
@@ -27,4 +28,4 @@ Next, to install the blog plugin run:
 
 Finally migrate your database and you're done.
 
-    rake db:migrate
+    rake db:migrate

data/refinerycms-blog.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-blog}
-  s.version           = %q{1.6.2}
+  s.version           = %q{1.7.0}
   s.description       = %q{A really straightforward open source Ruby on Rails blog engine designed for integration with RefineryCMS.}
-  s.date              = %q{2011-06-29}
+  s.date              = %q{2011-12-05}
   s.summary           = %q{Ruby on Rails blogging engine for RefineryCMS.}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com/blog}
@@ -99,12 +99,14 @@ Gem::Specification.new do |s|
     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
@@ -122,6 +124,7 @@ Gem::Specification.new do |s|
     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
@@ -138,6 +141,8 @@ Gem::Specification.new do |s|
     features/support/step_definitions/category_steps.rb
     features/support/step_definitions/tags_steps.rb
     features/tags.feature
+    Gemfile
+    Gemfile.lock
     lib
     lib/gemspec.rb
     lib/generators
@@ -197,6 +202,7 @@ Gem::Specification.new do |s|
     spec/models/blog_category_spec.rb
     spec/models/blog_comment_spec.rb
     spec/models/blog_post_spec.rb
+    todo.md
   )
   
 end

data/spec/models/blog_post_spec.rb

@@ -174,7 +174,7 @@ describe BlogPost do
       end
     end
 
-    context "with RefinerySetting comments_allowed set to true" do
+    context "with RefinerySetting comments_allowed set to false" do
       before do
         RefinerySetting.set(:comments_allowed, { :scoping => 'blog', :value => false })
       end
@@ -190,4 +190,28 @@ describe BlogPost do
       Factory.create(:blog_post, :custom_teaser => 'This is some custom content').should be_valid
     end
   end
+  
+  describe ".teasers_enabled?" do
+    context "with RefinerySetting teasers_enabled set to true" do
+      before do
+        RefinerySetting.set(:teasers_enabled, { :scoping => 'blog', :value => true })
+      end
+
+      it "should be true" do
+        BlogPost.teasers_enabled?.should be_true
+      end
+    end
+    
+    context "with RefinerySetting teasers_enabled set to false" do
+      before do
+        RefinerySetting.set(:teasers_enabled, { :scoping => 'blog', :value => false })
+      end
+
+      it "should be false" do
+        BlogPost.teasers_enabled?.should be_false
+      end
+    end
+    
+  end
+  
 end

data/todo.md

@@ -0,0 +1,5 @@
+## Why not, let's get this list going, eh?
+
+* Replace comments with disqus?
+* Facebook/twitter login for comments?
+* What else? Add your ideas...

metadata

@@ -1,108 +1,79 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: refinerycms-blog
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 1.7.0
   prerelease: 
-  segments: 
-  - 1
-  - 6
-  - 2
-  version: 1.6.2
 platform: ruby
-authors: 
+authors:
 - Resolve Digital
 - Neoteric Design
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-29 00:00:00 +12:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: refinerycms-core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70357228144960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 1
-        - 0
-        - 3
+      - !ruby/object:Gem::Version
         version: 1.0.3
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: filters_spam
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70357228144960
+- !ruby/object:Gem::Dependency
+  name: filters_spam
+  requirement: &70357228144480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 2
-        version: "0.2"
+      - !ruby/object:Gem::Version
+        version: '0.2'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: acts-as-taggable-on
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70357228144480
+- !ruby/object:Gem::Dependency
+  name: acts-as-taggable-on
+  requirement: &70357228144100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: seo_meta
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70357228144100
+- !ruby/object:Gem::Dependency
+  name: seo_meta
+  requirement: &70357228143560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: factory_girl
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70357228143560
+- !ruby/object:Gem::Dependency
+  name: factory_girl
+  requirement: &70357228143140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-description: A really straightforward open source Ruby on Rails blog engine designed for integration with RefineryCMS.
+  prerelease: false
+  version_requirements: *70357228143140
+description: A really straightforward open source Ruby on Rails blog engine designed
+  for integration with RefineryCMS.
 email: info@refinerycms.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - app/controllers/admin/blog/categories_controller.rb
 - app/controllers/admin/blog/comments_controller.rb
 - app/controllers/admin/blog/posts_controller.rb
@@ -157,12 +128,14 @@ files:
 - app/views/blog/shared/_tags.html.erb
 - app/views/shared/admin/_autocomplete.html.erb
 - changelog.md
+- 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
@@ -178,6 +151,7 @@ files:
 - 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/refinerycms_blog.rb
 - features/authors.feature
 - features/category.feature
@@ -189,6 +163,8 @@ files:
 - features/support/step_definitions/category_steps.rb
 - features/support/step_definitions/tags_steps.rb
 - features/tags.feature
+- Gemfile
+- Gemfile.lock
 - lib/gemspec.rb
 - lib/generators/refinerycms_blog_generator.rb
 - lib/refinery/blog/tabs.rb
@@ -232,39 +208,29 @@ files:
 - spec/models/blog_category_spec.rb
 - spec/models/blog_comment_spec.rb
 - spec/models/blog_post_spec.rb
-has_rdoc: true
+- todo.md
 homepage: http://refinerycms.com/blog
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby on Rails blogging engine for RefineryCMS.
 test_files: []
-