rails_legacy_mapper 1.0.0 → 1.1.0

data/CHANGELOG

@@ -1,3 +1,10 @@
-*Rails Legacy Mapper 1.0.0 (March 29, 2011)
+*1.1.0 (October 7th, 2012)
+
+* Add :subdomain conditions [Aman Gupta]
+
+* Add support for Rails 3.2
+
+
+*1.0.0 (March 29th, 2011)
 
 * Initial release

data/README.md

@@ -0,0 +1,40 @@
+Rails Legacy Mapper
+===================
+
+[![Build Status][build]][travis] [![Dependency Status][depends]][gemnasium]
+
+This gem provides an extraction of the DeprecatedMapper from Rails 3.0.
+If you have a legacy application with an old style routes.rb file this
+allows you to get your application running quickly in Rails 3.1.
+
+Example
+-------
+
+The trigger for using the legacy mapper is the arity (number of args)
+of the block passed to draw, e.g:
+
+``` ruby
+LegacyApp::Application.routes.draw do |map|
+
+  map.root :controller => 'pages', :action => 'index'
+
+  map.namespace :admin do |admin|
+    admin.resources :pages
+  end
+
+  map.page '/pages/:id', :controller => 'pages', :action => 'show'
+
+  map.connect '/:controller/:action/:id/'
+
+end
+```
+
+License
+-------
+
+Copyright (c) 2011 Andrew White, released under the MIT license
+
+[build]: https://secure.travis-ci.org/pixeltrix/rails_legacy_mapper.png
+[travis]: http://travis-ci.org/pixeltrix/rails_legacy_mapper
+[depends]: https://gemnasium.com/pixeltrix/rails_legacy_mapper.png?travis
+[gemnasium]: https://gemnasium.com/pixeltrix/rails_legacy_mapper

data/Rakefile

@@ -1,10 +1,8 @@
 require 'rake'
-require 'rake/rdoctask'
 require 'rake/testtask'
-require 'rubygems'
-require 'bundler/setup'
-
-Bundler::GemHelper.install_tasks
+require 'rdoc/task'
+require 'bundler/gem_tasks'
+require 'appraisal'
 
 desc 'Default: run rails_legacy_mapper tests.'
 task :default => :test

data/lib/rails_legacy_mapper/mapper.rb

@@ -15,6 +15,7 @@ module RailsLegacyMapper
 
       if conditions = options.delete(:conditions)
         conditions = conditions.dup
+        subdomain = conditions.delete(:subdomain)
         method = Array.wrap(conditions.delete(:method))
         method.map! { |m|
           if m == :head
@@ -75,7 +76,7 @@ module RailsLegacyMapper
         path = path.gsub('.:format', '(.:format)')
         path = optionalize_trailing_dynamic_segments(path, requirements, defaults)
         glob = $1.to_sym if path =~ /\/\*(\w+)$/
-        path = ::Rack::Mount::Utils.normalize_path(path)
+        path = normalize_path(path)
 
         if glob && !defaults[glob].blank?
           raise ActionController::RoutingError, "paths cannot have non-empty default values"
@@ -87,6 +88,7 @@ module RailsLegacyMapper
       conditions = {}
       conditions[:request_method] = method if method && !method.empty?
       conditions[:path_info] = path if path
+      conditions[:subdomain] = subdomain if subdomain
 
       @set.add_route(app, conditions, requirements, defaults, name)
     end
@@ -142,6 +144,15 @@ module RailsLegacyMapper
     end
     private :optionalize_trailing_dynamic_segments
 
+    def normalize_path(path) #:nodoc:
+      path = "/#{path}"
+      path.squeeze!('/')
+      path.sub!(%r{/+\Z}, '')
+      path = '/' if path == ''
+      path
+    end
+    private :normalize_path
+
     # Creates a named route called "root" for matching the root level request.
     def root(options = {})
       if options.is_a?(Symbol)

data/lib/rails_legacy_mapper/route_set_extensions.rb

@@ -13,40 +13,38 @@ module RailsLegacyMapper
       alias_method_chain :eval_block, :legacy_mapper
     end
 
-    module InstanceMethods #:nodoc:
-      def initialize_with_legacy_mapper(request_class = ActionDispatch::Request)
-        initialize_without_legacy_mapper
-        self.controller_namespaces = Set.new
-      end
+    def initialize_with_legacy_mapper(request_class = ActionDispatch::Request)
+      initialize_without_legacy_mapper
+      self.controller_namespaces = Set.new
+    end
 
-      def controller_constraints
-        @controller_constraints ||= begin
-          namespaces = controller_namespaces + in_memory_controller_namespaces
-          source = namespaces.map { |ns| "#{Regexp.escape(ns)}/#{CONTROLLER_REGEXP.source}" }
-          source << CONTROLLER_REGEXP.source
-          Regexp.compile(source.sort.reverse.join('|'))
-        end
+    def controller_constraints
+      @controller_constraints ||= begin
+        namespaces = controller_namespaces + in_memory_controller_namespaces
+        source = namespaces.map { |ns| "#{Regexp.escape(ns)}/#{CONTROLLER_REGEXP.source}" }
+        source << CONTROLLER_REGEXP.source
+        Regexp.compile(source.sort.reverse.join('|'))
       end
+    end
 
-      def in_memory_controller_namespaces
-        namespaces = Set.new
-        ActionController::Base.descendants.each do |klass|
-          next if klass.anonymous?
-          namespaces << klass.name.underscore.split('/')[0...-1].join('/')
-        end
-        namespaces.delete('')
-        namespaces
+    def in_memory_controller_namespaces
+      namespaces = Set.new
+      ActionController::Base.descendants.each do |klass|
+        next if klass.anonymous?
+        namespaces << klass.name.underscore.split('/')[0...-1].join('/')
       end
+      namespaces.delete('')
+      namespaces
+    end
 
-      def eval_block_with_legacy_mapper(block)
-        mapper = ActionDispatch::Routing::Mapper.new(self)
-        if block.arity == 1
-          mapper.instance_exec(RailsLegacyMapper::Mapper.new(self), &block)
-        elsif default_scope
-          mapper.with_default_scope(default_scope, &block)
-        else
-          mapper.instance_exec(&block)
-        end
+    def eval_block_with_legacy_mapper(block)
+      mapper = ActionDispatch::Routing::Mapper.new(self)
+      if block.arity == 1
+        mapper.instance_exec(RailsLegacyMapper::Mapper.new(self), &block)
+      elsif default_scope
+        mapper.with_default_scope(default_scope, &block)
+      else
+        mapper.instance_exec(&block)
       end
     end
   end

data/lib/rails_legacy_mapper/version.rb

@@ -1,3 +1,3 @@
 module RailsLegacyMapper
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/rails_legacy_mapper.gemspec

@@ -20,7 +20,7 @@ EOF
     ".gemtest",
     "CHANGELOG",
     "LICENSE",
-    "README",
+    "README.md",
     "Rakefile",
     "lib/rails_legacy_mapper.rb",
     "lib/rails_legacy_mapper/mapper.rb",
@@ -48,8 +48,7 @@ EOF
 
   s.require_paths = ["lib"]
 
-  s.add_dependency "rails", "~> 3.1.0.beta"
-  s.add_development_dependency "bundler", "~> 1.0.10"
-  s.add_development_dependency "mocha", "~> 0.9.8"
-  s.add_development_dependency "rake", "~> 0.8.7"
+  s.add_dependency "actionpack", "~> 3.1"
+  s.add_development_dependency "appraisal", "~> 0.4.0"
+  s.add_development_dependency "mocha", "~> 0.12.0"
 end

data/test/fake_controllers.rb

@@ -15,6 +15,14 @@ module Api
   class ProductsController < ActionController::Base; end
 end
 
+module Bling
+  class BloopController < ActionController::Base; end
+end
+
+module Foo
+  class BarController < ActionController::Base; end
+end
+
 class AccountController < ActionController::Base; end
 class AddressesController < ActionController::Base; end
 class ArchiveController < ActionController::Base; end

data/test/rack_mount_integration_test.rb

@@ -164,7 +164,11 @@ class RackMountIntegrationTest < ActiveSupport::TestCase
 
     assert_equal '/archive/2010', url_for(:controller => 'archive', :action => 'index', :year => '2010')
     assert_equal '/archive', url_for(:controller => 'archive', :action => 'index')
-    assert_equal '/archive?year=january', url_for(:controller => 'archive', :action => 'index', :year => 'january')
+
+    # Bug in Journey see https://github.com/rails/rails/issues/7047
+    unless defined?(::Journey)
+      assert_equal '/archive?year=january', url_for(:controller => 'archive', :action => 'index', :year => 'january')
+    end
 
     assert_equal '/people', url_for(:use_route => 'people')
     assert_equal '/people', url_for(:use_route => 'people', :controller => 'people', :action => 'index')
@@ -192,8 +196,12 @@ class RackMountIntegrationTest < ActiveSupport::TestCase
     assert_equal '/people/1/edit', url_for(:controller => 'people', :action => 'edit', :id => '1')
     assert_equal '/people/1/edit.xml', url_for(:controller => 'people', :action => 'edit', :id => '1', :format => 'xml')
     assert_equal '/people/1/edit', url_for(:use_route => 'edit_person', :id => '1')
-    assert_equal '/people/1?legacy=true', url_for(:controller => 'people', :action => 'show', :id => '1', :legacy => 'true')
-    assert_equal '/people?legacy=true', url_for(:controller => 'people', :action => 'index', :legacy => 'true')
+
+    # Bug in Journey see https://github.com/rails/rails/issues/7047
+    unless defined?(::Journey)
+      assert_equal '/people/1?legacy=true', url_for(:controller => 'people', :action => 'show', :id => '1', :legacy => 'true')
+      assert_equal '/people?legacy=true', url_for(:controller => 'people', :action => 'index', :legacy => 'true')
+    end
 
     assert_equal '/id_default/2', url_for(:controller => 'foo', :action => 'id_default', :id => '2')
     assert_equal '/id_default', url_for(:controller => 'foo', :action => 'id_default', :id => '1')
@@ -205,7 +213,12 @@ class RackMountIntegrationTest < ActiveSupport::TestCase
     assert_equal '/project', url_for({:controller => 'project', :action => 'index'})
     assert_equal '/projects/1', url_for({:controller => 'project', :action => 'index', :project_id => '1'})
     assert_equal '/projects/1', url_for({:controller => 'project', :action => 'index'}, {:project_id => '1'})
-    assert_raise(ActionController::RoutingError) { url_for({:use_route => 'project', :controller => 'project', :action => 'index'}) }
+
+    # Bug in Journey
+    unless defined?(::Journey)
+      assert_raise(ActionController::RoutingError) { url_for({:use_route => 'project', :controller => 'project', :action => 'index'}) }
+    end
+
     assert_equal '/projects/1', url_for({:use_route => 'project', :controller => 'project', :action => 'index', :project_id => '1'})
     assert_equal '/projects/1', url_for({:use_route => 'project', :controller => 'project', :action => 'index'}, {:project_id => '1'})
 
@@ -254,7 +267,11 @@ class RackMountIntegrationTest < ActiveSupport::TestCase
     assert_equal '/posts?page=2', url_for(:controller => 'posts', :page => 2)
     assert_equal '/posts?q%5Bfoo%5D%5Ba%5D=b', url_for(:controller => 'posts', :q => { :foo => { :a => 'b'}})
 
-    assert_equal '/', url_for(:controller => 'news', :action => 'index')
+    # Bug in Journey
+    unless defined?(::Journey)
+      assert_equal '/', url_for(:controller => 'news', :action => 'index')
+    end
+
     assert_equal '/', url_for(:controller => 'news', :action => 'index', :format => nil)
     assert_equal '/news.rss', url_for(:controller => 'news', :action => 'index', :format => 'rss')
 

data/test/resources_test.rb

@@ -127,7 +127,7 @@ class ResourcesTest < ActionController::TestCase
 
   def test_with_custom_conditions
     with_restful_routing :messages, :conditions => { :subdomain => 'app' } do
-      assert @routes.recognize_path("/messages", :method => :get, :subdomain => 'app')
+      assert @routes.recognize_path("http://app.example.com/messages", :method => :get)
     end
   end
 

data/test/route_set_test.rb

@@ -343,6 +343,26 @@ class RouteSetTest < ActiveSupport::TestCase
     }
   end
 
+  def test_recognize_with_subdomain_condition
+    set.draw do |map|
+      map.with_options(:controller => "api/users") do |user|
+        user.connect "/users/:id.:format", :action => "show",
+          :requirements => { :format => /json|xml/ },
+          :conditions => { :method => :get, :subdomain => "api" }
+      end
+    end
+
+    params = recognize_path("http://api.example.com/users/1.json")
+    assert_equal("api/users", params[:controller])
+    assert_equal("show", params[:action])
+    assert_equal("1", params[:id])
+    assert_equal("json", params[:format])
+
+    assert_raise(ActionController::RoutingError) do
+      recognize_path("http://www.example.com/users/1.json")
+    end
+  end
+
   def test_recognize_with_alias_in_conditions
     set.draw do |map|
       map.people "/people", :controller => 'people', :action => "index",

metadata

@@ -1,106 +1,82 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rails_legacy_mapper
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 1.1.0
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - Andrew White
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-29 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2012-10-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31098233
-        segments: 
-        - 3
-        - 1
-        - 0
-        - beta
-        version: 3.1.0.beta
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :runtime
-  requirement: *id001
-  name: rails
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 0
-        - 10
-        version: 1.0.10
-  prerelease: false
-  type: :development
-  requirement: *id002
-  name: bundler
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 9
-        - 8
-        version: 0.9.8
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: 0.4.0
   type: :development
-  requirement: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+- !ruby/object:Gem::Dependency
   name: mocha
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: 0.12.0
   type: :development
-  requirement: *id004
-  name: rake
-description: |
-  This gem provides an extraction of the DeprecatedMapper from Rails 3.0.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.12.0
+description: ! 'This gem provides an extraction of the DeprecatedMapper from Rails
+  3.0.
+
   If you have a legacy application with an old style routes.rb file this
+
   allows you to get your application running quickly in Rails 3.1.
 
-email: 
+'
+email:
 - andyw@pixeltrix.co.uk
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gemtest
 - CHANGELOG
 - LICENSE
-- README
+- README.md
 - Rakefile
 - lib/rails_legacy_mapper.rb
 - lib/rails_legacy_mapper/mapper.rb
@@ -114,41 +90,37 @@ files:
 - test/route_set_test.rb
 - test/test_helper.rb
 - test/uri_reserved_characters_routing_test.rb
-has_rdoc: true
 homepage: https://github.com/pixeltrix/rails_legacy_mapper/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -112924843715420209
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -112924843715420209
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Old style routes for Rails 3.1
-test_files: 
+test_files:
 - test/fake_controllers.rb
 - test/legacy_route_set_test.rb
 - test/rack_mount_integration_test.rb

data/README

@@ -1,25 +0,0 @@
-== Rails Legacy Mapper
-This gem provides an extraction of the DeprecatedMapper from Rails 3.0.
-If you have a legacy application with an old style routes.rb file this
-allows you to get your application running quickly in Rails 3.1.
-
-=== Example
-The trigger for using the legacy mapper is the arity (number of args)
-of the block passed to draw, e.g:
-
-  LegacyApp::Application.routes.draw do |map|
-
-    map.root :controller => 'pages', :action => 'index'
-
-    map.namespace :admin do |admin|
-      admin.resources :pages
-    end
-
-    map.page '/pages/:id', :controller => 'pages', :action => 'show'
-
-    map.connect '/:controller/:action/:id/'
-
-  end
-
-=== License
-Copyright (c) 2011 Andrew White, released under the MIT license