style fixes, dropping old-style hash

Author: mlitwiniuk

Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 # Declare your gem's dependencies in lit.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and
@@ -28,9 +28,9 @@ group :test do
   gem 'simple_form'
   gem 'ransack'
   gem 'kaminari'
-  gem 'fakeweb', "~> 1.3", :require=>false
-  gem "test_declarative", :require => false
-  gem 'mocha', :require => false
+  gem 'fakeweb', '~> 1.3', require: false
+  gem 'test_declarative', require: false
+  gem 'mocha', require: false
 end
 
 group :development, :test do

Rakefile

@@ -13,7 +13,6 @@ rescue LoadError
   RDoc::Task = Rake::RDocTask
 end
 
-
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Lit'
@@ -22,7 +21,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('../test/dummy/Rakefile', __FILE__)
 load 'rails/tasks/engine.rake'
 
 Bundler::GemHelper.install_tasks
@@ -36,5 +35,3 @@ Rake::TestTask.new(:test) do |t|
   t.pattern = 'test/**/*_test.rb'
   t.verbose = false
 end
-
-

app/controllers/lit/api/v1/base_controller.rb

@@ -6,13 +6,13 @@ class BaseController < ActionController::Base
         respond_to :json
         before_filter :authenticate_requests!
 
-
         private
-          def authenticate_requests!
-            authenticate_or_request_with_http_token do |token, options|
-              Lit.api_key == token
-            end
+
+        def authenticate_requests!
+          authenticate_or_request_with_http_token do |token, _options|
+            Lit.api_key == token
           end
+        end
       end
     end
   end

app/controllers/lit/api/v1/locales_controller.rb

@@ -1,12 +1,12 @@
-require_dependency "lit/api/v1/base_controller"
+require_dependency 'lit/api/v1/base_controller'
 
 module Lit
   module Api
     module V1
       class LocalesController < Api::V1::BaseController
         def index
           @locales = Locale.all
-          render :json=>@locales.as_json(:root=>false, :only=>[:id, :locale])
+          render json: @locales.as_json(root: false, only: [:id, :locale])
         end
       end
     end

app/controllers/lit/api/v1/localization_keys_controller.rb

@@ -1,4 +1,4 @@
-require_dependency "lit/api/v1/base_controller"
+require_dependency 'lit/api/v1/base_controller'
 
 module Lit
   class Api::V1::LocalizationKeysController < Api::V1::BaseController
@@ -9,8 +9,7 @@ def index
       else
         @localization_keys = @localization_keys.all
       end
-      render :json=>@localization_keys.as_json(:root=>false, :only=>[:id, :localization_key])
+      render json: @localization_keys.as_json(root: false, only: [:id, :localization_key])
     end
   end
 end
-

app/controllers/lit/api/v1/localizations_controller.rb

@@ -7,12 +7,12 @@ def index
       else
         @localizations = @localizations.all
       end
-      render :json=>@localizations.as_json(:root=>false, :only=>[:id, :localization_key_id, :locale_id], :methods=>[:value, :localization_key_str, :locale_str])
+      render json: @localizations.as_json(root: false, only: [:id, :localization_key_id, :locale_id], methods: [:value, :localization_key_str, :locale_str])
     end
 
     def last_change
       @localization = Localization.order('updated_at DESC').first
-      render :json=>@localization.as_json(:root=>false, :only=>[], :methods=>[:last_change])
+      render json: @localization.as_json(root: false, only: [], methods: [:last_change])
     end
   end
 end

app/controllers/lit/application_controller.rb

@@ -5,18 +5,19 @@ class ApplicationController < ActionController::Base
     after_filter :restore_hits_counter
 
     private
-      def authenticate
-        if Lit.authentication_function.present?
-          send(Lit.authentication_function)
-        end
-      end
 
-      def stop_hits_counter
-        Lit.init.cache.stop_hits_counter
-      end
+    def authenticate
+      return unless Lit.authentication_function.present?
 
-      def restore_hits_counter
-        Lit.init.cache.restore_hits_counter
-      end
+      send(Lit.authentication_function)
+    end
+
+    def stop_hits_counter
+      Lit.init.cache.stop_hits_counter
+    end
+
+    def restore_hits_counter
+      Lit.init.cache.restore_hits_counter
+    end
   end
 end

