refinerycms-blog 2.0.5 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3112353a79633fd20a81d13c11c85bad6db5c9c
-  data.tar.gz: b8864564da5a0c75a0c037a4c93eadcf8a648227
+  metadata.gz: 474d4fdc2f9ad359bd9255e60b9ca70b80a5ec62
+  data.tar.gz: acb4c9dbd5960f3f873ade37e2257c551f999c37
 SHA512:
-  metadata.gz: 3cabbaae668655f98c6ea62758ffe821d17b741cc9ac4152bc1ca33f8f70ee575dd80e0c7d850e0c8ac7488631e554d6bc6e38e0fe11245731de734f7ff56b6b
-  data.tar.gz: b0f32d1805116b613b0f0c4a1b358e7d95e857ad3244b786d7956109af5aef007bed8bd8ffe88648c34ba107eed047eaf0d92b93d1443f0619cf2f8a14a5a0f0
+  metadata.gz: d5f19a55c12dd44d8eee1e97b5ebb96bc16dbd3d56f23d5499e794df091afea8cd1800249db1ea221fa80d8b472b17c58ff2f39cb26ef0043e48a6790e4b7df1
+  data.tar.gz: aad373a5e0c9052fc338f379ef74a49ab31ebe9b32357f38e4bff98ef4dab01c905ddf95f55b851b6a14dbbfe31fe53a2adeb23fda386573bc3b34c9f9459242

data/.gitignore

@@ -51,4 +51,7 @@ capybara-*html
 .rbenv-version
 
 Gemfile.lock
-.rbx
+.rbx
+
+# Local Gemfile for developing without sharing dependencies
+.gemfile

data/.travis.yml

@@ -1,9 +1,8 @@
 language: ruby
-before_install:
-  - 'if [[ "$TRAVIS_RUBY_VERSION" =~ "jruby" ]] ; then gem update --system ; fi'
+bundler_args: --without development
 before_script:
   - "sh -e /etc/init.d/xvfb start"
-  - "bundle exec rake refinery:testing:dummy_app > /dev/null"
+  - "bundle exec rake refinery:testing:dummy_app"
 script:
   - "DISPLAY=:99.0 bundle exec rspec spec"
 notifications:
@@ -23,14 +22,9 @@ env:
   - DB=mysql
 matrix:
   allow_failures:
-    - rvm: rbx-18mode
     - rvm: rbx-19mode
-    - rvm: jruby-19mode
-    - rvm: jruby-18mode
 rvm:
+  - 2.0.0
   - 1.9.3
-  - 1.8.7
   - rbx-19mode
   - jruby-19mode
-  - rbx-18mode
-  - jruby-18mode

data/Gemfile

@@ -1,10 +1,12 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gemspec
 
-gem 'refinerycms', '~> 2.0.10'
+gem 'refinerycms', '~> 2.1.0'
+gem 'refinerycms-testing', :github => 'refinery/refinerycms', :branch => '2-1-stable', :group => :test
+gem 'refinerycms-settings', '~> 2.1.0'
+gem 'refinerycms-acts-as-indexed', :github => 'refinery/refinerycms-acts-as-indexed', :branch => '1-0-stable'
 
-gem 'quiet_assets', :group => :development
 
 # Database Configuration
 unless ENV['TRAVIS']
@@ -25,17 +27,14 @@ end
 
 gem 'jruby-openssl', :platform => :jruby
 
-group :test do
-  gem 'refinerycms-testing', '~> 2.0.3'
-  gem 'generator_spec', '~> 0.8.7'
-end
-
-# Gems used only for assets and not required
-# in production environments by default.
+# Refinery/rails should pull in the proper versions of these
 group :assets do
   gem 'sass-rails'
   gem 'coffee-rails'
   gem 'uglifier'
 end
 
-gem 'jquery-rails'
+# Load local gems according to Refinery developer preference.
+if File.exist? local_gemfile = File.expand_path('../.gemfile', __FILE__)
+  eval File.read(local_gemfile)
+end

