dragoman 0.0.10 → 0.0.11

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    N2U2NDZjNjJkYjc4MGQyNjc2MDI1MzNjOTdlNzE4MzIxNmI1YTc4Yw==
-  data.tar.gz: !binary |-
-    YzRkZmRjNzg1MTQ2ODAyODAyM2Q4OTFmZmE3NjliZDc4MGM0NWE1ZA==
+SHA1:
+  metadata.gz: 7a00d94d070f03449aaa0a78c015073607b8486a
+  data.tar.gz: 06d2ba3a8a7d8092c83b3e15b4285611ffc6613a
 SHA512:
-  metadata.gz: !binary |-
-    YzI0Y2E0N2FiMDViMGE5ZWU1ZDMyNTQ4ZjA5NzMyNjAxOTUyOTU3NjViMGI2
-    OGZkNWFmYmUyNTk3N2U1YzUyY2FkMjlhZGU3NTU0MGYzOTUzNjY4NDdkMmQ3
-    ZDNkNjVmZDk2NjVjNTdkNjhjMGIwMzNmN2I1OGRhNjY4NWY1MTM=
-  data.tar.gz: !binary |-
-    YmZkYjM3ZWE2N2Q2NGJmMWQ0NjUyZTZiZTc5MDA0OTA0NjAxZDVjOTllNDBm
-    ZjdlZDkyM2VlMDBjYzhkYTIzOTgxOGVmNmQwODY0ZDIyYmQyZjZkYzdiYzdl
-    Njg0ZDQ5ODllZjhiNDBhMDYyNDJiZjdiYjJkMjI2NjA5MmM0N2Q=
+  metadata.gz: 9824500a664c5dfee10542aba3807ea35241cd4443d870fa079af2ff01aa4ae08555f7ea70cfbfe4c3625e58797018b441913dbcb121b967427bdca0667f66ef
+  data.tar.gz: d521c7b1ff4f5d161e244e86f4b866ff6da5596803cf4ad2ec64fdb1ae9feddd62dffe55991c9c1b5179c686753ec17ba2a475d36679dd389dd2670ff590ea74

data/lib/dragoman/mapper.rb

@@ -1,8 +1,13 @@
 module Dragoman
   module Mapper
     def localize
-      @locales = I18n.available_locales
-      scope ':locale', shallow_path: ':locale', defaults: {dragoman_options: {locales: @locales}} do
+      locales = I18n.available_locales
+      unscoped_locales = [I18n.default_locale]
+      scoped_locales = locales - unscoped_locales
+      scope ':locale', shallow_path: ':locale', defaults: {dragoman_options: {locales: scoped_locales}} do
+        yield
+      end
+      defaults dragoman_options: {locales: unscoped_locales} do
         yield
       end
       @locales = nil

data/lib/dragoman/route_set.rb

@@ -23,8 +23,8 @@ module Dragoman
             new_conditions[:path_info] = new_path
             new_conditions[:parsed_path_info] = Dragoman::Journey::Parser.new.parse new_path if new_conditions[:parsed_path_info]
           end
-          new_requirements[:locale] = locale
-          new_defaults[:locale] = locale
+          new_requirements[:locale] = locale.to_s
+          new_defaults[:locale] = locale.to_s
           add_route_without_localization app, new_conditions, new_requirements, new_defaults, new_name, anchor
         end
       else

data/lib/dragoman/version.rb

@@ -1,3 +1,3 @@
 module Dragoman
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/spec/fake_app.rb

@@ -14,6 +14,7 @@ module Dummy
     config.paths["config/locales"] = ["spec/fixtures/locales/routes.yml"]
     config.eager_load = false
     config.i18n.fallbacks = true
+    config.i18n.default_locale = :nl
 
     if Dummy.rails4?
       config.paths["config/routes.rb"] = ["spec/fixtures/config/routes.rb"]

data/spec/routing/routes_spec.rb

@@ -16,80 +16,80 @@ describe 'routes' do
     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'
+    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'
   end
 
   it 'translates resource' do
     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'
+    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'
   end
 
   it 'translates namespaced routes' do
-    expect(admin_customers_nl_path).to eq '/nl/beheer/klanten'
+    expect(admin_customers_nl_path).to eq '/beheer/klanten'
     expect(admin_customers_en_path).to eq '/en/admin/customers'
   end
 
   it 'translates scoped routes' do
-    expect(payments_nl_path).to eq '/nl/geheim/betalingen'
+    expect(payments_nl_path).to eq '/geheim/betalingen'
     expect(payments_en_path).to eq '/en/secret/payments'
   end
 
   it 'sets the correct locale' do
-    expect(get: '/nl/producten').to route_to(controller: 'products', action: 'index', locale: 'nl')
-    expect(get: '/nl/products').not_to be_routable
+    expect(get: '/producten').to route_to(controller: 'products', action: 'index', locale: 'nl')
+    expect(get: '/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 '/nl'
+    expect(empty_nl_path).to eq '/'
     expect(empty_en_path).to eq '/en'
   end
 
   it 'skips empty scopes' do
-    expect(empty_books_nl_path).to eq '/nl/boeken'
+    expect(empty_books_nl_path).to eq '/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 '/nl/uitnodigingen/2/accepteren'
+    expect(edit_invitation_nl_path(id: 2)).to eq '/uitnodigingen/2/accepteren'
   end
 
   it 'looks up resources translations by the path option if present' do
-    expect(chairs_nl_path).to eq '/nl/stoelen'
+    expect(chairs_nl_path).to eq '/stoelen'
     expect(chairs_en_path).to eq '/en/seats'
   end
 
   it 'translates shallow paths' do
-    expect(driver_nl_path(id: 3)).to eq '/nl/snelle/bestuurders/3'
+    expect(driver_nl_path(id: 3)).to eq '/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 '/nl/music'
+    expect(music_nl_path).to eq '/music'
   end
 
   it 'uses the default path if no translation is present' do
     expect(sounds_en_path).to eq '/en/glitches'
-    expect(sounds_nl_path).to eq '/nl/sounds'
+    expect(sounds_nl_path).to eq '/sounds'
   end
 
   it 'translates routes in the original order as specified in routes.rb' do
     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'
+    expect(get: '/votes/positief').to route_to(action: 'positive', controller: 'votes', locale: 'nl') # should use 'positive' action instead of 'show'
   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'
+    expect(product_path(id: 1)).to eq '/producten/1'
+    expect(payments_path).to eq '/geheim/betalingen'
 
     I18n.locale = :en
     expect(product_path(id: 1)).to eq '/en/products/1'
@@ -98,8 +98,8 @@ describe 'routes' do
 
   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'
+    expect(product_url(id: 1)).to eq 'http://example.com/producten/1'
+    expect(payments_url).to eq 'http://example.com/geheim/betalingen'
 
     I18n.locale = :en
     expect(product_url(id: 1)).to eq 'http://example.com/en/products/1'

data/spec/spec_helper.rb

@@ -23,7 +23,7 @@ RSpec.configure do |config|
   end
 
   config.after(:each) do
-    I18n.locale = I18n.default_locale = :en
+    I18n.locale = I18n.default_locale = :nl
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dragoman
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Pieter Visser
@@ -9,34 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -82,17 +82,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Simple Rails Routes Translator