padrino-localization 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/padrino-localization/middleware.rb

@@ -28,7 +28,7 @@ module Padrino
       alias_method :langs=, :languages=
 
       def locale_pattern
-        @locale_pattern ||= /\A\/(#{langs.join('|')})?(\/?.*|)/i
+        @locale_pattern ||= /\A(?:\/(#{langs.join('|')}))?(\/?.*|)/i
       end
 
       def set_locale

data/padrino-localization.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "padrino-localization"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kot-begemot"]
-  s.date = "2012-08-14"
+  s.date = "2012-08-19"
   s.description = "This gem allows you to localalize your padrino application with ease"
   s.email = "max@studentify.nl"
   s.extra_rdoc_files = [
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
     "test/test_app/.components",
     "test/test_app/app/app.rb",
     "test/test_app/app/controllers/main.rb",
+    "test/test_app/app/controllers/user.rb",
     "test/test_app/app/helpers/application_helper.rb",
     "test/test_app/config.ru",
     "test/test_app/config/apps.rb",

data/test/padrino-localization_test.rb

@@ -54,4 +54,26 @@ class MainControllerTest < Test::Unit::TestCase
     visit "/en/test"
     assert_equal 404, page.status_code
   end
+
+  def test_user_controller_index
+    visit "/en/user"
+    assert page.has_content?("translation missing: en.user.index"), "Page body was: #{page.body}"
+
+    visit "/user"
+    assert page.has_content?("translation missing: en.user.index"), "Page body was: #{page.body}"
+
+    visit "/ru/user"
+    assert page.has_content? "translation missing: ru.user.index"
+  end
+
+  def test_user_show_with_params
+    visit "/en/user/show/10"
+    assert page.has_content? "ID is 10"
+
+    visit "/ru/user/show/10"
+    assert page.has_content?("ID is 10"), "Page body was: #{page.body}"
+
+    visit "/user/show/10"
+    assert page.has_content? "ID is 10"
+  end
 end

data/test/test_app/app/controllers/user.rb

@@ -0,0 +1,9 @@
+TestApp.controller :user do
+  get :index do
+    t 'user.index'
+  end
+
+  get :show,  :with => [:id] do
+    "ID is %{id}" % { :id => params[:id]}
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-localization
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000Z
+date: 2012-08-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino
-  requirement: &81298470 !ruby/object:Gem::Requirement
+  requirement: &84521410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *81298470
+  version_requirements: *84521410
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &81298130 !ruby/object:Gem::Requirement
+  requirement: &84468760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *81298130
+  version_requirements: *84468760
 - !ruby/object:Gem::Dependency
   name: test-spec
-  requirement: &81245390 !ruby/object:Gem::Requirement
+  requirement: &84468360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81245390
+  version_requirements: *84468360
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &81244950 !ruby/object:Gem::Requirement
+  requirement: &84467900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *81244950
+  version_requirements: *84467900
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &81244550 !ruby/object:Gem::Requirement
+  requirement: &84467510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *81244550
+  version_requirements: *84467510
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &81244170 !ruby/object:Gem::Requirement
+  requirement: &84467120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *81244170
+  version_requirements: *84467120
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &81243710 !ruby/object:Gem::Requirement
+  requirement: &84466650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: *81243710
+  version_requirements: *84466650
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &81243280 !ruby/object:Gem::Requirement
+  requirement: &84466240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.6.4
   type: :development
   prerelease: false
-  version_requirements: *81243280
+  version_requirements: *84466240
 - !ruby/object:Gem::Dependency
   name: ruby-debug
-  requirement: &81242850 !ruby/object:Gem::Requirement
+  requirement: &84465860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81242850
+  version_requirements: *84465860
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &81242470 !ruby/object:Gem::Requirement
+  requirement: &84465440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *81242470
+  version_requirements: *84465440
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &81242050 !ruby/object:Gem::Requirement
+  requirement: &84465050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81242050
+  version_requirements: *84465050
 description: This gem allows you to localalize your padrino application with ease
 email: max@studentify.nl
 executables: []
@@ -157,6 +157,7 @@ files:
 - test/test_app/.components
 - test/test_app/app/app.rb
 - test/test_app/app/controllers/main.rb
+- test/test_app/app/controllers/user.rb
 - test/test_app/app/helpers/application_helper.rb
 - test/test_app/config.ru
 - test/test_app/config/apps.rb
@@ -178,7 +179,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1063700397
+      hash: 747525453
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: