awesome_translations 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e0100ab729267c0c2a4b96553d791d80f19a706
-  data.tar.gz: c50097d0d61e87c7963148b8667caa2f90435e7b
+  metadata.gz: 17244241a75f058a4f243894536041bfb96a2b5c
+  data.tar.gz: 3fa2d342441637819bf5feca7ea2bd667bbcf95d
 SHA512:
-  metadata.gz: 1120b1e5056145e05dd733ef07384c2bbc9cb1b121fb59521c134c2128917cfb3800b692c855adbfe34165ce15b3c0d5f06ae3e7b0ef75930d4c1a0f15cf6f0c
-  data.tar.gz: a92f18f5e0a4af86478bfb5d642df4e01270dd20f23bc191f12e60e0b6da712a8856339df8e904c83442604841820f4f591cdc074aa7edf6b78b2d9c44b86500
+  metadata.gz: 53afdffd28bd53ed17bd76794e39015e71a70ecfec3519162285223e6919aa2429995b57bf6c00418c819a67856973f19fb0d9446a72d1c0263dd1ec4e9417c5
+  data.tar.gz: dd99746c755525b7965b849c57c34f233ce9be6a0eae4ecaabb2b218c3f77ca54eea5f0ea4acb9b489afd665a0d53573f8dd65ccf4e7b1704bd3c19183166dc1

data/README.md

@@ -30,7 +30,7 @@ AwesomeTranslations.load_object_extensions
 
 If you don't like monkey patching the Object-class, you can also load it like this by creating 'config/initializers/awesome_translations' and insert something like this to allow t-method-calls from inside models:
 ```ruby
-ActiveRecord::Base.__send__(:include, AwesomeTranslations::TranslateFunctionality)
+ActiveRecord::Base.include AwesomeTranslations::TranslateFunctionality
 ```
 
 You will also need to modify the line in your Gemfile a bit:

data/lib/awesome_translations/erb_inspector/file_inspector.rb

@@ -69,13 +69,13 @@ private
       key: key
     )
 
-    unless translation_with_key_exists?(translations_found, translation_inspector.key)
+    unless translation_with_key_exists?(translations_found, translation_inspector.full_key)
       yielder << translation_inspector
       translations_found << translation_inspector
     end
   end
 
-  def translation_with_key_exists?(translations_found, translation_key)
-    translations_found.select { |t| t.key == translation_key }.any?
+  def translation_with_key_exists?(translations_found, translation_full_key)
+    translations_found.select { |t| t.full_key == translation_full_key }.any?
   end
 end

data/lib/awesome_translations/erb_inspector/translation_inspector.rb

