padrino-localization 0.1.3 → 0.2.0

data/Gemfile

@@ -1,7 +1,8 @@
 source "http://rubygems.org"
 
 gem "padrino"
-  gem "i18n"
+gem "localization-middleware"
+gem "i18n"
 
 group :development, :test do
   gem "test-spec"

data/Gemfile.lock

@@ -36,6 +36,8 @@ GEM
       addressable
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
+    localization-middleware (0.1.0)
+      i18n
     mail (2.3.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -119,6 +121,7 @@ DEPENDENCIES
   debugger (~> 1.1.3)
   i18n
   jeweler (~> 1.6.4)
+  localization-middleware
   padrino
   rcov (~> 1.0.0)
   ruby-debug

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/lib/padrino-localization/middleware.rb

@@ -1,96 +1,8 @@
+require 'localization-middleware'
+
 module Padrino
   module Localization
-    class Middleware
-      attr_reader :languages
-      alias_method :langs, :languages
-      
-      class << self
-        def languages
-          @languages
-        end
-      end
-
-      def initialize(app, langs)
-        @app = app
-        self.languages = langs
-      end
-
-      def call(env)
-        @env = env
-        set_locale
-        response_array = @app.call(@env)
-        unset_locale
-        response_array
-      end
-
-      private
-
-      def languages= langs
-        @languages = langs.collect do |l|
-          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=
-
-      def locale_pattern
-        @locale_pattern ||= /\A(?:\/(#{langs.join('|')}))?(\/?.*|)/i
-      end
-
-      def set_locale
-        ::I18n.locale = locale_from_url.to_sym if locale_defined_in_url?
-      end
-
-      def unset_locale
-        ::I18n.locale = ::I18n.default_locale if locale_defined_in_url?
-        @locale_set = @locale = nil
-      end
-
-      ###
-      # Determine locale from the request URL and return it as a string, it it
-      # is matching any of provided locales
-      # If locale matching failed an empty String will be returned.
-      #
-      # Examples:
-      #
-      #   #http://www.example.com/se
-      #   locale_from_url # => 'se'
-      #
-      #   #http://www.example.com/de/posts
-      #   locale_from_url # => 'se'
-      #
-      #   #http://www.example.com/ursers
-      #   locale_from_url # => ''
-      #
-      def locale_from_url path_info = nil
-        @locale_set ||= begin
-          @locale ||= (match = (path_info || @env['PATH_INFO']).match(locale_pattern)) ? match[1] : nil
-          @env['PATH_INFO'] = match[2] if match && @env.try(:fetch, 'PATH_INFO')
-          true
-        end
-        @locale
-      end
-
-      ###
-      # Try to determine, weather the locale is defined, from request URL, if it is matching any of
-      # provided locales, and returns boolean as a result.
-      #
-      # Examples:
-      #
-      #   #http://www.example.com/se
-      #   locale_from_url # => true
-      #
-      #   #http://www.example.com/de/posts
-      #   locale_from_url # => true
-      #
-      #   #http://www.example.com/ursers
-      #   locale_from_url # => false
-      #
-      def locale_defined_in_url?
-        !locale_from_url.blank?
-      end
+    class Middleware < ::Localization::Middleware
     end
   end
 end

data/padrino-localization.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "padrino-localization"
-  s.version = "0.1.3"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kot-begemot"]
-  s.date = "2012-08-20"
+  s.date = "2012-08-26"
   s.description = "This gem allows you to localalize your padrino application with ease"
   s.email = "max@studentify.nl"
   s.extra_rdoc_files = [
@@ -53,6 +53,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<padrino>, [">= 0"])
+      s.add_runtime_dependency(%q<localization-middleware>, [">= 0"])
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
       s.add_development_dependency(%q<test-spec>, [">= 0"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
@@ -65,6 +66,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<capybara>, [">= 0"])
     else
       s.add_dependency(%q<padrino>, [">= 0"])
+      s.add_dependency(%q<localization-middleware>, [">= 0"])
       s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<test-spec>, [">= 0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
@@ -78,6 +80,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<padrino>, [">= 0"])
+    s.add_dependency(%q<localization-middleware>, [">= 0"])
     s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<test-spec>, [">= 0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-localization
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-20 00:00:00.000000000Z
+date: 2012-08-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino
-  requirement: &85254750 !ruby/object:Gem::Requirement
+  requirement: &75672620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85254750
+  version_requirements: *75672620
+- !ruby/object:Gem::Dependency
+  name: localization-middleware
+  requirement: &75672080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *75672080
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &85202010 !ruby/object:Gem::Requirement
+  requirement: &75671540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *85202010
+  version_requirements: *75671540
 - !ruby/object:Gem::Dependency
   name: test-spec
-  requirement: &85201580 !ruby/object:Gem::Requirement
+  requirement: &75671000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85201580
+  version_requirements: *75671000
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &85201180 !ruby/object:Gem::Requirement
+  requirement: &75670650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *85201180
+  version_requirements: *75670650
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &85200740 !ruby/object:Gem::Requirement
+  requirement: &75670280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *85200740
+  version_requirements: *75670280
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &85200330 !ruby/object:Gem::Requirement
+  requirement: &75669870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +87,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *85200330
+  version_requirements: *75669870
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &85199870 !ruby/object:Gem::Requirement
+  requirement: &75669510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +98,10 @@ dependencies:
         version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: *85199870
+  version_requirements: *75669510
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &85199470 !ruby/object:Gem::Requirement
+  requirement: &75669200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +109,10 @@ dependencies:
         version: 0.6.4
   type: :development
   prerelease: false
-  version_requirements: *85199470
+  version_requirements: *75669200
 - !ruby/object:Gem::Dependency
   name: ruby-debug
-  requirement: &85199090 !ruby/object:Gem::Requirement
+  requirement: &75668880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85199090
+  version_requirements: *75668880
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &85198690 !ruby/object:Gem::Requirement
+  requirement: &75668420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +131,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *85198690
+  version_requirements: *75668420
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &85198280 !ruby/object:Gem::Requirement
+  requirement: &75622500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *85198280
+  version_requirements: *75622500
 description: This gem allows you to localalize your padrino application with ease
 email: max@studentify.nl
 executables: []
@@ -179,7 +190,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -154014833
+      hash: 474849517
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: