refinerycms-blog 2.1.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 474d4fdc2f9ad359bd9255e60b9ca70b80a5ec62
-  data.tar.gz: acb4c9dbd5960f3f873ade37e2257c551f999c37
+  metadata.gz: 103f97d3e1867df74bda38e15a917f4c2b294199
+  data.tar.gz: 4676a7e4be28f32f41b06a9cfc9ca5564e442497
 SHA512:
-  metadata.gz: d5f19a55c12dd44d8eee1e97b5ebb96bc16dbd3d56f23d5499e794df091afea8cd1800249db1ea221fa80d8b472b17c58ff2f39cb26ef0043e48a6790e4b7df1
-  data.tar.gz: aad373a5e0c9052fc338f379ef74a49ab31ebe9b32357f38e4bff98ef4dab01c905ddf95f55b851b6a14dbbfe31fe53a2adeb23fda386573bc3b34c9f9459242
+  metadata.gz: 360bbc5841fb2a5cd87b1aa7fcc1742f53ee66d9c51dfe2bbec3068458857deed71b9be6c53e8d8df785552b05735c2fbb436dac044367743c0f97575052e930
+  data.tar.gz: 25eb5dab9e584d61542e3bd076493056696ba5443104e3beb2fb72ab6fc357bbf58ae7e71d062bd236077f1067921e4cb23479bb7dd85943c02f0fe411db7629

data/.travis.yml

@@ -1,30 +1,16 @@
 language: ruby
+cache: bundler
 bundler_args: --without development
-before_script:
-  - "sh -e /etc/init.d/xvfb start"
-  - "bundle exec rake refinery:testing:dummy_app"
-script:
-  - "DISPLAY=:99.0 bundle exec rspec spec"
-notifications:
-  email: true
-  irc:
-    use_notice: true
-    skip_join: true
-    channels:
-      - "irc.freenode.org#refinerycms"
-  campfire:
-    on_success: always
-    on_failure: always
-    rooms:
-      - secure: "JaX+Ckvdd2wqL2bD6t8PHvMDBHxWBlCrkBKPcDKxV0t0DOwzzzwxMryVqcRi\nPsmM/zvmWFATDyRmivhNOpu4lRg9RytSroxZ9nkmbLDqjCyEAZ6tv4yZXME/\nPaxPwmfwgS9g8TKjj3lSWS7rEpqqg0D5S0XIfIHrj6KB6LUmFHc="
+before_script: "bundle exec rake refinery:testing:dummy_app"
 env:
   - DB=postgresql
   - DB=mysql
-matrix:
-  allow_failures:
-    - rvm: rbx-19mode
+notifications:
+  webhooks:
+    - https://webhooks.gitter.im/e/b5d48907cdc89864b874
 rvm:
+  - 2.3.1
+  - 2.2
+  - 2.1
   - 2.0.0
-  - 1.9.3
-  - rbx-19mode
-  - jruby-19mode
+sudo: false

data/Gemfile

@@ -1,12 +1,23 @@
 source "https://rubygems.org"
 
+gem "refinerycms-authentication-devise", '~> 1.0.4'
+
 gemspec
 
-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 'refinerycms', '~> 3.0.5'
+
+group :development, :test do
+  gem 'refinerycms-testing', '~> 3.0.5'
+end
+
+# Add the default visual editor, for now.
+gem 'refinerycms-wymeditor', ['~> 1.0', '>= 1.0.6']
 
+group :test do
+  gem 'pry'
+  gem 'launchy'
+  gem 'poltergeist'
+end
 
 # Database Configuration
 unless ENV['TRAVIS']
@@ -25,13 +36,10 @@ if !ENV['TRAVIS'] || ENV['DB'] == 'postgresql'
   gem 'pg', :platform => :ruby
 end
 
-gem 'jruby-openssl', :platform => :jruby
-
 # Refinery/rails should pull in the proper versions of these
 group :assets do
   gem 'sass-rails'
   gem 'coffee-rails'
-  gem 'uglifier'
 end
 
 # Load local gems according to Refinery developer preference.

data/Rakefile

@@ -13,7 +13,6 @@ if File.exists?(APP_RAKEFILE)
 end
 
 require "refinerycms-testing"
-Refinery::Testing::Railtie.load_tasks
 Refinery::Testing::Railtie.load_dummy_tasks(ENGINE_PATH)
 
 load File.expand_path('../tasks/rspec.rake', __FILE__)

data/app/assets/javascripts/refinery/blog/backend.js

