dragoman 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4090b145af56cf395749d4563c858dc9d7ec438e
-  data.tar.gz: 4f1f281ed36a13365785fafa7eb487157372db5e
+  metadata.gz: c50f0ba55cd1b168ff9e181f96432d0a958a1fe5
+  data.tar.gz: ac628c72a7880a938596ed4239d7af3a6adebd66
 SHA512:
-  metadata.gz: 4000a0878013f2345310d757ab55e0d98d3862021f632a0bb1220f3ea0596133be2840a88aba3ceb418ce3007769e245e624e8aa2826ea9fc757cd2c14bad75e
-  data.tar.gz: ffd681555d10500818eeefa7858ca2b9ff3df0dc3e326a2d203fa7e522f9a262d309bee554aecd475fd94589cdc00c1901396a80923329525012faad35083a1d
+  metadata.gz: 1abbc1032a4f4a01d0cc41cdb8db0819d60bdb86b094b6c807796be7bfc674c76c1cef4e5b87b539394acc14a90329ce178ef6e70b7af39cc015c0a4d795f05e
+  data.tar.gz: 3d7683e61754b51c76424d92fec15cd96ec952b3345db3fe30b1f731ad317db5cbdcd29bb48f65423bc384f0df077f1387828c9b1cbf37ba365f3c8b86b6b949

data/.gitignore

@@ -15,3 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+gemfiles/*.lock
+log

data/lib/dragoman/mapper.rb

@@ -26,7 +26,7 @@ module Dragoman
 
     def add_route_with_localization(action, options)
       if @current_locale
-        options[:path] = Dragoman::Translator.translate_path(action, @current_locale) if action.present? && !canonical_action?(action)
+        options[:path] = Dragoman::Translator.translate_path(options[:path] || action, @current_locale) unless canonical_action?(action)
         options[:locale] = @current_locale
       end
       add_route_without_localization action, options
@@ -37,6 +37,7 @@ module Dragoman
         options = args.extract_options!.dup
         if options[:path] || args.any?
           options[:path] = Dragoman::Translator.translate_path(options[:path] || args.flatten.join('/'), @current_locale)
+          options[:shallow_path] = Dragoman::Translator.translate_path(options[:shallow_path], @current_locale) if options[:shallow_path]
         end
         scope_without_localization options, &block
       else
@@ -47,7 +48,7 @@ module Dragoman
     def resources_with_localization(*resources, &block)
       options = resources.extract_options!.dup
       if @current_locale
-        options[:path] = Dragoman::Translator.translate_path(resources.last, @current_locale)
+        options[:path] = Dragoman::Translator.translate_path(options[:path] || resources.last, @current_locale)
       end
       resources_without_localization(*resources, options, &block)
     end

data/lib/dragoman/mapper_rails3.rb

@@ -29,7 +29,7 @@ module Dragoman
 
     def add_route_with_localization(action, options)
       if @current_locale
-        options[:path] = Dragoman::Translator.translate_path(action, @current_locale) if action.present? && !canonical_action?(action, true)
+        options[:path] = Dragoman::Translator.translate_path(options[:path] || action, @current_locale) unless canonical_action?(action, true)
         options[:locale] = @current_locale
       end
       add_route_without_localization action, options

data/lib/dragoman/translator.rb

@@ -3,6 +3,7 @@ module Dragoman
   class Translator
 
     def self.translate_path path, locale
+      return path if path.blank?
       parsed_path = Dragoman::Journey::Parser.new.parse(path.to_s)
       Dragoman::TranslationVisitor.new(locale).accept(parsed_path)
     end

data/lib/dragoman/version.rb

@@ -1,3 +1,3 @@
 module Dragoman
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/fixtures/config/routes.rb

@@ -10,10 +10,28 @@ Dummy::Application.routes.draw do
       get 'payments' => 'application#index'
     end
 
-    resources :products
+    resources :products#, path_names: {edit: 'accept'}
     resource :account
 
-    get '' => 'application#test', as: 'empty'
+    get '' => 'application#index', as: 'empty'
+
+    namespace 'empty', path: '' do
+      get 'books' => 'application#index'
+    end
+    resources :invitations, only: [] do
+      member do
+        get :edit, path: 'accept'
+      end
+    end
+
+    resources :chairs, only: :index, path: 'seats'
+
+    # shallow routes
+    scope 'fast', shallow_path: 'fast' do
+      resources :cars, :only => [:index] do
+        resources :drivers, :only => [:show], shallow: true
+      end
+    end
   end
 
 end

data/spec/fixtures/locales/routes.yml

@@ -10,4 +10,11 @@ nl:
     new: nieuw
     edit: wijzigen
     account: profiel
+    books: boeken
+    invitations: uitnodigingen
+    accept: accepteren
+    seats: stoelen
+    drivers: bestuurders
+    fast: snelle
+    cars: autos
 

data/spec/routing/routes_spec.rb

@@ -50,6 +50,25 @@ describe 'routes' do
     expect(empty_en_path).to eq '/'
   end
 
+  it 'skips empty scopes' do
+    expect(empty_books_nl_path).to eq '/boeken'
+    expect(empty_books_en_path).to eq '/books'
+  end
+
+  it 'looks up translations by the path option if present' do
+    expect(edit_invitation_nl_path(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 '/stoelen'
+    expect(chairs_en_path).to eq '/seats'
+  end
+
+  it 'translated shallow paths' do
+    expect(driver_nl_path(3)).to eq '/snelle/bestuurders/3'
+    expect(driver_en_path(3)).to eq '/fast/drivers/3'
+  end
+
   describe 'adds untranslated path helpers' do
     it 'uses the I18n locale' do
       I18n.locale = :nl
@@ -59,7 +78,6 @@ describe 'routes' do
 
   describe 'adds untranslated url helpers' do
     it 'uses the I18n locale' do
-      print_routes
       I18n.locale = :nl
       expect(payments_url).to eq 'http://example.com/geheim/betalingen'
     end

data/spec/spec_helper.rb

@@ -20,7 +20,6 @@ RSpec.configure do |config|
 
   config.after(:each) do
     I18n.locale = I18n.default_locale = :en
-    # Rails.application.reload_routes!
   end
 
 end

metadata

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