data/app/assets/stylesheets/refinery/blog/backend.css.scss

@@ -33,35 +33,35 @@
 }
 ul.collapsible_menu li {
   position: relative;
-}
-ul.collapsible_menu li span.arrow {
-  background-repeat: no-repeat;
-  position: absolute;
-  right: 10px;
-  top: 13px;
-  width: 11px;
-  height: 7px;
-  cursor: pointer;
-}
-ul.collapsible_menu li span.arrow {
-  background-image: image_url('refinery/blog/icons/up.gif');
-}
-ul.collapsible_menu li.closed span.arrow {
-  background-image: image_url('refinery/blog/icons/down.gif');
-}
-ul.collapsible_menu > div {
-  width: 93%;
-  margin: 0px auto;
-}
-ul.blog_categories{
+  span.arrow {
+    background-repeat: no-repeat;
+    position: absolute;
+    right: 10px;
+    top: 13px;
+    width: 11px;
+    height: 7px;
+    cursor: pointer;
+    background-image: image_url('refinery/blog/icons/up.gif');
+  }
+  &.closed {
+    span.arrow {
+      background-image: image_url('refinery/blog/icons/down.gif');
+    }
+  }
+  > div {
+    width: 93%;
+    margin: 0px auto;
+  }
+}
+ul.blog_categories {
   height:200px;
   overflow:auto;
   border:1px solid #ccc;
   padding:5px;
-}
-ul.blog_categories, ul.blog_categories li {
-  list-style: none;
-  margin:5px 0;
+  &, li {
+    list-style: none;
+    margin:5px 0;
+  }
 }
 a#copy_body_link {
   background: image_url('refinery/icons/add.png') no-repeat scroll 0 6px transparent;

data/app/assets/stylesheets/refinery/blog/frontend.css.scss

@@ -1,20 +1,22 @@
-.blog_post header, .blog_post footer {
-  width: auto;
-}
-.blog_post .posted_at{
-}
-.post_categories .filed_in {
-  display: inline;
-}
-.post_categories ul {
-  margin: 0px 0px 0px 6px;
-  padding: 0px;
-  display: inline;
-}
-.post_categories ul li {
-  margin: 0px;
-  padding: 0px;
-  display: inline;
+.blog_post {
+  header, footer {
+    width: auto;
+  }
+}
+.post_categories {
+  .filled_in {
+    display: inline;
+  }
+  ul {
+    margin: 0px 0px 0px 6px;
+    padding: 0px;
+    display: inline;
+    li {
+      margin: 0px;
+      padding: 0px;
+      display: inline;
+    }
+  }
 }
 .field.message_field label {
   vertical-align: top;
@@ -25,69 +27,78 @@
   background: image_url('refinery/blog/rss-feed.png') no-repeat;
 }
 #next_prev_article{
-  overflow:hidden;
-  margin:10px 0;
-  position:relative;
-  height:30px;
-}
-#next_prev_article a{
-  display:block;
-  width:33%;
-  height:30px;
-  line-height:30px;
-  position:absolute;
-  top:0;
-}
-#next_prev_article a.prev{
-  left:0;
-}
-#next_prev_article a.home{
-  left:33%;
-  text-align:center;
-}
-#next_prev_article a.next{
-  text-align:right;
-  right:0;
+  overflow: hidden;
+  margin: 10px 0;
+  position: relative;
+  height: 30px;
+  a {
+    display: block;
+    width: 33%;
+    height: 30px;
+    line-height: 30px;
+    position: absolute;
+    top:0;
+    &.prev {
+      left:0;
+    }
+    &.home {
+      left: 33%;
+      text-align: center;
+    }
+    &.next {
+      text-align: right;
+      right:0;
+    }
+  }
 }
-
 #message, .flash {
   padding: 8px 8px 8px 30px;
   margin-bottom: 15px;
   position: relative;
 }
