trusty-cms 4.1.2 → 4.1.3

data/lib/trusty_cms/engine.rb

@@ -1,21 +1,21 @@
 module TrustyCms
   class Engine < Rails::Engine
-    paths["app/helpers"] = []
-    initializer "trusty_cms.assets.precompile" do |app|
+    paths['app/helpers'] = []
+    initializer 'trusty_cms.assets.precompile' do |app|
       app.config.assets.paths << Rails.root.join('../trusty-cms/node_modules')
       app.config.assets.precompile += %w(
-      admin/main.css admin.js
-      ckeditor/config.js
-      ckeditor/contents.css
-      ckeditor/config.js
-      ckeditor/styles.js
-      ckeditor/skins/moono/editor.css
-      ckeditor/lang/en.js
-      rad_social/rad_screen.css
-      rad_social/captcha.js
-      rad_social/rad_email.js
-      rad_social/rad_widget.js
-    )
+        admin/main.css admin.js
+        ckeditor/config.js
+        ckeditor/contents.css
+        ckeditor/config.js
+        ckeditor/styles.js
+        ckeditor/skins/moono/editor.css
+        ckeditor/lang/en.js
+        rad_social/rad_screen.css
+        rad_social/captcha.js
+        rad_social/rad_email.js
+        rad_social/rad_widget.js
+      )
     end
   end
 end

data/lib/trusty_cms/extension.rb

@@ -33,7 +33,7 @@ module TrustyCms
     end
 
     def migrations_path
-      File.join(self.root, 'db', 'migrate')
+      File.join(root, 'db', 'migrate')
     end
 
     def migrates_from
@@ -41,11 +41,11 @@ module TrustyCms
     end
 
     def routing_file
-      File.join(self.root, 'config', 'routes.rb')
+      File.join(root, 'config', 'routes.rb')
     end
 
     def load_initializers
-      Dir["#{self.root}/config/initializers/**/*.rb"].sort.each do |initializer|
+      Dir["#{root}/config/initializers/**/*.rb"].sort.each do |initializer|
         require initializer
       end
     end
@@ -53,7 +53,7 @@ module TrustyCms
     def migrator
       unless @migrator
         extension = self
-        @migrator = Class.new(ExtensionMigrator){ self.extension = extension }
+        @migrator = Class.new(ExtensionMigrator) { self.extension = extension }
       end
       @migrator
     end
@@ -62,7 +62,7 @@ module TrustyCms
       AdminUI.instance
     end
 
-    def tab(name, options={}, &block)
+    def tab(name, options = {}, &block)
       @the_tab = admin.nav[name]
       unless @the_tab
         @the_tab = TrustyCms::AdminUI::NavTab.new(name)
@@ -81,7 +81,7 @@ module TrustyCms
       if block_given?
         block.call(@the_tab)
       end
-      return @the_tab
+      @the_tab
     end
     alias :add_tab :tab
 
@@ -95,18 +95,16 @@ module TrustyCms
     #   ThirdPartyExtension.extend(MyExtension::IntegrationPoints)
     # end
     def extension_enabled?(extension)
-      begin
-        extension = (extension.to_s.camelcase + 'Extension').constantize
-        extension.enabled?
-      rescue NameError
-        false
-      end
+      extension = (extension.to_s.camelcase + 'Extension').constantize
+      extension.enabled?
+    rescue NameError
+      false
     end
 
     class << self
-
       def activate_extension
         return if instance.active?
+
         instance.activate_extension if instance.respond_to? :activate
         Dir["#{Rails.root}/config/routes/**/*.rb"].each do |route_file|
         end
@@ -115,6 +113,7 @@ module TrustyCms
 
       def deactivate_extension
         return unless instance.active?
+
         instance.active = false
         instance.deactivate if instance.respond_to? :deactivate
       end
@@ -124,14 +123,13 @@ module TrustyCms
         subclass.extension_name = subclass.name.to_name('Extension')
       end
 
-      def migrate_from(extension_name, until_migration=nil)
+      def migrate_from(extension_name, until_migration = nil)
         instance.migrates_from[extension_name] = until_migration
       end
 
-      def extension_config(&block)
+      def extension_config
         yield Rails.configuration
       end
-
     end
   end
 end

data/lib/trusty_cms/extension_loader.rb

@@ -17,11 +17,11 @@ module TrustyCms
         @config = rails_config
       end
 
-      def before_clear(*args) #:nodoc
+      def before_clear(*_args) #:nodoc
         ExtensionLoader.deactivate_extensions
       end
 
-      def after_clear(*args) #:nodoc
+      def after_clear(*_args) #:nodoc
         ExtensionLoader.load_extensions
         ExtensionLoader.activate_extensions
       end
@@ -77,7 +77,7 @@ module TrustyCms
         extension.path = extension_path
         extension
       rescue LoadError, NameError => e
-        $stderr.puts "Could not load extension: #{name}.\n#{e.inspect}"
+        warn "Could not load extension: #{name}.\n#{e.inspect}"
         nil
       end
     end
@@ -104,14 +104,14 @@ module TrustyCms
       if configuration.extensions.first == :all
         ordered_extensions = extensions
       else
-        configuration.extensions.each {|name| ordered_extensions << select_extension(name)  }
+        configuration.extensions.each { |name| ordered_extensions << select_extension(name) }
       end
       ordered_extensions.flatten.each(&:activate)
       Page.load_subclasses
     end
 
     def select_extension(name)
-      extensions.select {|ext| ext.extension_name.symbolize == name}
+      extensions.select { |ext| ext.extension_name.symbolize == name }
     end
 
     alias :reactivate :activate_extensions
@@ -122,7 +122,7 @@ module TrustyCms
       # An extension name can be supplied in addition to the path. It will be processed in the usual way to
       # remove trusty- and -extension and any verion numbering.
       #
-      def record_path(path, name=nil)
+      def record_path(path, name = nil)
         ExtensionPath.from_path(path, name)
       end
 

data/lib/trusty_cms/extension_migrator.rb

@@ -13,7 +13,7 @@ module TrustyCms
 
       def get_all_versions
         ActiveRecord::Base.connection.select_values("SELECT version FROM #{sanitize(schema_migrations_table_name)}").
-          select { |version| version.starts_with?("#{@extension.extension_name}-")}.
+          select { |version| version.starts_with?("#{@extension.extension_name}-") }.
           map { |version| version.sub("#{@extension.extension_name}-", '').to_i }.sort
       end
     end
@@ -25,58 +25,59 @@ module TrustyCms
     end
 
     private
-      def quote(s)
-        ActiveRecord::Base.connection.quote(s)
-      end
 
-      def extension_name
-        self.class.extension.extension_name
-      end
+    def quote(s)
+      ActiveRecord::Base.connection.quote(s)
+    end
 
-      def version_string(version)
-        "#{extension_name}-#{version}"
-      end
+    def extension_name
+      self.class.extension.extension_name
+    end
 
-      def initialize_extension_schema_migrations
-        current_version = ActiveRecord::Base.connection.select_value("SELECT schema_version FROM extension_meta WHERE name = #{sanitize(quote(extension_name))}")
-        if current_version
-          assume_migrated_upto_version(current_version.to_i)
-          ActiveRecord::Base.connection.delete("DELETE FROM extension_meta WHERE name = #{sanitize(quote(extension_name))}")
-        end
+    def version_string(version)
+      "#{extension_name}-#{version}"
+    end
+
+    def initialize_extension_schema_migrations
+      current_version = ActiveRecord::Base.connection.select_value("SELECT schema_version FROM extension_meta WHERE name = #{sanitize(quote(extension_name))}")
+      if current_version
+        assume_migrated_upto_version(current_version.to_i)
+        ActiveRecord::Base.connection.delete("DELETE FROM extension_meta WHERE name = #{sanitize(quote(extension_name))}")
       end
+    end
 
