awesome_translations 0.0.56 → 0.0.60

data/spec/lib/erb_inspector/file_inspector_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe AwesomeTranslations::ErbInspector::FileInspector do
+describe AwesomeTranslations::ErbInspector::FileInspector do # rubocop:disable RSpec/MultipleMemoizedHelpers
   let(:erb_inspector) do
     AwesomeTranslations::ErbInspector.new(
       dirs: [Rails.root.to_s]
@@ -15,7 +15,7 @@ describe AwesomeTranslations::ErbInspector::FileInspector do
   let(:user_index_translations) { user_index_inspector.translations.to_a }
   let(:hello_world_translation) { user_index_translations.find { |translation| translation.key == ".hello_world" } }
 
-  describe "#translations" do
+  describe "#translations" do # rubocop:disable RSpec/MultipleMemoizedHelpers
     it "finds the right number of translations" do
       expect(user_index_translations.length).to eq 3
     end
@@ -29,6 +29,7 @@ describe AwesomeTranslations::ErbInspector::FileInspector do
 
       expect(translation_full_keys).to include "assets.javascripts.translations.hello_world"
       expect(translation_full_keys).to include "javascripts.absolute.key"
+      expect(translation_full_keys).to include "javascripts.absolute.key_with_args"
     end
 
     it "finds liquid translations" do

data/spec/lib/erb_inspector/translation_inspector_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe AwesomeTranslations::ErbInspector::TranslationInspector do
+describe AwesomeTranslations::ErbInspector::TranslationInspector do # rubocop:disable RSpec/MultipleMemoizedHelpers
   let(:erb_inspector) do
     AwesomeTranslations::ErbInspector.new(
       dirs: [Rails.root.to_s]
@@ -24,7 +24,7 @@ describe AwesomeTranslations::ErbInspector::TranslationInspector do
   end
 
   it "#full_path" do
-    expect(hello_world_translation.full_path).to eq Rails.root.join("app", "views", "users", "index.html.haml").to_s
+    expect(hello_world_translation.full_path).to eq Rails.root.join("app/views/users/index.html.haml").to_s
   end
 
   it "#dir" do

data/spec/lib/erb_inspector_spec.rb

@@ -11,19 +11,19 @@ describe AwesomeTranslations::ErbInspector do
   let(:file_paths) { files.map(&:file_path) }
 
   describe "#files" do
-    it "should find haml-files" do
-      expect(files.length).to eq 32
+    it "finds the right amount of haml-files" do
+      expect(files.length).to eq 34
     end
 
-    it "should find haml-files" do
+    it "finds haml-files" do
       expect(file_paths).to include "app/views/users/index.html.haml"
     end
 
-    it "should find js-files" do
+    it "finds js-files" do
       expect(file_paths).to include "app/assets/javascripts/translations.js"
     end
 
-    it "should find erb-files" do
+    it "finds erb-files" do
       expect(file_paths).to include "app/views/users/show.html.erb"
     end
   end

data/spec/lib/model_inspector_spec.rb

@@ -2,15 +2,15 @@ require "spec_helper"
 
 describe AwesomeTranslations::ModelInspector do
   let(:user_inspector) { AwesomeTranslations::ModelInspector.model_classes.find { |model_inspector| model_inspector.clazz == User } }
-  let(:model_classes) { AwesomeTranslations::ModelInspector.model_classes.map(&:clazz).select { |clazz| !clazz.name.end_with?("::Translation") } }
+  let(:model_classes) { AwesomeTranslations::ModelInspector.model_classes.map(&:clazz).reject { |clazz| clazz.name.end_with?("::Translation") } }
 
   it "#model_classes" do
-    expect(model_classes.to_a.sort { |class1, class2| class1.name <=> class2.name }).to eq [Role, User]
+    expect(model_classes.to_a.sort_by(&:name)).to eq [ApplicationRecord, Role, User]
   end
 
   it "#engines" do
     expected = [ActionView::Railtie, AwesomeTranslations::Engine, MoneyRails::Engine]
-    expect(AwesomeTranslations::ModelInspector.engines.map(&:class).sort { |class1, class2| class1.name <=> class2.name }).to eq expected
+    expect(AwesomeTranslations::ModelInspector.engines.map(&:class).sort_by(&:name)).to eq expected
   end
 
   it "#class_key" do
@@ -34,6 +34,6 @@ describe AwesomeTranslations::ModelInspector do
   end
 
   it "#attributes" do
-    expect(user_inspector.attributes.map(&:name).to_a).to eq %w(id email password age)
+    expect(user_inspector.attributes.map(&:name).to_a).to eq %w[id email password age]
   end
 end

data/spec/lib/translation_migrator_spec.rb

@@ -27,8 +27,8 @@ describe AwesomeTranslations::TranslationMigrator do
   it "moves the translation from one file to another and deletes the old file" do
     old_path = translation_value.file_path
 
-    expect(old_path).to_not eq nil
-    expect(translation_value.file_path).to_not eq handler_translation.file_path
+    expect(old_path).not_to eq nil
+    expect(translation_value.file_path).not_to eq handler_translation.file_path
     expect(translation_value.key).to eq handler_translation.key
 
     migrator = AwesomeTranslations::TranslationMigrator.new(

data/spec/models/awesome_translations/handler_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe AwesomeTranslations::Handler do
-  it "should list available handlers" do
+  it "lists available handlers" do
     handlers = AwesomeTranslations::Handler.all
     expect(handlers.length).to be > 0
   end

data/spec/models/awesome_translations/translation_spec.rb

@@ -3,14 +3,14 @@ require "spec_helper"
 describe AwesomeTranslations::Translation do
   let(:day_names_monday_translation) do
     AwesomeTranslations::Translation.new(
-      dir: Rails.root.join("config", "locales", "awesome_translations", "date_time"),
+      dir: Rails.root.join("config/locales/awesome_translations/date_time"),
       key: "date.day_names[1]"
     )
   end
 
   let(:am_translation) do
     AwesomeTranslations::Translation.new(
-      dir: Rails.root.join("config", "locales", "awesome_translations", "date_time"),
+      dir: Rails.root.join("config/locales/awesome_translations/date_time"),
       key: "time.am"
     )
   end
@@ -35,6 +35,11 @@ describe AwesomeTranslations::Translation do
     it "returns correct value for normal translations" do
       expect(am_translation.value(locale: "en")).to eq "am"
     end
+
+    it "doesnt use fallbacks" do
+      expect(I18n).to receive(:t).with("time.am", default: nil, fallback: false).and_call_original
+      am_translation.value
+    end
   end
 
   describe "#value_for?" do

data/spec/spec_helper.rb

@@ -10,10 +10,12 @@ require "capybara-webkit"
 require "factory_bot"
 require "forgery"
 require "globalize"
+require "sass-rails"
+require "simple_form"
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+Dir[Rails.root.join("spec/support/**/*.rb")].sort.each { |f| require f }
 
 # Checks for pending migrations before tests are run.
 # If you are not using ActiveRecord, you can remove this line.
@@ -40,7 +42,7 @@ RSpec.configure do |config|
     generator.cache_translations
   end
 
-  config.before(:each) do
+  config.before do
     Capybara.reset_sessions!
 
     DatabaseCleaner.strategy = :transaction
@@ -55,7 +57,7 @@ RSpec.configure do |config|
     DatabaseCleaner.strategy = :truncation
   end
 
-  config.after(:each) do
+  config.after do
     DatabaseCleaner.clean
   end
 
@@ -67,11 +69,11 @@ RSpec.configure do |config|
     generator = AwesomeTranslations::CacheDatabaseGenerator.current
     generator.close
 
-    translation_file = Rails.root.join("config", "locales", "translations.yml").to_s
+    translation_file = Rails.root.join("config/locales/translations.yml").to_s
     File.unlink(translation_file) if File.exist?(translation_file)
 
-    at_dir = Rails.root.join("config", "locales", "awesome_translations").to_s
+    at_dir = Rails.root.join("config/locales/awesome_translations").to_s
     FileUtils.rm_rf(at_dir) if File.exist?(at_dir)
-    FileUtils.touch(Rails.root.join("config", "locales", ".keep").to_s)
+    FileUtils.touch(Rails.root.join("config/locales/.keep").to_s)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awesome_translations
 version: !ruby/object:Gem::Version
-  version: 0.0.56
+  version: 0.0.60
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-27 00:00:00.000000000 Z
+date: 2021-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-record-transactioner
@@ -28,14 +28,14 @@ dependencies:
   name: array_enumerator
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.10
 - !ruby/object:Gem::Dependency
@@ -58,20 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.29
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 0.0.33
+        version: 0.0.37
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.29
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 0.0.33
+        version: 0.0.37
 - !ruby/object:Gem::Dependency
   name: baza_migrations
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.14
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -129,50 +123,36 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.0.5
 - !ruby/object:Gem::Dependency
-  name: simple_form
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simple_form_ransack
+  name: string-cases
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.18
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.18
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
-  name: string-cases
+  name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '0'
 description: Semi-automatic maintenance of most translations in a Rails app.
 email:
-- k@spernj.org
+- kaspernj@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -208,7 +188,6 @@ files:
 - app/views/awesome_translations/migrations/new.html.erb
 - app/views/awesome_translations/movals/index.html.erb
 - app/views/layouts/awesome_translations/application.html.erb
-- config/initializers/simple_form_ransack.rb
 - config/rails_best_practices.yml
 - config/routes.rb
 - db/baza_translations_migrations/20150902155200_create_translation_keys.rb
@@ -253,6 +232,7 @@ files:
 - spec/controllers/users_controller_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/javascripts/translations.js
 - spec/dummy/app/assets/stylesheets/application.css
@@ -261,6 +241,7 @@ files:
 - spec/dummy/app/controllers/users_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/my_mailer.rb
+- spec/dummy/app/models/application_record.rb
 - spec/dummy/app/models/role.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.erb
@@ -331,88 +312,89 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Semi-automatic maintenance of most translations in a Rails app.
 test_files:
+- spec/handlers_spec.rb
+- spec/controllers/groups_controller_spec.rb
+- spec/controllers/users_controller_spec.rb
+- spec/controllers/handlers_controller_spec.rb
+- spec/features/duplicates_spec.rb
+- spec/features/movals_spec.rb
+- spec/features/clean_ups_spec.rb
+- spec/handlers/file_handler_spec.rb
 - spec/handlers/model_handler_spec.rb
 - spec/handlers/validations_handler_spec.rb
-- spec/handlers/file_handler_spec.rb
-- spec/lib/erb_inspector/file_inspector_spec.rb
-- spec/lib/erb_inspector/translation_inspector_spec.rb
-- spec/lib/model_inspector/attribute_spec.rb
-- spec/lib/erb_inspector_spec.rb
-- spec/lib/object_extensions_spec.rb
-- spec/lib/model_inspector_spec.rb
-- spec/lib/cache_database_generator_spec.rb
-- spec/lib/translation_migrator_spec.rb
-- spec/dummy/config/initializers/session_store.rb
+- spec/spec_helper.rb
+- spec/models/awesome_translations/handler_spec.rb
+- spec/models/awesome_translations/translated_value_spec.rb
+- spec/models/awesome_translations/translation_spec.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/routes.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/application.rb
+- spec/dummy/config/database.yml
 - spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/boot.rb
-- spec/dummy/config/environment.rb
-- spec/dummy/config/application.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/routes.rb
-- spec/dummy/Rakefile
+- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/secret_token.rb
+- spec/dummy/README.rdoc
+- spec/dummy/bin/rails
+- spec/dummy/bin/bundle
+- spec/dummy/bin/rake
 - spec/dummy/config.ru
-- spec/dummy/db/schema.rb
-- spec/dummy/db/migrate/20141018081640_create_roles.rb
 - spec/dummy/db/migrate/20141018081559_create_users.rb
+- spec/dummy/db/migrate/20141018081640_create_roles.rb
 - spec/dummy/db/migrate/20150607110245_add_price_cents_to_roles.rb
-- spec/dummy/public/404.html
-- spec/dummy/public/500.html
-- spec/dummy/public/422.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/bin/rake
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
-- spec/dummy/README.rdoc
-- spec/dummy/app/mailers/my_mailer.rb
-- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/db/schema.rb
+- spec/dummy/Rakefile
+- spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/users/edit.html.liquid
-- spec/dummy/app/views/users/index.html.haml
 - spec/dummy/app/views/users/_partial_test.html.erb
 - spec/dummy/app/views/users/show.html.erb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/models/user.rb
-- spec/dummy/app/models/role.rb
-- spec/dummy/app/controllers/locales_controller.rb
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/controllers/users_controller.rb
+- spec/dummy/app/views/users/index.html.haml
+- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/javascripts/translations.js
 - spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/spec_helper.rb
-- spec/models/awesome_translations/translated_value_spec.rb
-- spec/models/awesome_translations/handler_spec.rb
-- spec/models/awesome_translations/translation_spec.rb
-- spec/features/movals_spec.rb
-- spec/features/clean_ups_spec.rb
-- spec/features/duplicates_spec.rb
-- spec/controllers/groups_controller_spec.rb
-- spec/controllers/users_controller_spec.rb
-- spec/controllers/handlers_controller_spec.rb
-- spec/factories/user.rb
+- spec/dummy/app/controllers/users_controller.rb
+- spec/dummy/app/controllers/locales_controller.rb
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/mailers/my_mailer.rb
+- spec/dummy/app/models/role.rb
+- spec/dummy/app/models/user.rb
+- spec/dummy/app/models/application_record.rb
+- spec/dummy/public/500.html
+- spec/dummy/public/404.html
+- spec/dummy/public/422.html
+- spec/dummy/public/favicon.ico
 - spec/factories/translation_value.rb
 - spec/factories/group.rb
-- spec/factories/handler.rb
+- spec/factories/user.rb
 - spec/factories/handler_translation.rb
 - spec/factories/translation_key.rb
-- spec/handlers_spec.rb
+- spec/factories/handler.rb
+- spec/lib/erb_inspector/file_inspector_spec.rb
+- spec/lib/erb_inspector/translation_inspector_spec.rb
+- spec/lib/model_inspector/attribute_spec.rb
+- spec/lib/translation_migrator_spec.rb
+- spec/lib/model_inspector_spec.rb
+- spec/lib/cache_database_generator_spec.rb
+- spec/lib/erb_inspector_spec.rb
+- spec/lib/object_extensions_spec.rb

data/config/initializers/simple_form_ransack.rb

@@ -1 +0,0 @@
-Rails.application.config.i18n.load_path += SimpleFormRansack.locale_files