occams 1.0.0 → 1.0.2

data/app/views/occams/admin/cms/files/_file.html.haml

@@ -1,7 +1,7 @@
 %li{data: {id: file.id}}
   :ruby
     file_tag  = cms_file_link_tag(file)
-    thumb_url = url_for(file.attachment.variant(Occams::Cms::File::VARIANT_SIZE[:thumb])) if file.attachment.variable?
+    thumb_url = url_for(file.attachment.representation(resize_to_limit: [200, nil])) if file.attachment.variable?
   .row
     .col-md-5.item
       .item-controls.d-none.d-lg-block

data/config/application.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-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.
@@ -10,8 +10,7 @@ Bundler.require(*Rails.groups)
 
 module Occams
   class Application < Rails::Application
-
-    require_relative "../lib/occams"
+    require_relative '../lib/occams'
 
     config.load_defaults 5.2
 
@@ -31,9 +30,8 @@ module Occams
     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/cms_routes.rb"
+    config.paths['config/routes.rb'] << 'config/cms_routes.rb'
 
     config.i18n.enforce_available_locales = true
-
   end
 end

data/config/boot.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 # Set up gems listed in the Gemfile.
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
-require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
-File.exist?(ENV["BUNDLE_GEMFILE"])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+
+File.exist? ENV.fetch('BUNDLE_GEMFILE')

data/config/environment.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Load the rails application
-require File.expand_path("application", __dir__)
+require File.expand_path('application', __dir__)
 
 # Initialize the rails application
 Occams::Application.initialize!

data/config/environments/development.rb

@@ -16,12 +16,12 @@ defined?(Occams::Application) && Occams::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

@@ -17,7 +17,7 @@ defined?(Occams::Application) && Occams::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/occams.rb

@@ -90,8 +90,8 @@ end
 
 # Default credentials for Occams::AccessControl::AdminAuthentication
 # YOU REALLY WANT TO CHANGE THIS BEFORE PUTTING YOUR SITE LIVE
-Occams::AccessControl::AdminAuthentication.username = "user"
-Occams::AccessControl::AdminAuthentication.password = "pass"
+Occams::AccessControl::AdminAuthentication.username = 'user'
+Occams::AccessControl::AdminAuthentication.password = 'pass'
 
 # Uncomment this module and `config.admin_auth` above to use custom admin authentication
 # module OccamsAdminAuthentication

data/config.ru

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

data/lib/generators/occams/cms/assets_generator.rb

@@ -4,14 +4,12 @@ module Occams
   module Generators
     module Cms
       class AssetsGenerator < Rails::Generators::Base
-
-        source_root File.expand_path(File.join(File.dirname(__FILE__), "../../../../app/assets"))
+        source_root File.expand_path(File.join(File.dirname(__FILE__), '../../../../app/assets'))
 
         def generate_assets
-          directory "javascripts/occams/admin/cms", "app/assets/javascripts/occams/admin/cms"
-          directory "stylesheets/occams/admin/cms", "app/assets/stylesheets/occams/admin/cms"
+          directory 'javascripts/occams/admin/cms', 'app/assets/javascripts/occams/admin/cms'
+          directory 'stylesheets/occams/admin/cms', 'app/assets/stylesheets/occams/admin/cms'
         end
-
       end
     end
   end

data/lib/generators/occams/cms/cms_generator.rb

@@ -1,31 +1,30 @@
 # frozen_string_literal: true
 
-require "rails/generators/active_record"
+require 'rails/generators/active_record'
 
 module Occams
   module Generators
     class CmsGenerator < Rails::Generators::Base
-
       include Rails::Generators::Migration
       include Thor::Actions
 
-      source_root File.expand_path("../../../..", __dir__)
+      source_root File.expand_path('../../../..', __dir__)
 
       def generate_migration
-        destination   = File.expand_path("db/migrate/01_create_cms.rb", destination_root)
+        destination   = File.expand_path('db/migrate/01_create_cms.rb', destination_root)
         migration_dir = File.dirname(destination)
-        destination   = self.class.migration_exists?(migration_dir, "create_cms")
+        destination   = self.class.migration_exists?(migration_dir, 'create_cms')
 
         if destination
           puts "\e[0m\e[31mFound existing cms_create.rb migration. Remove it if you want to regenerate.\e[0m"
         else
-          migration_template "db/migrate/01_create_cms.rb", "db/migrate/create_cms.rb"
+          migration_template 'db/migrate/01_create_cms.rb', 'db/migrate/create_cms.rb'
         end
       end
 
       def generate_initializer
-        copy_file "config/initializers/occams.rb",
-          "config/initializers/occams.rb"
+        copy_file 'config/initializers/occams.rb',
+                  'config/initializers/occams.rb'
       end
 
       def generate_railties_order
@@ -46,24 +45,23 @@ module Occams
       end
 
       def generate_cms_seeds
-        directory "db/cms_seeds", "db/cms_seeds"
+        directory 'db/cms_seeds', 'db/cms_seeds'
       end
 
       def generate_assets
-        copy_file "app/assets/javascripts/occams/admin/cms/custom.js",
-          "app/assets/javascripts/occams/admin/cms/custom.js"
-        copy_file "app/assets/stylesheets/occams/admin/cms/custom.sass",
-          "app/assets/stylesheets/occams/admin/cms/custom.sass"
+        copy_file 'app/assets/javascripts/occams/admin/cms/custom.js',
+                  'app/assets/javascripts/occams/admin/cms/custom.js'
+        copy_file 'app/assets/stylesheets/occams/admin/cms/custom.sass',
+                  'app/assets/stylesheets/occams/admin/cms/custom.sass'
       end
 
       def show_readme
-        readme "lib/generators/occams/cms/README"
+        readme 'lib/generators/occams/cms/README'
       end
 
       def self.next_migration_number(dirname)
         ActiveRecord::Generators::Base.next_migration_number(dirname)
       end
-
     end
   end
 end

data/lib/generators/occams/cms/controllers_generator.rb

@@ -4,13 +4,11 @@ module Occams
   module Generators
     module Cms
       class ControllersGenerator < Rails::Generators::Base
-
-        source_root File.expand_path(File.join(File.dirname(__FILE__), "../../../../app/controllers"))
+        source_root File.expand_path(File.join(File.dirname(__FILE__), '../../../../app/controllers'))
 
         def generate_controllers
-          directory "occams", "app/controllers/occams"
+          directory 'occams', 'app/controllers/occams'
         end
-
       end
     end
   end

data/lib/generators/occams/cms/models_generator.rb

@@ -4,13 +4,11 @@ module Occams
   module Generators
     module Cms
       class ModelsGenerator < Rails::Generators::Base
-
-        source_root File.expand_path(File.join(File.dirname(__FILE__), "../../../../app/models"))
+        source_root File.expand_path(File.join(File.dirname(__FILE__), '../../../../app/models'))
 
         def generate_models
-          directory "occams", "app/models/occams"
+          directory 'occams', 'app/models/occams'
         end
-
       end
     end
   end

data/lib/generators/occams/cms/views_generator.rb

@@ -4,13 +4,11 @@ module Occams
   module Generators
     module Cms
       class ViewsGenerator < Rails::Generators::Base
-
-        source_root File.expand_path(File.join(File.dirname(__FILE__), "../../../../app/views"))
+        source_root File.expand_path(File.join(File.dirname(__FILE__), '../../../../app/views'))
 
         def generate_views
-          directory "occams", "app/views/occams"
+          directory 'occams', 'app/views/occams'
         end
-
       end
     end
   end

data/lib/generators/occams/scaffold/scaffold_generator.rb

@@ -1,28 +1,28 @@
 # frozen_string_literal: true
 
-require "rails/generators/generated_attribute"
-require "rails/generators/active_record"
+require 'rails/generators/generated_attribute'
+require 'rails/generators/active_record'
 
 module Occams
   module Generators
     class ScaffoldGenerator < Rails::Generators::NamedBase
-
       include Rails::Generators::Migration
 
       no_tasks do
         attr_accessor :model_attrs
       end
 
-      source_root File.expand_path(File.join(File.dirname(__FILE__), "templates"))
+      source_root File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
 
-      argument :model_args, type: :array, default: [], banner: "attribute:type"
+      argument :model_args, type: :array, default: [], banner: 'attribute:type'
 
       def initialize(*args, &block)
         super
         @model_attrs = []
         model_args.each do |arg|
-          next unless arg.include?(":")
-          @model_attrs << Rails::Generators::GeneratedAttribute.new(*arg.split(":"))
+          next unless arg.include?(':')
+
+          @model_attrs << Rails::Generators::GeneratedAttribute.new(*arg.split(':'))
         end
       end
 
@@ -31,23 +31,23 @@ module Occams
       end
 
       def generate_model
-        migration_template "migration.rb", "db/migrate/create_#{file_name.pluralize}.rb"
-        template "model.rb", "app/models/#{file_name}.rb"
-        template "tests/model.rb", "test/models/#{file_name}_test.rb"
-        template "tests/fixture.yml", "test/fixtures/#{file_name.pluralize}.yml"
+        migration_template 'migration.rb', "db/migrate/create_#{file_name.pluralize}.rb"
+        template 'model.rb', "app/models/#{file_name}.rb"
+        template 'tests/model.rb', "test/models/#{file_name}_test.rb"
+        template 'tests/fixture.yml', "test/fixtures/#{file_name.pluralize}.yml"
       end
 
       def generate_controller
-        template "controller.rb", "app/controllers/admin/#{file_name.pluralize}_controller.rb"
-        template "tests/controller.rb", "test/controllers/admin/#{file_name.pluralize}_controller_test.rb"
+        template 'controller.rb', "app/controllers/admin/#{file_name.pluralize}_controller.rb"
+        template 'tests/controller.rb', "test/controllers/admin/#{file_name.pluralize}_controller_test.rb"
       end
 
       def generate_views
-        template "views/index.haml", "app/views/admin/#{file_name.pluralize}/index.html.haml"
-        template "views/show.haml", "app/views/admin/#{file_name.pluralize}/show.html.haml"
-        template "views/new.haml", "app/views/admin/#{file_name.pluralize}/new.html.haml"
-        template "views/edit.haml", "app/views/admin/#{file_name.pluralize}/edit.html.haml"
-        template "views/_form.haml", "app/views/admin/#{file_name.pluralize}/_form.html.haml"
+        template 'views/index.haml', "app/views/admin/#{file_name.pluralize}/index.html.haml"
+        template 'views/show.haml', "app/views/admin/#{file_name.pluralize}/show.html.haml"
+        template 'views/new.haml', "app/views/admin/#{file_name.pluralize}/new.html.haml"
+        template 'views/edit.haml', "app/views/admin/#{file_name.pluralize}/edit.html.haml"
+        template 'views/_form.haml', "app/views/admin/#{file_name.pluralize}/_form.html.haml"
       end
 
       def generate_route
@@ -61,7 +61,7 @@ module Occams
       end
 
       def generate_navigation_link
-        partial_path = "app/views/occams/admin/cms/partials/_navigation_inner.html.haml"
+        partial_path = 'app/views/occams/admin/cms/partials/_navigation_inner.html.haml'
 
         unless File.exist?(File.join(destination_root, partial_path))
           create_file partial_path
@@ -74,7 +74,6 @@ module Occams
           HAML
         end
       end
-
     end
   end
 end

data/lib/occams/access_control/admin_authentication.rb

@@ -2,7 +2,6 @@
 
 module Occams::AccessControl
   module AdminAuthentication
-
     # Set username and password in config/initializers/occams.rb
     # Like this:
     #   Occams::AccessControl::AdminAuthentication.username = 'myname'
@@ -19,6 +18,5 @@ module Occams::AccessControl
         self.username == username && self.password == password
       end
     end
-
   end
 end

data/lib/occams/access_control/admin_authorization.rb

@@ -2,11 +2,9 @@
 
 module Occams::AccessControl
   module AdminAuthorization
-
     # By default there's no authorization of any kind
     def authorize
       true
     end
-
   end
 end

data/lib/occams/access_control/public_authentication.rb

@@ -2,11 +2,9 @@
 
 module Occams::AccessControl
   module PublicAuthentication
-
     # By defaut all published pages are accessible
     def authenticate
       true
     end
-
   end
 end

data/lib/occams/access_control/public_authorization.rb

@@ -2,11 +2,9 @@
 
 module Occams::AccessControl
   module PublicAuthorization
-
     # By default there's no authorization of any kind
     def authorize
       true
     end
-
   end
 end

data/lib/occams/configuration.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class Occams::Configuration
-
   # Don't like Occams? Set it to whatever you like. :(
   attr_accessor :cms_title
 
@@ -87,44 +86,44 @@ class Occams::Configuration
 
   # Configuration defaults
   def initialize
-    @cms_title              = "Occams CMS Engine"
-    @admin_base_controller  = "ApplicationController"
-    @public_base_controller = "ApplicationController"
-    @admin_auth             = "Occams::AccessControl::AdminAuthentication"
-    @admin_authorization    = "Occams::AccessControl::AdminAuthorization"
-    @public_auth            = "Occams::AccessControl::PublicAuthentication"
-    @public_authorization   = "Occams::AccessControl::PublicAuthorization"
+    @cms_title              = 'Occams CMS Engine'
+    @admin_base_controller  = 'ApplicationController'
+    @public_base_controller = 'ApplicationController'
+    @admin_auth             = 'Occams::AccessControl::AdminAuthentication'
+    @admin_authorization    = 'Occams::AccessControl::AdminAuthorization'
+    @public_auth            = 'Occams::AccessControl::PublicAuthentication'
+    @public_authorization   = 'Occams::AccessControl::PublicAuthorization'
     @seed_data_path         = nil
