padrino-contrib 0.1.2 → 0.1.3

data/lib/padrino-contrib/auto_locale.rb

@@ -28,15 +28,32 @@ module Padrino
 
       def self.registered(app)
         app.helpers Padrino::Contrib::AutoLocale::Helpers
+        app.extend ClassMethods
         app.set :locales, [:en]
         app.before do
-          if request.path_info =~ /^\/(#{options.locales.join('|')})(?=\/|$)/
+          if request.path_info =~ /^\/(#{options.locales.join('|')})\b/
             I18n.locale = $1.to_sym
           else
-            I18n.locale = options.locales.first
+            I18n.locale = options.locales[0]
           end
         end
-      end # self.registered
+
+        def self.padrino_route_added(route, verb, path, args, options, block)
+          route.instance_variable_set(:@original_path, "/:lang#{route.original_path}") unless route.original_path =~/:lang/
+        end
+      end
+
+      module ClassMethods
+        ##
+        # We need to add always a lang to all our routes
+        #
+        def url(*args)
+          params = args.extract_options!
+          params[:lang] = I18n.locale
+          args << params
+          super(*args)
+        end
+      end
     end # AutoLocale
   end # Contrib
 end # Padrino

data/lib/padrino-contrib/version.rb

@@ -1,5 +1,5 @@
 module Padrino
   module Contrib
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-contrib
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Davide D'Agostino
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-27 00:00:00 +02:00
+date: 2011-07-28 00:00:00 +02:00
 default_executable: 
 dependencies: []