translatable_routes 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d558f9e950165aefca940162d56890a6002333d
-  data.tar.gz: 1c5f5a4d4a6a1618cc527b819837b90c1b4feca6
+  metadata.gz: bcb323b671272f53a95fb2bf189081c2b90fa8a7
+  data.tar.gz: 1f0e5de66aa5254091520e02e2a8f4693740b749
 SHA512:
-  metadata.gz: 9bdc5eca6a98540e953896a98749ebcdbd4cc60d8223bde47275dd5e6160da3edc9179cb31e0216bab2242ed54e5b9c3473b471bbcc4d4b2f7497d1700666798
-  data.tar.gz: 5b77227f4487b998b487768ed94611b3f67d578452323c26ff4605e541d930eb3a2eab5638cf4589dc3fe8391d5247d6b96d7c2c61602d488839e22aca788d4b
+  metadata.gz: 4b6ea0303ec82d7072d2bf56fd022607ed6cd411aa8f0c08d8786f870dd0c43908bc2f5c66b3c83c47ac3517062367d2b06f9eba710954651cc9a7d09c344c0b
+  data.tar.gz: af2914ede89ac2f8191ff26a33a78237e9aa64d1e1f293b07d82b6d530d2319627b1054ae6ae9139c363cf2718ab0f9efb77907e7bfe5896ee258e2e9b622d73

data/lib/translatable_routes/action_dispatch/mapper.rb

@@ -35,7 +35,7 @@ module TranslatableRoutes
                   end
                 end
               end
-            else
+            elsif !options[:as].nil?
               options[:as] = "#{options[:as] || action}_#{locale}"
             end
             super i18n_path(action, locale), options
@@ -50,11 +50,14 @@ module TranslatableRoutes
           end
           if @scope[:scope_level_resource]
             helper = name_for_action(options[:as], action)
-          else
+            @set.named_routes.define_i18n_url_helper helper
+          elsif !options[:as].nil?
             helper = "#{options[:as] || action}"
-            helper = "#{@scope[:as]}_#{helper}" if @scope[:as]
+            if @scope[:as]
+              helper.prepend "#{@scope[:as]}_"
+            end
+            @set.named_routes.define_i18n_url_helper helper
           end
-          @set.named_routes.define_i18n_url_helper helper
         else
           super
         end
@@ -71,7 +74,7 @@ module TranslatableRoutes
             if part[0] == ':' or part[0] == '*'
               i18n_path << part
             else
-              i18n_path << I18n.t("routes.#{part}", locale: locale, default: part.gsub(/_/, '-'))
+              i18n_path << I18n.t("routes.#{part.gsub('-', '_')}", locale: locale, default: part.gsub('_', '-'))
             end
           end
           i18n_path.join('/')

data/lib/translatable_routes/action_dispatch/named_route_collection.rb

@@ -17,7 +17,7 @@ module TranslatableRoutes
           target.module_eval do
             define_method helper do |*args|
               options = args.extract_options!
-              suffix = (options[:locale] || I18n.locale).to_s.gsub('-', '_').downcase
+              suffix = (options[:locale] || url_options[:locale] || I18n.locale).to_s.gsub('-', '_').downcase
               send "#{name}_#{suffix}_#{type}", *(args << options)
             end
           end

data/lib/translatable_routes/version.rb

@@ -1,5 +1,5 @@
 module TranslatableRoutes
 
-  VERSION = '1.3.5'
+  VERSION = '1.3.6'
 
 end

data/test/dummy/log/test.log

@@ -6669,3 +6669,18 @@ HelpersTest: test_helpers
 RoutesTest: test_routes
 -----------------------
    (0.1ms)  rollback transaction
+   (0.2ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (0.1ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.0ms)  SELECT version FROM "schema_migrations"
+   (0.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (0.1ms)  begin transaction
+-----------------------
+RoutesTest: test_routes
+-----------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-------------------------
+HelpersTest: test_helpers
+-------------------------
+   (0.0ms)  rollback transaction

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: translatable_routes
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Museways
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-04 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails