padrino-localization 0.1.0 → 0.1.1

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3

data/Gemfile

@@ -1,6 +1,7 @@
 source "http://rubygems.org"
 
 gem "padrino"
+  gem "i18n"
 
 group :development, :test do
   gem "test-spec"
@@ -14,6 +15,5 @@ group :development, :test do
   gem 'ruby-debug', :platform => :ruby_18
   gem "rcov", "~> 1.0.0", :platform => :ruby_18
 
-  gem "i18n"
   gem "capybara"
 end

data/README.rdoc

@@ -1,4 +1,5 @@
 = padrino-localization
+{<img src="https://secure.travis-ci.org/kot-begemot/padrino-localization.png" />}[http://travis-ci.org/kot-begemot/padrino-localization]
 
 The gem that allows to localize your application.
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/padrino-localization.rb

@@ -27,13 +27,14 @@ module Padrino
       #   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}
+        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
-          url_without_locale *args, locale_scope
+          args << locale_scope
+          url_without_locale *args
         end.gsub('//','/')
       end
 

data/padrino-localization.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "padrino-localization"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kot-begemot"]
-  s.date = "2012-08-05"
+  s.date = "2012-08-14"
   s.description = "This gem allows you to localalize your padrino application with ease"
   s.email = "max@studentify.nl"
   s.extra_rdoc_files = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rvmrc",
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -51,6 +52,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<i18n>, [">= 0"])
       s.add_development_dependency(%q<test-spec>, [">= 0"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -59,10 +61,10 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<simplecov>, ["~> 0.6.4"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
       s.add_development_dependency(%q<rcov>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<i18n>, [">= 0"])
       s.add_development_dependency(%q<capybara>, [">= 0"])
     else
       s.add_dependency(%q<padrino>, [">= 0"])
+      s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<test-spec>, [">= 0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -71,11 +73,11 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>, ["~> 0.6.4"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
       s.add_dependency(%q<rcov>, ["~> 1.0.0"])
-      s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<capybara>, [">= 0"])
     end
   else
     s.add_dependency(%q<padrino>, [">= 0"])
+    s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<test-spec>, [">= 0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -84,7 +86,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<simplecov>, ["~> 0.6.4"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])
     s.add_dependency(%q<rcov>, ["~> 1.0.0"])
-    s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<capybara>, [">= 0"])
   end
 end

data/test/test_app/config/boot.rb

@@ -1,12 +1,11 @@
 require 'bundler'
+Bundler.setup(:default, :test)
+require 'padrino'
+
 # Defines our constants
 PADRINO_ENV  = ENV["PADRINO_ENV"] ||= ENV["RACK_ENV"] ||= "development"  unless defined?(PADRINO_ENV)
 PADRINO_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
-# Only have default and environemtn gems
-Bundler.setup(:default, :test)
-# Only require default and environment gems
-Bundler.require(:default, :test)
 
 ##
 # Add here your before load hooks

data/test/test_helper.rb

@@ -1,8 +1,12 @@
 require 'rubygems'
+require 'test/unit'
 require 'capybara'
 require 'capybara/dsl'
-require 'test/unit'
-require 'debugger'
+if RUBY_VERSION >= '1.9.0'
+  require "debugger"
+else
+  require 'ruby-debug'
+end 
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-localization
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-05 00:00:00.000000000Z
+date: 2012-08-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino
-  requirement: &87211030 !ruby/object:Gem::Requirement
+  requirement: &81298470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *87211030
+  version_requirements: *81298470
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &81298130 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *81298130
 - !ruby/object:Gem::Dependency
   name: test-spec
-  requirement: &87210680 !ruby/object:Gem::Requirement
+  requirement: &81245390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *87210680
+  version_requirements: *81245390
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &87210340 !ruby/object:Gem::Requirement
+  requirement: &81244950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +54,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *87210340
+  version_requirements: *81244950
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &87157680 !ruby/object:Gem::Requirement
+  requirement: &81244550 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *87157680
+  version_requirements: *81244550
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &87157280 !ruby/object:Gem::Requirement
+  requirement: &81244170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *87157280
+  version_requirements: *81244170
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &87156640 !ruby/object:Gem::Requirement
+  requirement: &81243710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +87,10 @@ dependencies:
         version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: *87156640
+  version_requirements: *81243710
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &87156130 !ruby/object:Gem::Requirement
+  requirement: &81243280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +98,10 @@ dependencies:
         version: 0.6.4
   type: :development
   prerelease: false
-  version_requirements: *87156130
+  version_requirements: *81243280
 - !ruby/object:Gem::Dependency
   name: ruby-debug
-  requirement: &87155750 !ruby/object:Gem::Requirement
+  requirement: &81242850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *87155750
+  version_requirements: *81242850
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &87155330 !ruby/object:Gem::Requirement
+  requirement: &81242470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,21 +120,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *87155330
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: &87154890 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *87154890
+  version_requirements: *81242470
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &87154520 !ruby/object:Gem::Requirement
+  requirement: &81242050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *87154520
+  version_requirements: *81242050
 description: This gem allows you to localalize your padrino application with ease
 email: max@studentify.nl
 executables: []
@@ -142,6 +142,7 @@ extra_rdoc_files:
 files:
 - .document
 - .rvmrc
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -177,7 +178,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -640946865
+      hash: -1063700397
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: