spina-blog 0.1.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 97d9f2510ec0ebe7437622bb570d9258389664d7
-  data.tar.gz: 4044f1fe24b7e271926c3e18e0ad6389be073bb7
+SHA256:
+  metadata.gz: 4ae6021c44e7cb0d5a6bef0b8f9a4d9a55b12306eba623f6e69948cc086832d0
+  data.tar.gz: f23b893c8653a368374a13f807c8dc9122c48e5e27bbc3b1f35d109082b98cce
 SHA512:
-  metadata.gz: eecbcff074f8af40bfbf8c0ca68e257ac59a4ab258163237a105970cb54a6588a03a441303e9aba4cd519e6699c787734dbf6892c2cdda707c467e582bfc86a3
-  data.tar.gz: c2da15eca9d8e4cee700ed4e4ac44149bc6c877a870b001d2ca2ef72a7b311f8dd77186defa6cac678935e391bf4554dcd990e6d4b24125e640ef1d25f330958
+  metadata.gz: f21a555d1d2bb6da5239a06a7e77f032b6bd15804c2e3d363001b9081d99cba11301f652a43080d0bd50a3f97e70a8bba21c1b3688b06bcde0be8026e424ef04
+  data.tar.gz: 2f1af801f0d7303b8d31f13aafebcdd58e20a515e8669d6234f185033a65542b840bb296bac297467cf109a9b674ae387d6bf0948820d37ef55883a81be9916d

data/README.md

