trusty-cms 4.1.2 → 4.1.3

data/lib/trusty_cms/pagination/controller.rb

@@ -6,33 +6,30 @@ module TrustyCms
       def configure_pagination
         # unconfigured parameters remain at will_paginate defaults
         # will_paginate controller options are not overridden by tag attribetus
-        WillPaginate::ViewHelpers.pagination_options[:param_name] = TrustyCms::Config["pagination.param_name"].to_sym unless TrustyCms::Config["pagination.param_name"].blank?
-        WillPaginate::ViewHelpers.pagination_options[:per_page_param_name] = TrustyCms::Config["pagination.per_page_param_name"].blank? ? :per_page : TrustyCms::Config["pagination.per_page_param_name"].to_sym
+        WillPaginate::ViewHelpers.pagination_options[:param_name] = TrustyCms::Config['pagination.param_name'].to_sym unless TrustyCms::Config['pagination.param_name'].blank?
+        WillPaginate::ViewHelpers.pagination_options[:per_page_param_name] = TrustyCms::Config['pagination.per_page_param_name'].blank? ? :per_page : TrustyCms::Config['pagination.per_page_param_name'].to_sym
 
         # will_paginate view options can be overridden by tag attributes
-        [:class, :previous_label, :next_label, :inner_window, :outer_window, :separator, :container].each do |opt|
+        %i[class previous_label next_label inner_window outer_window separator container].each do |opt|
           WillPaginate::ViewHelpers.pagination_options[opt] = TrustyCms::Config["pagination.#{opt}"] unless TrustyCms::Config["pagination.#{opt}"].blank?
         end
       end
 
       def pagination_parameters
         {
-          :page => params[WillPaginate::ViewHelpers.pagination_options[:param_name]] || 1,
-          :per_page => params[WillPaginate::ViewHelpers.pagination_options[:per_page_param_name]] || TrustyCms::Config['pagination.per_page'] || 20
+          page: params[WillPaginate::ViewHelpers.pagination_options[:param_name]] || 1,
+          per_page: params[WillPaginate::ViewHelpers.pagination_options[:per_page_param_name]] || TrustyCms::Config['pagination.per_page'] || 20,
         }
       end
 
       def self.included(base)
-        base.class_eval {
+        base.class_eval do
           helper_method :pagination_parameters
           before_action :configure_pagination
-        }
+        end
       end
     end
   end
-
-
-
 end
 
 

data/lib/trusty_cms/pagination/link_renderer.rb

@@ -23,10 +23,10 @@ module TrustyCms
         linkclass = %{ class="#{attributes[:class]}"} if attributes[:class]
         linkrel = %{ rel="#{attributes[:rel]}"} if attributes[:rel]
         param_name = WillPaginate::ViewHelpers.pagination_options[:param_name]
