comfy_blog 2.0.2 → 2.0.3

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

@@ -4,9 +4,9 @@
 = form.text_field :slug, data: {slug: true}
 
 - if (options = ::Comfy::Cms::Layout.options_for_select(@site)).present?
-  = form.select :layout_id, options, {}, {data: {url: form_fragments_comfy_admin_cms_site_page_path(@site, @post.id.to_i)}, id: "fragments-toggle"}
+  = 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/pages/form_fragments", form: form, record: @post
+= render "comfy/admin/cms/fragments/form_fragments", form: form, record: @post
 
 = render 'comfy/admin/cms/categories/form', form: form
 

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

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

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

@@ -1,8 +1,8 @@
-xml.instruct! :xml, version: '1.0'
-xml.rss version: '2.0' do
+xml.instruct! :xml, version: "1.0"
+xml.rss version: "2.0" do
   xml.channel do
-    xml.title 'My Blog'
-    xml.description 'My Blog Description'
+    xml.title "My Blog"
+    xml.description "My Blog Description"
     xml.link comfy_blog_posts_url(@cms_site.path)
 
     @blog_posts.each do |post|

data/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+load Gem.bin_path('bundler', 'bundle')

data/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../config/application', __dir__)
+require_relative '../config/boot'
+require 'rails/commands'

data/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/bin/setup

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = File.expand_path('..', __dir__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?('config/database.yml')
+  #   cp 'config/database.yml.sample', 'config/database.yml'
+  # end
+
+  puts "\n== Preparing database =="
+  system! 'bin/rails db:setup'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end

data/bin/update

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+require 'fileutils'
+include FileUtils
+
+# path to your application root.
+APP_ROOT = File.expand_path('..', __dir__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+chdir APP_ROOT do
+  # This script is a way to update your development environment automatically.
+  # Add necessary update steps to this file.
+
+  puts '== Installing dependencies =='
+  system! 'gem install bundler --conservative'
+  system('bundle check') || system!('bundle install')
+
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
+
+  puts "\n== Updating database =="
+  system! 'bin/rails db:migrate'
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! 'bin/rails log:clear tmp:clear'
+
+  puts "\n== Restarting application server =="
+  system! 'bin/rails restart'
+end

data/bin/yarn

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+VENDOR_PATH = File.expand_path('..', __dir__)
+Dir.chdir(VENDOR_PATH) do
+  begin
+    exec "yarnpkg #{ARGV.join(' ')}"
+  rescue Errno::ENOENT
+    $stderr.puts "Yarn executable was not detected in the system."
+    $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
+    exit 1
+  end
+end

data/comfy_blog.gemspec

@@ -1,23 +1,23 @@
-$:.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.push File.expand_path("../lib", __FILE__)
 
-require 'comfy_blog/version'
+require "comfy_blog/version"
 
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
-  s.name        = 'comfy_blog'
+  s.name        = "comfy_blog"
   s.version     = ComfyBlog::VERSION
   s.authors     = ["Oleg Khabarov"]
   s.email       = ["oleg@khabarov.ca"]
   s.homepage    = "http://github.com/comfy/comfy-blog"
   s.summary     = "Simple Blog Engine for ComfortableMexicanSofa"
   s.description = "Simple Blog Engine for ComfortableMexicanSofa"
-  s.license     = 'MIT'
+  s.license     = "MIT"
 
   s.files         = `git ls-files`.split("\n")
   s.platform      = Gem::Platform::RUBY
-  s.require_paths = ['lib']
+  s.require_paths = ["lib"]
 
   s.required_ruby_version = ">= 2.2.2"
 
-  s.add_dependency 'comfortable_mexican_sofa', '>= 2.0.2'
+  s.add_dependency "comfortable_mexican_sofa", ">= 2.0.3"
 end

data/config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
-run ComfyBlog::Application
+require ::File.expand_path("../config/environment", __FILE__)
+run ComfyBlog::Application

data/config/application.rb

@@ -1,6 +1,6 @@
-require_relative 'boot'
+require_relative "boot"
 
-require 'rails/all'
+require "rails/all"
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
@@ -9,7 +9,7 @@ Bundler.require(*Rails.groups)
 module ComfyBlog
   class Application < Rails::Application
 
-    require_relative '../lib/comfy_blog'
+    require_relative "../lib/comfy_blog"
 
     config.load_defaults 5.2
 
@@ -29,8 +29,9 @@ module ComfyBlog
     config.railties_order = [ActiveStorage::Engine, :main_app, :all]
 
     # Making sure we don't load our dev routes as part of the engine
-    config.paths['config/routes.rb'] << 'config/blog_routes.rb'
+    config.paths["config/routes.rb"] << "config/blog_routes.rb"
 
     config.i18n.enforce_available_locales = true
+
   end
 end

data/config/boot.rb

@@ -1,5 +1,5 @@
 # Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
-File.exists?(ENV['BUNDLE_GEMFILE'])
+require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
+File.exist?(ENV["BUNDLE_GEMFILE"])

data/config/environment.rb

@@ -1,5 +1,5 @@
 # Load the rails application
-require File.expand_path('../application', __FILE__)
+require File.expand_path("../application", __FILE__)
 
 # Initialize the rails application
 ComfyBlog::Application.initialize!

data/config/environments/development.rb

@@ -14,12 +14,12 @@ defined?(ComfyBlog::Application) && ComfyBlog::Application.configure do
 
   # Enable/disable caching. By default caching is disabled.
   # Run rails dev:cache to toggle caching.
-  if Rails.root.join('tmp/caching-dev.txt').exist?
+  if Rails.root.join("tmp/caching-dev.txt").exist?
     config.action_controller.perform_caching = true
 
     config.cache_store = :memory_store
     config.public_file_server.headers = {
-      'Cache-Control' => "public, max-age=#{2.days.to_i}"
+      "Cache-Control" => "public, max-age=#{2.days.to_i}"
     }
   else
     config.action_controller.perform_caching = false

data/config/environments/test.rb

@@ -15,7 +15,7 @@ defined?(ComfyBlog::Application) && ComfyBlog::Application.configure do
   # Configure public file server for tests with Cache-Control for performance.
   config.public_file_server.enabled = true
   config.public_file_server.headers = {
-    'Cache-Control' => "public, max-age=#{1.hour.to_i}"
+    "Cache-Control" => "public, max-age=#{1.hour.to_i}"
   }
 
   # Show full error reports and disable caching.

data/config/initializers/comfy_blog.rb

@@ -1,9 +1,7 @@
 ComfyBlog.configure do |config|
-
   # application layout to be used to index blog posts
   #   config.app_layout = 'comfy/blog/application'
 
   # Number of posts per page. Default is 10
   #   config.posts_per_page = 10
-
 end

data/lib/comfy_blog.rb

@@ -1,12 +1,12 @@
-require_relative 'comfy_blog/version'
-require_relative 'comfy_blog/engine'
-require_relative 'comfy_blog/configuration'
-require_relative 'comfy_blog/routing'
+require_relative "comfy_blog/version"
+require_relative "comfy_blog/engine"
+require_relative "comfy_blog/configuration"
+require_relative "comfy_blog/routing"
 
 module ComfyBlog
-  
+
   class << self
-    
+
     # Modify Blog configuration
     # Example:
     #   ComfyBlog.configure do |config|
@@ -15,13 +15,13 @@ module ComfyBlog
     def configure
       yield configuration
     end
-    
+
     # Accessor for ComfyBlog::Configuration
     def configuration
       @configuration ||= ComfyBlog::Configuration.new
     end
-    alias :config :configuration
-    
+    alias config configuration
+
   end
-  
+
 end

data/lib/comfy_blog/configuration.rb

@@ -14,7 +14,7 @@ module ComfyBlog
     # Configuration defaults
     def initialize
       @posts_per_page   = 10
-      @app_layout       = 'comfy/blog/application'
+      @app_layout       = "comfy/blog/application"
       @public_blog_path = nil
     end
 

data/lib/comfy_blog/engine.rb

@@ -1,25 +1,30 @@
-require 'rubygems'
-require 'rails'
-require 'comfortable_mexican_sofa'
-require 'comfy_blog'
+require "rubygems"
+require "rails"
+require "comfortable_mexican_sofa"
+require "comfy_blog"
 
 module ComfyBlog
 
   module CmsSiteExtensions
+
     extend ActiveSupport::Concern
     included do
       has_many :blog_posts,
-        class_name: 'Blog::Post',
+        class_name: "Blog::Post",
         dependent:  :destroy
     end
+
   end
 
   class Engine < ::Rails::Engine
-    initializer 'comfy_blog.configuration' do |app|
-      ComfortableMexicanSofa::ViewHooks.add(:navigation, '/comfy/admin/blog/partials/navigation')
+
+    initializer "comfy_blog.configuration" do
+      ComfortableMexicanSofa::ViewHooks.add(:navigation, "/comfy/admin/blog/partials/navigation")
       config.to_prepare do
         Comfy::Cms::Site.send :include, ComfyBlog::CmsSiteExtensions
       end
     end
+
   end
+
 end

data/lib/comfy_blog/routes/blog.rb

@@ -1,19 +1,19 @@
 class ActionDispatch::Routing::Mapper
 
   def comfy_route_blog(options = {})
-
-    ComfyBlog.configuration.public_blog_path = options[:path] || 'blog'
-    path = ['(:cms_path)', ComfyBlog.configuration.public_blog_path].join('/')
+    ComfyBlog.configuration.public_blog_path = options[:path] || "blog"
+    path = ["(:cms_path)", ComfyBlog.configuration.public_blog_path].join("/")
 
     scope module: :comfy, as: :comfy do
       namespace :blog, path: path do
-        with_options constraints: {year: /\d{4}/, month: /\d{1,2}/} do |o|
-          o.get ':year',              to: 'posts#index',  as: :posts_of_year
-          o.get ':year/:month',       to: 'posts#index',  as: :posts_of_month
-          o.get ':year/:month/:slug', to: 'posts#show',   as: :post
-          o.get '/',                  to: 'posts#index',  as: :posts
+        with_options constraints: { year: %r{\d{4}}, month: %r{\d{1,2}} } do |o|
+          o.get ":year",              to: "posts#index",  as: :posts_of_year
+          o.get ":year/:month",       to: "posts#index",  as: :posts_of_month
+          o.get ":year/:month/:slug", to: "posts#show",   as: :post
+          o.get "/",                  to: "posts#index",  as: :posts
         end
       end
     end
   end
+
 end

data/lib/comfy_blog/routes/blog_admin.rb

@@ -1,14 +1,15 @@
 class ActionDispatch::Routing::Mapper
 
   def comfy_route_blog_admin(options = {})
-    options[:path] ||= 'admin'
-    path = [options[:path], 'sites', ':site_id'].join('/')
+    options[:path] ||= "admin"
+    path = [options[:path], "sites", ":site_id"].join("/")
 
     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" do
-            resources :revisions, only: [:index, :show], controller: "revisions/post" do
+            get :form_fragments, on: :member
+            resources :revisions, only: %i[index show], controller: "revisions/post" do
               patch :revert, on: :member
             end
           end
@@ -16,4 +17,5 @@ class ActionDispatch::Routing::Mapper
       end
     end
   end
+
 end

data/lib/comfy_blog/routing.rb

@@ -1,2 +1,2 @@
-require_relative 'routes/blog_admin'
-require_relative 'routes/blog'
+require_relative "routes/blog_admin"
+require_relative "routes/blog"

data/lib/comfy_blog/version.rb

@@ -1,3 +1,5 @@
 module ComfyBlog
-  VERSION = "2.0.2"
+
+  VERSION = "2.0.3".freeze
+
 end

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

@@ -1,4 +1,4 @@
-require 'rails/generators/active_record'
+require "rails/generators/active_record"
 
 module Comfy
   module Generators
@@ -7,27 +7,27 @@ module Comfy
       include Rails::Generators::Migration
       include Thor::Actions
 
-      source_root File.expand_path('../../../../..', __FILE__)
+      source_root File.expand_path("../../../../..", __FILE__)
 
       def self.next_migration_number(dirname)
         ActiveRecord::Generators::Base.next_migration_number(dirname)
       end
 
       def generate_migration
-        destination   = File.expand_path('db/migrate/01_create_blog.rb', self.destination_root)
+        destination   = File.expand_path("db/migrate/01_create_blog.rb", destination_root)
         migration_dir = File.dirname(destination)
-        destination   = self.class.migration_exists?(migration_dir, 'create_blog')
+        destination   = self.class.migration_exists?(migration_dir, "create_blog")
 
         if destination
           puts "\e[0m\e[31mFound existing create_blog migration. Remove it if you want to regenerate.\e[0m"
         else
-          migration_template 'db/migrate/01_create_blog.rb', 'db/migrate/create_blog.rb'
+          migration_template "db/migrate/01_create_blog.rb", "db/migrate/create_blog.rb"
         end
       end
 
       def generate_initialization
-        copy_file 'config/initializers/comfy_blog.rb',
-          'config/initializers/comfy_blog.rb'
+        copy_file "config/initializers/comfy_blog.rb",
+          "config/initializers/comfy_blog.rb"
       end
 
       def generate_routing
@@ -39,11 +39,11 @@ module Comfy
       end
 
       def generate_views
-        directory 'app/views/comfy/blog', 'app/views/comfy/blog'
+        directory "app/views/comfy/blog", "app/views/comfy/blog"
       end
 
       def show_readme
-        readme 'lib/generators/comfy/blog/README'
+        readme "lib/generators/comfy/blog/README"
       end
 
     end