comfy_blog 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ced1c8ddc66db697dd6df8d669e2fc6a32841a667cd63b323cebe1d466f15b7d
-  data.tar.gz: 2b97e015ac0480fb61bd5779e18e5d77d31be90c9cb562a7b779348199b9a579
+  metadata.gz: 17f8e86969065a0b1d7dc9e810b01be4fca6adc991fd992a2aec729375440f62
+  data.tar.gz: f41cba1159e1a0cda6d4f7d6389e7b273718bcf163f07b7ed9491bb352b9391d
 SHA512:
-  metadata.gz: 5c113c5b36b83fed58049f41cb8f990c20e2b752bac862069740456ce46e7bbd58e2b4e58876ce57f0d39f80b14fde625de106563595f237fb30acb063a9329e
-  data.tar.gz: 7b9c2bbffe4f9e29f908b100522b8433309f112eb5bb0e8ad41e68a5e335ec760b65f06fd17e0ee96f5d1cb29479f82474274fd275489025a3406938c62be199
+  metadata.gz: 5d5d32c1f928835fbfd0c3c140a45e0b69df795a367240451c37bb27622eb00a04b7bb0bb8356c32d0fc2ebc1603180b2638eb8a6c7094a08d07e3c83820c690
+  data.tar.gz: 63d747aae5e8a869c91eee5e62f58f9682b10256ee5f1d330e415fac7d63c17d689f7d85e1dac368dd1d398649358f82d93f33b223f926045764bda00b8123e0

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.3
   Exclude:
     - bin/*
     - db/schema.rb

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 rvm:
-  - 2.2.9
-  - 2.3.6
-  - 2.4.3
-  - 2.5.0
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
+  - ruby-head
 gemfile:
   - test/gemfiles/5.2.gemfile
 branches:
@@ -12,8 +12,10 @@ branches:
 before_install:
   - gem update --system
   - gem update bundler
-before_script:
-  - rake db:migrate
 script:
+  - bundle exec rake db:migrate
   - bundle exec rake test
   - bundle exec rubocop
+matrix:
+  allow_failures:
+    - rvm: ruby-head

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "http://rubygems.org"
 
 gemspec

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "config/application"
 
 Rails.application.load_tasks

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Admin::Blog::PostsController < Comfy::Admin::Cms::BaseController
 
   before_action :build_post, only: %i[new create]
@@ -51,6 +53,12 @@ class Comfy::Admin::Blog::PostsController < Comfy::Admin::Cms::BaseController
   def form_fragments
     @post = @site.blog_posts.find_by(id: params[:id]) || @site.blog_posts.new
     @post.layout = @site.layouts.find_by(id: params[:layout_id])
+
+    render(
+      partial:  "comfy/admin/cms/fragments/form_fragments",
+      locals:   { record: @post, scope: :post },
+      layout:   false
+    )
   end
 
 protected

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Admin::Blog::Revisions::PostController < Comfy::Admin::Cms::Revisions::BaseController
 
   def show

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Blog::PostsController < Comfy::Cms::BaseController
 
   include Comfy::Paginate

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Comfy::Blog::Post < ActiveRecord::Base
 
   self.table_name = "comfy_blog_posts"

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

@@ -6,18 +6,17 @@
 - if (options = ::Comfy::Cms::Layout.options_for_select(@site)).present?
   = form.select :layout_id, options, {}, {data: {url: form_fragments_comfy_admin_blog_post_path(@site, @post.id.to_i)}, id: "fragments-toggle"}
 
-= render "comfy/admin/cms/fragments/form_fragments", form: form, record: @post
+#form-fragments-container
+  = render "comfy/admin/cms/fragments/form_fragments", record: @post, scope: :post
 
-= render 'comfy/admin/cms/categories/form', form: form
+= render "comfy/admin/cms/categories/form", form: form
 
 = form.text_field :published_at, value: @post.published_at.try(:to_s, :db), data: {'cms-datetime' => true}
 
-.row
-  .col-sm-10.ml-auto
-    = form.check_box :is_published
+= form.check_box :is_published
 
 = comfy_admin_partial "comfy/admin/blog/partials/post_form_after", form: form
 
 = form.form_actions do
-  = form.submit t(@post.new_record?? '.create' : '.update'), class: "btn btn-primary"
-  = link_to t('.cancel'), comfy_admin_blog_posts_path(@site, @blog), class: 'btn btn-link'
+  = submit_tag t(@post.new_record?? ".create" : ".update"), class: "btn btn-primary ml-sm-1", data: {disable_with: false}
+  = link_to t(".cancel"), comfy_admin_blog_posts_path(@site, @blog), class: "btn btn-link"

data/app/views/comfy/blog/posts/index.rss.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 xml.instruct! :xml, version: "1.0"
 xml.rss version: "2.0" do
   xml.channel do

data/comfy_blog.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.push File.expand_path("../lib", __FILE__)
 
 require "comfy_blog/version"
@@ -19,7 +21,7 @@ Gem::Specification.new do |s|
 
   s.require_paths = ["lib"]
 
-  s.required_ruby_version = ">= 2.2.2"
+  s.required_ruby_version = ">= 2.3.0"
 
-  s.add_dependency "comfortable_mexican_sofa", ">= 2.0.10"
+  s.add_dependency "comfortable_mexican_sofa", ">= 2.0.14"
 end

data/config.ru

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file is used by Rack-based servers to start the application.
 
 require ::File.expand_path("../config/environment", __FILE__)

data/config/application.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "boot"
 
 require "rails/all"

data/config/blog_routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ComfyBlog::Application.routes.draw do
   comfy_route :cms_admin
   comfy_route :blog_admin

data/config/boot.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Set up gems listed in the Gemfile.
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
 

data/config/environment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Load the rails application
 require File.expand_path("../application", __FILE__)
 

data/config/environments/development.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 defined?(ComfyBlog::Application) && ComfyBlog::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

data/config/environments/test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 defined?(ComfyBlog::Application) && ComfyBlog::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

data/config/initializers/comfy_blog.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ComfyBlog.configure do |config|
   # application layout to be used to index blog posts
   #   config.app_layout = 'comfy/blog/application'

data/lib/comfy_blog.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "comfy_blog/version"
 require_relative "comfy_blog/engine"
 require_relative "comfy_blog/configuration"

data/lib/comfy_blog/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ComfyBlog
   class Configuration
 

data/lib/comfy_blog/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rubygems"
 require "rails"
 require "comfortable_mexican_sofa"

data/lib/comfy_blog/routes/blog.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ActionDispatch::Routing::Mapper
 
   def comfy_route_blog(options = {})

data/lib/comfy_blog/routes/blog_admin.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ActionDispatch::Routing::Mapper
 
   def comfy_route_blog_admin(options = {})

data/lib/comfy_blog/routing.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require_relative "routes/blog_admin"
 require_relative "routes/blog"

data/lib/comfy_blog/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module ComfyBlog
 
-  VERSION = "2.0.5".freeze
+  VERSION = "2.0.6"
 
 end

data/lib/generators/comfy/blog/blog_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails/generators/active_record"
 
 module Comfy

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comfy_blog
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Oleg Khabarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-08 00:00:00.000000000 Z
+date: 2018-04-10 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.10
+        version: 2.0.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.0.14
 description: Simple Blog Engine for ComfortableMexicanSofa
 email:
 - oleg@khabarov.ca
@@ -48,7 +48,6 @@ files:
 - app/views/comfy/admin/blog/partials/_navigation.html.haml
 - app/views/comfy/admin/blog/posts/_form.html.haml
 - app/views/comfy/admin/blog/posts/edit.html.haml
-- app/views/comfy/admin/blog/posts/form_fragments.js.erb
 - app/views/comfy/admin/blog/posts/index.html.haml
 - app/views/comfy/admin/blog/posts/new.html.haml
 - app/views/comfy/blog/posts/index.html.haml
@@ -114,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/app/views/comfy/admin/blog/posts/form_fragments.js.erb

@@ -1 +0,0 @@
-$('#form-fragments').replaceWith('<%= escape_javascript(render("comfy/admin/cms/fragments/form_fragments", record: @post)) %>');