awesome_translations 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b375c005d186492da432ff61ee765d1cec23561d
-  data.tar.gz: 880aaef8a675d36e7564b83275ca9f2515f2a08c
+  metadata.gz: 841a4232003732fc8e30b6193b46f31604a51086
+  data.tar.gz: 798320a600a7b4aaad1f39910e5f1dee898f2b57
 SHA512:
-  metadata.gz: 6e7802f5bb02f054029758938701f17ce82bd43e38011b3c560d8fd76dd6be8b646f484233f190fd1a353988607877ffee9dd0d70b789760b51fed823ce28f43
-  data.tar.gz: 0a5ca541fdc9087642ed5011047609b1c73a4598aee6587129efe401de0543163acbda928903bb238523ba08fdf52f399c857a02063be808c348000c94b58ed9
+  metadata.gz: 227e2b2decb2056fc30351cc62f164c6f8ae61572e4934ecdaf23f4a94601b2e9b906da82a2874b174540ac8a3ed8142dcfd7e6a6a30354edb301ddf2bbb2a1a
+  data.tar.gz: db7f8e1019e5086cb9f0a8a45ee6809e579394b716903afdef196026766685540c21d8ad9488be9604a15510e3fb690f878ff3664688b51c8f4b40d16418b835

data/README.md

@@ -20,6 +20,19 @@ Insert this into your "routes.rb" file:
 mount AwesomeTranslations::Engine => "/awesome_translations" if Rails.env.development?
 ```
 
+## Translations under controllers and models
+
+If you want to do translations from your models or controllers, you will need to add this to a new initializer file under "config/initializers/awesome_translations.rb"
+
+```ruby
+AwesomeTranslations.load_object_extensions
+```
+
+You will also need to modify the line in your Gemfile a bit:
+```ruby
+gem 'awesome_translations'
+```
+
 ## Translating your application
 
 Start a Rails server for your project and go to the namespace called something like "http://localhost:3000/awesome_translations". Start translating your app through the webinterface.

data/lib/awesome_translations/global_translator.rb

@@ -0,0 +1,43 @@
+class AwesomeTranslations::GlobalTranslator
+  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
+
+      # Remove any Rails root.
+      removed_root = false
+      AwesomeTranslations::ModelInspector.engines.each do |engine|
+        root = engine.root.to_s
+
+        if previous_file.starts_with?(root)
+          previous_file = previous_file.gsub(/\A#{Regexp.escape(root)}\//, "")
+          removed_root = true
+          break
+        end
+      end
+
+      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))
+
+      translation_key = dir
+      translation_key = translation_key.gsub(/\Aapp\//, "")
+      translation_key << "/#{file}"
+      translation_key.gsub!("/", ".")
+      translation_key << key
+
+      # Change key to full path.
+      key = translation_key
+    end
+
+    I18n.t(key, *args[:translation_args], &blk)
+  end
+end

data/lib/awesome_translations/object_extensions.rb

@@ -1,41 +1,5 @@
 module AwesomeTranslations::ObjectExtensions
   def t(key, *args, &blk)
-    if key.is_a?(String) && key.start_with?(".")
-      # Removed any helpful appended input to filepath from stacktrace.
-      if match = caller[0].match(/\A(.+):(\d+):/)
-        previous_file = match[1]
-      else
-        raise "Could not get previous file name from: #{caller[0]}"
-      end
-
-      # Remove any Rails root.
-      removed_root = false
-      AwesomeTranslations::ModelInspector.engines.each do |engine|
-        root = engine.root.to_s
-
-        if previous_file.starts_with?(root)
-          previous_file = previous_file.gsub(/\A#{Regexp.escape(root)}\//, "")
-          removed_root = true
-          break
-        end
-      end
-
-      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))
-
-      translation_key = dir
-      translation_key = translation_key.gsub(/\Aapp\//, "")
-      translation_key << "/#{file}"
-      translation_key.gsub!("/", ".")
-      translation_key << key
-
-      # Change key to full path.
-      key = translation_key
-    end
-
-    I18n.t(key, *args, &blk)
+    AwesomeTranslations::GlobalTranslator.translate(key, caller_number: 1, translation_args: args, &blk)
   end
 end

data/lib/awesome_translations/version.rb

@@ -1,3 +1,3 @@
 module AwesomeTranslations
-  VERSION = "0.0.7"
+  VERSION = '0.0.8'
 end

data/lib/awesome_translations.rb

@@ -4,11 +4,14 @@ require "array_enumerator"
 require "jquery-rails"
 
 module AwesomeTranslations
-  autoload :Config, "#{File.dirname(__FILE__)}/awesome_translations/config"
-  autoload :ErbInspector, "#{File.dirname(__FILE__)}/awesome_translations/erb_inspector"
-  autoload :Handlers, "#{File.dirname(__FILE__)}/awesome_translations/handlers"
-  autoload :ObjectExtensions, "awesome_translations/object_extensions"
-  autoload :ModelInspector, "awesome_translations/model_inspector"
+  path = "#{File.dirname(__FILE__)}/awesome_translations"
+
+  autoload :Config, "#{path}/config"
+  autoload :ErbInspector, "#{path}/erb_inspector"
+  autoload :GlobalTranslator, "#{path}/global_translator"
+  autoload :Handlers, "#{path}/handlers"
+  autoload :ObjectExtensions, "#{path}/object_extensions"
+  autoload :ModelInspector, "#{path}/model_inspector"
 
   def self.config
     @config ||= AwesomeTranslations::Config.new

data/spec/dummy/log/test.log

@@ -591,3 +591,236 @@ Completed 302 Found in 8ms (ActiveRecord: 0.0ms)
    (0.0ms)  rollback transaction
    (0.0ms)  begin transaction
    (0.0ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.4ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  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.1ms)  SAVEPOINT active_record_1
+  User Exists (0.4ms)  SELECT 1 AS one FROM "users" WHERE "users"."email" = 'rbutler@shuffledrive.com' LIMIT 1
+  SQL (2.6ms)  INSERT INTO "users" ("age", "email", "password") VALUES (?, ?, ?)  [["age", 5], ["email", "rbutler@shuffledrive.com"], ["password", "curabitur at"]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+Processing by UsersController#index as HTML
+  User Load (0.1ms)  SELECT "users".* FROM "users"
+  Rendered users/index.html.haml within layouts/application (12.5ms)
+Completed 200 OK in 48ms (Views: 47.8ms | ActiveRecord: 0.1ms)
+   (0.6ms)  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.1ms)  begin transaction
+Processing by AwesomeTranslations::HandlersController#index as HTML
+Completed 200 OK in 205ms (Views: 204.7ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+Processing by AwesomeTranslations::HandlersController#show as HTML
+  Parameters: {"id"=>"model_handler"}
+Completed 200 OK in 10ms (Views: 10.1ms | ActiveRecord: 0.0ms)
+   (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.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  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.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.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
+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 5ms (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 8ms (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.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.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.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
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  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" = 'sramos@eabox.name' LIMIT 1
+  SQL (2.1ms)  INSERT INTO "users" ("age", "email", "password") VALUES (?, ?, ?)  [["age", 10], ["email", "sramos@eabox.name"], ["password", "in hac"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+Processing by UsersController#index as HTML
+  User Load (0.1ms)  SELECT "users".* FROM "users"
+  Rendered users/index.html.haml within layouts/application (12.1ms)
+Completed 200 OK in 29ms (Views: 28.0ms | ActiveRecord: 0.1ms)
+   (0.4ms)  rollback transaction
+   (0.1ms)  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.1ms)  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.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by AwesomeTranslations::HandlersController#index as HTML
+Completed 200 OK in 12ms (Views: 11.4ms | 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 21ms (Views: 20.8ms | 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.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.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  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.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (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
+   (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.1ms)  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.1ms)  begin transaction
+   (0.1ms)  rollback transaction

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awesome_translations
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -212,6 +212,7 @@ files:
 - lib/awesome_translations/erb_inspector.rb
 - lib/awesome_translations/erb_inspector/file_inspector.rb
 - lib/awesome_translations/erb_inspector/translation_inspector.rb
+- lib/awesome_translations/global_translator.rb
 - lib/awesome_translations/handlers.rb
 - lib/awesome_translations/handlers/base_handler.rb
 - lib/awesome_translations/handlers/erb_handler.rb