awesome_translations 0.0.56 → 0.0.60

data/lib/awesome_translations/handlers/model_handler.rb

@@ -12,7 +12,7 @@ class AwesomeTranslations::Handlers::ModelHandler < AwesomeTranslations::Handler
 
   def translations_for_group(group)
     ArrayEnumerator.new do |yielder|
-      model_inspector = AwesomeTranslations::ModelInspector.model_classes.find { |model_inspector| model_inspector.clazz.name == group.name }
+      model_inspector = AwesomeTranslations::ModelInspector.model_classes.find { |model_inspector_i| model_inspector_i.clazz.name == group.name }
       raise "No inspector by that name: #{group.name}" unless model_inspector
 
       model_names(model_inspector).each { |translation| yielder << translation }

data/lib/awesome_translations/handlers/validations_handler.rb

@@ -12,7 +12,7 @@ class AwesomeTranslations::Handlers::ValidationsHandler < AwesomeTranslations::H
 
   def translations_for_group(group)
     ArrayEnumerator.new do |yielder|
-      model_inspector = AwesomeTranslations::ModelInspector.model_classes.find { |model_inspector| model_inspector.clazz.name == group.name }
+      model_inspector = AwesomeTranslations::ModelInspector.model_classes.find { |model_inspector_i| model_inspector_i.clazz.name == group.name }
       raise "No inspector by that name: #{group.name}" unless model_inspector
 
       model_inspector.clazz._validators.each do |attribute_name, validators|
@@ -23,11 +23,11 @@ class AwesomeTranslations::Handlers::ValidationsHandler < AwesomeTranslations::H
             translations_for_format_validator(validator, model_inspector, attribute_name, yielder)
           elsif validator.is_a?(ActiveRecord::Validations::UniquenessValidator)
             translations_for_uniqueness_validator(validator, model_inspector, attribute_name, yielder)
-          elsif validator.class.name == "ActiveRecord::Validations::PresenceValidator"
+          elsif validator.class.name == "ActiveRecord::Validations::PresenceValidator" # rubocop:disable Style/ClassEqualityComparison:
             translations_for_presence_validator(validator, model_inspector, attribute_name, yielder)
-          elsif validator.class.name == "EmailValidator"
+          elsif validator.class.name == "EmailValidator" # rubocop:disable Style/ClassEqualityComparison:
             translations_for_email_validator(validator, model_inspector, attribute_name, yielder)
-          elsif validator.class.name == "ActiveModel::Validations::ConfirmationValidator"
+          elsif validator.class.name == "ActiveModel::Validations::ConfirmationValidator" # rubocop:disable Style/ClassEqualityComparison:
             translations_for_confirmation_validator(validator, model_inspector, attribute_name, yielder)
           else
             Rails.logger.error "Unhandeled validator: #{validator.class.name}"

data/lib/awesome_translations/handlers.rb

@@ -11,6 +11,7 @@ class AwesomeTranslations::Handlers
 
         const_name_snake = "#{match[1]}_handler"
         next if const_name_snake == "base_handler"
+
         const_name_camel = StringCases.snake_to_camel(const_name_snake)
 
         handler = AwesomeTranslations::Handler.new(

data/lib/awesome_translations/model_inspector.rb

@@ -2,6 +2,7 @@ class AwesomeTranslations::ModelInspector
   autoload :Attribute, "#{File.dirname(__FILE__)}/model_inspector/attribute"
 
   attr_reader :clazz
+
   cattr_accessor :models_loaded
 
   # Yields a model-inspector for each model found in the application.
@@ -16,6 +17,7 @@ class AwesomeTranslations::ModelInspector
     ArrayEnumerator.new do |yielder|
       find_subclasses(ActiveRecord::Base) do |model_inspector|
         next if !model_inspector.clazz.name || @skip.include?(model_inspector.clazz.name)
+
         yielder << model_inspector
       end
     end
@@ -33,11 +35,10 @@ class AwesomeTranslations::ModelInspector
     end
   end
 
-  def paperclip_attachments
+  def paperclip_attachments(&blk)
     return unless ::Kernel.const_defined?("Paperclip")
-    Paperclip::AttachmentRegistry.names_for(@clazz).each do |name|
-      yield name
-    end
+
+    Paperclip::AttachmentRegistry.names_for(@clazz, &blk)
   end
 
   def money_attributes
@@ -73,10 +74,8 @@ class AwesomeTranslations::ModelInspector
   end
 
   # TODO: Maybe this should yield a ModelInspector::Relationship instead?
-  def relationships
-    @clazz.reflections.each do |key, reflection|
-      yield key, reflection
-    end
+  def relationships(&blk)
+    @clazz.reflections.each(&blk)
   end
 
   def attribute_key(attribute_name)
@@ -93,6 +92,7 @@ class AwesomeTranslations::ModelInspector
 
   def self.find_subclasses(clazz, &blk)
     return if @scanned[clazz.name]
+
     @scanned[clazz.name] = true
 
     clazz.subclasses.each do |subclass|
@@ -121,14 +121,20 @@ class AwesomeTranslations::ModelInspector
 
   # Loads models for the given app-directory (Rails-root or engine).
   def self.load_models_for(root)
-    Dir.glob("#{root}/app/models/**/*.rb") do |model_path|
+    Dir.glob("#{root}/app/models/**/*.rb").sort.each do |model_path|
+      next if active_storage_path?(model_path)
+
       begin
         require model_path
-      rescue => e
-        $stderr.puts "Could not load model in #{model_path}"
-        $stderr.puts e.inspect
-        $stderr.puts e.backtrace
+      rescue StandardError => e
+        warn "Could not load model in #{model_path}"
+        warn e.inspect
+        warn e.backtrace
       end
     end
   end
+
+  def self.active_storage_path?(model_path)
+    model_path.match?(/\/gems\/activestorage-([\d.]+)\//)
+  end
 end

data/lib/awesome_translations/translation_migrator.rb

@@ -44,7 +44,7 @@ class AwesomeTranslations::TranslationMigrator
       File.open(@old_path, "w") { |fp| fp.write(YAML.dump(translations_hash)) }
     end
 
-    @translation_value.update_attributes!(file_path: @new_path) if @new_path
+    @translation_value.update!(file_path: @new_path) if @new_path
   end
 
 private

data/lib/awesome_translations/version.rb

@@ -1,3 +1,3 @@
 module AwesomeTranslations
-  VERSION = "0.0.56".freeze
+  VERSION = "0.0.60".freeze
 end

data/lib/awesome_translations.rb

@@ -11,6 +11,6 @@ module AwesomeTranslations
   end
 
   def self.load_object_extensions
-    ::Object.__send__(:include, AwesomeTranslations::ObjectExtensions)
+    ::Object.include AwesomeTranslations::ObjectExtensions
   end
 end

data/lib/tasks/awesome_translations_tasks.rake

@@ -5,7 +5,7 @@
 
 namespace :awesome_translations do
   task "install" => :environment do
-    yml_root = "#{Rails.root}/config/locales/awesome_translations"
+    yml_root = Rails.root.join("config/locales/awesome_translations")
 
     dirs = [
       yml_root,

data/spec/controllers/groups_controller_spec.rb

@@ -3,10 +3,10 @@ require "spec_helper"
 describe AwesomeTranslations::GroupsController do
   routes { AwesomeTranslations::Engine.routes }
 
-  let(:model_locales_path) { Rails.root.join("config", "locales", "awesome_translations", "models").to_s }
+  let(:model_locales_path) { Rails.root.join("config/locales/awesome_translations/models").to_s }
   let(:user_yml_path) { "#{model_locales_path}/user/da.yml" }
   let(:role_yml_path) { "#{model_locales_path}/role/da.yml" }
-  let(:date_time_path) { Rails.root.join("config", "locales", "awesome_translations", "date_time", "da.yml").to_s }
+  let(:date_time_path) { Rails.root.join("config/locales/awesome_translations/date_time/da.yml").to_s }
 
   before do
     AwesomeTranslations::CacheDatabaseGenerator.current.cache_translations
@@ -22,7 +22,7 @@ describe AwesomeTranslations::GroupsController do
 
   describe "#update" do
     it "updates translations" do
-      expect(I18n.load_path).to_not include model_locales_path
+      expect(I18n.load_path).not_to include model_locales_path
 
       put :update, params: {handler_id: "model_handler", id: "User", t: {
         "activerecord.attributes.user.password" => {"da" => "Adgangskode", "de" => "Kenwort", "en" => "Password"}
@@ -47,10 +47,10 @@ describe AwesomeTranslations::GroupsController do
         .joins(:translation_key)
         .find_by(translation_keys: {key: key_to_update}, locale: "de")
 
-      expect(da_translation_value).to_not eq nil
+      expect(da_translation_value).not_to eq nil
       expect(da_translation_value.value).to eq "Rolle"
 
-      expect(de_translation_value).to_not eq nil
+      expect(de_translation_value).not_to eq nil
       expect(de_translation_value.value).to eq "Die type"
 
       expect(I18n.load_path).to include role_yml_path

data/spec/controllers/handlers_controller_spec.rb

@@ -31,7 +31,7 @@ describe AwesomeTranslations::HandlersController do
       groups = assigns(:groups)
 
       expect(all_groups.length).to be > groups.length
-      expect(groups.length).to eq 4
+      expect(groups.length).to eq 5
       expect(response).to be_success
     end
   end

data/spec/dummy/Rakefile

@@ -1,6 +1,6 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path("../config/application", __FILE__)
+require File.expand_path("config/application", __dir__)
 
 Dummy::Application.load_tasks

data/spec/dummy/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/spec/dummy/app/assets/javascripts/translations.js

@@ -1,2 +1,3 @@
 console.log(I18n.t(".hello_world"))
 console.log(I18n.t("javascripts.absolute.key"))
+console.log(I18n.t("javascripts.absolute.key_with_args", {some_arg: "Hello", some_other_arg: "World"}))

data/spec/dummy/app/controllers/users_controller.rb

@@ -22,7 +22,7 @@ class UsersController < ApplicationController
   def edit; end
 
   def update
-    if @user.update_attributes(user_params)
+    if @user.update(user_params)
       flash[:notice] = controller_t(".user_was_updated")
       redirect_to user_path(@user)
     else

data/spec/dummy/app/mailers/my_mailer.rb

@@ -1,4 +1,4 @@
-class MyMailer < ActionMailer::Base
+class MyMailer < ActionMailer::Base # rubocop:disable Rails/ApplicationMailer
   def mailer_action(_user_id)
     mail(subject: t(".custom_subject"))
   end

data/spec/dummy/app/models/application_record.rb

@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end

data/spec/dummy/app/models/role.rb

@@ -1,4 +1,4 @@
-class Role < ActiveRecord::Base
+class Role < ApplicationRecord
   translates :name
 
   belongs_to :user

data/spec/dummy/app/models/user.rb

@@ -1,4 +1,4 @@
-class User < ActiveRecord::Base
+class User < ApplicationRecord
   validates :email, presence: true
   validates :email, uniqueness: true
   validates :email, length: {in: 2..255}, format: {with: /\A.+@.+\Z/}

data/spec/dummy/bin/bundle

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 load Gem.bin_path("bundler", "bundle")

data/spec/dummy/bin/rails

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path("../../config/application", __FILE__)
+APP_PATH = File.expand_path("../config/application", __dir__)
 require_relative "../config/boot"
 require "rails/commands"

data/spec/dummy/config/application.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../boot", __FILE__)
+require File.expand_path("boot", __dir__)
 
 # Pick the frameworks you want:
 require "active_record/railtie"
@@ -24,7 +24,12 @@ class Dummy::Application < Rails::Application
   # config.time_zone = 'Central Time (US & Canada)'
 
   # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-  config.i18n.load_path += Dir[Rails.root.join("config", "locales", "**", "*.{rb,yml}").to_s]
+  config.i18n.load_path += Dir[Rails.root.join("config/locales/**/*.{rb,yml}").to_s]
   config.i18n.available_locales = [:da, :de, :en]
   config.i18n.default_locale = :en
+
+  config.assets.precompile += %w[
+    awesome_translations/application.css
+    awesome_translations/application.js
+  ]
 end

data/spec/dummy/config/boot.rb

@@ -1,5 +1,5 @@
 # Set up gems listed in the Gemfile.
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../../../Gemfile", __FILE__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../../Gemfile", __dir__)
 
 require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
-$LOAD_PATH.unshift File.expand_path("../../../../lib", __FILE__)
+$LOAD_PATH.unshift File.expand_path("../../../lib", __dir__)

data/spec/dummy/config/environment.rb

@@ -1,5 +1,5 @@
 # Load the Rails application.
-require File.expand_path("../application", __FILE__)
+require File.expand_path("application", __dir__)
 
 # Initialize the Rails application.
 Dummy::Application.initialize!

data/spec/dummy/config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path("../config/environment", __FILE__)
+require ::File.expand_path("config/environment", __dir__)
 run Rails.application

data/spec/factories/group.rb

@@ -2,7 +2,7 @@ FactoryBot.define do
   factory :group, class: "AwesomeTranslations::CacheDatabaseGenerator::Group" do
     handler
 
-    identifier "tests"
-    name "Tests"
+    identifier { "tests" }
+    name { "Tests" }
   end
 end

data/spec/factories/handler.rb

@@ -1,11 +1,11 @@
 FactoryBot.define do
   factory :handler, class: "AwesomeTranslations::CacheDatabaseGenerator::Handler" do
-    identifier "rails_handler"
-    name "RailsHandler"
+    identifier { "rails_handler" }
+    name { "RailsHandler" }
 
     factory :model_handler do
-      identifier "model_handler"
-      name "ModelHandler"
+      identifier { "model_handler" }
+      name { "ModelHandler" }
     end
   end
 end

data/spec/factories/handler_translation.rb

@@ -4,10 +4,10 @@ FactoryBot.define do
     translation_key
     group
 
-    key_show "some.key"
-    file_path nil
-    line_no nil
-    full_path nil
-    dir "#{Rails.root}/config/locales/awesome_translations/some/key"
+    key_show { "some.key" }
+    file_path { nil }
+    line_no { nil }
+    full_path { nil }
+    dir { Rails.root.join("config/locales/awesome_translations/some/key") }
   end
 end

data/spec/factories/translation_key.rb

@@ -3,6 +3,6 @@ FactoryBot.define do
     handler
     group
 
-    key "some.key"
+    key { "some.key" }
   end
 end

data/spec/factories/translation_value.rb

@@ -2,8 +2,8 @@ FactoryBot.define do
   factory :translation_value, class: "AwesomeTranslations::CacheDatabaseGenerator::TranslationValue" do
     translation_key
 
-    file_path "#{Rails.root}/config/locales/some_file.yml"
-    locale "en"
-    value "English"
+    file_path { Rails.root.join("config/locales/some_file.yml") }
+    locale { "en" }
+    value { "English" }
   end
 end

data/spec/features/clean_ups_spec.rb

@@ -7,7 +7,7 @@ describe AwesomeTranslations::CleanUpsController do
     create :translation_value,
       translation_key: translation_key,
       locale: "da",
-      file_path: "#{Rails.root}/config/locales/awesome_translations/some_file.yml"
+      file_path: Rails.root.join("config/locales/awesome_translations/some_file.yml")
   end
   let(:content) do
     {

data/spec/features/duplicates_spec.rb

@@ -4,18 +4,18 @@ describe AwesomeTranslations::DuplicatesController do
   let!(:handler_translation) do
     create :handler_translation,
       translation_key: translation_key,
-      dir: Rails.root.join("config", "locales", "some", "right", "path")
+      dir: Rails.root.join("config/locales/some/right/path")
   end
   let!(:translation_key) { create :translation_key, key: "some.key" }
   let!(:translation_value) do
     create :translation_value,
       translation_key: translation_key,
-      file_path: Rails.root.join("config", "locales", "some", "right", "path", "en.yml")
+      file_path: Rails.root.join("config/locales/some/right/path/en.yml")
   end
   let!(:translation_value_duplicate) do
     create :translation_value,
       translation_key: translation_key,
-      file_path: Rails.root.join("config", "locales", "some", "wrong", "path", "en.yml")
+      file_path: Rails.root.join("config/locales/some/wrong/path/en.yml")
   end
 
   before do
@@ -40,7 +40,7 @@ describe AwesomeTranslations::DuplicatesController do
       visit duplicates_path
 
       expect(page).to have_http_status(:success)
-      expect(current_path).to eq duplicates_path
+      expect(page).to have_current_path duplicates_path, ignore_query: true
 
       find("input[type=checkbox][name='d[#{translation_value_duplicate.id}]']")
 

data/spec/features/movals_spec.rb

@@ -1,16 +1,16 @@
 require "spec_helper"
 
-describe AwesomeTranslations::MovalsController do
+describe AwesomeTranslations::MovalsController do # rubocop:disable RSpec/MultipleMemoizedHelpers
   let!(:handler_translation) do
     create :handler_translation,
       translation_key: translation_key,
-      dir: Rails.root.join("config", "locales", "some", "right", "path")
+      dir: Rails.root.join("config/locales/some/right/path")
   end
   let!(:translation_key) { create :translation_key, key: "some.key" }
   let!(:translation_value) do
     create :translation_value,
       translation_key: translation_key,
-      file_path: Rails.root.join("config", "locales", "some", "wrong", "path", "en.yml")
+      file_path: Rails.root.join("config/locales/some/wrong/path/en.yml")
   end
 
   let!(:handler_translation_right_path) { create :handler_translation, translation_key: translation_key_right_path, dir: "/some/path" }
@@ -34,12 +34,12 @@ describe AwesomeTranslations::MovalsController do
     end
   end
 
-  describe "#index" do
+  describe "#index" do # rubocop:disable RSpec/MultipleMemoizedHelpers
     it "renders the page and shows the correct results" do
       visit movals_path
 
       expect(page).to have_http_status(:success)
-      expect(current_path).to eq movals_path
+      expect(page).to have_current_path movals_path, ignore_query: true
 
       find("input[type=checkbox][value='#{handler_translation.id}']") # Expect to find
 
@@ -49,14 +49,14 @@ describe AwesomeTranslations::MovalsController do
     end
   end
 
-  describe "#create" do
+  describe "#create" do # rubocop:disable RSpec/MultipleMemoizedHelpers
     it "moves the checked translations to the right path" do
       visit movals_path
 
       find("input[type=submit]").click
       translation_value.reload
 
-      expect(translation_value.file_path).to eq Rails.root.join("config", "locales", "some", "right", "path", "en.yml").to_s
+      expect(translation_value.file_path).to eq Rails.root.join("config/locales/some/right/path/en.yml").to_s
     end
   end
 end

data/spec/handlers/file_handler_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe AwesomeTranslations::Handlers::FileHandler do
   let(:handler) { AwesomeTranslations::Handlers::FileHandler.new }
 
-  describe "erb stuff" do
+  describe "erb stuff" do # rubocop:disable RSpec/MultipleMemoizedHelpers
     let(:users_index_group) { handler.groups.find { |group| group.name == "app/views/users/index.html.haml" } }
     let(:users_index_translations) { users_index_group.translations }
     let(:users_partial_test_translations) { handler.groups.find { |group| group.name == "app/views/users/_partial_test.html.erb" }.translations }
@@ -36,11 +36,11 @@ describe AwesomeTranslations::Handlers::FileHandler do
 
     it "sets the correct translation path" do
       danish_translation = layout_translations.find { |t| t.key == "layouts.application.danish" }
-      expect(danish_translation.dir).to eq "#{Rails.root}/config/locales/awesome_translations/layouts/application"
+      expect(danish_translation.dir).to eq Rails.root.join("config/locales/awesome_translations/layouts/application").to_s
     end
   end
 
-  describe "library stuff" do
+  describe "library stuff" do # rubocop:disable RSpec/MultipleMemoizedHelpers
     let(:group) { handler.groups.find { |group| group.name == "app/models/role.rb" } }
     let(:mailer_group) { handler.groups.find { |group| group.name == "app/mailers/my_mailer.rb" } }
     let(:subject_translation) { mailer_group.translations.find { |translation| translation.key == "my_mailer.mailer_action.custom_subject" } }
@@ -51,7 +51,7 @@ describe AwesomeTranslations::Handlers::FileHandler do
     let(:update_saved_translation) { users_controller_handler.translations.find { |translation| translation.key == "users.user_was_updated" } }
 
     it "finds translations made with the t method" do
-      expect(admin_translation).to_not eq nil
+      expect(admin_translation).not_to eq nil
       expect(admin_translation.key).to eq "models.role.administrator"
       expect(admin_translation.dir).to end_with "spec/dummy/config/locales/awesome_translations/models/role"
     end
@@ -64,8 +64,8 @@ describe AwesomeTranslations::Handlers::FileHandler do
       moderator_translation = group.translations.find { |translation| translation.key == "models.role.moderator" }
       user_translation = group.translations.find { |translation| translation.key == "models.role.user" }
 
-      expect(moderator_translation).to_not eq nil
-      expect(user_translation).to_not eq nil
+      expect(moderator_translation).not_to eq nil
+      expect(user_translation).not_to eq nil
     end
 
     it "finds helpers translations using helper_t" do
@@ -73,7 +73,7 @@ describe AwesomeTranslations::Handlers::FileHandler do
     end
 
     it "finds translations with the controller_t-method" do
-      expect(update_saved_translation).to_not eq nil
+      expect(update_saved_translation).not_to eq nil
       expect(update_saved_translation.key).to eq "users.user_was_updated"
       expect(update_saved_translation.dir).to end_with "spec/dummy/config/locales/awesome_translations/users"
     end
@@ -93,7 +93,7 @@ describe AwesomeTranslations::Handlers::FileHandler do
     end
 
     it "sets the correct translation path" do
-      expect(yes_translation.dir).to eq "#{Rails.root}/config/locales/awesome_translations"
+      expect(yes_translation.dir).to eq Rails.root.join("config/locales/awesome_translations").to_s
     end
 
     it "detects absolute existing direct translations" do

data/spec/handlers/model_handler_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe AwesomeTranslations::Handlers::ModelHandler do
+describe AwesomeTranslations::Handlers::ModelHandler do # rubocop:disable RSpec/MultipleMemoizedHelpers
   let(:model_handler) { AwesomeTranslations::Handlers::ModelHandler.new }
   let(:groups) { model_handler.groups.to_a }
   let(:user_group) { model_handler.groups.detect { |group| group.name == "User" } }
@@ -9,11 +9,11 @@ describe AwesomeTranslations::Handlers::ModelHandler do
   let(:role_translation_keys) { role_group.translations.map(&:key).to_a }
 
   it "#groups" do
-    expect(groups.length).to eq 4
+    expect(groups.length).to eq 5
   end
 
-  describe "#translations_for_group" do
-    it "should find the right number of translations" do
+  describe "#translations_for_group" do # rubocop:disable RSpec/MultipleMemoizedHelpers
+    it "finds the right number of translations" do
       expect(user_group.translations.to_a.length).to eq 7
     end
 

data/spec/handlers/validations_handler_spec.rb

@@ -6,7 +6,7 @@ describe AwesomeTranslations::Handlers::ValidationsHandler do
   let(:blank_email_translation) { user_group.translations.find { |translation| translation.key.include? "email.blank" } }
 
   it "#groups" do
-    expect(validations_handler.groups.to_a.length).to eq 4
+    expect(validations_handler.groups.to_a.length).to eq 5
   end
 
   describe "#translations_for_group" do
@@ -19,12 +19,12 @@ describe AwesomeTranslations::Handlers::ValidationsHandler do
     end
 
     it "finds the right directory" do
-      expect(blank_email_translation.dir).to eq "#{Rails.root}/config/locales/awesome_translations/models/user"
+      expect(blank_email_translation.dir).to eq Rails.root.join("config/locales/awesome_translations/models/user").to_s
     end
 
     it "finds confirmation translations" do
       confirmation_translation = user_group.translations.find { |translation| translation.key.include? "email_confirmation" }
-      expect(confirmation_translation).to_not be_blank
+      expect(confirmation_translation).not_to be_blank
       expect(confirmation_translation.key).to eq "activerecord.errors.models.user.attributes.email_confirmation.confirmation"
     end
   end

data/spec/handlers_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe AwesomeTranslations::Handlers do
-  it "should not include base in list" do
+  it "does not include base in list" do
     AwesomeTranslations::Handlers.list.each do |handler|
       expect(handler.id.to_s.downcase.include?("base")).to eq false
     end

data/spec/lib/cache_database_generator_spec.rb

@@ -6,7 +6,7 @@ describe AwesomeTranslations::CacheDatabaseGenerator do
   let(:db) { cache_database_generator.db }
 
   before do
-    locales_path = Rails.root.join("config", "locales")
+    locales_path = Rails.root.join("config/locales")
     FileUtils.rm_rf(locales_path)
     Dir.mkdir(locales_path)
 
@@ -41,7 +41,7 @@ describe AwesomeTranslations::CacheDatabaseGenerator do
         .where(translation_keys: {key: "activerecord.attributes.user.id"})
         .first
 
-      expect(translation).to_not eq nil
+      expect(translation).not_to eq nil
     end
 
     it "#cache_handler_translations" do
@@ -53,7 +53,7 @@ describe AwesomeTranslations::CacheDatabaseGenerator do
         .where(translation_keys: {key: "activerecord.attributes.user.id"})
         .first
 
-      expect(translation).to_not eq nil
+      expect(translation).not_to eq nil
     end
   end
 end