dragoman 0.0.8 → 0.0.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWIwNWViZWVkYjQxNmRkYzA3OTE3YWQwMWZkMzgzOGUzNjI2ZTg0Yw==
+    NmFlODAzNTRiOWE3ODUyYjYzM2E2YTM0ZDQ0MmM1YjBjMTAyZmZmMw==
   data.tar.gz: !binary |-
-    ZWRmYWFmM2FiNjYzYWI1ZWUxOWZlMTM3NzIwY2EwMzA5MzU4ZDI4Yw==
+    NGZiZmE2MDhlMzJjODBiN2NkNDUzZDg4ZWE3NTA3NWYzNGE1Nzg2Ng==
 SHA512:
   metadata.gz: !binary |-
-    NWUwOWY0Nzc3MDE0YWE3NWRmMGMxMzczZGNmYjUwMjhhZjQxMGU1YzUyZjc3
-    ODFkZDA4ZWMxNjUzMmM3YmNmNGE5ZDQzY2QyMzEzZjcwOTZkODhkZjZiYmMx
-    NWVlZDUyYmY3NmQxOWJiMTVhNWEyMWU3MmNhM2RhODcwMTJhNjM=
+    NWM3ZGEyN2IyODQyMDlkNGU4NzFmZTljNjZlZWVlZTY1NzY1Y2RmNzM1NTY2
+    NTg2YzllYzNjYTZkMjU3MjE5YWY2ZWYzMDg0MTk2YWM1OGJjMjgyOGJkNmVi
+    MzI4ZjIxM2Y4ZjU3ZGZjMjc2ZDZjMTg1Y2I2ZWVkNmQ3NTc4ZGE=
   data.tar.gz: !binary |-
-    YzhhZDM0NWQxZDdiOGIzMTI1Y2FlM2VkMmExZDgxODMyZGI5ZjNhY2NmMjdj
-    NmZmOGM1ZjA1YTQ0ZmRjMjI1M2QwZTRmNzVkZDdmN2U0Y2M1N2RmZjYyNzQ4
-    ZTE4MTAwNTRmNzI0ZDI0NjRhYTAxODFiODRjZTlmZjhlOGFlNjM=
+    YWQyMjc4MDA5NGQ2MTAyZThkNzBiMjgwYzYwYmY2OWM3MmI1MGZiY2Y2MzJl
+    ZDJlMDUzZWYyMThjNDMxODIxYWQyM2FmYmMxNmRiYzRmM2I2ZGY1ZTUxMDkx
+    YmIwMjYxY2ExYWZhYzYxYTc1M2JmMWZmNDE2YTRjY2Q3ZGM1ZDc=

data/lib/dragoman/mapper.rb

@@ -2,7 +2,7 @@ module Dragoman
   module Mapper
     def localize
       @locales = I18n.available_locales
-      scope '(:locale)', shallow_path: '(:locale)', defaults: {dragoman_options: {locales: @locales}} do
+      scope ':locale', shallow_path: ':locale', defaults: {dragoman_options: {locales: @locales}} do
         yield
       end
       @locales = nil

data/lib/dragoman/route_set.rb

@@ -13,6 +13,7 @@ module Dragoman
         dragoman_options[:locales].each do |locale|
           new_conditions = conditions.dup
           new_requirements = requirements.dup
+          new_defaults = defaults.dup
 
           new_name = name ? "#{name}_#{locale}" : nil
           new_name = nil if new_name && named_routes.routes[new_name.to_sym] # Why is this necessary
@@ -23,7 +24,8 @@ module Dragoman
             new_conditions[:parsed_path_info] = Dragoman::Journey::Parser.new.parse new_path if new_conditions[:parsed_path_info]
           end
           new_requirements[:locale] = locale
-          add_route_without_localization app, new_conditions, new_requirements, defaults.dup, new_name, anchor
+          new_defaults[:locale] = locale
+          add_route_without_localization app, new_conditions, new_requirements, new_defaults, new_name, anchor
         end
       else
         add_route_without_localization app, conditions, requirements, defaults, name, anchor

data/lib/dragoman/url_helpers.rb

@@ -3,10 +3,10 @@ module Dragoman
 
     def self.add_untranslated_helpers name, path_module, url_module
       path_module.send :define_method, "#{name}_path" do |*args|
-        __send__(Dragoman::UrlHelpers.localized_helper_name(name, :path), *args)
+        __send__(Dragoman::UrlHelpers.localized_helper_name(name, :path), *Dragoman::UrlHelpers.args_with_locale(*args))
       end
       url_module.send :define_method, "#{name}_url" do |*args|
-        __send__(Dragoman::UrlHelpers.localized_helper_name(name, :url), *args)
+        __send__(Dragoman::UrlHelpers.localized_helper_name(name, :url), *Dragoman::UrlHelpers.args_with_locale(*args))
       end
     end
 
@@ -15,5 +15,14 @@ module Dragoman
       "#{name}_#{locale}_#{url_helper_type}"
     end
 
+    def self.args_with_locale *args
+      if args[0].is_a?(Hash)
+        args[0].merge!({locale: I18n.locale})
+      else
+        args << {locale: I18n.locale}
+      end
+      args
+    end
+
   end
 end

data/lib/dragoman/version.rb

@@ -1,3 +1,3 @@
 module Dragoman
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/routing/routes_spec.rb

@@ -13,92 +13,97 @@ describe 'routes' do
   end
 
   it 'translates resources' do
-    expect(products_en_path).to eq '/products'
-    expect(new_product_en_path).to eq '/products/new'
-    expect(edit_product_en_path(id: 1)).to eq '/products/1/edit'
-    expect(products_nl_path).to eq '/producten'
-    expect(new_product_nl_path).to eq '/producten/nieuw'
-    expect(edit_product_nl_path(id: 1)).to eq '/producten/1/wijzigen'
+    expect(products_en_path).to eq '/en/products'
+    expect(new_product_en_path).to eq '/en/products/new'
+    expect(edit_product_en_path(id: 1)).to eq '/en/products/1/edit'
+    expect(products_nl_path).to eq '/nl/producten'
+    expect(new_product_nl_path).to eq '/nl/producten/nieuw'
+    expect(edit_product_nl_path(id: 1)).to eq '/nl/producten/1/wijzigen'
   end
 
   it 'translates resource' do
-    expect(account_en_path).to eq '/account'
-    expect(edit_account_en_path).to eq '/account/edit'
-    expect(new_account_en_path).to eq '/account/new'
-    expect(account_nl_path).to eq '/profiel'
-    expect(edit_account_nl_path).to eq '/profiel/wijzigen'
-    expect(new_account_nl_path).to eq '/profiel/nieuw'
+    expect(account_en_path).to eq '/en/account'
+    expect(edit_account_en_path).to eq '/en/account/edit'
+    expect(new_account_en_path).to eq '/en/account/new'
+    expect(account_nl_path).to eq '/nl/profiel'
+    expect(edit_account_nl_path).to eq '/nl/profiel/wijzigen'
+    expect(new_account_nl_path).to eq '/nl/profiel/nieuw'
   end
 
   it 'translates namespaced routes' do
-    expect(admin_customers_nl_path).to eq '/beheer/klanten'
-    expect(admin_customers_en_path).to eq '/admin/customers'
+    expect(admin_customers_nl_path).to eq '/nl/beheer/klanten'
+    expect(admin_customers_en_path).to eq '/en/admin/customers'
   end
 
   it 'translates scoped routes' do
-    expect(payments_nl_path).to eq '/geheim/betalingen'
-    expect(payments_en_path).to eq '/secret/payments'
+    expect(payments_nl_path).to eq '/nl/geheim/betalingen'
+    expect(payments_en_path).to eq '/en/secret/payments'
   end
 
   it 'sets the correct locale' do
-    expect(get: '/producten').to route_to(controller: 'products', action: 'index')
-    expect(get: '/products').to route_to(controller: 'products', action: 'index')
     expect(get: '/nl/producten').to route_to(controller: 'products', action: 'index', locale: 'nl')
+    expect(get: '/nl/products').not_to be_routable
+    expect(get: '/products').not_to be_routable
     expect(get: '/en/products').to route_to(controller: 'products', action: 'index', locale: 'en')
     expect(get: '/en/producten').not_to be_routable
   end
 
   it 'skips empty paths' do
-    expect(empty_nl_path).to eq '/'
-    expect(empty_en_path).to eq '/'
+    expect(empty_nl_path).to eq '/nl'
+    expect(empty_en_path).to eq '/en'
   end
 
   it 'skips empty scopes' do
-    expect(empty_books_nl_path).to eq '/boeken'
-    expect(empty_books_en_path).to eq '/books'
+    expect(empty_books_nl_path).to eq '/nl/boeken'
+    expect(empty_books_en_path).to eq '/en/books'
   end
 
   it 'looks up translations by the path option if present' do
-    expect(edit_invitation_nl_path(id: 2)).to eq '/uitnodigingen/2/accepteren'
+    expect(edit_invitation_nl_path(id: 2)).to eq '/nl/uitnodigingen/2/accepteren'
   end
 
   it 'looks up resources translations by the path option if present' do
-    expect(chairs_nl_path).to eq '/stoelen'
-    expect(chairs_en_path).to eq '/seats'
+    expect(chairs_nl_path).to eq '/nl/stoelen'
+    expect(chairs_en_path).to eq '/en/seats'
   end
 
   it 'translates shallow paths' do
-    expect(driver_nl_path(id: 3)).to eq '/snelle/bestuurders/3'
-    expect(driver_en_path(id: 3)).to eq '/fast/drivers/3'
-    expect(driver_en_path(id: 3, locale: 'en')).to eq '/en/fast/drivers/3'
+    expect(driver_nl_path(id: 3)).to eq '/nl/snelle/bestuurders/3'
+    expect(driver_en_path(id: 3)).to eq '/en/fast/drivers/3'
   end
 
   it 'skips blank translations' do
-    expect(music_nl_path).to eq '/music'
+    expect(music_nl_path).to eq '/nl/music'
   end
 
   it 'uses the default path if no translation is present' do
-    expect(sounds_en_path).to eq '/glitches'
-    expect(sounds_nl_path).to eq '/sounds'
+    expect(sounds_en_path).to eq '/en/glitches'
+    expect(sounds_nl_path).to eq '/nl/sounds'
   end
 
   it 'translates routes in the original order as specified in routes.rb' do
-    expect(get: 'votes/positive').to route_to(action: 'positive', controller: 'votes')
-    expect(get: 'votes/positief').to route_to(action: 'positive', controller: 'votes') # should use 'positive' action instead of 'show'
+    expect(get: '/en/votes/positive').to route_to(action: 'positive', controller: 'votes', locale: 'en')
+    expect(get: '/nl/votes/positief').to route_to(action: 'positive', controller: 'votes', locale: 'nl') # should use 'positive' action instead of 'show'
   end
 
-  describe 'adds untranslated path helpers' do
-    it 'uses the I18n locale' do
-      I18n.locale = :nl
-      expect(payments_path).to eq '/geheim/betalingen'
-    end
+  it 'uses the I18n locale to add untranslated path helpers' do
+    I18n.locale = :nl
+    expect(product_path(id: 1)).to eq '/nl/producten/1'
+    expect(payments_path).to eq '/nl/geheim/betalingen'
+
+    I18n.locale = :en
+    expect(product_path(id: 1)).to eq '/en/products/1'
+    expect(payments_path).to eq '/en/secret/payments'
   end
 
-  describe 'adds untranslated url helpers' do
-    it 'uses the I18n locale' do
-      I18n.locale = :nl
-      expect(payments_url).to eq 'http://example.com/geheim/betalingen'
-    end
+  it 'uses the I18n locale to add untranslated url helpers' do
+    I18n.locale = :nl
+    expect(product_url(id: 1)).to eq 'http://example.com/nl/producten/1'
+    expect(payments_url).to eq 'http://example.com/nl/geheim/betalingen'
+
+    I18n.locale = :en
+    expect(product_url(id: 1)).to eq 'http://example.com/en/products/1'
+    expect(payments_url).to eq 'http://example.com/en/secret/payments'
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dragoman
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Pieter Visser
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails