trusty-cms 4.1.2 → 4.1.3

data/lib/tasks/radiant_config.rake

@@ -1,15 +1,15 @@
 require 'trusty_cms/task_support'
 namespace :trusty_cms do
   namespace :config do
-    desc "Export TrustyCms::Config to Rails.root/config/trusty_config.yml. Specify a path with TRUSTY_CONFIG_PATH - defaults to Rails.root/config/trusty_config.yml"
-    task :export => :environment do
+    desc 'Export TrustyCms::Config to Rails.root/config/trusty_config.yml. Specify a path with TRUSTY_CONFIG_PATH - defaults to Rails.root/config/trusty_config.yml'
+    task export: :environment do
       config_path = ENV['TRUSTY_CONFIG_PATH'] || "#{Rails.root}/config/trusty_config.yml"
       clear = ENV['CLEAR_CONFIG'] || nil
       TrustyCms::TaskSupport.config_export(config_path)
     end
 
-    desc "Import TrustyCms::Config from Rails.root/config/trusty_config.yml. Specify a path with TRUSTY_CONFIG_PATH - defaults to Rails.root/config/trusty_config.yml Set CLEAR_CONFIG=true to delete all existing settings before import"
-    task :import => :environment do
+    desc 'Import TrustyCms::Config from Rails.root/config/trusty_config.yml. Specify a path with TRUSTY_CONFIG_PATH - defaults to Rails.root/config/trusty_config.yml Set CLEAR_CONFIG=true to delete all existing settings before import'
+    task import: :environment do
       config_path = ENV['TRUSTY_CONFIG_PATH'] || "#{Rails.root}/config/trusty_config.yml"
       clear = ENV['CLEAR_CONFIG'] || nil
       TrustyCms::TaskSupport.config_import(config_path, clear)

data/lib/tasks/snippets_extension_tasks.rake

@@ -1,9 +1,8 @@
 namespace :trusty do
   namespace :extensions do
     namespace :snippets do
-      
       desc 'Runs the migration of the Snippets extension'
-      task :migrate => :environment do
+      task migrate: :environment do
         require 'trusty_cms/extension_migrator'
         if ENV['VERSION']
           SnippetsExtension.migrator.migrate(ENV['VERSION'].to_i)
@@ -15,30 +14,31 @@ namespace :trusty do
       end
 
       desc 'Copies public assets of the Snippets to the instance public/ directory.'
-      task :update => :environment do
-        is_svn_or_dir = proc {|path| path =~ /\.svn/ || File.directory?(path) }
+      task update: :environment do
+        is_svn_or_dir = proc { |path| path =~ /\.svn/ || File.directory?(path) }
         puts 'Copying assets from SnippetsExtension'
         Dir[SnippetsExtension.root + '/public/**/*'].reject(&is_svn_or_dir).each do |file|
           path = file.sub(SnippetsExtension.root, '')
           directory = File.dirname(path)
-          mkdir_p Rails.root + directory, :verbose => false
-          cp file, Rails.root + path, :verbose => false
+          mkdir_p Rails.root + directory, verbose: false
+          cp file, Rails.root + path, verbose: false
         end
       end
-      
+
       desc 'Syncs all available translations for this ext to the English ext master'
-      task :sync => :environment do
+      task sync: :environment do
         # The main translation root, basically where English is kept
         language_root = SnippetsExtension.root + '/config/locales'
         words = TranslationSupport.get_translation_keys(language_root)
-        
+
         Dir['#{language_root}/*.yml'].each do |filename|
           next if filename.match('_available_tags')
+
           basename = File.basename(filename, '.yml')
           puts "Syncing #{basename}"
           (comments, other) = TranslationSupport.read_file(filename, basename)
-          words.each { |k, v| other[k] ||= words[k] }  # Initializing hash variable as empty if it does not exist
-          other.delete_if { |k, v| !words[k] }         # Remove if not defined in en.yml
+          words.each { |k, _v| other[k] ||= words[k] }  # Initializing hash variable as empty if it does not exist
+          other.delete_if { |k, _v| !words[k] }         # Remove if not defined in en.yml
           TranslationSupport.write_file(filename, basename, comments, other)
         end
       end

data/lib/tasks/translate.rake

@@ -1,8 +1,7 @@
 namespace :trusty_cms do
   namespace :i18n do
-
-    desc "Syncs all available translations to the English master"
-    task :sync => :environment do
+    desc 'Syncs all available translations to the English master'
+    task sync: :environment do
       # All places TrustyCms can store locales
       locale_paths = TrustyCms::AvailableLocales.locale_paths
       # The main translation root, basically where English is kept
@@ -12,31 +11,32 @@ namespace :trusty_cms do
         if path == language_root || path.match('language_pack')
           Dir["#{path}/*.yml"].each do |filename|
             next if filename.match('_available_tags')
+
             basename = File.basename(filename, '.yml')
             puts "Syncing #{basename}"
             (comments, other) = TranslationSupport.read_file(filename, basename)
-            words.each { |k,v| other[k] ||= words[k] }  # Initializing hash variable as empty if it does not exist
-            other.delete_if { |k,v| !words[k] }         # Remove if not defined in en.yml
+            words.each { |k, _v| other[k] ||= words[k] }  # Initializing hash variable as empty if it does not exist
+            other.delete_if { |k, _v| !words[k] }         # Remove if not defined in en.yml
             TranslationSupport.write_file(filename, basename, comments, other)
           end
         end
       end
     end
 
-    desc "Creates or updates the English available tag descriptions"
-    task :available_tags => :environment do
+    desc 'Creates or updates the English available tag descriptions'
+    task available_tags: :environment do
       descriptions = Hash.new
       Page.tag_descriptions.sort.each do |tag, desc|
-        tag = '    ' + tag.gsub(':','-') + ':'
-        desc = desc.gsub('    ','      ')
-        descriptions[tag] = ' "' + desc.gsub('%','%').gsub('"','\"').strip + '"'
+        tag = '    ' + tag.gsub(':', '-') + ':'
+        desc = desc.gsub('    ', '      ')
+        descriptions[tag] = ' "' + desc.gsub('%', '%').gsub('"', '\"').strip + '"'
       end
       comments = ''
-      TranslationSupport.write_file("#{TRUSTY_CMS_ROOT}/config/locales/en_available_tags.yml","---\nen:\n  desc",comments,descriptions)
+      TranslationSupport.write_file("#{TRUSTY_CMS_ROOT}/config/locales/en_available_tags.yml", "---\nen:\n  desc", comments, descriptions)
     end
 
-    desc "Syncs all translations available_tags to the English master"
-    task :sync_available_tags => :environment do
+    desc 'Syncs all translations available_tags to the English master'
+    task sync_available_tags: :environment do
       # All places TrustyCms can store locales
       locale_paths = TrustyCms::AvailableLocales.locale_paths
       # The main translation root, basically where English is kept
@@ -46,6 +46,7 @@ namespace :trusty_cms do
         if path == language_root || path.match('language_pack')
           Dir["#{path}/*.yml"].each do |filename|
             next unless filename.match('_available_tags')
+
             basename = File.basename(filename, '_available_tags.yml')
             puts "Syncing #{basename}"
             (comments, other) = TranslationSupport.open_available_tags(filename)
@@ -54,6 +55,5 @@ namespace :trusty_cms do
         end
       end
     end
-
   end
 end

data/lib/tasks/upgrade_to_devise.rake

@@ -17,7 +17,7 @@ namespace :import do
         admin: legacy.admin,
         designer: legacy.designer,
         content_editor: legacy.content_editor,
-        notes: legacy.notes
+        notes: legacy.notes,
       )
       u.save!
     end

data/lib/translation_support.rb

@@ -1,54 +1,54 @@
 class TranslationSupport
   class << self
-
-    #Retrieve US word set
-    def get_translation_keys(language_root, suffix=nil)
+    # Retrieve US word set
+    def get_translation_keys(language_root, suffix = nil)
       (dummy_comments, words) = read_file("#{language_root}/en#{suffix}.yml", 'en')
       words
     end
 
