dragoman 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98d21fd0c11e6b04a5c566370a212cfb13069c21
-  data.tar.gz: 1a8fc051d3c4e267c2eda8258596db72ee9ca07e
+  metadata.gz: a203343dac859415cb421f222a4ca5be311f540d
+  data.tar.gz: e38180d72757b4752bc88ffcfa6e7fd38115a8b4
 SHA512:
-  metadata.gz: f325ed8abd2e5e93688feb77156d5dff9233bc4b3af8aa0fc03cd72eeeefa3c83eb21953ff5b46e8fb7e2ca1d12c20aa7f8bd10c5142d8a5d1d1f6b4fd889f48
-  data.tar.gz: 874f57c046af88f991ceece65f4375ce24d20a59cf4a5d023c99317db7f022b87e1f6cb71e4bf97c37ed2ec21530150458cdcf6f13e3be0beed868c3f8aab688
+  metadata.gz: 2377cbbd03c6ea5c8fedce7a3e9943632bb2f62ac1c5a503100ee7bf7d580b046ee80b8d06da086d793f849454ebe707dcff0c20d0fdc4690892d7e8efad8bfa
+  data.tar.gz: 738305615fa10ed287b2889cb71991642515b00b0b3fe33c39603918c382fe6fe670c1351232b65f38b40bdc36a05120312491639d5678b8bb3f23e5634d435d

data/lib/dragoman/mapper.rb

@@ -1,57 +1,11 @@
 module Dragoman
   module Mapper
-
-    module Mapping
-      def build_with_localization scope, set, path, as, options
-        if options[:locale]
-          Dragoman::UrlHelpers.add_untranslated_helpers as, set.named_routes.path_helpers_module, set.named_routes.url_helpers_module if as
-          as = "#{as}_#{options[:locale]}" if as.present?
-          as = nil if as && set.named_routes.routes[as.to_sym] # TODO: why do we need to set as to nil?
-        end
-        build_without_localization scope, set, path, as, options
-      end
-    end
-
-    private
-
     def localize
-      @current_locale = nil
-      locales = I18n.available_locales
-      locales.each do |locale|
-        @current_locale = locale.to_s
+      @locales = I18n.available_locales
+      scope '(:locale)', defaults: {dragoman_options: {locales: @locales}} do
         yield
       end
-      @current_locale = nil
-    end
-
-    def add_route_with_localization(action, options)
-      if @current_locale
-        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
-    end
-
-    def scope_with_localization(*args, &block)
-      if @current_locale
-        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
-        scope_without_localization *args, &block
-      end
-    end
-
-    def resources_with_localization(*resources, &block)
-      options = resources.extract_options!.dup
-      if @current_locale
-        options[:path] = Dragoman::Translator.translate_path(options[:path] || resources.last, @current_locale)
-      end
-      resources_without_localization(*resources, options, &block)
+      @locales = nil
     end
-
   end
 end

data/lib/dragoman/railtie.rb

@@ -2,11 +2,8 @@ module Dragoman
 
   class Railtie < Rails::Railtie
     initializer 'dragoman.insert_into_routing_mapper' do |app|
-      if Rails::VERSION::MAJOR >= 4
-        ActionDispatch::Routing::Mapper.send :include, Dragoman::MapperRails4
-      else
-        ActionDispatch::Routing::Mapper.send :include, Dragoman::MapperRails3
-      end
+      ActionDispatch::Routing::Mapper.send :include, Dragoman::Mapper
+      ActionDispatch::Routing::RouteSet.send :include, Dragoman::RouteSet
     end
   end
 

data/lib/dragoman/route_set.rb

@@ -0,0 +1,40 @@
+module Dragoman
+  module RouteSet
+
+    def self.included(base)
+      base.send :alias_method_chain, :add_route, :localization
+    end
+
+    def add_route_with_localization(app, conditions = {}, requirements = {}, defaults = {}, name = nil, anchor = true)
+      dragoman_options = defaults.delete :dragoman_options
+      path_helpers, url_helpers = helper_modules
+      if dragoman_options
+        Dragoman::UrlHelpers.add_untranslated_helpers name, path_helpers, url_helpers if name
+        dragoman_options[:locales].each do |locale|
+          new_conditions = conditions.dup
+          new_requirements = requirements.dup
+
+          new_name = name ? "#{name}_#{locale}" : nil
+          new_name = nil if new_name && named_routes.routes[new_name.to_sym] # Why is this necessary
+
+          if new_path = new_conditions.delete(:path_info)
+            new_path = Dragoman::Translator.translate_path new_path, locale
+            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
+          add_route_without_localization app, new_conditions, new_requirements, defaults.dup, new_name, anchor
+        end
+      else
+        add_route_without_localization app, conditions, requirements, defaults, name, anchor
+      end
+    end
+
+    private
+
+    def helper_modules
+      named_routes.respond_to?(:path_helpers_module) ? [named_routes.path_helpers_module, named_routes.url_helpers_module] : [named_routes.module, named_routes.module]
+    end
+
+  end
+end

data/lib/dragoman/version.rb

@@ -1,3 +1,3 @@
 module Dragoman
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/dragoman.rb

@@ -13,9 +13,4 @@ require "dragoman/url_helpers"
 require "dragoman/mapper"
 require "dragoman/railtie" if defined?(Rails)
 require "dragoman/version"
-
-if Rails::VERSION::MAJOR >= 4
-  require "dragoman/mapper_rails4"
-else
-  require "dragoman/mapper_rails3"
-end
+require "dragoman/route_set"

data/spec/fixtures/config/routes.rb

@@ -39,6 +39,12 @@ Dummy::Application.routes.draw do
     # route without translation
     get 'sounds' => 'application#index'
 
+    resources :votes, only: :show do
+      collection do
+        get 'positive'
+      end
+    end
+
   end
 
 end

data/spec/fixtures/locales/routes.yml

@@ -19,4 +19,5 @@ nl:
     fast: snelle
     cars: autos
     music: ""
+    positive: positief
 

data/spec/routing/routes_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-class ProductsController < ApplicationController
-end
+class ProductsController < ApplicationController; end
+class VotesController < ApplicationController; end
 
 describe 'routes' do
 
@@ -15,10 +15,10 @@ describe 'routes' do
   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(1)).to eq '/products/1/edit'
+    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(1)).to eq '/producten/1/wijzigen'
+    expect(edit_product_nl_path(id: 1)).to eq '/producten/1/wijzigen'
   end
 
   it 'translates resource' do
@@ -41,8 +41,11 @@ describe 'routes' do
   end
 
   it 'sets the correct locale' do
-    assert_routing '/producten', :controller => 'products', :action => 'index', :locale => 'nl'
-    assert_routing '/products', :controller => 'products', :action => 'index', :locale => 'en'
+    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: '/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
@@ -56,7 +59,7 @@ describe 'routes' do
   end
 
   it 'looks up translations by the path option if present' do
-    expect(edit_invitation_nl_path(2)).to eq '/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
@@ -65,8 +68,8 @@ describe 'routes' do
   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'
+    expect(driver_nl_path(id: 3)).to eq '/snelle/bestuurders/3'
+    expect(driver_en_path(id: 3)).to eq '/fast/drivers/3'
   end
 
   it 'skips blank translations' do
@@ -78,6 +81,11 @@ describe 'routes' do
     expect(sounds_nl_path).to eq '/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'
+  end
+
   describe 'adds untranslated path helpers' do
     it 'uses the I18n locale' do
       I18n.locale = :nl

data/spec/spec_helper.rb

@@ -18,6 +18,10 @@ RSpec.configure do |config|
 
   config.infer_spec_type_from_file_location!
 
+  config.after(:all) do
+    print_routes
+  end
+
   config.after(:each) do
     I18n.locale = I18n.default_locale = :en
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dragoman
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Pieter Visser
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -59,9 +59,8 @@ files:
 - gemfiles/rails_4.2.gemfile
 - lib/dragoman.rb
 - lib/dragoman/mapper.rb
-- lib/dragoman/mapper_rails3.rb
-- lib/dragoman/mapper_rails4.rb
 - lib/dragoman/railtie.rb
+- lib/dragoman/route_set.rb
 - lib/dragoman/translation_visitor.rb
 - lib/dragoman/translator.rb
 - lib/dragoman/url_helpers.rb

data/lib/dragoman/mapper_rails3.rb

@@ -1,39 +0,0 @@
-module Dragoman
-
-  module MapperRails3
-    include Mapper
-
-    def self.included(base)
-      base.send :alias_method_chain, :add_route, :localization
-      base.send :alias_method_chain, :scope, :localization
-
-      base.send :alias_method_chain, :resources, :localization
-
-      base::Mapping.send :include,  MappingRails3
-    end
-
-    module MappingRails3
-      def self.included(base)
-        base.send :alias_method_chain, :to_route, :localization
-      end
-
-      def to_route_with_localization
-        if @options[:locale]
-          Dragoman::UrlHelpers.add_untranslated_helpers @options[:as], @set.named_routes.module, @set.named_routes.module if @options[:as]
-          @options[:as] = "#{@options[:as]}_#{@options[:locale]}" if @options[:as].present?
-          @options[:as] = nil if @options[:as] && @set.named_routes.routes[@options[:as].to_sym] # TODO: why do we need to set as to nil?
-        end
-        to_route_without_localization
-      end
-    end
-
-    def add_route_with_localization(action, options)
-      if @current_locale
-        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
-    end
-
-  end
-end

data/lib/dragoman/mapper_rails4.rb

@@ -1,21 +0,0 @@
-module Dragoman
-  module MapperRails4
-
-    include Mapper
-
-    def self.included(base)
-      base.send :alias_method_chain, :add_route, :localization
-      base.send :alias_method_chain, :scope, :localization
-
-      base.send :alias_method_chain, :resources, :localization
-
-      base::Mapping.extend Mapping
-      base::Mapping.class_eval do
-        class << self
-          alias_method_chain :build, :localization
-        end
-      end
-    end
-
-  end
-end