RubyGems - awesome_translations - Versions diffs - 0.0.50 → 0.0.51 - Mend

awesome_translations 0.0.50 → 0.0.51

Files changed (20) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71559d649c9838d361131954f3a516da017ca8c7
-  data.tar.gz: 7a424544ad774be257b1e5bec601230c7b2a3a4c
+  metadata.gz: dc90567edcc82ca8c14b5a0e557d197be4e4ce80
+  data.tar.gz: e4bae086230a613b4429fd306523aeb49927efbf
 SHA512:
-  metadata.gz: 1fccfc503d47e0e418f9a89eefc92612f691f41a3c729dffccc477cb74770d0d65c4ecec85a8ba6e0907a827b6e915f67796daaf22053ad109a6ba2dcb79a053
-  data.tar.gz: 5889856a581266af3fc7ff6388cb0396e2420a26d52dd2d948653194dc080e99642ae59675897f053980c5839584d97088b67e1bfd66c5170fc42e228b8b7e06
+  metadata.gz: 29cc8148769a499a617561caccac6d5ca06fccc9c72d1f66a82b95d60f358f7cda556140d458472b7fe52a73b3ca85eb7377eb2abaa6d0e5d1af6cded28ee1ed
+  data.tar.gz: ba8a1ed70f0d910ac7f56f7d5674665f4baeb40e113e1aefc19e93e31bbe8705c0cb530ab71e6b819ed970b75b0d5aec7b58751e5558bb4e0f08857270421169

data/app/controllers/awesome_translations/duplicates_controller.rb CHANGED Viewed

@@ -24,6 +24,6 @@ class AwesomeTranslations::DuplicatesController < AwesomeTranslations::Applicati
       translation_value.destroy!
     end
-    redirect_to :back
+    redirect_back(fallback_location: :root)
   end
 end

data/app/controllers/awesome_translations/groups_controller.rb CHANGED Viewed

@@ -26,7 +26,7 @@ class AwesomeTranslations::GroupsController < AwesomeTranslations::ApplicationCo
     generator = AwesomeTranslations::CacheDatabaseGenerator.current
     generator.update_translations_for_group(@handler, @group)
-    redirect_to :back
+    redirect_back(fallback_location: :root)
   end
 private

data/app/controllers/awesome_translations/handlers_controller.rb CHANGED Viewed

@@ -9,7 +9,7 @@ class AwesomeTranslations::HandlersController < AwesomeTranslations::Application
     generator = AwesomeTranslations::CacheDatabaseGenerator.current
     generator.update_handlers
-    redirect_to :back
+    redirect_back(fallback_location: :root)
   end
   def update_groups_cache
@@ -19,7 +19,7 @@ class AwesomeTranslations::HandlersController < AwesomeTranslations::Application
       generator.update_groups_for_handler(handler_model)
     end
-    redirect_to :back
+    redirect_back(fallback_location: :root)
   end
   def show

data/app/controllers/awesome_translations/movals_controller.rb CHANGED Viewed

@@ -16,6 +16,6 @@ class AwesomeTranslations::MovalsController < AwesomeTranslations::ApplicationCo
       translation_value.migrate_to_awesome_translations_namespace!
     end
-    redirect_to :back
+    redirect_back(fallback_location: :root)
   end
 end

data/app/views/awesome_translations/clean_ups/new.html.erb CHANGED Viewed

@@ -1,4 +1,5 @@
 <% content_for(:header_title) { "Clean Up" } %>
 <%= form_for :clean_ups, url: clean_ups_path do |f| %>
   <div class="panel panel-default">
     <div class="panel-heading">
@@ -14,7 +15,7 @@
         </thead>
         <tbody>
           <% translations_to_clean_up.each do |translation| %>
-            <tr class="translation-value" data-id="<%= translation.id %>">}
+            <tr class="translation-value" data-id="<%= translation.id %>">
               <td>
                 <%= check_box_tag("c[#{translation.id}]", 1, true) %>
               </td>

data/app/views/layouts/awesome_translations/application.html.erb CHANGED Viewed

@@ -8,7 +8,6 @@
       <%= content_for?(:header_title) ? content_for(:header_title) : "AwesomeTranslations" %>
     </title>
     <%= csrf_meta_tags %>
-    <%= favicon_link_tag %>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha256-916EbMg70RQy9LHiGkXzG8hSg9EdNy97GazNG/aiY1w=" crossorigin="anonymous" />
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha256-eZrrJcwDc/3uDhsdt61sL2oOBY362qM3lon1gyExkL0=" crossorigin="anonymous" />
@@ -21,7 +20,7 @@
     <%= content_for(:header_script) %>
   </head>
-  <body class="<%= ["controller-#{controller_name}", "action-#{action_name}"] %>">
+  <body class="controller-<%= controller_name %> action-<%= action_name %>">
     <div class="navbar navbar-default navbar-static-top">
       <div class="container">
         <button class="navbar-toggle" data-target=".navbar-responsive-collapse" data-toggle="collapse" type="button">
@@ -29,7 +28,9 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </button>
         <%= link_to "Awesome Translations", "/awesome_translations", class: "navbar-brand" %>
         <div class="navbar-collapse collapse navbar-responsive-collapse">
           <ul class="nav navbar-nav">
             <li>

data/lib/awesome_translations/erb_inspector/file_inspector.rb CHANGED Viewed

@@ -1,4 +1,5 @@
 class AwesomeTranslations::ErbInspector::FileInspector
+  JS_FILE_EXTS = [".coffee", ".coffee.erb", ".es6", ".es6.erb", ".js", ".js.erb"]
   METHOD_NAMES = %w(t controller_t helper_t).freeze
   VALID_BEGINNING = '(^|\s+|\(|\{|\[|<%=\s*)'.freeze
@@ -23,6 +24,8 @@ class AwesomeTranslations::ErbInspector::FileInspector
           if extname == ".liquid"
             parse_content_liquid(line_no, line, translations_found, yielder)
+          elsif JS_FILE_EXTS.include?(extname)
+            parse_content_js(line_no, line, translations_found, yielder)
           else
             parse_content(line_no, line, translations_found, yielder)
           end
@@ -63,6 +66,16 @@ private
     end
   end
+  def parse_content_js(line_no, line, translations_found, yielder)
+    line.scan(/\I18n\.t\('(.+?)'\)/) do |match|
+      add_translation(line_no, "I18n.t", match[0], translations_found, yielder)
+    end
+    line.scan(/\I18n\.t\("(.+?)"\)/) do |match|
+      add_translation(line_no, "I18n-js.t", match[0], translations_found, yielder)
+    end
+  end
   def parse_content(line_no, line, translations_found, yielder)
     METHOD_NAMES.each do |method_name|
       if (last_method_match = line.match(/def\s+(.+?)(\(|\n|\r\n)/))

data/lib/awesome_translations/erb_inspector/translation_inspector.rb CHANGED Viewed

@@ -41,7 +41,7 @@ class AwesomeTranslations::ErbInspector::TranslationInspector
 private
   def generate_full_key
-    if (@method == "t" || @method == "helper_t" || @method == "controller_t") && @key.start_with?(".")
+    if (@method == "t" || @method == "helper_t" || @method == "controller_t" || @method == "I18n-js.t") && @key.start_with?(".")
       @full_key = File.dirname(@file_path).to_s
       if @full_key.starts_with?("app/mailers")
@@ -67,7 +67,7 @@ private
       @full_key << ".#{@last_method}" if (is_mailer || is_controller) && @last_method && @method != "controller_t"
       @full_key << "."
       @full_key << @key.gsub(/\A\./, "")
-    elsif @method == "t" || @method == "helper_t" || @method == "controller_t"
+    elsif @method == "I18n-js.t" || @method == "t" || @method == "helper_t" || @method == "controller_t"
       @full_key = @key
     else
       raise "Unknown method-name: '#{@method}'."

data/lib/awesome_translations/erb_inspector.rb CHANGED Viewed

@@ -4,7 +4,7 @@ class AwesomeTranslations::ErbInspector
   def initialize(args = {})
     @args = args
-    @args[:exts] ||= [".erb", ".haml", ".liquid", ".markerb", ".rb", ".rake", ".slim", "."]
+    @args[:exts] ||= [".erb", ".haml", ".liquid", ".markerb", ".rb", ".rake", ".slim", "."] + AwesomeTranslations::ErbInspector::FileInspector::JS_FILE_EXTS
     if @args[:dirs]
       @dirs = @args[:dirs]

data/lib/awesome_translations/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module AwesomeTranslations
-  VERSION = "0.0.50".freeze
+  VERSION = "0.0.51".freeze
 end

data/spec/controllers/groups_controller_spec.rb CHANGED Viewed

@@ -24,9 +24,9 @@ describe AwesomeTranslations::GroupsController do
     it "updates translations" do
       expect(I18n.load_path).to_not include model_locales_path
-      put :update, handler_id: "model_handler", id: "User", t: {
+      put :update, params: {handler_id: "model_handler", id: "User", t: {
         "activerecord.attributes.user.password" => {"da" => "Adgangskode", "de" => "Kenwort", "en" => "Password"}
-      }
+      }}
       danish_user_translations = YAML.load_file(user_yml_path)
       expect(danish_user_translations["da"]["activerecord"]["attributes"]["user"]["password"]).to eq "Adgangskode"
@@ -35,9 +35,9 @@ describe AwesomeTranslations::GroupsController do
     it "updates paths" do
       key_to_update = "activerecord.attributes.role.role"
-      put :update, handler_id: "model_handler", id: "Role", t: {
+      put :update, params: {handler_id: "model_handler", id: "Role", t: {
         key_to_update => {"da" => "Rolle", "de" => "Die type", "en" => "Role"}
-      }
+      }}
       da_translation_value = AwesomeTranslations::CacheDatabaseGenerator::TranslationValue
         .joins(:translation_key)
@@ -57,7 +57,7 @@ describe AwesomeTranslations::GroupsController do
     end
     it "handles array translations" do
-      put :update, handler_id: "rails_handler", id: "date_time", t: {
+      put :update, params: {handler_id: "rails_handler", id: "date_time", t: {
         "date.day_names" => {
           "1" => {
             "da" => "Mandag"
@@ -66,7 +66,7 @@ describe AwesomeTranslations::GroupsController do
             "da" => "Torsdag"
           }
         }
-      }
+      }}
       translations = YAML.load_file(date_time_path)
@@ -77,7 +77,7 @@ describe AwesomeTranslations::GroupsController do
   it "#update_translations_cache" do
     request.env["HTTP_REFERER"] = handler_group_path("rails_handler", "date_time")
-    post :update_translations_cache, handler_id: "rails_handler", id: "date_time"
+    post :update_translations_cache, params: {handler_id: "rails_handler", id: "date_time"}
     expect(response).to redirect_to handler_group_path("rails_handler", "date_time")
   end
 end

data/spec/controllers/handlers_controller_spec.rb CHANGED Viewed

@@ -19,13 +19,13 @@ describe AwesomeTranslations::HandlersController do
   describe "#show" do
     it "renders the page" do
       AwesomeTranslations::CacheDatabaseGenerator.current.cache_translations
-      get :show, id: "model_handler"
+      get :show, params: {id: "model_handler"}
       expect(response).to be_success
     end
     it "filters with missing translations" do
       AwesomeTranslations::CacheDatabaseGenerator.current.cache_translations
-      get :show, id: "model_handler", with_missing_translations: "only_with"
+      get :show, params: {id: "model_handler", with_missing_translations: "only_with"}
       all_groups = AwesomeTranslations::CacheDatabaseGenerator::Group.all
       groups = assigns(:groups)
@@ -45,7 +45,7 @@ describe AwesomeTranslations::HandlersController do
   it "#update_groups_cache" do
     AwesomeTranslations::CacheDatabaseGenerator.current.cache_translations
     request.env["HTTP_REFERER"] = handler_path("rails_handler")
-    post :update_groups_cache, id: "rails_handler"
+    post :update_groups_cache, params: {id: "rails_handler"}
     expect(response).to redirect_to handler_path("rails_handler")
   end
 end

data/spec/controllers/users_controller_spec.rb CHANGED Viewed

@@ -10,7 +10,7 @@ describe UsersController do
   end
   it "#update" do
-    patch :update, id: user.id, user: {email: "newemail@example.com"}
+    patch :update, params: {id: user.id, user: {email: "newemail@example.com"}}
     expect(response).to redirect_to user_url(user)
     # Ensure correct key

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

	@@ -0,0 +1,2 @@
1	+ console.log(I18n.t(".hello_world"))
2	+ console.log(I18n.t("javascripts.absolute.key"))

data/spec/lib/erb_inspector/file_inspector_spec.rb CHANGED Viewed

@@ -9,6 +9,7 @@ describe AwesomeTranslations::ErbInspector::FileInspector do
   let(:files) { erb_inspector.files.to_a }
   let(:file_paths) { files.map(&:file_path) }
+  let(:js_translations_inspector) { files.find { |file_inspector| file_inspector.file_path == "app/assets/javascripts/translations.js" } }
   let(:user_index_inspector) { files.find { |file_inspector| file_inspector.file_path == "app/views/users/index.html.haml" } }
   let(:user_edit_inspector) { files.find { |file_inspector| file_inspector.file_path == "app/views/users/edit.html.liquid" } }
   let(:user_index_translations) { user_index_inspector.translations.to_a }
@@ -19,6 +20,17 @@ describe AwesomeTranslations::ErbInspector::FileInspector do
       expect(user_index_translations.length).to eq 3
     end
+    it "finds javascript translations" do
+      translation_keys = js_translations_inspector.translations.map(&:key)
+      translation_full_keys = js_translations_inspector.translations.map(&:full_key)
+      expect(translation_keys).to include ".hello_world"
+      expect(translation_keys).to include "javascripts.absolute.key"
+      expect(translation_full_keys).to include "assets.javascripts.translations.hello_world"
+      expect(translation_full_keys).to include "javascripts.absolute.key"
+    end
     it "finds liquid translations" do
       translation_keys = user_edit_inspector.translations.map(&:key)

data/spec/lib/erb_inspector_spec.rb CHANGED Viewed

@@ -12,13 +12,17 @@ describe AwesomeTranslations::ErbInspector do
   describe "#files" do
     it "should find haml-files" do
-      expect(files.length).to eq 30
+      expect(files.length).to eq 32
     end
     it "should find haml-files" do
       expect(file_paths).to include "app/views/users/index.html.haml"
     end
+    it "should find js-files" do
+      expect(file_paths).to include "app/assets/javascripts/translations.js"
+    end
     it "should find erb-files" do
       expect(file_paths).to include "app/views/users/show.html.erb"
     end

data/spec/lib/model_inspector_spec.rb CHANGED Viewed

@@ -9,7 +9,7 @@ describe AwesomeTranslations::ModelInspector do
   end
   it "#engines" do
-    expected = [AwesomeTranslations::Engine, MoneyRails::Engine]
+    expected = [ActionView::Railtie, AwesomeTranslations::Engine, MoneyRails::Engine]
     expect(AwesomeTranslations::ModelInspector.engines.map(&:class).sort { |class1, class2| class1.name <=> class2.name }).to eq expected
   end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awesome_translations
 version: !ruby/object:Gem::Version
-  version: 0.0.50
+  version: 0.0.51
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-07-16 00:00:00.000000000 Z
+date: 2017-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: array_enumerator
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: string-cases
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +248,7 @@ files:
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/javascripts/translations.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/locales_controller.rb
@@ -959,7 +960,6 @@ files:
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/zP/zPQqWF28I7kpoF1Dnj5EEarB0GpwOkUaA2Tz0hblh24.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/ze/zedtAd8zH8Ioxo82-6BNpt6Ts6mMzO3imVF8J-NtYb0.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/zh/zhMAhCSzLNtc-6pw-wSoR2Rz5C7dIaAfCZ_inNCngKg.cache
-- spec/dummy/tmp/pids/server.pid
 - spec/factories/group.rb
 - spec/factories/handler.rb
 - spec/factories/handler_translation.rb
@@ -1013,6 +1013,7 @@ test_files:
 - spec/controllers/handlers_controller_spec.rb
 - spec/controllers/users_controller_spec.rb
 - spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/javascripts/translations.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/locales_controller.rb
@@ -1726,7 +1727,6 @@ test_files:
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/ZS/zsbNbYYv-fy4XAGW2nAPt4I4bY2YUDa23WGZt_jKnVQ.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/ZS/ZSjVZobcSitaP1Y4cHUI_-kywC2Q3JnYnpx2RdN3VwA.cache
 - spec/dummy/tmp/cache/assets/sprockets/v3.0/Zw/ZwBNplTazyFPeZh5cxN-pYMEbPlumj2eWpK7v3ENe0o.cache
-- spec/dummy/tmp/pids/server.pid
 - spec/factories/group.rb
 - spec/factories/handler.rb
 - spec/factories/handler_translation.rb

data/spec/dummy/tmp/pids/server.pid DELETED Viewed

	@@ -1 +0,0 @@
1	- 79400