-        %Q{<a href="#{@url_stem}?#{param_name}=#{page}"#{linkrel}#{linkclass}>#{text}</a>}
+        %{<a href="#{@url_stem}?#{param_name}=#{page}"#{linkrel}#{linkclass}>#{text}</a>}
       end
 
-      def page_span(page, text, attributes = {})
+      def page_span(_page, text, attributes = {})
         %{<span class="#{attributes[:class]}">#{text}</span>}
       end
     end

data/lib/trusty_cms/resource_responses.rb

@@ -39,7 +39,7 @@ module TrustyCms
         lambda do
           # 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 proc.lambda? and proc.arity != 1
+          if RUBY_VERSION =~ /^1\.9/ && proc.lambda? && (proc.arity != 1)
             raise "You can only pass a proc ('Proc.new') or a lambda that takes exactly one arg (for self) to the wrap method."
           end
 
@@ -51,7 +51,7 @@ module TrustyCms
     class Collector < OpenStruct
       def initialize
         super
-        @table = Hash.new {|h,k| h[k] = Response.new }
+        @table = Hash.new { |h, k| h[k] = Response.new }
       end
 
       def initialize_copy(orig)
@@ -90,7 +90,7 @@ module TrustyCms
         if block_given?
           @publish_block = block
         else
-          raise ArgumentError, "Block required to publish" unless @publish_block
+          raise ArgumentError, 'Block required to publish' unless @publish_block
         end
       end
 

data/lib/trusty_cms/setup.rb

@@ -1,9 +1,8 @@
-require "highline"
-require "forwardable"
+require 'highline'
+require 'forwardable'
 
 module TrustyCms
   class Setup
-
     class << self
       def bootstrap(config)
         setup = new
@@ -19,24 +18,24 @@ module TrustyCms
       @admin = create_admin_user(config[:admin_name], config[:admin_username], config[:admin_password])
       load_default_configuration
       # load_database_template(config[:database_template])
-      announce "Finished."
+      announce 'Finished.'
     end
 
     def create_admin_user(name, username, password)
-      unless name and username and password
-        announce "Create the admin user (press enter for defaults)."
-        name = prompt_for_admin_name unless name
-        username = prompt_for_admin_username unless username
-        password = prompt_for_admin_password unless password
+      unless name && username && password
+        announce 'Create the admin user (press enter for defaults).'
+        name ||= prompt_for_admin_name
+        username ||= prompt_for_admin_username
+        password ||= prompt_for_admin_password
       end
       attributes = {
-        :name => name,
-        :login => username,
-        :password => password,
-        :password_confirmation => password
+        name: name,
+        login: username,
+        password: password,
+        password_confirmation: password,
       }
       admin = User.find_by(login: username)
-      admin = User.new unless admin
+      admin ||= User.new
       admin.update_attributes(attributes)
       admin.admin = true
       admin.save
@@ -45,11 +44,11 @@ module TrustyCms
 
     def load_default_configuration
       feedback "\nInitializing configuration" do
-        step { TrustyCms::Config['admin.title'   ] = 'TrustyCms CMS' }
+        step { TrustyCms::Config['admin.title'] = 'TrustyCms CMS' }
         step { TrustyCms::Config['admin.subtitle'] = 'Publishing for Small Teams' }
-        step { TrustyCms::Config['defaults.page.parts' ] = 'body, extended' }
-        step { TrustyCms::Config['defaults.page.status' ] = 'Draft' }
-        step { TrustyCms::Config['defaults.page.filter' ] = nil }
+        step { TrustyCms::Config['defaults.page.parts'] = 'body, extended' }
+        step { TrustyCms::Config['defaults.page.status'] = 'Draft' }
+        step { TrustyCms::Config['defaults.page.filter'] = nil }
         step { TrustyCms::Config['defaults.page.fields'] = 'Keywords, Description' }
         step { TrustyCms::Config['session_timeout'] = 2.weeks }
         step { TrustyCms::Config['default_locale'] = 'en' }
@@ -60,11 +59,11 @@ module TrustyCms
       template = nil
       if filename
         name = find_template_in_path(filename)
-        unless name
+        if name
+          template = load_template_file(name)
+        else
           announce "Invalid template name: #{filename}"
           filename = nil
-        else
-          template = load_template_file(name)
         end
       end
       unless filename
@@ -88,141 +87,140 @@ module TrustyCms
 
     private
 
-      def prompt_for_admin_name
-        username = ask('Name (Administrator): ', String) do |q|
-          q.validate = /^.{0,100}$/
-          q.responses[:not_valid] = "Invalid name. Must be under 100 characters long."
-          q.whitespace = :strip
-        end
-        username = "Administrator" if username.blank?
-        username
+    def prompt_for_admin_name
+      username = ask('Name (Administrator): ', String) do |q|
+        q.validate = /^.{0,100}$/
+        q.responses[:not_valid] = 'Invalid name. Must be under 100 characters long.'
+        q.whitespace = :strip
       end
+      username = 'Administrator' if username.blank?
+      username
+    end
 
-      def prompt_for_admin_username
-        username = ask('Username (admin): ', String) do |q|
-          q.validate = /^(|.{3,40})$/
-          q.responses[:not_valid] = "Invalid username. Must be at least 3 characters long."
-          q.whitespace = :strip
-        end
-        username = "admin" if username.blank?
-        username
+    def prompt_for_admin_username
+      username = ask('Username (admin): ', String) do |q|
+        q.validate = /^(|.{3,40})$/
+        q.responses[:not_valid] = 'Invalid username. Must be at least 3 characters long.'
+        q.whitespace = :strip
       end
+      username = 'admin' if username.blank?
+      username
+    end
 
-      def prompt_for_admin_password
-        default_password = 'trusty'
-        password = ask("Password (#{default_password}): ", String) do |q|
-          q.echo = false unless defined?(::JRuby) # JRuby doesn't support stty interaction
-          q.validate = /^(|.{5,40})$/
-          q.responses[:not_valid] = "Invalid password. Must be at least 5 characters long."
-          q.whitespace = :strip
-        end
-        password = default_password if password.blank?
-        password
+    def prompt_for_admin_password
+      default_password = 'trusty'
+      password = ask("Password (#{default_password}): ", String) do |q|
+        q.echo = false unless defined?(::JRuby) # JRuby doesn't support stty interaction
+        q.validate = /^(|.{5,40})$/
+        q.responses[:not_valid] = 'Invalid password. Must be at least 5 characters long.'
+        q.whitespace = :strip
       end
+      password = default_password if password.blank?
+      password
+    end
 
-      def find_template_in_path(filename)
-        (
-          [
-            filename,
-            "#{TRUSTY_CMS_ROOT}/#{filename}",
-            "#{TRUSTY_CMS_ROOT}/db/templates/#{filename}",
-            "#{Rails.root}/#{filename}",
-            "#{Rails.root}/db/templates/#{filename}",
-            "#{Dir.pwd}/#{filename}",
-            "#{Dir.pwd}/db/templates/#{filename}"
-          ] +
-          Dir.glob("#{TRUSTY_CMS_ROOT}/vendor/extensions/**/db/templates/#{filename}") +
-          Dir.glob("#{Rails.root}/vendor/extensions/**/db/templates/#{filename}") +
-          TrustyCms::Extension.descendants.inject([]) do |r, d|
-            r << "#{d.root}/db/templates/#{filename}"
-          end
-        ).find { |name| File.file?(name) }
-      end
+    def find_template_in_path(filename)
+      (
+        [
+          filename,
+          "#{TRUSTY_CMS_ROOT}/#{filename}",
+          "#{TRUSTY_CMS_ROOT}/db/templates/#{filename}",
+          "#{Rails.root}/#{filename}",
+          "#{Rails.root}/db/templates/#{filename}",
+          "#{Dir.pwd}/#{filename}",
+          "#{Dir.pwd}/db/templates/#{filename}",
+        ] +
+        Dir.glob("#{TRUSTY_CMS_ROOT}/vendor/extensions/**/db/templates/#{filename}") +
+        Dir.glob("#{Rails.root}/vendor/extensions/**/db/templates/#{filename}") +
+        TrustyCms::Extension.descendants.inject([]) do |r, d|
+          r << "#{d.root}/db/templates/#{filename}"
+        end
+      ).find { |name| File.file?(name) }
+    end
 
-      def find_and_load_templates(glob)
-        templates = Dir[glob]
-        templates.map! { |template| load_template_file(template) }
-        templates.sort_by { |template| template['name'] }
-      end
+    def find_and_load_templates(glob)
+      templates = Dir[glob]
+      templates.map! { |template| load_template_file(template) }
+      templates.sort_by { |template| template['name'] }
+    end
 
-      def load_template_file(filename)
-        YAML.load_file(filename)
-      end
+    def load_template_file(filename)
+      YAML.load_file(filename)
+    end
 
-      def create_records(template)
-        records = template['records']
-        if records
-          puts
-          records.keys.each do |key|
-            feedback "Creating #{key.to_s.underscore.humanize}" do
-              model = model(key)
-              model.reset_column_information
-              record_pairs = order_by_id(records[key])
-              step do
-                record_pairs.each do |id, record|
-                  model.new(record).save
-                end
+    def create_records(template)
+      records = template['records']
+      if records
+        puts
+        records.keys.each do |key|
+          feedback "Creating #{key.to_s.underscore.humanize}" do
+            model = model(key)
+            model.reset_column_information
+            record_pairs = order_by_id(records[key])
+            step do
+              record_pairs.each do |_id, record|
+                model.new(record).save
               end
             end
           end
         end
       end
+    end
 
-      def model(model_name)
-        model_name.to_s.singularize.constantize
-      end
-
-      def order_by_id(records)
-        records.map { |name, record| [record['id'], record] }.sort { |a, b| a[0] <=> b[0] }
-      end
+    def model(model_name)
+      model_name.to_s.singularize.constantize
+    end
 
-      extend Forwardable
-      def_delegators :terminal, :agree, :ask, :choose, :say
+    def order_by_id(records)
+      records.map { |_name, record| [record['id'], record] }.sort { |a, b| a[0] <=> b[0] }
+    end
 
-      def terminal
-        @terminal ||= HighLine.new
-      end
+    extend Forwardable
+    def_delegators :terminal, :agree, :ask, :choose, :say
 
-      def output
-        terminal.instance_variable_get("@output")
-      end
+    def terminal
+      @terminal ||= HighLine.new
+    end
 
-      def wrap(string)
-        string = terminal.send(:wrap, string) unless terminal.wrap_at.nil?
-        string
-      end
+    def output
+      terminal.instance_variable_get('@output')
+    end
 
-      def print(string)
-        output.print(wrap(string))
-        output.flush
-      end
+    def wrap(string)
+      string = terminal.send(:wrap, string) unless terminal.wrap_at.nil?
+      string
+    end
 
-      def puts(string = "\n")
-        say string
-      end
+    def print(string)
+      output.print(wrap(string))
+      output.flush
+    end
 
-      def announce(string)
-        puts "\n#{string}"
-      end
+    def puts(string = "\n")
+      say string
+    end
 
-      def feedback(process, &block)
-        print "#{process}..."
-        if yield
-          puts "OK"
-          true
-        else
-          puts "FAILED"
-          false
-        end
-      rescue Exception => e
-        puts "FAILED"
-        raise e
-      end
+    def announce(string)
+      puts "\n#{string}"
+    end
 
-      def step
-        yield if block_given?
-        print '.'
-      end
+    def feedback(process)
+      print "#{process}..."
+      if yield
+        puts 'OK'
+        true
+      else
+        puts 'FAILED'
+        false
+      end
+    rescue Exception => e
+      puts 'FAILED'
+      raise e
+    end
 
+    def step
+      yield if block_given?
+      print '.'
+    end
   end
 end

data/lib/trusty_cms/taggable.rb

@@ -13,20 +13,21 @@ module TrustyCms::Taggable
         end
         class << new_base
           def default_url_options
-            {:controller => "site", :action => "show_page", :only_path => true}
+            { controller: 'site', action: 'show_page', only_path: true }
           end
         end
-        new_base.tag_descriptions.merge! self.tag_descriptions
+        new_base.tag_descriptions.merge! tag_descriptions
       end
 
       protected
-        def params
-          @params ||= request.parameters unless request.nil?
-        end
 
-        def request_uri
-          @request_url ||= request.request_uri unless request.nil?
-        end
+      def params
+        @params ||= request.parameters unless request.nil?
+      end
+
+      def request_uri
+        @request_url ||= request.request_uri unless request.nil?
+      end
     end
   end
 
@@ -44,11 +45,11 @@ module TrustyCms::Taggable
     Util.tags_in_array(methods)
   end
 
-  def tag_descriptions(hash=nil)
+  def tag_descriptions(hash = nil)
     self.class.tag_descriptions hash
   end
 
-  def warn_of_tag_deprecation(tag_name, options={})
+  def warn_of_tag_deprecation(tag_name, options = {})
     message = "Deprecated radius tag <r:#{tag_name}>"
     message << " will be removed or significantly changed in trusty #{options[:deadline]}." if options[:deadline]
     message << " Please use <r:#{options[:substitute]}> instead." if options[:substitute]
@@ -57,12 +58,12 @@ module TrustyCms::Taggable
 
   module ClassMethods
     def inherited(subclass)
-      subclass.tag_descriptions.reverse_merge! self.tag_descriptions
+      subclass.tag_descriptions.reverse_merge! tag_descriptions
       super
     end
 
     def tag_descriptions(hash = nil)
-      TrustyCms::Taggable.tag_descriptions[self.name] ||= (hash ||{})
+      TrustyCms::Taggable.tag_descriptions[name] ||= (hash || {})
     end
 
     def desc(text)
@@ -71,13 +72,13 @@ module TrustyCms::Taggable
     end
 
     def tag(name, &block)
-      self.tag_descriptions[name] = TrustyCms::Taggable.last_description if TrustyCms::Taggable.last_description
+      tag_descriptions[name] = TrustyCms::Taggable.last_description if TrustyCms::Taggable.last_description
       TrustyCms::Taggable.last_description = nil
       define_method("tag:#{name}", &block)
     end
 
     def tags
-      Util.tags_in_array(self.instance_methods)
+      Util.tags_in_array(instance_methods)
     end
 
     # Define a tag while also deprecating it. Normal usage:
@@ -98,7 +99,7 @@ module TrustyCms::Taggable
     #   raise TagError "..."
     # end
     #
-    def deprecated_tag(name, options={}, &dblock)
+    def deprecated_tag(name, options = {}, &dblock)
       TrustyCms::Taggable.tag_deprecations[name] = options.dup
       if dblock
         tag(name) do |tag|
@@ -121,18 +122,14 @@ module TrustyCms::Taggable
 
     def self.strip_leading_whitespace(text)
       text = text.dup
-      text.gsub!("\t", "  ")
+      text.gsub!("\t", '  ')
       lines = text.split("\n")
       leading = lines.map do |line|
         unless line =~ /^\s*$/
-           line.match(/^(\s*)/)[0].length
-        else
-          nil
+          line.match(/^(\s*)/)[0].length
         end
       end.compact.min
-      lines.inject([]) {|ary, line| ary << line.sub(/^[ ]{#{leading}}/, "")}.join("\n")
+      lines.inject([]) { |ary, line| ary << line.sub(/^[ ]{#{leading}}/, '') }.join("\n")
     end
-
   end
-
 end