comfy_blog 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61326ff45ee457862bc9f4f00de3c9c825fd8e71
-  data.tar.gz: 5cf76269962ea8a37ad65a06a1ba903735f437d3
+  metadata.gz: ed87b17424062fedd960bd78ef9b0c6bd9b8923d
+  data.tar.gz: a652f008197705629d93c583c1d36cb79a9b9712
 SHA512:
-  metadata.gz: 7524fe62eb167f1a074bf50f2f0620c56a74ce45fdf7a3d3f08e30c848eec0fa1e1ab6aeb9b73f9a33599436bf575fc37a0b9b75708902da1592fdd1816372af
-  data.tar.gz: 980e2668fa3323a5382710b2821a608d75a556b72e5867f09757e5de8513c699c65a9ccefb80fd3d6416f08dfdce4df85abbef885da7c4a1baadd4a7d63eae96
+  metadata.gz: d1489b02510daba80054da073d9c0ef0ee001146e6f00fdd0eeca4594cf69b74699d36843ff07dd29532b3dbaff5cd127b1a758ed36cead694851d8d6aa67cc7
+  data.tar.gz: '0586168fa718e0f0123e98568a8f20f9c71a17ad3b98debda40ba06854d645a71ed85332d6f03c93721d25f6ceab735046d639539b29b7ee0d578e5bc0b530e7'

data/app/controllers/comfy/admin/blog/revisions/post_controller.rb

@@ -0,0 +1,22 @@
+class Comfy::Admin::Blog::Revisions::PostController < Comfy::Admin::Cms::Revisions::BaseController
+
+  def show
+    @current_content    = @record.fragments.inject({}){|c, b| c[b.identifier] = b.content; c }
+    @versioned_content  = @record.fragments.inject({}){|c, b| c[b.identifier] = @revision.data['fragments_attributes'].detect{|r| r[:identifier] == b.identifier}.try(:[], :content); c }
+
+    render "comfy/admin/cms/revisions/show"
+  end
+
+private
+
+  def load_record
+    @record = @site.blog_posts.find(params[:blog_post_id])
+  rescue ActiveRecord::RecordNotFound
+    flash[:danger] = I18n.t('comfy.admin.cms.revisions.record_not_found')
+    redirect_to comfy_admin_blog_posts_path(@site)
+  end
+
+  def record_path
+    edit_comfy_admin_blog_post_path(@site, @record)
+  end
+end

data/app/models/comfy/blog/post.rb

@@ -5,6 +5,8 @@ class Comfy::Blog::Post < ActiveRecord::Base
   include Comfy::Cms::WithFragments
   include Comfy::Cms::WithCategories
 
+  cms_has_revisions_for :fragments_attributes
+
   # -- Relationships -----------------------------------------------------------
   belongs_to :site,
     class_name: 'Comfy::Cms::Site'

data/app/views/comfy/admin/blog/posts/edit.html.haml

@@ -1,3 +1,7 @@
+- content_for :right_column do
+  - link = comfy_admin_blog_post_revisions_path(@site, @post)
+  = render "comfy/admin/cms/revisions/sidebar", record: @post, link: link
+
 .page-header
   %h2= t('.title')
 

data/comfy_blog.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.2.2"
 
-  s.add_dependency 'comfortable_mexican_sofa', '>= 2.0.0'
+  s.add_dependency 'comfortable_mexican_sofa', '>= 2.0.2'
 end

data/config/environments/development.rb

@@ -57,4 +57,6 @@ defined?(ComfyBlog::Application) && ComfyBlog::Application.configure do
   config.file_watcher = ActiveSupport::EventedFileUpdateChecker
 
   config.active_job.queue_adapter = :inline
+
+  config.action_view.raise_on_missing_translations = true
 end

data/config/environments/test.rb

@@ -44,4 +44,6 @@ defined?(ComfyBlog::Application) && ComfyBlog::Application.configure do
   # config.action_view.raise_on_missing_translations = true
 
   config.active_job.queue_adapter = :inline
+
+  config.action_view.raise_on_missing_translations = true
 end

data/lib/comfy_blog/routes/blog_admin.rb

@@ -7,7 +7,11 @@ class ActionDispatch::Routing::Mapper
     scope module: :comfy, as: :comfy do
       scope module: :admin do
         namespace :blog, as: :admin, path: path, except: [:show] do
-          resources :posts, as: :blog_posts, path: "blog-posts"
+          resources :posts, as: :blog_posts, path: "blog-posts" do
+            resources :revisions, only: [:index, :show], controller: "revisions/post" do
+              patch :revert, on: :member
+            end
+          end
         end
       end
     end

data/lib/comfy_blog/version.rb

@@ -1,3 +1,3 @@
 module ComfyBlog
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/test/controllers/comfy/admin/blog/revisions/post_controller_test.rb