app/controllers/lit/dashboard_controller.rb

@@ -1,4 +1,4 @@
-require_dependency "lit/application_controller"
+require_dependency 'lit/application_controller'
 
 module Lit
   class DashboardController < ::Lit::ApplicationController

app/controllers/lit/incomming_localizations_controller.rb

@@ -1,4 +1,4 @@
-require_dependency "lit/application_controller"
+require_dependency 'lit/application_controller'
 
 module Lit
   class IncommingLocalizationsController < ApplicationController
@@ -35,8 +35,9 @@ def destroy
     end
 
     private
-      def find_source
-        @source = Source.find(params[:source_id].to_i)
-      end
+
+    def find_source
+      @source = Source.find(params[:source_id].to_i)
+    end
   end
 end

app/controllers/lit/locales_controller.rb

@@ -1,27 +1,27 @@
-require_dependency "lit/application_controller"
+require_dependency 'lit/application_controller'
 
 module Lit
   class LocalesController < ApplicationController
     def index
       @locales = Locale.ordered.all
-  
+
       respond_to do |format|
         format.html # index.html.erb
         format.json { render json: @locales }
       end
     end
-    
+
     def hide
       @locale = Locale.find(params[:id])
       @locale.is_hidden = !@locale.is_hidden?
       @locale.save
       respond_to :js
     end
-  
+
     def destroy
       @locale = Locale.find(params[:id])
       @locale.destroy
-  
+
       respond_to do |format|
         format.html { redirect_to locales_url }
         format.json { head :no_content }

app/controllers/lit/localization_keys_controller.rb

@@ -1,19 +1,19 @@
 module Lit
   class LocalizationKeysController < ::Lit::ApplicationController
-    before_filter :get_localization_scope, :except=>[:destroy]
+    before_filter :get_localization_scope, except: [:destroy]
 
     def index
       get_localization_keys
     end
 
     def starred
-      @scope = @scope.where(:is_starred=>true)
+      @scope = @scope.where(is_starred: true)
 
       if @scope.respond_to?(:page)
         @scope = @scope.page(params[:page])
       end
       get_localization_keys
-      render :action=>:index
+      render action: :index
     end
 
     def star
@@ -33,72 +33,72 @@ def destroy
     end
 
     private
-      def get_localization_scope
-        @search_options = params.slice(*valid_keys)
-        @search_options[:include_completed] = '1' if @search_options.empty?
-        @scope = LocalizationKey.uniq.preload(:localizations => :locale).search(@search_options)
-      end
 
-      def get_localization_keys
-        key_parts = @search_options[:key_prefix].to_s.split('.').length
-        @prefixes = @scope.reorder(nil).uniq.pluck(:localization_key).map{|lk| lk.split('.').shift(key_parts+1).join('.') }.uniq.sort
-        if @search_options[:key_prefix].present?
-          parts = @search_options[:key_prefix].split('.')
-          @parent_prefix = parts[0,parts.length-1].join('.')
-        end
-        if @scope.respond_to?(:page)
-          @localization_keys = @scope.page(params[:page])
-        else
-          @localization_keys = @scope.all
-        end
-      end
+    def get_localization_scope
+      @search_options = params.slice(*valid_keys)
+      @search_options[:include_completed] = '1' if @search_options.empty?
+      @scope = LocalizationKey.uniq.preload(localizations: :locale).search(@search_options)
+    end
 
-      def valid_keys
-        %w( key include_completed key_prefix order )
+    def get_localization_keys
+      key_parts = @search_options[:key_prefix].to_s.split('.').length
+      @prefixes = @scope.reorder(nil).uniq.pluck(:localization_key).map { |lk| lk.split('.').shift(key_parts + 1).join('.') }.uniq.sort
+      if @search_options[:key_prefix].present?
+        parts = @search_options[:key_prefix].split('.')
+        @parent_prefix = parts[0, parts.length - 1].join('.')
+      end
+      if @scope.respond_to?(:page)
+        @localization_keys = @scope.page(params[:page])
+      else
+        @localization_keys = @scope.all
       end