-    #Retrieve comments, translation data in hash form
+    # Retrieve comments, translation data in hash form
     def read_file(filename, basename)
-      (comments, data) = IO.read(filename).split(/\n#{basename}:\s*\n/)   #Add error checking for failed file read?
-      return comments, create_hash(data, basename)
+      (comments, data) = IO.read(filename).split(/\n#{basename}:\s*\n/) # Add error checking for failed file read?
+      [comments, create_hash(data, basename)]
     end
 
-    #Creates hash of translation data
-    def create_hash(data, basename)
+    # Creates hash of translation data
+    def create_hash(data, _basename)
       words = Hash.new
       return words if !data
+
       parent = Array.new
       previous_key = 'base'
       data.split("\n").each do |w|
         next if w.strip.blank?
+
         (key, value) = w.split(':', 2)
         value ||= ''
-        shift = (key =~ /\w/)/2 - parent.size                             #Determine level of current key in comparison to parent array
-        key = key.sub(/^\s+/,'')
-        parent << previous_key if shift > 0                               #If key is child of previous key, add previous key as parent
-        (shift * -1).times { parent.pop } if shift < 0                      #If key is not related to previous key, remove parent keys
-        previous_key = key                                                #Track key in case next key is child of this key
+        shift = (key =~ /\w/) / 2 - parent.size # Determine level of current key in comparison to parent array
+        key = key.sub(/^\s+/, '')
+        parent << previous_key if shift > 0 # If key is child of previous key, add previous key as parent
+        (shift * -1).times { parent.pop } if shift < 0 # If key is not related to previous key, remove parent keys
+        previous_key = key # Track key in case next key is child of this key
         words[parent.join(':') + ':' + key] = value unless key.blank?
       end
       words
     end
 
     def open_available_tags(filename)
-      data = YAML::load(File.open("#{filename}"))
+      data = YAML::load(File.open(filename.to_s))
       data.to_s
     end
 
-    #Writes to file from translation data hash structure
-    def write_file(filename,basename,comments,words)
-      File.open(filename, "w") do |log|
-        log.puts(comments+"\n"+basename+": \n")
-        words.sort.each do |k,v|
+    # Writes to file from translation data hash structure
+    def write_file(filename, basename, comments, words)
+      File.open(filename, 'w') do |log|
+        log.puts(comments + "\n" + basename + ": \n")
+        words.sort.each do |k, v|
           keys = k.split(':')
-          (keys.size-1).times { keys[keys.size-1] = '  ' + keys[keys.size-1] }   #Add indentation for children keys
-          log.puts(keys[keys.size-1]+':'+v+"\n")
+          (keys.size - 1).times { keys[keys.size - 1] = '  ' + keys[keys.size - 1] } # Add indentation for children keys
+          log.puts(keys[keys.size - 1] + ':' + v + "\n")
         end
       end
     end
-
   end
 end

data/lib/trusty_cms.rb

@@ -1,7 +1,7 @@
-TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unless defined? TRUSTY_CMS_ROOT
+TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')) unless defined? TRUSTY_CMS_ROOT
 
 unless defined? TrustyCms::VERSION
   module TrustyCms
-    VERSION = '4.1.2'
+    VERSION = '4.1.3'.freeze
   end
 end

data/lib/trusty_cms/admin_ui.rb

@@ -18,10 +18,10 @@ module TrustyCms
       end
 
       def [](id)
-        unless id.kind_of? Integer
-          self.find {|subnav_item| subnav_item.name.to_s.titleize == id.to_s.titleize }
-        else
+        if id.is_a? Integer
           super
+        else
+          find { |subnav_item| subnav_item.name.to_s.titleize == id.to_s.titleize }
         end
       end
 
@@ -29,6 +29,7 @@ module TrustyCms
         options = args.extract_options!
         item = args.size > 1 ? deprecated_add(*(args << caller)) : args.first
         raise DuplicateTabNameError.new("duplicate tab name `#{item.name}'") if self[item.name]
+
         item.tab = self if item.respond_to?(:tab=)
         if options.empty?
           super(item)
@@ -79,8 +80,9 @@ module TrustyCms
       attr_reader :name, :url
       attr_accessor :tab
 
-      def initialize(name, url = "#")
-        @name, @url = name, url
+      def initialize(name, url = '#')
+        @name = name
+        @url = url
       end
 
       def visible?(user)
@@ -92,8 +94,9 @@ module TrustyCms
       end
 
       private
+
       def visible_by_controller?(user)
-        params = TrustyCms::Application.routes.recognize_path(url, :method => :get)
+        params = TrustyCms::Application.routes.recognize_path(url, method: :get)
         if params && params[:controller]
           klass = "#{params[:controller].camelize}Controller".constantize
           klass.user_has_access_to_action?(user, params[:action])
@@ -131,24 +134,24 @@ module TrustyCms
     end
 
     def initialize_nav
-      @nav = NavTab.new("Tab Container")
+      @nav = NavTab.new('Tab Container')
       load_default_nav
     end
 
     def load_default_nav
-      content = nav_tab("Content")
-      content << nav_item("Pages", "/admin/pages")
+      content = nav_tab('Content')
+      content << nav_item('Pages', '/admin/pages')
       nav << content
 
-      design = nav_tab("Design")
-      design << nav_item("Layouts", "/admin/layouts")
+      design = nav_tab('Design')
+      design << nav_item('Layouts', '/admin/layouts')
       nav << design
 
-      settings = nav_tab("Settings")
-      settings << nav_item("General", "/admin/configuration")
-      settings << nav_item("Personal", "/admin/preferences")
-      settings << nav_item("Users", "/admin/users")
-      settings << nav_item("Extensions", "/admin/extensions")
+      settings = nav_tab('Settings')
+      settings << nav_item('General', '/admin/configuration')
+      settings << nav_item('Personal', '/admin/preferences')
+      settings << nav_item('Users', '/admin/users')
+      settings << nav_item('Extensions', '/admin/extensions')
       nav << settings
     end
 

data/lib/trusty_cms/admin_ui/region_partials.rb

@@ -1,6 +1,6 @@
 class TrustyCms::AdminUI::RegionPartials
   def initialize(template)
-    @partials = Hash.new {|h,k| h[k] = "<strong>`#{k}' default partial not found!</strong>" }
+    @partials = Hash.new { |h, k| h[k] = "<strong>`#{k}' default partial not found!</strong>" }
     @template = template
   end
 
@@ -8,13 +8,14 @@ class TrustyCms::AdminUI::RegionPartials
     @partials[key.to_s]
   end
 
-  def method_missing(method, *args, &block)
+  def method_missing(method, *_args, &block)
     if block_given?
       # Ruby 1.9.2 yields self in instance_eval... see https://gist.github.com/479572
       # lambdas are as strict as methods in 1.9.x, making sure that the args match, Procs are not.
-      if RUBY_VERSION =~ /^1\.9/ and block.lambda? and block.arity != 1
+      if RUBY_VERSION =~ /^1\.9/ && block.lambda? && (block.arity != 1)
         raise "You can only pass a proc ('Proc.new') or a lambda that takes exactly one arg (for self) to TrustyCms::AdminUI::RegionPartials' method_missing."
       end
+
       @partials[method.to_s] = @template.capture(&block)
     else
       @partials[method.to_s]

data/lib/trusty_cms/admin_ui/region_set.rb

@@ -1,7 +1,6 @@
 class TrustyCms::AdminUI::RegionSet
-
   def initialize
-    @regions = Hash.new do |h,k|
+    @regions = Hash.new do |h, k|
       h[k] = []
     end
     yield self if block_given?
@@ -11,8 +10,9 @@ class TrustyCms::AdminUI::RegionSet
     @regions[region.to_sym]
   end
 
-  def add(region=nil, partial=nil, options={})
-    raise ArgumentError, "You must specify a region and a partial" unless region and partial
+  def add(region = nil, partial = nil, options = {})
+    raise ArgumentError, 'You must specify a region and a partial' unless region && partial
+
     if options[:before]
       index = @regions[region].empty? ? 0 : (@regions[region].index(options[:before]) || @regions[region].size)
       self[region].insert(index, partial)
@@ -31,5 +31,4 @@ class TrustyCms::AdminUI::RegionSet
       super
     end
   end
-
 end

data/lib/trusty_cms/available_locales.rb

@@ -1,5 +1,4 @@
 module TrustyCms::AvailableLocales
-
   # Returns the list of available locale files in options_for_select format.
   #
   def self.locales
@@ -8,12 +7,11 @@ module TrustyCms::AvailableLocales
       if File.exists?(path) && path !~ /_available_tags/
         locale_yaml = YAML.load_file(path)
         stem = File.basename(path, '.yml')
-        if locale_yaml[stem] && lang = locale_yaml[stem]["this_file_language"]
+        if locale_yaml[stem] && lang = locale_yaml[stem]['this_file_language']
           available_locales[lang] = stem
         end
       end
     end
-    available_locales.collect {|k,v| [k, v]}.sort_by { |s| s[0] }
+    available_locales.collect { |k, v| [k, v] }.sort_by { |s| s[0] }
   end
-
 end

data/lib/trusty_cms/config/definition.rb

@@ -1,7 +1,6 @@
 module TrustyCms
   class Config
     class Definition
-
       attr_reader :empty, :default, :type, :notes, :validate_with, :select_from, :allow_blank, :allow_display, :allow_change, :units, :definer
 
       # Configuration 'definitions' are metadata held in memory that add restriction and description to individual config entries.
@@ -22,8 +21,8 @@ module TrustyCms
       #
       # See the method documentation in TrustyCms::Config for options and conventions.
       #
-      def initialize(options={})
-        [:empty, :default, :type, :notes, :validate_with, :select_from, :allow_blank, :allow_change, :allow_display, :units, :definer].each do |attribute|
+      def initialize(options = {})
+        %i[empty default type notes validate_with select_from allow_blank allow_change allow_display units definer].each do |attribute|
           instance_variable_set "@#{attribute}".to_sym, options[attribute]
         end
       end
@@ -61,7 +60,7 @@ module TrustyCms
           choices = select_from
           choices = choices.call if choices.respond_to? :call
           choices = normalize_selection(choices)
-          choices.unshift ["",""] if allow_blank?
+          choices.unshift ['', ''] if allow_blank?
           choices
         end
       end
@@ -71,14 +70,14 @@ module TrustyCms
       #
       def normalize_selection(choices)
         choices = choices.to_a if Hash === choices
-        choices = choices.collect{|c| (c.is_a? Array) ? c : [c,c]}
+        choices = choices.collect { |c| (c.is_a? Array) ? c : [c, c] }
       end
 
       # If the config item is a selector and :select_from specifies [name, value] pairs (as hash or array),
       # this will return the name corresponding to the currently selected value.
       #
       def selected(value)
-        if value && selector? && pair = selection.find{|s| s.last == value}
+        if value && selector? && pair = selection.find { |s| s.last == value }
           pair.first
         end
       end
@@ -103,13 +102,18 @@ module TrustyCms
           setting.errors.add :value, :not_permitted unless selectable?(setting.value)
         end
         if integer?
-          Integer(setting.value) rescue setting.errors.add :value, :not_a_number
+          begin
+            Integer(setting.value)
+          rescue StandardError
+            setting.errors.add :value, :not_a_number
+          end
         end
       end
 
       # Returns true if the value is one of the permitted selections. Not case-sensitive.
       def selectable?(value)
         return true unless selector?
+
         selection.map(&:last).map(&:downcase).include?(value.downcase)
       end
 
@@ -135,7 +139,6 @@ module TrustyCms
       def hidden?
         true if allow_display == false
       end
-
     end
   end
 end