@@ -37,6 +37,10 @@ private
       elsif @full_key.start_with?("app/views/")
         # Remove "app/views" from view-translations since that doesn't get used in keys.
         @full_key.gsub!(/\Aapp\/views\//, "")
+      elsif @full_key.start_with?('app/controllers')
+        # Remove "app/controllers" from controller-translations since that doesn't get used in keys.
+        @full_key.gsub!(/\Aapp\/controllers(\/?)/, '')
+        is_controller = true
       elsif @full_key.start_with?('app/cells')
         @full_key.gsub!(/\Aapp\/cells\//, '')
       elsif @full_key.start_with?("app/")
@@ -47,7 +51,7 @@ private
       @full_key.gsub!("/", ".")
       @full_key << "." unless @full_key.empty?
       @full_key << file_key(@file_path)
-      @full_key << ".#{@last_method}" if is_mailer && @last_method
+      @full_key << ".#{@last_method}" if (is_mailer || is_controller) && @last_method
       @full_key << "."
       @full_key << @key.gsub(/\A\./, "")
     elsif @method == 't' || @method == 'helper_t'
@@ -66,12 +70,15 @@ private
     # Remove leading "_" from partials
     key = key.gsub(/\A_/, "")
 
+    # Remove '_controller' from controllers
+    key = key.gsub(/_controller\Z/, '')
+
     return key
   end
 
   def generate_dir
     if @key.start_with?(".")
-      @dir = "#{Rails.root}/config/locales/awesome_translations/#{File.dirname(@file_path)}"
+      @dir = "#{Rails.root}/config/locales/awesome_translations/#{File.dirname(@file_path)}/#{File.basename(@file_path, File.extname(@file_path))}"
     else
       @dir = "#{Rails.root}/config/locales/awesome_translations"
     end

data/lib/awesome_translations/global_translator.rb

@@ -1,14 +1,12 @@
 class AwesomeTranslations::GlobalTranslator
+  RUBY_2 = RUBY_VERSION.starts_with?('2')
+
   def self.translate(key, args, &blk)
     if key.is_a?(String) && key.start_with?(".")
       caller_number = args[:caller_number] || 0
 
-      # Removed any helpful appended input to filepath from stacktrace.
-      if match = caller[caller_number].match(/\A(.+):(\d+):/)
-        previous_file = match[1]
-      else
-        raise "Could not get previous file name from: #{caller[0]}"
-      end
+      call = call_information(caller_number)
+      previous_file = call[:path]
 
       # Remove any Rails root.
       removed_root = false
@@ -24,14 +22,22 @@ class AwesomeTranslations::GlobalTranslator
 
       dir = File.dirname(previous_file)
       dir = dir.gsub(/\A#{Regexp.escape(Rails.root.to_s)}\//, "")
-      dir = dir.gsub(/\Aapp\//, "") if dir.starts_with?("app/")
 
       file = File.basename(previous_file, File.extname(previous_file))
 
+      if dir.starts_with?('app/controllers')
+        dir = dir.gsub(/\Aapp\/controllers(\/?)/, '')
+        file = file.gsub(/_controller\Z/, '')
+        is_controller = true
+      elsif dir.starts_with?("app/")
+        dir = dir.gsub(/\Aapp\//, "")
+      end
+
       translation_key = dir
       translation_key = translation_key.gsub(/\Aapp\//, "")
       translation_key << "/#{file}"
       translation_key.gsub!("/", ".")
+      translation_key << ".#{call[:method]}" if is_controller
       translation_key << key
 
       # Change key to full path.
@@ -40,4 +46,28 @@ class AwesomeTranslations::GlobalTranslator
 
     I18n.t(key, *args[:translation_args], &blk)
   end
+
+  def self.call_information(caller_number)
+    if RUBY_2
+      # This is much faster than the other solution
+      call = caller_locations(caller_number + 2, caller_number + 2).first
+
+      return {
+        method: call.label,
+        path: call.absolute_path,
+        line_no: call.lineno
+      }
+    else
+      call = caller[caller_number + 1]
+      file_info = call.match(/\A(.+):(\d+):in `(.+?)'/)
+
+      raise "Could not get previous file name from: #{caller[0]}" unless file_info[1].present?
+
+      return {
+        method: file_info[3],
+        path: file_info[1],
+        line_no: file_info[2]
+      }
+    end
+  end
 end

data/lib/awesome_translations/version.rb

@@ -1,3 +1,3 @@
 module AwesomeTranslations
-  VERSION = '0.0.18'
+  VERSION = '0.0.19'
 end

data/spec/dummy/log/test.log

@@ -15840,3 +15840,291 @@ Completed 200 OK in 12ms (Views: 11.7ms | ActiveRecord: 0.0ms)
    (0.0ms)  rollback transaction
    (0.0ms)  begin transaction
    (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by AwesomeTranslations::HandlersController#index as HTML
+  Rendered /media/storage/Dev/Rails/awesome_translations/app/views/awesome_translations/handlers/index.html.haml within layouts/awesome_translations/application (2.5ms)
+Completed 200 OK in 227ms (Views: 226.7ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by AwesomeTranslations::HandlersController#show as HTML
+  Parameters: {"id"=>"model_handler"}
+Completed 200 OK in 51ms (Views: 50.9ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+  User Exists (0.1ms)  SELECT 1 AS one FROM "users" WHERE "users"."email" = 'cphillips@babbleset.name' LIMIT 1
+  SQL (1.7ms)  INSERT INTO "users" ("age", "email", "password") VALUES (?, ?, ?)  [["age", 1], ["email", "cphillips@babbleset.name"], ["password", "ante ipsum"]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+Processing by UsersController#index as HTML
+  User Load (0.1ms)  SELECT "users".* FROM "users"
+Completed 200 OK in 11ms (Views: 10.9ms | ActiveRecord: 0.1ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by AwesomeTranslations::GroupsController#update as HTML
+  Parameters: {"handler_id"=>"model_handler", "id"=>"Role", "t"=>{"activerecord.attributes.role.role"=>{"da"=>"Rolle", "de"=>"Die type", "en"=>"Role"}}}
+Redirected to http://test.host/handlers/model_handler/groups/Role
+Completed 302 Found in 4ms (ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by AwesomeTranslations::GroupsController#update as HTML
+  Parameters: {"handler_id"=>"model_handler", "id"=>"User", "t"=>{"activerecord.attributes.user.password"=>"[FILTERED]"}}
+Redirected to http://test.host/handlers/model_handler/groups/User
+Completed 302 Found in 6ms (ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+Processing by AwesomeTranslations::GroupsController#update as HTML
+  Parameters: {"handler_id"=>"rails_handler", "id"=>"date_time", "t"=>{"date.day_names"=>{"1"=>{"da"=>"Mandag"}, "4"=>{"da"=>"Torsdag"}}}}
+Redirected to http://test.host/handlers/rails_handler/groups/date_time
+Completed 302 Found in 6ms (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by AwesomeTranslations::GroupsController#update as HTML
+  Parameters: {"handler_id"=>"rails_handler", "id"=>"date_time", "t"=>{"date.day_names"=>{"1"=>{"da"=>"Mandag"}, "4"=>{"da"=>"Torsdag"}}}}
+Redirected to http://test.host/handlers/rails_handler/groups/date_time
+Completed 302 Found in 16ms (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by AwesomeTranslations::GroupsController#update as HTML
+  Parameters: {"handler_id"=>"model_handler", "id"=>"User", "t"=>{"activerecord.attributes.user.password"=>"[FILTERED]"}}
+Redirected to http://test.host/handlers/model_handler/groups/User
+Completed 302 Found in 8ms (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by AwesomeTranslations::GroupsController#update as HTML
+  Parameters: {"handler_id"=>"model_handler", "id"=>"Role", "t"=>{"activerecord.attributes.role.role"=>{"da"=>"Rolle", "de"=>"Die type", "en"=>"Role"}}}
+Redirected to http://test.host/handlers/model_handler/groups/Role
+Completed 302 Found in 9ms (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.3ms)  rollback transaction
+   (0.1ms)  begin transaction
+Processing by AwesomeTranslations::HandlersController#index as HTML
+Completed 200 OK in 194ms (Views: 193.1ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by AwesomeTranslations::HandlersController#show as HTML
+  Parameters: {"id"=>"model_handler"}
+Completed 200 OK in 86ms (Views: 86.1ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  SAVEPOINT active_record_1
+  User Exists (0.1ms)  SELECT 1 AS one FROM "users" WHERE "users"."email" = 'jfields@dabfeed.gov' LIMIT 1
+  SQL (1.4ms)  INSERT INTO "users" ("age", "email", "password") VALUES (?, ?, ?)  [["age", 3], ["email", "jfields@dabfeed.gov"], ["password", "et ultrices"]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+Processing by UsersController#index as HTML
+  User Load (0.1ms)  SELECT "users".* FROM "users"
+Completed 200 OK in 11ms (Views: 11.0ms | ActiveRecord: 0.1ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction

data/spec/handlers/library_handler_spec.rb

@@ -7,7 +7,7 @@ describe AwesomeTranslations::Handlers::LibraryHandler do
   let(:subject_translation) { mailer_group.translations.select { |translation| translation.key == "my_mailer.mailer_action.custom_subject" }.first }
   let(:admin_translation) { group.translations.select { |translation| translation.key == "models.role.administrator" }.first }
   let(:application_helper_group) { handler.groups.select { |group| group.name == 'app/helpers/application_helper.rb' }.first }
-  let(:hello_world_translation) { application_helper_group.translations.select { |translation| puts "Translation: #{translation}"; translation.key == 'helpers.application_helper.hello_world' }.first }
+  let(:hello_world_translation) { application_helper_group.translations.select { |translation| translation.key == 'helpers.application_helper.hello_world' }.first }
 
   it "finds translations made with the t method" do
     admin_translation.should_not eq nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awesome_translations
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails