sunrise-cms 1.0.3 → 1.1.1

data/lib/sunrise/utils/search_wrapper.rb

@@ -1,18 +1,19 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 module Sunrise
   module Utils
     module SearchWrapper
       extend ActiveSupport::Concern
-      
+
       included do
         helper_method :search_wrapper
       end
-      
+
       protected
-      
-        def search_wrapper
-          @search_wrapper ||= Sunrise::Views::SearchWrapper.new(params[:search])
-        end
+
+      def search_wrapper
+        @search_wrapper ||= Sunrise::Views::SearchWrapper.new(params[:search])
+      end
     end
   end
 end

data/lib/sunrise/utils/transliteration.rb

@@ -1,7 +1,8 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 module Sunrise
   module Utils
-    # Russian transliteration 
+    # Russian transliteration
     #
     module Transliteration
       extend self
@@ -11,58 +12,58 @@ module Sunrise
       # Cleaned up and optimized.
 
       LOWER_SINGLE = {
-        "і"=>"i","ґ"=>"g","ё"=>"yo","№"=>"#","є"=>"e",
-        "ї"=>"yi","а"=>"a","б"=>"b",
-        "в"=>"v","г"=>"g","д"=>"d","е"=>"e","ж"=>"zh",
-        "з"=>"z","и"=>"i","й"=>"y","к"=>"k","л"=>"l",
-        "м"=>"m","н"=>"n","о"=>"o","п"=>"p","р"=>"r",
-        "с"=>"s","т"=>"t","у"=>"u","ф"=>"f","х"=>"h",
-        "ц"=>"ts","ч"=>"ch","ш"=>"sh","щ"=>"sch","ъ"=>"'",
-        "ы"=>"y","ь"=>"","э"=>"e","ю"=>"yu","я"=>"ya",
-      }
+        'і' => 'i', 'ґ' => 'g', 'ё' => 'yo', '№' => '#', 'є' => 'e',
+        'ї' => 'yi', 'а' => 'a', 'б' => 'b',
+        'в' => 'v', 'г' => 'g', 'д' => 'd', 'е' => 'e', 'ж' => 'zh',
+        'з' => 'z', 'и' => 'i', 'й' => 'y', 'к' => 'k', 'л' => 'l',
+        'м' => 'm', 'н' => 'n', 'о' => 'o', 'п' => 'p', 'р' => 'r',
+        'с' => 's', 'т' => 't', 'у' => 'u', 'ф' => 'f', 'х' => 'h',
+        'ц' => 'ts', 'ч' => 'ch', 'ш' => 'sh', 'щ' => 'sch', 'ъ' => "'",
+        'ы' => 'y', 'ь' => '', 'э' => 'e', 'ю' => 'yu', 'я' => 'ya'
+      }.freeze
       LOWER_MULTI = {
-        "ье"=>"ie",
-        "ьё"=>"ie",
-      }
+        'ье' => 'ie',
+        'ьё' => 'ie'
+      }.freeze
 
       UPPER_SINGLE = {
-        "Ґ"=>"G","Ё"=>"YO","Є"=>"E","Ї"=>"YI","І"=>"I",
-        "А"=>"A","Б"=>"B","В"=>"V","Г"=>"G",
-        "Д"=>"D","Е"=>"E","Ж"=>"ZH","З"=>"Z","И"=>"I",
-        "Й"=>"Y","К"=>"K","Л"=>"L","М"=>"M","Н"=>"N",
-        "О"=>"O","П"=>"P","Р"=>"R","С"=>"S","Т"=>"T",
-        "У"=>"U","Ф"=>"F","Х"=>"H","Ц"=>"TS","Ч"=>"CH",
-        "Ш"=>"SH","Щ"=>"SCH","Ъ"=>"'","Ы"=>"Y","Ь"=>"",
-        "Э"=>"E","Ю"=>"YU","Я"=>"YA",
-      }
+        'Ґ' => 'G', 'Ё' => 'YO', 'Є' => 'E', 'Ї' => 'YI', 'І' => 'I',
+        'А' => 'A', 'Б' => 'B', 'В' => 'V', 'Г' => 'G',
+        'Д' => 'D', 'Е' => 'E', 'Ж' => 'ZH', 'З' => 'Z', 'И' => 'I',
+        'Й' => 'Y', 'К' => 'K', 'Л' => 'L', 'М' => 'M', 'Н' => 'N',
+        'О' => 'O', 'П' => 'P', 'Р' => 'R', 'С' => 'S', 'Т' => 'T',
+        'У' => 'U', 'Ф' => 'F', 'Х' => 'H', 'Ц' => 'TS', 'Ч' => 'CH',
+        'Ш' => 'SH', 'Щ' => 'SCH', 'Ъ' => "'", 'Ы' => 'Y', 'Ь' => '',
+        'Э' => 'E', 'Ю' => 'YU', 'Я' => 'YA'
+      }.freeze
       UPPER_MULTI = {
-        "ЬЕ"=>"IE",
-        "ЬЁ"=>"IE",
-      }
+        'ЬЕ' => 'IE',
+        'ЬЁ' => 'IE'
+      }.freeze
 