-      def initialize_received_migrations
-        if donors = self.class.extension.migrates_from
-          donors.each do |extension_name, until_migration|
-            replaced = ActiveRecord::Base.connection.select_values("SELECT version FROM #{sanitize(ActiveRecord::Migrator.schema_migrations_table_name)} WHERE version LIKE '#{extension_name}-%'").map{|v| v.sub(/^#{extension_name}\-/, '').to_i}
-            replaced.delete_if{|v| v > until_migration.to_i} if until_migration
-            assume_migrated_upto_version(replaced.max) if replaced.any?
-          end
+    def initialize_received_migrations
+      if donors = self.class.extension.migrates_from
+        donors.each do |extension_name, until_migration|
+          replaced = ActiveRecord::Base.connection.select_values("SELECT version FROM #{sanitize(ActiveRecord::Migrator.schema_migrations_table_name)} WHERE version LIKE '#{extension_name}-%'").map { |v| v.sub(/^#{extension_name}\-/, '').to_i }
+          replaced.delete_if { |v| v > until_migration.to_i } if until_migration
+          assume_migrated_upto_version(replaced.max) if replaced.any?
         end
       end
+    end
 
-      def assume_migrated_upto_version(version)
-        version = version.to_i
-        sm_table = self.class.schema_migrations_table_name
+    def assume_migrated_upto_version(version)
+      version = version.to_i
+      sm_table = self.class.schema_migrations_table_name
 
-        migrated = self.class.get_all_versions
-        versions = Dir["#{@migrations_path}/[0-9]*_*.rb"].map do |filename|
-          filename.split('/').last.split('_').first.to_i
-        end
+      migrated = self.class.get_all_versions
+      versions = Dir["#{@migrations_path}/[0-9]*_*.rb"].map do |filename|
+        filename.split('/').last.split('_').first.to_i
+      end
 
-        unless migrated.include?(version)
-          ActiveRecord::Base.connection.execute "INSERT INTO #{sm_table} (version) VALUES (#{sanitize(quote(version_string(version)))})"
-        end
+      unless migrated.include?(version)
+        ActiveRecord::Base.connection.execute "INSERT INTO #{sm_table} (version) VALUES (#{sanitize(quote(version_string(version)))})"
+      end
 
-        inserted = Set.new
-        (versions - migrated).each do |v|
-          if inserted.include?(v)
-            raise "Duplicate migration #{v}. Please renumber your migrations to resolve the conflict."
-          elsif v < version
-            ActiveRecord::Base.connection.execute "INSERT INTO #{sm_table} (version) VALUES (#{sanitize(quote(version_string(v)))})"
-            inserted << v
-          end
+      inserted = Set.new
+      (versions - migrated).each do |v|
+        if inserted.include?(v)
+          raise "Duplicate migration #{v}. Please renumber your migrations to resolve the conflict."
+        elsif v < version
+          ActiveRecord::Base.connection.execute "INSERT INTO #{sm_table} (version) VALUES (#{sanitize(quote(version_string(v)))})"
+          inserted << v
         end
       end
+    end
   end
 end

data/lib/trusty_cms/extension_path.rb

@@ -24,7 +24,8 @@ module TrustyCms
     @@known_paths = {}
 
     def initialize(options = {}) #:nodoc
-      @name, @path = options[:name].underscore, options[:path]
+      @name = options[:name].underscore
+      @path = options[:path]
       @@known_paths[@name.to_sym] = self
     end
 
@@ -43,10 +44,10 @@ module TrustyCms
     #
     # If two arguments are given, the second is taken to be the full extension name.
     #
-    def self.from_path(path, name=nil)
+    def self.from_path(path, name = nil)
       name = path if name.blank?
       name = File.basename(name).gsub(/^trusty-|-extension(-[\d\.a-z]+|-[a-z\d]+)*$/, '')
-      new(:name => name, :path => path)
+      new(name: name, path: path)
     end
 
     # Forgets all recorded extension paths.
@@ -77,7 +78,7 @@ module TrustyCms
     # Call the class method ExtensionPath.plugin_paths to get a list of the plugin paths found in all enabled extensions.
     #
     def plugin_paths
-      check_subdirectory("vendor/plugins")
+      check_subdirectory('vendor/plugins')
     end
 
     # Returns a list of names of all the locale files found within this extension root.
@@ -85,8 +86,8 @@ module TrustyCms
     # in reverse order so that locale definitions override one another correctly.
     #
     def locale_paths
-      if check_subdirectory("config/locales")
-        Dir[File.join("#{path}","config/locales","*.{rb,yml}")]
+      if check_subdirectory('config/locales')
+        Dir[File.join(path.to_s, 'config/locales', '*.{rb,yml}')]
       end
     end
 
@@ -94,21 +95,21 @@ module TrustyCms
     # Call the class method ExtensionPath.helper_paths to get a list of the helper paths found in all enabled extensions.
     #
     def helper_paths
-      check_subdirectory("app/helpers")
+      check_subdirectory('app/helpers')
     end
 
     # Returns the app/models path if it is found within this extension root.
     # Call the class method ExtensionPath.model_paths to get a list of the model paths found in all enabled extensions.
     #
     def model_paths
-      check_subdirectory("app/models")
+      check_subdirectory('app/models')
     end
 
     # Returns the app/controllers path if it is found within this extension root.
     # Call the class method ExtensionPath.controller_paths to get a list of the controller paths found in all enabled extensions.
     #
     def controller_paths
-      check_subdirectory("app/controllers")
+      check_subdirectory('app/controllers')
     end
 
     # Returns the app/views path if it is found within this extension root.
@@ -116,21 +117,21 @@ module TrustyCms
     # in reverse order so that views override one another correctly.
     #
     def view_paths
-      check_subdirectory("app/views")
+      check_subdirectory('app/views')
     end
 
     # Returns the app/metal path if it is found within this extension root.
     # Call the class method ExtensionPath.metal_paths to get a list of the metal paths found in all enabled extensions.
     #
     def metal_paths
-      check_subdirectory("app/metal")
+      check_subdirectory('app/metal')
     end
 
     # Returns a list of all the rake task files found within this extension root.
     #
     def rake_task_paths
-      if check_subdirectory("lib/tasks")
-        Dir[File.join("#{path}","lib/tasks/**","*.rake")]
+      if check_subdirectory('lib/tasks')
+        Dir[File.join(path.to_s, 'lib/tasks/**', '*.rake')]
       end
     end
 
@@ -149,6 +150,7 @@ module TrustyCms
       #
       def find(name)
         raise LoadError, "Cannot return path for unknown extension: #{name}" unless @@known_paths[name.to_sym]
+
         @@known_paths[name.to_sym]
       end
 
@@ -175,19 +177,19 @@ module TrustyCms
         enabled.map(&:path)
       end
 
-      [:load_paths, :plugin_paths, :helper_paths, :model_paths, :controller_paths, :eager_load_paths].each do |m|
+      %i[load_paths plugin_paths helper_paths model_paths controller_paths eager_load_paths].each do |m|
         define_method(m) do
-          enabled.map{|ep| ep.send(m)}.flatten.compact
+          enabled.map { |ep| ep.send(m) }.flatten.compact
         end
       end
-      [:locale_paths, :view_paths, :metal_paths, :rake_task_paths].each do |m|
+      %i[locale_paths view_paths metal_paths rake_task_paths].each do |m|
         define_method(m) do
-          enabled.map{|ep| ep.send(m)}.flatten.compact.reverse
+          enabled.map { |ep| ep.send(m) }.flatten.compact.reverse
         end
       end
     end
 
-  private
+    private
 
     # If the supplied path within the extension root exists and is a directory, its absolute path is returned. Otherwise, nil.
     #
@@ -195,6 +197,5 @@ module TrustyCms
       subdirectory = File.join(path, subpath)
       subdirectory if File.directory?(subdirectory)
     end
-
   end
 end

data/lib/trusty_cms/initializer.rb

@@ -11,7 +11,7 @@ require 'trusty_cms/engine'
 
 # This is a wild and probably terrible hack built to initialize extension engines.
 # I have no idea what the repercussions will be. Revisit later.
-Gem.loaded_specs.each_with_object([]) do |(gemname, gemspec), found|
+Gem.loaded_specs.each_with_object([]) do |(gemname, gemspec), _found|
   if gemname =~ /trusty-.*-extension$/
     ep = TrustyCms::ExtensionLoader.record_path(gemspec.full_gem_path, gemname)
     require "#{ep.name}/engine"
@@ -19,15 +19,12 @@ Gem.loaded_specs.each_with_object([]) do |(gemname, gemspec), found|
 end
 
 module TrustyCms
-
   module Initializer
-
     # Rails::Initializer is essentially a list of startup steps and we extend it here by:
     # * overriding or extending some of those steps so that they use trusty and extension paths
     #   as well as (or instead of) the rails defaults.
     # * appending some extra steps to set up the admin UI and activate extensions
 
-
     # Returns true in the very unusual case where trusty has been deployed as a rails app itself, rather than
     # loaded as a gem or from vendor/. This is only likely in situations where trusty is customised so heavily
     # that extensions are not sufficient.
@@ -54,7 +51,8 @@ module TrustyCms
 
       configuration.middleware.insert_before(
         :"ActionController::ParamsParser",
-        Rails::Rack::Metal, :if => Rails::Rack::Metal.metals.any?)
+        Rails::Rack::Metal, if: Rails::Rack::Metal.metals.any?
+      )
     end
 
     # Extends the Rails initializer to add locale paths from TRUSTY_CMS_ROOT and from trusty extensions.
@@ -120,7 +118,7 @@ module TrustyCms
     #
     def after_initialize
       super
-      extension_loader.activate_extensions  # also calls initialize_views
+      extension_loader.activate_extensions # also calls initialize_views
       TrustyCms::Application.config.add_controller_paths(extension_loader.paths(:controller))
       TrustyCms::Application.config.add_eager_load_paths(extension_loader.paths(:eager_load))
     end
@@ -157,8 +155,7 @@ module TrustyCms
     # Returns the ExtensionLoader singleton that will eventually load extensions.
     #
     def extension_loader
-      ExtensionLoader.instance {|l| l.initializer = self }
+      ExtensionLoader.instance { |l| l.initializer = self }
     end
-
   end
 end