-.flash_notice, .flash_message {
-  border: 1px solid #00A017;
-  color: #00A017;
-  background: 7px 7px no-repeat image_url('refinery/blog/icons/accept.png') #E0F5E0;
-}
-.flash_notice, .flash_notice * {
-  color: #00A017;
-}
-.flash_error {
-  border: 1px solid #A00027;
-  color: #A00027;
-  background: 7px 7px no-repeat image_url('refinery/blog/icons/cancel.png') #FFB1B1;
-}
-.flash.flash_notice #flash_close, .flash.flash_error #flash_close {
-  text-transform: lowercase;
-}
-.flash.flash_message {
-  background: #E0F5E0;
-  padding: 9px;
-  position: relative;
-  margin-bottom: 32px;
-}
-.flash.flash_message h2 {
-  margin-top: 12px;
-}
-.flash_message, .flash_message * {
-  color: #262719;
-  font-size: 14px;
-}
-.flash a, .flash a:hover {
-  color: #e20003;
-  border-bottom-color: #e20003;
+.flash {
+  &.flash_notice {
+    &, * {
+      color: #00A017;
+    }
+  }
+  &.flash_notice, &.flash_message {
+    border: 1px solid #00A017;
+    color: #00A017;
+    background: 7px 7px no-repeat image_url('refinery/blog/icons/accept.png') #E0F5E0;
+  }
+  &.flash_notice #flash_close, &.flash_error #flash_close {
+    text-transform: lowercase;
+  }
+  &.flash_message {
+    background: #E0F5E0;
+    padding: 9px;
+    position: relative;
+    margin-bottom: 32px;
+    h2 {
+      margin-top: 12px;
+    }
+  }
+  a {
+    &, &:hover {
+      color: #e20003;
+      border-bottom-color: #e20003;
+    }
+  }
+  &.flash_error {
+    border: 1px solid #A00027;
+    color: #A00027;
+    background: 7px 7px no-repeat image_url('refinery/blog/icons/cancel.png') #FFB1B1;
+    a {
+      &, &:hover {
+        display: none;
+      }
+    }
+  }
+  &.flash_message {
+    &, & * {
+      color: #262719;
+      font-size: 14px;
+    }
+  }
 }
-.flash.flash_error a, .flash.flash_error a:hover {
-  display: none;
-} /* FLASH MESSAGES */

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

@@ -10,35 +10,35 @@ module Refinery
         def index
           @comments = Refinery::Blog::Comment.unmoderated.page(params[:page])
 
-          render :action => 'index'
+          render :index
         end
 
         def approved
-          unless params[:id].present?
-            @comments = Refinery::Blog::Comment.approved.page(params[:page])
+          @comments = Refinery::Blog::Comment.approved.page(params[:page])
 
-            render :action => 'index'
-          else
-            @comment = Refinery::Blog::Comment.find(params[:id])
-            @comment.approve!
-            flash[:notice] = t('approved', :scope => 'refinery.blog.admin.comments', :author => @comment.name)
+          render :index
+        end
+
+        def approve
+          @comment = Refinery::Blog::Comment.find(params[:id])
+          @comment.approve!
+          flash[:notice] = t('approved', :scope => 'refinery.blog.admin.comments', :author => @comment.name)
 
-            redirect_to refinery.url_for(:action => params[:return_to] || 'index', :id => nil)
-          end
+          redirect_to refinery.blog_admin_comments_path
         end
 
         def rejected
-          unless params[:id].present?
-            @comments = Refinery::Blog::Comment.rejected.page(params[:page])
+          @comments = Refinery::Blog::Comment.rejected.page(params[:page])
+
+          render :index
+        end
 
-            render :action => 'index'
-          else
-            @comment = Refinery::Blog::Comment.find(params[:id])
-            @comment.reject!
-            flash[:notice] = t('rejected', :scope => 'refinery.blog.admin.comments', :author => @comment.name)
+        def reject
+          @comment = Refinery::Blog::Comment.find(params[:id])
+          @comment.reject!
+          flash[:notice] = t('rejected', :scope => 'refinery.blog.admin.comments', :author => @comment.name)
 