@@ -1,7 +1,7 @@
-[![Build Status](https://travis-ci.org/initforthe/spina-blog.svg?branch=master)](https://travis-ci.org/initforthe/spina-blog)
+[![Build Status](https://travis-ci.org/SpinaCMS/spina-blog.svg?branch=master)](https://travis-ci.org/initforthe/spina-blog) [![Code Climate](https://codeclimate.com/github/initforthe/spina-blog/badges/gpa.svg)](https://codeclimate.com/github/initforthe/spina-blog) [![Test Coverage](https://codeclimate.com/github/initforthe/spina-blog/badges/coverage.svg)](https://codeclimate.com/github/initforthe/spina-blog/coverage)
 
 # Spina::Blog
-Short description and motivation.
+Simple blog engine for [Spina CMS](https://www.spinacms.com/). It supports posts and categories.
 
 ## Usage
 How to use my plugin.
@@ -18,13 +18,25 @@ And then execute:
 $ bundle
 ```
 
+And install:
+```bash
+$ rails g spina_blog:install
+```
+
 Or install it yourself as:
 ```bash
 $ gem install spina-blog
 ```
 
 ## Contributing
-Contribution directions go here.
+The version of Spina 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 Spina CMS.
+
+### Testing
+
+With rake spec
+```bash
+$ bundle exec rake spec
+```
 
 ## License
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/Rakefile

@@ -16,16 +16,6 @@ end
 
 require 'bundler/gem_tasks'
 
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-  t.warning = false
-end
-
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 

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

@@ -1,77 +1,80 @@
+# frozen_string_literal: true
+
 module Spina
   module Admin
-    class Blog::CategoriesController < AdminController
-      before_action :set_breadcrumb
-      before_action :set_locale
-
-      decorates_assigned :category
+    module Blog
+      # Spina::Admin::Blog::CategoriesController
+      class CategoriesController < AdminController
+        before_action :category, except: %i[new create index]
+        before_action :set_breadcrumb
+        before_action :set_locale
 
-      layout 'spina/admin/categories'
+        decorates_assigned :category
 
-      def index
-        @categories = Spina::Blog::Category.order(:name)
-      end
+        layout 'spina/admin/categories'
 
-      def new
-        @category = Spina::Blog::Category.new
-        add_breadcrumb I18n.t('spina.blog.categories.new')
-        render layout: 'spina/admin/admin'
-      end
+        def index
+          @categories = Spina::Blog::Category.order(:name)
+        end
 
-      def create
-        @category = Spina::Blog::Category.new category_params
-        if @category.save
-          redirect_to spina.edit_admin_blog_category_url(@category.id), notice: t('spina.blog.categories.saved')
-        else
+        def new
+          @category = Spina::Blog::Category.new
           add_breadcrumb I18n.t('spina.blog.categories.new')
-          render :new, layout: 'spina/admin/admin'
+          render layout: 'spina/admin/admin'
         end
-      end
 
-      def edit
-        @category = Spina::Blog::Category.find params[:id]
-        add_breadcrumb @category.name
-        render layout: 'spina/admin/admin'
-      end
+        def create
+          @category = Spina::Blog::Category.new category_params
+          if @category.save
+            redirect_to spina.edit_admin_blog_category_url(@category.id),
+                        notice: t('spina.blog.categories.saved')
+          else
+            add_breadcrumb I18n.t('spina.blog.categories.new')
+            render :new, layout: 'spina/admin/admin'
+          end
+        end
+
+        def edit
+          add_breadcrumb @category.name
+          render layout: 'spina/admin/admin'
+        end
 
-      def update
-        I18n.locale = params[:locale] || I18n.default_locale
-        @category = Spina::Blog::Category.find(params[:id])
-        respond_to do |format|
+        def update
           if @category.update_attributes(category_params)
             add_breadcrumb @category.name
-            @category.touch
-            I18n.locale = I18n.default_locale
-            format.html { redirect_to spina.edit_admin_blog_category_url(@category.id, params: {locale: @locale}), notice: t('spina.blog.categories.saved') }
-            format.js
+            redirect_to spina.edit_admin_blog_category_url(
+              @category.id, params: { locale: @locale }
+            ), notice: t('spina.blog.categories.saved')
           else
-            format.html do
-              render :edit, layout: 'spina/admin/admin'
-            end
+            render :edit, layout: 'spina/admin/admin'
           end
         end
-      end
 
-      def destroy
-        @category = Spina::Blog::Category.find(params[:id])
-        @category.destroy
-        redirect_to spina.admin_blog_categories_path
-      end
+        def destroy
+          @category.destroy
+          redirect_to spina.admin_blog_categories_path
+        end
 
-      private
+        private
 
-      def set_breadcrumb
-        add_breadcrumb I18n.t('spina.blog.categories.name'), spina.admin_blog_categories_path
-      end
+        def set_breadcrumb
+          add_breadcrumb I18n.t('spina.blog.categories.name'),
+                         spina.admin_blog_categories_path
+        end
 
-      def set_locale
-        @locale = params[:locale] || I18n.default_locale
-      end
+        def category
+          @category = Spina::Blog::Category.find params[:id]
+        end
 
-      def category_params
-        params.require(:category).permit(:name)
-      end
+        def set_locale
+          @locale = params[:locale] || I18n.default_locale
+          I18n.locale = @locale
+        end
 
+        def category_params
+          params.require(:category).permit(:name)
+        end
+      end
     end
   end
 end

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

@@ -1,98 +1,103 @@
+# frozen_string_literal: true
+
 module Spina
   module Admin
-    class Blog::PostsController < AdminController
-      before_action :set_breadcrumb
-      before_action :set_tabs, only: [:new, :create, :edit, :update]
-      before_action :set_locale
-
-      decorates_assigned :post
+    module Blog
+      # Spina::Admin::Blog::PostsController
+      class PostsController < AdminController
+        before_action :post, except: %i[index live draft future new create]
+        before_action :set_breadcrumb
+        before_action :set_tabs, only: %i[new create edit update]
+        before_action :set_locale
 
-      layout 'spina/admin/blog'
+        decorates_assigned :post
 
-      def index
-        @posts = Spina::Blog::Post.order(created_at: :desc)
-      end
+        layout 'spina/admin/blog'
 
-      def live
-        @posts = Spina::Blog::Post.live.order(created_at: :desc)
-        render :index
-      end
+        def index
+          @posts = Spina::Blog::Post.order(created_at: :desc)
+        end
 
-      def draft
-        @posts = Spina::Blog::Post.draft.order(created_at: :desc)
-        render :index
-      end
+        def live
+          @posts = Spina::Blog::Post.live.order(created_at: :desc)
+          render :index
+        end
 
-      def future
-        @posts = Spina::Blog::Post.future.order(created_at: :desc)
-        render :index
-      end
+        def draft
+          @posts = Spina::Blog::Post.draft.order(created_at: :desc)
+          render :index
+        end
 
-      def new
-        @post = Spina::Blog::Post.new
-        add_breadcrumb I18n.t('spina.blog.posts.new')
-        render layout: 'spina/admin/admin'
-      end
+        def future
+          @posts = Spina::Blog::Post.future.order(created_at: :desc)
+          render :index
+        end
 
-      def create
-        @post = Spina::Blog::Post.new post_params
-        if @post.save
-          redirect_to spina.edit_admin_blog_post_url(@post.id), notice: t('spina.blog.posts.saved')
-        else
+        def new
+          @post = Spina::Blog::Post.new
           add_breadcrumb I18n.t('spina.blog.posts.new')
-          render :new, layout: 'spina/admin/admin'
+          render layout: 'spina/admin/admin'
         end
-      end
 
-      def edit
-        @post = Spina::Blog::Post.find params[:id]
-        add_breadcrumb @post.title
-        render layout: 'spina/admin/admin'
-      end
+        def create
+          @post = Spina::Blog::Post.new post_params
+          if @post.save
+            redirect_to spina.edit_admin_blog_post_url(@post.id),
+                        notice: t('spina.blog.posts.saved')
+          else
+            add_breadcrumb I18n.t('spina.blog.posts.new')
+            render :new, layout: 'spina/admin/admin'
+          end
+        end
 
-      def update
-        I18n.locale = params[:locale] || I18n.default_locale
-        @post = Spina::Blog::Post.find(params[:id])
-        respond_to do |format|
+        def edit
+          add_breadcrumb @post.title
+          render layout: 'spina/admin/admin'
+        end
+
+        def update
           if @post.update_attributes(post_params)
             add_breadcrumb @post.title
-            @post.touch
-            I18n.locale = I18n.default_locale
-            format.html { redirect_to spina.edit_admin_blog_post_url(@post.id, params: {locale: @locale}), notice: t('spina.blog.posts.saved') }
-            format.js
+            redirect_to spina.edit_admin_blog_post_url(
+              @post.id, params: { locale: @locale }
+            ), notice: t('spina.blog.posts.saved')
           else
-            format.html do
-              render :edit, layout: 'spina/admin/admin'
-            end
+            render :edit, layout: 'spina/admin/admin'
           end
         end
-      end
 
-      def destroy
-        @post = Spina::Blog::Post.find(params[:id])
-        @post.destroy
-        redirect_to spina.admin_blog_posts_path
-      end
+        def destroy
+          @post.destroy
+          redirect_to spina.admin_blog_posts_path
+        end
 
-      private
+        private
 
-      def set_breadcrumb
-        add_breadcrumb I18n.t('spina.blog.posts.title'), spina.admin_blog_posts_path
-      end
+        def post
+          @post = Spina::Blog::Post.find(params[:id])
+        end
 
-      def set_tabs
-        @tabs = %w{post_content post_configuration}
-      end
+        def set_breadcrumb
+          add_breadcrumb I18n.t('spina.blog.posts.title'),
+                         spina.admin_blog_posts_path
+        end
 
-      def set_locale
-        @locale = params[:locale] || I18n.default_locale
-      end
+        def set_tabs
+          @tabs = %w[post_content post_configuration]
+        end
 
-      def post_params
-        params.require(:post).permit(:title, :slug, :excerpt,
-          :content, :photo_id, :draft, :published_at, :spina_user_id, :category_id)
-      end
+        def set_locale
+          @locale = params[:locale] || I18n.default_locale
+          I18n.locale = @locale
+        end
 
+        def post_params
+          params.require(:post).permit(
+            :title, :slug, :excerpt, :content, :image_id, :draft, :published_at,
+            :user_id, :category_id, :featured
+          )
+        end
+      end
     end
   end
 end

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

@@ -1,10 +1,32 @@
+# frozen_string_literal: true
+
 module Spina
-  class Blog::CategoriesController < ApplicationController
+  module Blog
+    # Spina::Blog::CategoriesController
+    class CategoriesController < ApplicationController
+      before_action :page
+      before_action :category
+      before_action :posts
 
-    def show
-      @category = Spina::Blog::Category.friendly.find params[:id]
-      @posts = @category.posts.available.live.order(published_at: :desc).page(params[:page])
-    end
+      def show; end
+
+      private
 
+      def category
+        @category = Spina::Blog::Category.friendly.find params[:id]
+      end
+
+      def posts
+        @posts = @category.posts.available.live.order(published_at: :desc)
+                          .page(params[:page])
+      end
+
+      def page
+        @page = Spina::Page.find_or_create_by name: 'blog' do |page|
+          page.link_url = '/blog'
+          page.deletable = false
+        end
+      end
+    end
   end
 end

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

@@ -1,50 +1,69 @@
+# frozen_string_literal: true
+
 module Spina
-  class Blog::PostsController < ::Spina::ApplicationController
+  module Blog
+    # Spina::Blog::PostsController
+    class PostsController < ::Spina::ApplicationController
+      before_action :page
+      before_action :posts, only: [:index]
+
+      def index
+        # if current_spina_user and current_spina_user.admin?
+        #   @posts = @posts.unscope(where: :draft)
+        # end
 
-    before_action :set_page
+        respond_to do |format|
+          format.atom
+          format.html { render layout: theme_layout }
+        end
+      end
 
-    def index
-      @posts = Spina::Blog::Post.available.live.order(published_at: :desc).page(params[:page])
+      def show
+        @post = Spina::Blog::Post.friendly.find params[:id]
+        render layout: theme_layout
+      rescue ActiveRecord::RecordNotFound
+        try_redirect
+      end
 
-      # if current_spina_user and current_spina_user.admin?
-      #   @posts = @posts.unscope(where: :draft)
-      # end
+      def archive
+        @posts = Spina::Blog::Post.live
+                                  .where(published_at: start_date..end_date)
+                                  .order(published_at: :desc)
+                                  .page(params[:page])
 
-      respond_to do |format|
-        format.atom
-        format.html { render layout: "#{current_theme.name.parameterize.underscore}/application" }
+        render layout: theme_layout
       end
-    end
 
-    def show
-      @post = Spina::Blog::Post.friendly.find params[:id]
+      private
 
-      render layout: "#{current_theme.name.parameterize.underscore}/application"
-    end
+      def start_date
+        Time.zone.local(params[:year].to_i, (params[:month] || 1).to_i)
+      end
 
-    def archive
-      if params[:year] and params[:month]
-        start = Time.new params[:year].to_i, params[:month].to_i
-        finish = start.end_of_month
-      elsif params[:year]
-        start = Time.new params[:year].to_i
-        finish = start.end_of_year
+      def end_date
+        start_date.end_of_year
       end
 
-      @posts = Spina::Blog::Post.live
-        .where(published_at: start..finish)
-        .order(published_at: :desc)
-        .page(params[:page])
+      def theme_layout
+        "#{current_theme.name.parameterize.underscore}/application"
+      end
 
-      render layout: "#{current_theme.name.parameterize.underscore}/application"
-    end
+      def page
+        @page = Spina::Page.find_or_create_by name: 'blog' do |page|
+          page.title = 'Blog'
+          page.link_url = '/blog'
+          page.deletable = false
+        end
+      end
 
-    private
+      def posts
+        @posts = Spina::Blog::Post.available.live.order(published_at: :desc)
+                                  .page(params[:page])
+      end
 
-    def set_page
-      @page = Spina::Page.find_or_create_by link_url: '/blog' do |page|
-        page.name = 'Blog'
-        page.deletable = false
+      def try_redirect
+        rule = RewriteRule.find_by!(old_path: "/blog/posts/#{params[:id]}")
+        redirect_to rule.new_path, status: :moved_permanently
       end
     end
   end