+    end
 
-      def grouped_localizations
-        @_grouped_localizations ||= begin
-          {}.tap do |hash|
-            @localization_keys.each do |lk|
-              hash[lk] = {}
-              lk.localizations.each do |l|
-                hash[lk][l.locale.locale.to_sym] = l
-              end
+    def valid_keys
+      %w( key include_completed key_prefix order )
+    end
+
+    def grouped_localizations
+      @_grouped_localizations ||= begin
+        {}.tap do |hash|
+          @localization_keys.each do |lk|
+            hash[lk] = {}
+            lk.localizations.each do |l|
+              hash[lk][l.locale.locale.to_sym] = l
             end
           end
         end
       end
+    end
 
-      def localization_for(locale, localization_key)
-        @_localization_for ||= {}
-        key = [locale, localization_key]
-        ret = @_localization_for[key]
-        if ret == false
-          nil
-        elsif ret.nil?
-          ret = grouped_localizations[localization_key][locale]
-          unless ret
-            Lit.init.cache.refresh_key("#{locale}.#{localization_key.localization_key}")
-            ret = localization_key.localizations.where(:locale_id=>Lit.init.cache.find_locale(locale).id).first
-          end
-          @_localization_for[key] = ret ? ret : false
-        else
-          ret
+    def localization_for(locale, localization_key)
+      @_localization_for ||= {}
+      key = [locale, localization_key]
+      ret = @_localization_for[key]
+      if ret == false
+        nil
+      elsif ret.nil?
+        ret = grouped_localizations[localization_key][locale]
+        unless ret
+          Lit.init.cache.refresh_key("#{locale}.#{localization_key.localization_key}")
+          ret = localization_key.localizations.where(locale_id: Lit.init.cache.find_locale(locale).id).first
         end
-
+        @_localization_for[key] = ret ? ret : false
+      else
+        ret
       end
+    end
 
-      helper_method :localization_for
+    helper_method :localization_for
 
-      def has_versions?(localization)
-        @_versions ||= begin
-          ids = grouped_localizations.values.map(&:values).flatten.map(&:id)
-          Lit::Localization.where(:id => ids).joins(:versions).group("#{Lit::Localization.quoted_table_name}.id").count
-        end
-        @_versions[localization.id].to_i > 0
+    def has_versions?(localization)
+      @_versions ||= begin
+        ids = grouped_localizations.values.map(&:values).flatten.map(&:id)
+        Lit::Localization.where(id: ids).joins(:versions).group("#{Lit::Localization.quoted_table_name}.id").count
       end
+      @_versions[localization.id].to_i > 0
+    end
 
-      helper_method :has_versions?
+    helper_method :has_versions?
   end
 end

app/controllers/lit/localizations_controller.rb

@@ -22,25 +22,26 @@ def previous_versions
     end
 
     private
-      def find_localization_key
-        @localization_key = Lit::LocalizationKey.find(params[:localization_key_id])
-      end
 
-      def find_localization
-        @localization = @localization_key.localizations.find(params[:id])
-      end
+    def find_localization_key
+      @localization_key = Lit::LocalizationKey.find(params[:localization_key_id])
+    end
 
-      def clear_params
-        if defined?(::ActionController::StrongParameters)
-          # allow translated_value to be an array
-          if @localization.value.is_a?(Array)
-            params.require(:localization).permit(:locale_id, :translated_value => [])
-          else
-            params.require(:localization).permit(:locale_id, :translated_value)
-          end
+    def find_localization
+      @localization = @localization_key.localizations.find(params[:id])
+    end
+
+    def clear_params
+      if defined?(::ActionController::StrongParameters)
+        # allow translated_value to be an array
+        if @localization.value.is_a?(Array)
+          params.require(:localization).permit(:locale_id, translated_value: [])
         else
-          params[:localization].is_a?(Hash) ? params[:localization].slice(:translated_value, :locale_id) : {}
+          params.require(:localization).permit(:locale_id, :translated_value)
         end
+      else
+        params[:localization].is_a?(Hash) ? params[:localization].slice(:translated_value, :locale_id) : {}
       end
+    end
   end
 end