-            redirect_to refinery.url_for(:action => params[:return_to] || 'index', :id => nil)
-          end
+          redirect_to refinery.blog_admin_comments_path
         end
 
       end

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

@@ -4,7 +4,8 @@ module Refinery
       class PostsController < ::Refinery::AdminController
 
         crudify :'refinery/blog/post',
-                :order => 'published_at DESC'
+                :order => 'published_at DESC',
+                :include => [:translations, :author]
 
         before_filter :find_all_categories,
                       :only => [:new, :edit, :create, :update]
@@ -55,7 +56,7 @@ module Refinery
                 unless request.xhr?
                   redirect_to :back
                 else
-                  render :partial => "/shared/message"
+                  render "/shared/message"
                 end
               end
             else
@@ -63,7 +64,7 @@ module Refinery
             end
           else
             unless request.xhr?
-              render :action => 'new'
+              render :new
             else
               render :partial => "/refinery/admin/error_messages",
                      :locals => {
@@ -75,8 +76,12 @@ module Refinery
         end
 
       protected
+        def find_post
+          @post = Refinery::Blog::Post.find_by_slug_or_id(params[:id])
+        end
+
         def find_all_categories
-          @categories = Refinery::Blog::Category.find(:all)
+          @categories = Refinery::Blog::Category.all
         end
 
         def check_category_ids

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

@@ -4,7 +4,7 @@ module Refinery
 
       def show
         @category = Refinery::Blog::Category.find(params[:id])
-        @posts = @category.posts.live.includes(:comments, :categories).page(params[:page])
+        @posts = @category.posts.live.includes(:comments, :categories).with_globalize.page(params[:page])
       end
 
     end

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

@@ -16,14 +16,14 @@ module Refinery
         end
         respond_with (@posts) do |format|
           format.html
-          format.rss
+          format.rss { render :layout => false }
         end
       end
 
       def show
         @comment = Comment.new
 
-        @canonical = url_for(:locale => ::Refinery::I18n.default_frontend_locale) if canonical?
+        @canonical = refinery.url_for(:locale => Refinery::I18n.current_frontend_locale) if canonical?
 
         @post.increment!(:access_count, 1)
 
@@ -52,21 +52,21 @@ module Refinery
                                       :anchor => "comment-#{@comment.to_param}")
           end
         else
-          render :action => 'show'
+          render :show
         end
       end
 
       def archive
         if params[:month].present?
           date = "#{params[:month]}/#{params[:year]}"
-          @archive_date = Time.parse(date)
-          @date_title = @archive_date.strftime('%B %Y')
-          @posts = Post.live.by_archive(@archive_date).page(params[:page])
+          archive_date = Time.parse(date)
+          @date_title = ::I18n.l(archive_date, :format => '%B %Y')
+          @posts = Post.live.by_month(archive_date).page(params[:page])
         else
           date = "01/#{params[:year]}"
-          @archive_date = Time.parse(date)
-          @date_title = @archive_date.strftime('%Y')
-          @posts = Post.live.by_year(@archive_date).page(params[:page])
+          archive_date = Time.parse(date)
+          @date_title = ::I18n.l(archive_date, :format => '%Y')
+          @posts = Post.live.by_year(archive_date).page(params[:page])
         end
         respond_with (@posts)
       end
@@ -74,11 +74,12 @@ module Refinery
       def tagged
         @tag = ActsAsTaggableOn::Tag.find(params[:tag_id])
         @tag_name = @tag.name
-        @posts = Post.tagged_with(@tag_name).page(params[:page])
+        @posts = Post.live.tagged_with(@tag_name).page(params[:page])
       end
 
+    protected
       def canonical?
-        ::Refinery.i18n_enabled? && ::Refinery::I18n.default_frontend_locale != ::Refinery::I18n.current_frontend_locale
+        Refinery::I18n.default_frontend_locale != Refinery::I18n.current_frontend_locale
       end
     end
   end