padrino-localization 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/padrino-localization.rb

@@ -7,54 +7,55 @@ module Padrino
     module Urls
       def self.registered(app)
         app.helpers self
-      end
-
-      def self.included(base)
-        base.instance_eval do
-          alias_method_chain :url, :locale
+        app.extend ::Padrino::Localization::Urls::ClassMethods
+        app.instance_eval do
+          alias :url_without_locale :url
+          alias :url :url_with_locale
+          alias :url_for :url_with_locale
         end
       end
 
-      ###
-      # Generates an URL with a current locale, for a resource, inside of application.
-      #
-      # Example:
-      #
-      #   url_for_with_locale(:users) # /ru/users
-      #
-      #   url_for_with_locale('/') # /ru/
-      #
-      #   url_for_with_locale(:posts, :new, :locale => 'se') # /se/posts/new
-      #
-      def url_with_locale *args
-        locale_scope = (::I18n.locale == ::I18n.default_locale) ? {} : {:locale => ::I18n.locale}
-        if args.last.kind_of? Hash
-          # should not overwrite provided locale
-          args.last.merge!(locale_scope)
-          url_without_locale *args
-        else
-          args << locale_scope
-          url_without_locale *args
-        end.gsub('//','/')
-      end
+      module ClassMethods
+
+        ###
+        # Generates an URL with a current locale, for a resource, inside of application.
+        #
+        # Example:
+        #
+        #   url_for_with_locale(:users) # /ru/users
+        #
+        #   url_for_with_locale('/') # /ru/
+        #
+        #   url_for_with_locale(:posts, :new, :locale => 'se') # /se/posts/new
+        #
+        def url_with_locale *args
+          opts = args.extract_options!
+          locale_scope = opts.delete(:locale) || ::I18n.locale
+          locale_scope = ::I18n.locale unless Padrino::Localization::Middleware.languages.include?(locale_scope.to_s)
+          args << opts
+          link = url_without_locale *args
+          link.insert(0,"/#{locale_scope}") if (locale_scope.to_s != ::I18n.default_locale.to_s)
+          link
+        end
 
-      ###
-      # Returns a link, unless application locale is equivalent to those from URL.
-      #
-      # Examples:
-      #
-      #   link_to_unless_current_locale :ru, "Main page", url(:main, :index, :locale => :ru)
-      #   # => "Main page"
-      #
-      #   link_to_unless_current_locale :ru, "Main page", url(:main, :index, :locale => :ru)
-      #   # => "Main page"
-      #
-      def link_to_unless_current_locale *opts, &block
-        locale = opts.shift.to_s
-        if locale == ::I18n.locale.to_s
-          opts.first
-        else
-          link_to *opts, &block
+        ###
+        # Returns a link, unless application locale is equivalent to those from URL.
+        #
+        # Examples:
+        #
+        #   link_to_unless_current_locale :ru, "Main page", url(:main, :index, :locale => :ru)
+        #   # => "Main page"
+        #
+        #   link_to_unless_current_locale :ru, "Main page", url(:main, :index, :locale => :ru)
+        #   # => "Main page"
+        #
+        def link_to_unless_current_locale *opts, &block
+          locale = opts.shift.to_s
+          if locale == ::I18n.locale.to_s
+            opts.first
+          else
+            link_to *opts, &block
+          end
         end
       end
     end

data/lib/padrino-localization/middleware.rb

@@ -3,6 +3,12 @@ module Padrino
     class Middleware
       attr_reader :languages
       alias_method :langs, :languages
+      
+      class << self
+        def languages
+          @languages
+        end
+      end
 
       def initialize(app, langs)
         @app = app
@@ -24,6 +30,8 @@ module Padrino
           raise ArgumentError.new("An arguments should be 2 latters long") unless l.to_s =~ /\A[a-z]{2}\Z/i
           l.to_s
         end
+        self.class.instance_variable_set :@languages, @languages
+        @languages
       end
       alias_method :langs=, :languages=
 

data/padrino-localization.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "padrino-localization"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kot-begemot"]
-  s.date = "2012-08-19"
+  s.date = "2012-08-20"
   s.description = "This gem allows you to localalize your padrino application with ease"
   s.email = "max@studentify.nl"
   s.extra_rdoc_files = [

data/test/padrino-localization_test.rb

@@ -66,14 +66,25 @@ class MainControllerTest < Test::Unit::TestCase
     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"
+  def test_url_test_no_locale
+    assert_equal '/', TestApp.url(:index)
+  end
 
-    visit "/ru/user/show/10"
-    assert page.has_content?("ID is 10"), "Page body was: #{page.body}"
+  def test_url_test_with_locale
+    assert_equal '/ru/', TestApp.url_with_locale(:index, :locale => "ru")
+    assert_equal '/ru/', TestApp.url(:index, :locale => "ru")
+    assert_equal '/ru/', TestApp.url_for(:index, :locale => "ru")
+    ::I18n.locale = :ru
+    assert_equal '/ru/', TestApp.url(:index)
+    assert_equal '/', TestApp.url(:index, :locale => "en")
+    ::I18n.locale = ::I18n.default_locale
+  end
 
-    visit "/user/show/10"
-    assert page.has_content? "ID is 10"
+  def test_url_is_not_registered
+    assert_equal '/', TestApp.url_with_locale(:index, :locale => "sdv")
+    ::I18n.locale = :ru
+    assert_equal '/ru/', TestApp.url(:index, :locale => "sdfsa")
+    assert_equal '/ru/', TestApp.url_for(:index, :locale => "sdfsa")
+    ::I18n.locale = ::I18n.default_locale
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-localization
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-19 00:00:00.000000000Z
+date: 2012-08-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino
-  requirement: &84521410 !ruby/object:Gem::Requirement
+  requirement: &85254750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84521410
+  version_requirements: *85254750
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &84468760 !ruby/object:Gem::Requirement
+  requirement: &85202010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84468760
+  version_requirements: *85202010
 - !ruby/object:Gem::Dependency
   name: test-spec
-  requirement: &84468360 !ruby/object:Gem::Requirement
+  requirement: &85201580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84468360
+  version_requirements: *85201580
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &84467900 !ruby/object:Gem::Requirement
+  requirement: &85201180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *84467900
+  version_requirements: *85201180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &84467510 !ruby/object:Gem::Requirement
+  requirement: &85200740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *84467510
+  version_requirements: *85200740
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &84467120 !ruby/object:Gem::Requirement
+  requirement: &85200330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *84467120
+  version_requirements: *85200330
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &84466650 !ruby/object:Gem::Requirement
+  requirement: &85199870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: *84466650
+  version_requirements: *85199870
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &84466240 !ruby/object:Gem::Requirement
+  requirement: &85199470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.6.4
   type: :development
   prerelease: false
-  version_requirements: *84466240
+  version_requirements: *85199470
 - !ruby/object:Gem::Dependency
   name: ruby-debug
-  requirement: &84465860 !ruby/object:Gem::Requirement
+  requirement: &85199090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84465860
+  version_requirements: *85199090
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &84465440 !ruby/object:Gem::Requirement
+  requirement: &85198690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *84465440
+  version_requirements: *85198690
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &84465050 !ruby/object:Gem::Requirement
+  requirement: &85198280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84465050
+  version_requirements: *85198280
 description: This gem allows you to localalize your padrino application with ease
 email: max@studentify.nl
 executables: []
@@ -179,7 +179,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 747525453
+      hash: -154014833
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: