rails-localization 0.2.0 → 1.2.0

data/test/support/capybara_helper.rb

@@ -1,12 +1,16 @@
+require File.join(File.dirname(__FILE__), '..', 'test_app', 'config', 'environment')
+require 'rails/test_help'
+require 'capybara/rails'
+
 module CapybaraHelper
   def self.included(base)
     base.class_eval do
       include Capybara::DSL
-    end
-  end
 
-  def after_teardown
-    Capybara.reset_sessions!
-    Capybara.use_default_driver
+      teardown do
+        Capybara.reset_sessions!
+        Capybara.use_default_driver
+      end
+    end
   end
 end

data/test/test_app/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+gem "rails", ">= 3.0.0", "< 4.0.0"
+gem "rails-localization", path: "../../../rails-localization"

data/test/test_app/Gemfile.lock

@@ -0,0 +1,93 @@
+PATH
+  remote: ../../../rails-localization
+  specs:
+    rails-localization (1.0.0)
+      i18n
+      rails (>= 3.0.0, < 4.0.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.2.15)
+      actionpack (= 3.2.15)
+      mail (~> 2.5.4)
+    actionpack (3.2.15)
+      activemodel (= 3.2.15)
+      activesupport (= 3.2.15)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.15)
+      activesupport (= 3.2.15)
+      builder (~> 3.0.0)
+    activerecord (3.2.15)
+      activemodel (= 3.2.15)
+      activesupport (= 3.2.15)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.15)
+      activemodel (= 3.2.15)
+      activesupport (= 3.2.15)
+    activesupport (3.2.15)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    arel (3.0.3)
+    builder (3.0.4)
+    erubis (2.7.0)
+    hike (1.2.3)
+    i18n (0.6.5)
+    journey (1.0.4)
+    json (1.8.1)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.25.1)
+    multi_json (1.8.2)
+    polyglot (0.3.3)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails (3.2.15)
+      actionmailer (= 3.2.15)
+      actionpack (= 3.2.15)
+      activerecord (= 3.2.15)
+      activeresource (= 3.2.15)
+      activesupport (= 3.2.15)
+      bundler (~> 1.0)
+      railties (= 3.2.15)
+    railties (3.2.15)
+      actionpack (= 3.2.15)
+      activesupport (= 3.2.15)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.1.0)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.18.1)
+    tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.38)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rails (>= 3.0.0, < 4.0.0)
+  rails-localization!

data/test/test_app/Rakefile

@@ -0,0 +1,7 @@
+#!/usr/bin/env rake
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+TestApp::Application.load_tasks

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

@@ -8,7 +8,7 @@ class UsersController < ApplicationController
   end
 
   def without_locale
-    render :text => users_path(:locale => false), :layout => false
+    render :text => users_path, :layout => false
   end
 
   def with_defined_locale

data/test/test_app/config/application.rb

@@ -2,9 +2,8 @@ require File.expand_path('../boot', __FILE__)
 
 require "action_controller/railtie"
 require "action_mailer/railtie"
-require "active_resource/railtie"
-require "rails/test_unit/railtie"
 require "sprockets/railtie"
+require "rails/test_unit/railtie"
 
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line
@@ -62,8 +61,6 @@ module TestApp
 
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
-
-    config.middleware.use "Rails::Localization::Middleware", %w(en ru)
   end
 end
 

data/test/test_app/config/environments/development.rb

@@ -7,7 +7,7 @@ TestApp::Application.configure do
   config.cache_classes = false
 
   # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  config.eager_load = false
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
@@ -23,11 +23,11 @@ TestApp::Application.configure do
   config.action_dispatch.best_standards_support = :builtin
 
   # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  #config.active_record.mass_assignment_sanitizer = :strict
 
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
+  #config.active_record.auto_explain_threshold_in_seconds = 0.5
 
   # Do not compress assets
   config.assets.compress = false

data/test/test_app/config/environments/production.rb

@@ -20,6 +20,8 @@ TestApp::Application.configure do
   # Generate digests for assets URLs
   config.assets.digest = true
 
+  config.eager_load = true
+
   # Defaults to nil and saved in location specified by config.assets.prefix
   # config.assets.manifest = YOUR_PATH
 

data/test/test_app/config/environments/test.rb

@@ -7,13 +7,12 @@ TestApp::Application.configure do
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
+  config.eager_load = false
+
   # Configure static asset server for tests with Cache-Control for performance
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false

data/test/test_app/config/routes.rb

@@ -7,13 +7,16 @@ SubApp::Engine.routes.draw do
 end
 
 TestApp::Application.routes.draw do
-  mount SubApp::Engine => '/sub', :as => :sub_app_engine
+  localized({"en" => "English", "ru" => "Russian"}) do
+    mount SubApp::Engine => '/sub', :as => :sub_app_engine
 
-  get :users, :to => "users#index"
-  get "users/with_locale", :to => "users#with_locale"
-  get "users/without_locale", :to => "users#without_locale"
-  get "users/with_defined_locale", :to => "users#with_defined_locale"
-  get :welcome, :to => 'main#welcome'
+    get :users, :to => "users#index"
+    get "users/with_locale", :to => "users#with_locale"
+    get :welcome, :to => 'main#welcome'
 
-  root :to => 'main#index'
+    root :to => 'main#index'
+  end
+
+  get "users/without_locale", :to => "users#without_locale"
+  get "users/with_defined_locale", :to => "users#with_defined_locale", locale: "en"
 end

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 require 'bundler'
 require 'rack/test'
-require 'test/unit'
-require 'ruby-debug'
+require 'test-unit'
+require 'shoulda/context'
 
 Bundler.setup(:default, :test)
 
@@ -9,12 +9,7 @@ ENV["RAILS_ENV"] = "test"
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'rails-localization'
-
-require File.join(File.dirname(__FILE__), 'test_app', 'config', 'environment')
-require File.expand_path("support/capybara_helper", File.dirname(__FILE__))
 
-require 'rails/test_help'
-require 'capybara/rails'
+require 'rails-localization'
 
 I18n.locale = :en

data/test/urls_overwriting_test.rb

@@ -1,26 +1,18 @@
 # encoding: utf-8
 require File.expand_path("test_helper", File.dirname(__FILE__))
+require File.expand_path("support/capybara_helper", File.dirname(__FILE__))
 
 class UrlsOverwritingTest < ActionController::TestCase
-
   def teardown
     ::I18n.locale = ::I18n.default_locale
   end
 
-  # test "root" do
-  #   assert_generates("/", :controller => "main", :action => "index")
-  #   ::I18n.locale = :en
-  #   assert_generates("/", :controller => "main", :action => "index")
-  #   ::I18n.locale = :ru
-  #   assert_generates("/", :controller => "main", :action => "index", :locale => false)
-  #   assert_generates("/", :controller => "main", :action => "index", :locale => :en)
-  #   assert_generates("/", :controller => "main", :action => "index", :locale => "en")
-  #   assert_generates("/ru/", :controller => "main", :action => "index")
-  # end
-
-  # test "incorrect locale" do
-  #   assert_raises Rails::Localization::UnknownLocaleError do
-  #     assert_generates("/", :controller => "main", :action => "index", :locale => :de)
-  #   end
-  # end
+  test "root" do
+    assert_generates("/", :controller => "main", :action => "index")
+    ::I18n.locale = :en
+    assert_generates("/", :controller => "main", :action => "index")
+    assert_generates("/en", :controller => "main", :action => "index", :locale => "en")
+    ::I18n.locale = :ru
+    assert_generates("/ru", :controller => "main", :action => "index", :locale => "ru")
+  end
 end

metadata

@@ -1,159 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: rails-localization
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - E-Max
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &77360150 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *77360150
-- !ruby/object:Gem::Dependency
-  name: localization-middleware
-  requirement: &77146830 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *77146830
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &77146440 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *77146440
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: &77145760 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *77145760
-- !ruby/object:Gem::Dependency
-  name: test-spec
-  requirement: &77145250 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *77145250
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &77144810 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *77144810
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &77144340 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :development
-  prerelease: false
-  version_requirements: *77144340
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &77143800 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: 1.8.0
   type: :development
   prerelease: false
-  version_requirements: *77143800
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: &77143340 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.4
-  type: :development
-  prerelease: false
-  version_requirements: *77143340
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &77142970 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *77142970
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: &77142600 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.3
-  type: :development
-  prerelease: false
-  version_requirements: *77142600
-- !ruby/object:Gem::Dependency
-  name: ruby-debug
-  requirement: &77142220 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *77142220
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: &77141600 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *77141600
+        version: 1.8.0
 description: This gem allows you to localize your rails application with ease
 email: max@studentify.nl
 executables: []
@@ -163,7 +61,8 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .document
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
 - .travis.yml
 - Gemfile
 - Gemfile.lock
@@ -172,13 +71,22 @@ files:
 - Rakefile
 - VERSION
 - lib/rails-localization.rb
-- lib/rails-localization/middleware.rb
-- lib/rails-localization/routes_set_ext.rb
+- lib/rails-localization/controller.rb
+- lib/rails-localization/engine.rb
+- lib/rails-localization/i18n.rb
+- lib/rails-localization/route_set.rb
+- lib/rails-localization/router.rb
+- lib/rails-localization/url_options.rb
 - lib/rails_localization.rb
 - rails-localization.gemspec
+- test/i18n_integration_test.rb
+- test/mapper_integration_test.rb
 - test/rails-localization_test.rb
 - test/support/capybara_helper.rb
 - test/test_app/.gitignore
+- test/test_app/Gemfile
+- test/test_app/Gemfile.lock
+- test/test_app/Rakefile
 - test/test_app/app/assets/images/rails.png
 - test/test_app/app/assets/javascripts/application.js
 - test/test_app/app/assets/stylesheets/application.css
@@ -218,29 +126,25 @@ files:
 homepage: http://github.com/kot-begemot/rails-localization
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -403332335
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rails localization Gem
 test_files: []