@@ -1,4 +1,8 @@
+//= require jquery-ui/autocomplete
+
 $(document).ready(function(){
+  $('#more_options').hide()
+
   $('nav#actions.multilist > ul:not(.search_list) li a[href$="' + window.location.pathname + '"]')
     .parent().addClass('selected');
   if($('nav#actions.multilist > ul:not(.search_list) li.selected').length == 0) {
@@ -48,68 +52,23 @@ $(document).ready(function(){
     e.preventDefault();
   });
 
-
-  $(function() {
-    $('#page-tabs').tabs();
-    $('#copy_body_link').click(function(event) {
-      // Find the WYMEditor that maps to the custom_teaser field
-      var teaserTextArea = $('#post_custom_teaser')[0];
-      var teaserEditor = null;
-      $.each(WYMeditor.INSTANCES, function(index, editor) {
-        if (editor._element[0] == teaserTextArea) {
-          teaserEditor = editor;
-        }
-      });
-
-      if (teaserEditor) {
-        teaserEditor.html($('#post_body').attr('value'));
+  $('#page-tabs').tabs();
+  $('#copy_body_link').click(function(event) {
+    // Find the WYMEditor that maps to the custom_teaser field
+    var teaserTextArea = $('#post_custom_teaser')[0];
+    var teaserEditor = null;
+    $.each(WYMeditor.INSTANCES, function(index, editor) {
+      if (editor._element[0] == teaserTextArea) {
+        teaserEditor = editor;
       }
-
-      event.preventDefault();
     });
-  });
-
 
-  function split( val ) {
-    return val.split( /,\s*/ );
-  }
-  function extractLast( term ) {
-    return split( term ).pop();
-  }
+    if (teaserEditor) {
+      teaserEditor.html($('#post_body').val());
+    }
 
-  page_options.init(false, '', '')
+    event.preventDefault();
+  });
 
-  $('<%= dom_id %>').bind( "keydown", function( event ) {
-    if ( event.keyCode === $.ui.keyCode.TAB && $( this ).data( "autocomplete" ).menu.active ) {
-      event.preventDefault()
-    }
-  }).autocomplete({
-    source: function( request, response ) {
-      $.getJSON( "<%= url %>", {
-        term: extractLast( request.term )
-      }, response );
-    },
-    search: function() {
-      // custom minLength
-      var term = extractLast( this.value );
-      if ( term.length < 2 ) {
-        return false;
-      }
-    },
-    focus: function() {
-      // prevent value inserted on focus
-      return false;
-    },
-    select: function( event, ui ) {
-      var terms = split( this.value );
-      // remove the current input
-      terms.pop();
-      // add the selected item
-      terms.push( ui.item.value );
-      // add placeholder to get the comma-and-space at the end
-      terms.push( "" );
-      this.value = terms.join( ", " );
-      return false;
-    }
-  })
+  page_options.init(false, '', '');
 });

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

@@ -1,58 +1,3 @@
-.comments_icon {
-  background-image: image_url('refinery/blog/icons/comments.png');
-}
-.comment_icon {
-  background-image: image_url('refinery/blog/icons/comment.png');
-}
-.comment_cross_icon {
-  background-image: image_url('refinery/blog/icons/comment_cross.png');
-}
-.comment_tick_icon {
-  background-image: image_url('refinery/blog/icons/comment_tick.png');
-}
-.folder_icon {
-  background-image: image_url('refinery/blog/icons/folder.png');
-}
-.folder_add_icon {
-  background-image: image_url('refinery/blog/icons/folder_add.png');
-}
-.folder_edit_icon {
-  background-image: image_url('refinery/blog/icons/folder_edit.png');
-}
-.settings_icon {
-  background-image: image_url('refinery/blog/icons/cog.png');
-}
-.page_icon {
-  background-image: image_url('refinery/blog/icons/page.png');
-}
-.page_copy_icon {
-  background-image: image_url('refinery/blog/icons/page_copy.png');
-}
-.page_add_icon {
-  background-image: image_url('refinery/blog/icons/page_add.png');
-}
-ul.collapsible_menu li {
-  position: relative;
-  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;
@@ -71,3 +16,7 @@ a#copy_body_link {
   margin-top: 0;
   padding-left: 20px;
 }
+.form-actions a.confirm-delete, #content .form-actions a.confirm-delete {
+  position: relative;
+  right: auto;
+}

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

@@ -65,7 +65,7 @@
   &.flash_notice, &.flash_message {
     border: 1px solid #00A017;
     color: #00A017;
-    background: 7px 7px no-repeat image_url('refinery/blog/icons/accept.png') #E0F5E0;
+    background: 7px 7px no-repeat image_url('refinery/icons/accept.png') #E0F5E0;
   }
   &.flash_notice #flash_close, &.flash_error #flash_close {
     text-transform: lowercase;
@@ -88,7 +88,7 @@
   &.flash_error {
     border: 1px solid #A00027;
     color: #A00027;
-    background: 7px 7px no-repeat image_url('refinery/blog/icons/cancel.png') #FFB1B1;
+    background: 7px 7px no-repeat image_url('refinery/icons/cancel.png') #FFB1B1;
     a {
       &, &:hover {
         display: none;

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

@@ -4,8 +4,14 @@ module Refinery
       class CategoriesController < ::Refinery::AdminController
 
         crudify :'refinery/blog/category',
+                :include => [:translations],
                 :order => 'title ASC'
 
+        private
+
+        def category_params
+          params.require(:category).permit(:title)
+        end
       end
     end
   end

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

@@ -38,12 +38,12 @@ module Refinery
         def create
           # if the position field exists, set this object as last object, given the conditions of this class.
           if Refinery::Blog::Post.column_names.include?("position")
-            params[:post].merge!({
+            post_params.merge!({
               :position => ((Refinery::Blog::Post.maximum(:position, :conditions => "")||-1) + 1)
             })
           end
 
-          if (@post = Refinery::Blog::Post.create(params[:post])).valid?
+          if (@post = Refinery::Blog::Post.create(post_params)).valid?
             (request.xhr? ? flash.now : flash).notice = t(
               'refinery.crudify.created',
               :what => "'#{@post.title}'"
@@ -75,9 +75,31 @@ module Refinery
           end
         end
 
+        def delete_translation
+          find_post
+          @post.translations.find_by_locale(params[:locale_to_delete]).destroy
+          flash[:notice] = ::I18n.t('delete_translation_success', :scope => 'refinery.blog.admin.posts.post')
+          redirect_to refinery.blog_admin_posts_path
+        end
+
+      private
+
+        def post_params
+          params.require(:post).permit(permitted_post_params)
+        end
+        
+        def permitted_post_params
+          [
+            :title, :body, :custom_teaser, :tag_list,
+            :draft, :published_at, :custom_url, :user_id, :browser_title,
+            :meta_description, :source_url, :source_url_title, :category_ids => []
+          ]
+        end
+
       protected
+
         def find_post
-          @post = Refinery::Blog::Post.find_by_slug_or_id(params[:id])
+          @post = Refinery::Blog::Post.friendly.find(params[:id])
         end
 
         def find_all_categories

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

@@ -2,16 +2,42 @@ module Refinery
   module Blog
     class BlogController < ::ApplicationController
 
-      include ControllerHelper
-
       helper :'refinery/blog/posts'
-      before_filter :find_page, :find_all_blog_categories
+      before_action :find_page, :find_all_blog_categories
 
       protected
 
-        def find_page
-          @page = Refinery::Page.find_by_link_url(Refinery::Blog.page_url)
+      def find_all_blog_categories
+        @categories = Refinery::Blog::Category.translated
+      end
+
+      def find_blog_post
+        unless (@post = post_finder_scope.with_globalize.friendly.find(params[:id])).try(:live?)
+          if current_refinery_user && current_refinery_user.has_plugin?("refinerycms_blog")
+            @post = post_finder_scope.friendly.find(params[:id])
+          else
+            error_404
+          end
         end
+      end
+
+      def find_all_blog_posts
+        @posts = post_finder_scope.live.includes(
+          :comments, :categories, :translations
+        ).with_globalize.newest_first.page(params[:page])
+      end
+
+      def find_page
+        @page = Refinery::Page.find_by(:link_url => Refinery::Blog.page_url)
+      end
+
+      def find_tags
+        @tags = post_finder_scope.live.tag_counts_on(:tags)
+      end
+
+      def post_finder_scope
+        Refinery::Blog::Post
+      end
     end
   end
 end

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

@@ -2,9 +2,16 @@ module Refinery
   module Blog
     class CategoriesController < BlogController
 
-      def show
-        @category = Refinery::Blog::Category.find(params[:id])
-        @posts = @category.posts.live.includes(:comments, :categories).with_globalize.page(params[:page])
+      before_action :find_category, :find_all_blog_posts, only: :show
+
+      private
+
+      def find_category
+        @category = Refinery::Blog::Category.friendly.find(params[:id])
+      end
+
+      def post_finder_scope
+        @category.posts
       end
 
     end

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

@@ -10,9 +10,12 @@ module Refinery
 
       def index
         if request.format.rss?
-          @posts = Post.live.includes(:comments, :categories)
-          # limit rss feed for services (like feedburner) who have max size
-          @posts = Post.recent(params["max_results"]) if params["max_results"].present?
+          @posts = if params["max_results"].present?
+            # limit rss feed for services (like feedburner) who have max size
+            Post.recent(params["max_results"])
+          else
+            Post.newest_first.live.includes(:comments, :categories)
+          end
         end
         respond_with (@posts) do |format|
           format.html
@@ -34,10 +37,11 @@ module Refinery
       end
 
       def comment
-        if (@comment = @post.comments.create(params[:comment])).valid?
+        @comment = @post.comments.create(comment_params)
+        if @comment.valid?
           if Comment::Moderation.enabled? or @comment.ham?
             begin
-              CommentMailer.notification(@comment, request).deliver
+              CommentMailer.notification(@comment, request).deliver_now
             rescue
               logger.warn "There was an error delivering a blog comment notification.\n#{$!}\n"
             end
@@ -74,7 +78,13 @@ module Refinery
       def tagged
         @tag = ActsAsTaggableOn::Tag.find(params[:tag_id])
         @tag_name = @tag.name
-        @posts = Post.live.tagged_with(@tag_name).page(params[:page])
+        @posts = Post.live.newest_first.uniq.tagged_with(@tag_name).page(params[:page])
+      end
+
+    private
+
+      def comment_params
+        params.require(:comment).permit(:name, :email, :message)
       end
 
     protected