@@ -0,0 +1,67 @@
+require_relative '../../../../../test_helper'
+
+class Comfy::Admin::Cms::Revisions::PageControllerTest < ActionDispatch::IntegrationTest
+
+  setup do
+    @site     = comfy_cms_sites(:default)
+    @post     = comfy_blog_posts(:default)
+    @revision = comfy_cms_revisions(:post)
+  end
+
+  def test_get_index
+    r :get, comfy_admin_blog_post_revisions_path(@site, @post)
+    assert_response :redirect
+    assert_redirected_to action: :show, id: @revision
+  end
+
+  def test_get_index_with_no_revisions
+    Comfy::Cms::Revision.delete_all
+    r :get, comfy_admin_blog_post_revisions_path(@site, @post)
+    assert_response :redirect
+    assert_redirected_to edit_comfy_admin_blog_post_path(@site, @post)
+  end
+
+  def test_get_show
+    r :get, comfy_admin_blog_post_revision_path(@site, @post, @revision)
+    assert_response :success
+    assert assigns(:record)
+    assert assigns(:revision)
+    assert assigns(:record).is_a?(Comfy::Blog::Post)
+    assert_template :show
+  end
+
+  def test_get_show_for_invalid_record
+    r :get, comfy_admin_blog_post_revision_path(@site, "invalid", @revision)
+    assert_response :redirect
+    assert_redirected_to comfy_admin_blog_posts_path(@site)
+    assert_equal 'Record Not Found', flash[:danger]
+  end
+
+
+  def test_get_show_failure
+    r :get, comfy_admin_blog_post_revision_path(@site, @post, "invalid")
+    assert_response :redirect
+    assert assigns(:record)
+    assert_redirected_to edit_comfy_admin_blog_post_path(@site, assigns(:record))
+    assert_equal 'Revision Not Found', flash[:danger]
+  end
+
+  def test_revert
+    assert_difference -> {@post.revisions.count} do
+      r :patch, revert_comfy_admin_blog_post_revision_path(@site, @post, @revision)
+      assert_response :redirect
+      assert_redirected_to edit_comfy_admin_blog_post_path(@site, @post)
+      assert_equal 'Content Reverted', flash[:success]
+
+      @post.reload
+
+      assert_equal [{
+        identifier: "content",
+        tag:        "text",
+        content:    "old content",
+        datetime:   nil,
+        boolean:    false
+      }], @post.fragments_attributes
+    end
+  end
+end

data/test/fixtures/comfy/cms/revisions.yml

@@ -0,0 +1,7 @@
+post:
+  record: default (Comfy::Blog::Post)
+  data: <%= {
+    "fragments_attributes" => [
+      { "identifier" => "content",
+        "content"    => "old content" }
+    ]}.to_yaml.inspect %>

data/test/gemfiles/Gemfile.rails.5.2

@@ -1,16 +1,6 @@
 source 'http://rubygems.org'
 
-gem "rails",
-  github: "rails"
-gem "arel",
-  github: "rails/arel"
-
-gem "bootstrap_form",
-  github: "bootstrap-ruby/rails-bootstrap-forms",
-  branch: "bootstrap-v4"
-
-gem "comfortable_mexican_sofa",
-  github: "comfy/comfortable-mexican-sofa"
+gemspec path: "../../"
 
 gem 'kaminari', '>= 0.14.0'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comfy_blog
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Oleg Khabarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-01 00:00:00.000000000 Z
+date: 2017-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: comfortable_mexican_sofa
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.2
 description: Simple Blog Engine for ComfortableMexicanSofa
 email:
 - oleg@khabarov.ca
@@ -38,6 +38,7 @@ files:
 - README.md
 - Rakefile
 - app/controllers/comfy/admin/blog/posts_controller.rb
+- app/controllers/comfy/admin/blog/revisions/post_controller.rb
 - app/controllers/comfy/blog/posts_controller.rb
 - app/models/comfy/blog/post.rb
 - app/views/comfy/admin/blog/partials/_navigation.html.haml
@@ -90,9 +91,11 @@ files:
 - lib/generators/comfy/blog/blog_generator.rb
 - script/rails
 - test/controllers/comfy/admin/blog/posts_controller_test.rb
+- test/controllers/comfy/admin/blog/revisions/post_controller_test.rb
 - test/controllers/comfy/blog/posts_controller_test.rb
 - test/fixtures/comfy/blog/posts.yml
 - test/fixtures/comfy/cms/layouts.yml
+- test/fixtures/comfy/cms/revisions.yml
 - test/fixtures/comfy/cms/sites.yml
 - test/fixtures/generators/blog/routes.rb
 - test/gemfiles/Gemfile.rails.5.2