-      LOWER = (LOWER_SINGLE.merge(LOWER_MULTI)).freeze
-      UPPER = (UPPER_SINGLE.merge(UPPER_MULTI)).freeze
-      MULTI_KEYS = (LOWER_MULTI.merge(UPPER_MULTI)).keys.sort_by {|s| s.length}.reverse.freeze
+      LOWER = LOWER_SINGLE.merge(LOWER_MULTI).freeze
+      UPPER = UPPER_SINGLE.merge(UPPER_MULTI).freeze
+      MULTI_KEYS = LOWER_MULTI.merge(UPPER_MULTI).keys.sort_by { |s| s.length }.reverse.freeze
 
       # Transliterate a string with russian characters
       #
       # Возвращает строку, в которой все буквы русского алфавита заменены на похожую по звучанию латиницу
       def transliterate(str)
-        chars = str.scan(%r{#{MULTI_KEYS.join '|'}|\w|.})
+        chars = str.scan(/#{MULTI_KEYS.join '|'}|\w|./)
 
-        result = ""
+        result = ''
 
         chars.each_with_index do |char, index|
-          if UPPER.has_key?(char) && LOWER.has_key?(chars[index+1])
-            # combined case
-            result << UPPER[char].downcase.capitalize
-          elsif UPPER.has_key?(char)
-            result << UPPER[char]
-          elsif LOWER.has_key?(char)
-            result << LOWER[char]
-          else
-            result << char
-          end
+          result << if UPPER.key?(char) && LOWER.key?(chars[index + 1])
+                      # combined case
+                      UPPER[char].downcase.capitalize
+                    elsif UPPER.key?(char)
+                      UPPER[char]
+                    elsif LOWER.key?(char)
+                      LOWER[char]
+                    else
+                      char
+                    end
         end
 
         result

data/lib/sunrise/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Sunrise
-  VERSION = "1.0.3".freeze
+  VERSION = '1.1.1'.freeze
 end

data/lib/sunrise/views/date_time_input.rb

@@ -1,20 +1,22 @@
+# frozen_string_literal: true
+
 require 'simple_form'
 
 module SimpleForm
   module Inputs
     class DateTimeInput < Base
       include ActionView::Helpers::TagHelper
-      
+
       def input
         input_html_options[:value] ||= formated_value
         month_count = input_html_options[:month_count] || 1
-        
+
         icon = "<div class='but-holder icon'><div class='act-but'><a class='but-container calend' href='javascript:void(0);' id='#{@builder.object_name}_#{attribute_name}_icon'><img src='/assets/sunrise/empty.gif' /></a></div></div>".html_safe
-        html = [content_tag(:div, @builder.text_field(attribute_name, input_html_options) + icon, :class => 'calend-holder')]
-        
+        html = [content_tag(:div, @builder.text_field(attribute_name, input_html_options) + icon, class: 'calend-holder')]
+
         html << case input_type
-          when :date then
-            @builder.javascript_tag("$(function() {
+                when :date
+                  @builder.javascript_tag("$(function() {
 		          $('##{@builder.object_name}_#{attribute_name}').datepicker({
 			          numberOfMonths: #{month_count},
 			          showButtonPanel: true
@@ -23,8 +25,8 @@ module SimpleForm
 		            $('##{@builder.object_name}_#{attribute_name}').datepicker('show');
 		          });
 	          });")
-	        when :datetime then
-	          @builder.javascript_tag("$(function() {
+                when :datetime
+                  @builder.javascript_tag("$(function() {
 		          $('##{@builder.object_name}_#{attribute_name}').datetimepicker({
 			          numberOfMonths: #{month_count},
 			          hourGrid: 4,
@@ -34,25 +36,25 @@ module SimpleForm
 		            $('##{@builder.object_name}_#{attribute_name}').datetimepicker('show');
 		          });
 	          });")
-	      end
+        end
 
-	      html.join.html_safe
+        html.join.html_safe
       end
 
-    private
-      
+      private
+
       def formated_value
         object.send(attribute_name).try(:strftime, value_format)
       end
-      
+
       def value_format
         case input_type
-          when :date then "%d.%m.%Y"
-          when :datetime then "%d.%m.%Y %H:%M"
-          when :time then "%H:%M"
+        when :date then '%d.%m.%Y'
+        when :datetime then '%d.%m.%Y %H:%M'
+        when :time then '%H:%M'
         end
       end
-      
+
       def has_required?
         false
       end

data/lib/sunrise/views/form_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'simple_form'
 require 'sunrise/views/date_time_input'
 
@@ -6,28 +8,28 @@ module Sunrise
     class FormBuilder < ::SimpleForm::FormBuilder
       include ActionView::Helpers::TagHelper
       include ActionView::Helpers::JavaScriptHelper
-      
+
       def input(attribute_name, options = {}, &block)
         options[:input_html] ||= {}
-        options[:input_html] = {:class => 'text'}.merge(options[:input_html])
-        
-        attribute_name = "#{attribute_name}_#{options[:locale]}" unless options[:locale].blank?
-        
+        options[:input_html] = { class: 'text' }.merge(options[:input_html])
+
+        attribute_name = "#{attribute_name}_#{options[:locale]}" if options[:locale].present?
+
         super(attribute_name, options, &block)
       end
-      
-      def globalize(options={}, &block)
+
+      def globalize(options = {})
         locales = options[:locales] || Sunrise.available_locales
         html = []
-        
+
         html.join.html_safe
       end
-      
+
       protected
-      
-        def object_plural
-          object_name.to_s.pluralize
-        end
+
+      def object_plural
+        object_name.to_s.pluralize
+      end
     end
   end
 end

data/lib/sunrise/views/helper.rb

@@ -1,16 +1,17 @@
+# frozen_string_literal: true
+
 module Sunrise
   module Views
     module Helper
-
       def javascript(*args)
-	      content_for(:head) { javascript_include_tag(*args) }
+        content_for(:head) { javascript_include_tag(*args) }
       end
 
       def stylesheet(*args)
         content_for(:head) { stylesheet_link_tag(*args) }
       end
 
-      def link_by_href(name, options={})
+      def link_by_href(name, options = {})
         link_to name, name, options
       end
 
@@ -21,9 +22,9 @@ module Sunrise
       def link_to_unless_span(condition, name, options = {}, html_options = {}, &block)
         if condition
           if block_given?
-	          block.arity <= 1 ? yield(name) : yield(name, options, html_options)
+            block.arity <= 1 ? yield(name) : yield(name, options, html_options)
           else
-           content_tag(:span, name, html_options)
+            content_tag(:span, name, html_options)
           end
         else
           link_to(name, options, html_options)
@@ -40,70 +41,69 @@ module Sunrise
           link_to(name, options, html_options)
         else
           if block_given?
-	          block.arity <= 1 ? yield(name) : yield(name, options, html_options)
+            block.arity <= 1 ? yield(name) : yield(name, options, html_options)
           else
-           content_tag(tag_name, name, html_options)
+            content_tag(tag_name, name, html_options)
           end
         end
-      end	
+      end
 
       def link_to_unless_tag(condition, name, options = {}, html_options = {}, &block)
         tag_name = html_options.delete(:tag) || :span
-        unless condition
-          link_to(name, options, html_options)
-        else
+        if condition
           if block_given?
-	          block.arity <= 1 ? yield(name) : yield(name, options, html_options)
+            block.arity <= 1 ? yield(name) : yield(name, options, html_options)
           else
-           content_tag(tag_name, name, html_options)
+            content_tag(tag_name, name, html_options)
           end
+        else
+          link_to(name, options, html_options)
         end
       end
 
       # swf_object
       def swf_object(swf, id, width, height, flash_version, options = {})
         options.symbolize_keys!
-        
+
         params = options.delete(:params) || {}
         attributes = options.delete(:attributes) || {}
         flashvars = options.delete(:flashvars) || {}
-        
-        attributes[:classid] ||= "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+
+        attributes[:classid] ||= 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000'
         attributes[:id] ||= id
         attributes[:name] ||= id
-        
+
         output_buffer = ActiveSupport::SafeBuffer.new
-        
+
         if options[:create_div]
-          output_buffer << content_tag(:div, 
-            "This website requires <a href='http://www.adobe.com/shockwave/download/download.cgi?P1_Prod_Version=ShockwaveFlash&promoid=BIOW' target='_blank'>Flash player</a> #{flash_version} or higher.",
-            :id => id)
+          output_buffer << content_tag(:div,
+                                       "This website requires <a href='http://www.adobe.com/shockwave/download/download.cgi?P1_Prod_Version=ShockwaveFlash&promoid=BIOW' target='_blank'>Flash player</a> #{flash_version} or higher.",
+                                       id: id)
         end
-        
+
         js = []
-        
-        js << "var params = {#{params.to_a.map{|item| "#{item[0]}:'#{item[1]}'" }.join(',')}};"
-        js << "var attributes = {#{attributes.to_a.map{|item| "#{item[0]}:'#{item[1]}'" }.join(',')}};"
-        js << "var flashvars = {#{flashvars.to_a.map{|item| "#{item[0]}:'#{item[1]}'" }.join(',')}};"
+
+        js << "var params = {#{params.to_a.map { |item| "#{item[0]}:'#{item[1]}'" }.join(',')}};"
+        js << "var attributes = {#{attributes.to_a.map { |item| "#{item[0]}:'#{item[1]}'" }.join(',')}};"
+        js << "var flashvars = {#{flashvars.to_a.map { |item| "#{item[0]}:'#{item[1]}'" }.join(',')}};"
 
         js << "swfobject.embedSWF('#{swf}', '#{id}', '#{width}', '#{height}', '#{flash_version}', '/swf/expressInstall.swf', flashvars, params, attributes);"
 
         output_buffer << javascript_tag(js.join)
-        
+
         output_buffer
       end
 
-      def encode_email(email_address, options = {})
+      def encode_email(email_address, _options = {})
         email_address = email_address.to_s
         string = ''
 
         "document.write('#{email_address}');".each_byte do |c|
-           string << sprintf("%%%x", c)
-         end
-         
+          string << format('%%%x', c)
+        end
+
         "<script type=\"#{Mime::JS}\">eval(decodeURIComponent('#{string}'))</script>"
       end
-      
     end
   end
 end

data/lib/sunrise/views/search_wrapper.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 require 'ostruct'
 
 module Sunrise
   module Views
     class SearchWrapper < ::OpenStruct
       extend ActiveModel::Naming
-      
+
       def self.model_name
         @_model_name ||= begin
-          namespace = self.parents.detect { |n| n.respond_to?(:_railtie) }
-          ActiveModel::Name.new(self, namespace, "search")
+          namespace = parents.detect { |n| n.respond_to?(:_railtie) }
+          ActiveModel::Name.new(self, namespace, 'search')
         end
       end
     end

data/lib/tasks/assets.rake

@@ -1,24 +1,26 @@
-require 'progressbar'
+# frozen_string_literal: true
 
 namespace :assets do
-  desc "Refresh carrierwave assets versions by model (CLASS=)"
-  task :reprocess => :environment do
+  desc 'Refresh carrierwave assets versions by model (CLASS=)'
+  task reprocess: :environment do
+    require 'progressbar'
+
     name = (ENV['CLASS'] || ENV['class'] || 'Asset').to_s
     klass = name.safe_constantize
-    
+
     raise "Cannot find a constant with the #{name} specified in the argument string" if klass.nil?
-    
+
     pbar = ProgressBar.new(name, klass.count)
-    pbar.bar_mark = "="
-    
+    pbar.bar_mark = '='
+
     index = 0
-    
+
     klass.find_each do |item|
       item.data.recreate_versions!
       index += 1
       pbar.set(index)
     end
-    
+
     pbar.finish
   end
 end