-    @admin_route_redirect   = ""
+    @admin_route_redirect   = ''
     @enable_sitemap         = true
     @enable_seeds           = false
-    @seeds_path             = File.expand_path("db/cms_seeds", Rails.root)
+    @seeds_path             = File.expand_path('db/cms_seeds', Rails.root)
     @revisions_limit        = 25
     @locales                = {
-      "ar"    => "عربي",
-      "ca"    => "Català",
-      "cs"    => "Česky",
-      "da"    => "Dansk",
-      "de"    => "Deutsch",
-      "en"    => "English",
-      "es"    => "Español",
-      "fi"    => "Suomi",
-      "fr"    => "Français",
-      "gr"    => "Ελληνικά",
-      "hr"    => "Hrvatski",
-      "it"    => "Italiano",
-      "ja"    => "日本語",
-      "nb"    => "Norsk",
-      "nl"    => "Nederlands",
-      "pl"    => "Polski",
-      "pt-BR" => "Português Brasileiro",
-      "ru"    => "Русский",
-      "sk"    => "Slovensky",
-      "sv"    => "Svenska",
-      "tr"    => "Türkçe",
-      "uk"    => "Українська",
-      "zh-CN" => "简体中文",
-      "zh-TW" => "正體中文"
+      'ar' => 'عربي',
+      'ca' => 'Català',
+      'cs' => 'Česky',
+      'da' => 'Dansk',
+      'de' => 'Deutsch',
+      'en' => 'English',
+      'es' => 'Español',
+      'fi' => 'Suomi',
+      'fr' => 'Français',
+      'gr' => 'Ελληνικά',
+      'hr' => 'Hrvatski',
+      'it' => 'Italiano',
+      'ja' => '日本語',
+      'nb' => 'Norsk',
+      'nl' => 'Nederlands',
+      'pl' => 'Polski',
+      'pt-BR' => 'Português Brasileiro',
+      'ru' => 'Русский',
+      'sk' => 'Slovensky',
+      'sv' => 'Svenska',
+      'tr' => 'Türkçe',
+      'uk' => 'Українська',
+      'zh-CN' => '简体中文',
+      'zh-TW' => '正體中文'
     }
     @admin_locale         = nil
     @admin_cache_sweeper  = nil
@@ -136,5 +135,4 @@ class Occams::Configuration
     @public_cms_path      = nil
     @page_to_json_options = { methods: [:content], except: [:content_cache] }
   end
-
 end

data/lib/occams/content/block.rb

@@ -4,11 +4,9 @@
 # it means that all nodes between this must be moved into here
 # {{cms:block}} some content {{cms:end_block}}
 class Occams::Content::Block < Occams::Content::Tag
-
   attr_writer :nodes
 
   def nodes
     @nodes ||= []
   end
-
 end

data/lib/occams/content/params_parser.rb

@@ -1,23 +1,22 @@
 # frozen_string_literal: true
 
-require "strscan"
+require 'strscan'
 
 class Occams::Content::ParamsParser
-
   class Error < StandardError; end
 
-  STRING_LITERAL  = %r{'[^']*'|"[^"]*"}
-  IDENTIFIER      = %r{[a-z0-9][\w\-/.]*}i
-  HASH_KEY        = %r{#{IDENTIFIER}:}
-  COMMA           = %r{,}
-  HASH_OPEN       = %r{\{}
-  HASH_CLOSE      = %r{\}}
-  ARRAY_OPEN      = %r{\[}
-  ARRAY_CLOSE     = %r{\]}
-  INTEGER         = %r{\b[0-9]+\b}i
+  STRING_LITERAL  = %r{'[^']*'|"[^"]*"}.freeze
+  IDENTIFIER      = %r{[a-z0-9][\w\-/.]*}i.freeze
+  HASH_KEY        = %r{#{IDENTIFIER}:}.freeze
+  COMMA           = %r{,}.freeze
+  HASH_OPEN       = %r{\{}.freeze
+  HASH_CLOSE      = %r{\}}.freeze
+  ARRAY_OPEN      = %r{\[}.freeze
+  ARRAY_CLOSE     = %r{\]}.freeze
+  INTEGER         = %r{\b[0-9]+\b}i.freeze
 
   # @param <String> string
-  def initialize(string = "")
+  def initialize(string = '')
     @string = string
   end
 
@@ -121,7 +120,7 @@ private
   # @param [String] args_string
   # @return [Array<String>] tokens
   def tokenize(args_string)
-    args_string = args_string.tr("“”‘’", %q(""''))
+    args_string = args_string.tr('“”‘’', %q(""''))
     ss = StringScanner.new(args_string)
     tokens = []
     loop do
@@ -147,5 +146,4 @@ private
 
     tokens
   end
-
 end