locale_rails 2.0.4 → 2.0.5

data/COPYING

@@ -0,0 +1,56 @@
+Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
+You can redistribute it and/or modify it under either the terms of the GPL
+version 2 (see the file GPL), or the conditions below:
+
+  1. You may make and give away verbatim copies of the source form of the
+     software without restriction, provided that you duplicate all of the
+     original copyright notices and associated disclaimers.
+
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+	  modifications to Usenet or an equivalent medium, or by allowing
+	  the author to include your modifications in the software.
+
+       b) use the modified software only within your corporation or
+          organization.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  3. You may distribute the software in object code or binary form,
+     provided that you do at least ONE of the following:
+
+       a) distribute the binaries and library files of the software,
+	  together with instructions (in the manual page or equivalent)
+	  on where to get the original distribution.
+
+       b) accompany the distribution with the machine-readable source of
+	  the software.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  4. You may modify and include the part of the software into any other
+     software (possibly commercial).  But some files in the distribution
+     are not written by the author, so that they are not under these terms.
+
+     For the list of those files and their copying conditions, see the
+     file LEGAL.
+
+  5. The scripts and library files supplied as input to or produced as 
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whomever generated them, 
+     and may be sold commercially, and may be aggregated with this
+     software.
+
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.

data/ChangeLog

@@ -1,3 +1,11 @@
+= locale_rails-2.0.5 (2009-11-11)
+ * Update license information (explicit to use Ruby's or LGPL).
+   [Pointed out by Masateru Yoshikawa]
+ * Fixed to work expire_fragment/action.
+   [Reported by Sean Tan]
+ * Support Rails-2.3.2, 2.3.3 and 2.3.4.
+   Update the version information.
+
 = locale_rails-2.0.4 (2009-05-22)
  * Fixed that localized views are not working correctly. [Reported by Dan Coutu]
  * Add tests

data/README.rdoc

@@ -42,14 +42,17 @@ auto-detection and some other features includes this library.
  I18n.default_locale = "ja" 
 
 == Support matrix
+* locale_rails-2.0.5 - rails-2.3.2,2.3.3,2.3.4
+* locale_rails-2.0.4 - rails-2.3.2
+* locale_rails-2.0.3 - rails-2.3.2
 * locale_rails-2.0.2 - rails-2.3.2
 * locale_rails-2.0.1 - rails-2.3.2
 * locale_rails-2.0.0 - rails-2.3.2
 * locale_rails-0.1.0 - rails-2.1.x
 
 == License
-This program is licenced under the same licence as Ruby.
-(See the file 'COPYING'.)
+This program is licenced under the same licence as Ruby(See COPYING) or
+LGPL(Lesser General Public License: http://www.gnu.org/licenses/lgpl-3.0.txt).
 
 == Maintainer
 Masao Mutoh <mutomasa at gmail.com>

data/Rakefile

@@ -47,7 +47,7 @@ spec = Gem::Specification.new do |s|
   s.files = FileList['**/*'].to_a.select{|v| v !~ /pkg|CVS|git/}
   s.require_path = 'lib'
   s.bindir = 'bin'
-  s.add_dependency('locale', '>= 2.0.4')
+  s.add_dependency('locale', '>= 2.0.5')
   s.has_rdoc = true
   s.description = <<-EOF
     Ruby-Locale for Ruby on Rails is the pure ruby library which provides basic functions for localization.

data/lib/locale_rails/action_controller.rb

@@ -4,7 +4,7 @@
   Copyright (C) 2008-2009  Masao Mutoh
 
   You may redistribute it and/or modify it under the same
-  license terms as Ruby.
+  license terms as Ruby or LGPL.
 
 =end
 

data/lib/locale_rails/action_controller/base.rb

@@ -1,19 +1,16 @@
 =begin
   lib/locale_rails/action_controller/base.rb - Ruby/Locale for "Ruby on Rails"
 
-  Copyright (C) 2008  Masao Mutoh
+  Copyright (C) 2008-2009  Masao Mutoh
 
   You may redistribute it and/or modify it under the same
-  license terms as Ruby.
-
-  $Id: action_controller.rb 25 2008-11-30 15:44:24Z mutoh $
+  license terms as Ruby or LGPL.
 =end
 
 require 'action_controller'
 
 module ActionController #:nodoc:
   class Base
-    
     prepend_before_filter :init_locale
 
     def self.locale_filter_chain # :nodoc:

data/lib/locale_rails/action_controller/caching.rb

@@ -1,12 +1,10 @@
 =begin
   lib/locale_rails/action_controller.rb - Ruby/Locale for "Ruby on Rails"
 
-  Copyright (C) 2008  Masao Mutoh
+  Copyright (C) 2008-2009  Masao Mutoh
 
   You may redistribute it and/or modify it under the same
-  license terms as Ruby.
-
-  $Id: action_controller.rb 25 2008-11-30 15:44:24Z mutoh $
+  license terms as Ruby or LGPL.
 =end
 
 require 'action_controller/caching'
@@ -15,9 +13,13 @@ module ActionController #:nodoc:
 
   module Caching
     module Fragments
+      @@fragmented_locales = []
       def fragment_cache_key_with_locale(name) 
         ret = fragment_cache_key_without_locale(name)
         if ret.is_a? String
+          unless @@fragmented_locales.include? I18n.locale
+            @@fragmented_locales << I18n.locale
+          end
           ret.gsub(/:/, ".") << "_#{I18n.locale}"
         else
           ret
@@ -36,8 +38,8 @@ module ActionController #:nodoc:
           end
         else
           key = key.gsub(/:/, ".")
-          self.class.benchmark "Expired fragment: #{key}, lang = #{I18n.supported_locales}" do
-            supported_locales.each do |lang|
+          self.class.benchmark "Expired fragment: #{key}, lang = #{@@fragmented_locales}" do
+            @@fragmented_locales.each do |lang|
               fc_store.delete("#{key}_#{lang}", options)
             end
           end

data/lib/locale_rails/action_controller/test_process.rb

@@ -4,7 +4,7 @@
   Copyright (C) 2009  Masao Mutoh
 
   You may redistribute it and/or modify it under the same
-  license terms as Ruby.
+  license terms as Ruby or LGPL.
 
 =end
 

data/lib/locale_rails/action_view.rb

@@ -1,10 +1,10 @@
 =begin
   locale_rails/lib/action_view.rb - Ruby/Locale for "Ruby on Rails"
 
-  Copyright (C) 2008  Masao Mutoh
+  Copyright (C) 2008-2009  Masao Mutoh
 
   You may redistribute it and/or modify it under the same
-  license terms as Ruby.
+  license terms as Ruby or LGPL.
 
   Original: Ruby-GetText-Package-1.92.0
 

data/lib/locale_rails/i18n.rb

@@ -4,9 +4,8 @@
   Copyright (C) 2008,2009  Masao Mutoh
 
   You may redistribute it and/or modify it under the same
-  license terms as Ruby.
+  license terms as Ruby or LGPL.
 
-  $Id: i18n.rb 25 2008-11-30 15:44:24Z mutoh $
 =end
 
 module I18n

data/lib/locale_rails/version.rb

@@ -1,4 +1,4 @@
 module LocaleRails
-  RAILS_VERSION = "2.3.2"
-  VERSION = "2.0.4"
+  RAILS_VERSION = "2.3.4"
+  VERSION = "2.0.5"
 end

data/sample/config/environment.rb

@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.2' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.3' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')

data/sample/log/development.log

@@ -0,0 +1,128 @@
+# Logfile created on Sun Oct 25 03:26:31 +0900 2009  SQL (0.4ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.3ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+
+
+Processing ApplicationController#index (for 127.0.0.1 at 2009-10-25 03:33:52) [GET]
+
+ActionController::RoutingError (No route matches "/test" with {:method=>:get}):
+  /usr/lib/ruby/1.8/webrick/httpserver.rb:104:in `service'
+  /usr/lib/ruby/1.8/webrick/httpserver.rb:65:in `run'
+  /usr/lib/ruby/1.8/webrick/server.rb:173:in `start_thread'
+  /usr/lib/ruby/1.8/webrick/server.rb:162:in `start'
+  /usr/lib/ruby/1.8/webrick/server.rb:162:in `start_thread'
+  /usr/lib/ruby/1.8/webrick/server.rb:95:in `start'
+  /usr/lib/ruby/1.8/webrick/server.rb:92:in `each'
+  /usr/lib/ruby/1.8/webrick/server.rb:92:in `start'
+  /usr/lib/ruby/1.8/webrick/server.rb:23:in `start'
+  /usr/lib/ruby/1.8/webrick/server.rb:82:in `start'
+
+Rendering rescues/layout (not_found)
+
+
+Processing SamplesController#index (for 127.0.0.1 at 2009-10-25 03:33:55) [GET]
+Rendering template within layouts/samples
+Rendering samples/index
+Rendered samples/_part (23.2ms)
+Completed in 239ms (View: 70, DB: 0) | 200 OK [http://localhost/]
+
+
+Processing SamplesController#index (for 127.0.0.1 at 2009-10-25 03:34:01) [GET]
+  Parameters: {"lang"=>"fr"}
+Rendering template within layouts/samples
+Rendering samples/index
+Rendered samples/_part (8.1ms)
+Completed in 20ms (View: 18, DB: 0) | 200 OK [http://localhost/samples?lang=fr]
+
+
+Processing SamplesController#set_cookie (for 127.0.0.1 at 2009-10-25 03:34:14) [GET]
+  Parameters: {"id"=>"zh_CN"}
+Redirected to http://localhost:3000/samples
+Completed in 4ms (DB: 0) | 302 Found [http://localhost/samples/set_cookie/zh_CN]
+
+
+Processing SamplesController#index (for 127.0.0.1 at 2009-10-25 03:34:14) [GET]
+Rendering template within layouts/samples
+Rendering samples/index
+Rendered samples/_part (7.8ms)
+Completed in 21ms (View: 18, DB: 0) | 200 OK [http://localhost/samples]
+
+
+Processing SamplesController#index (for 127.0.0.1 at 2009-10-25 03:34:33) [GET]
+Rendering template within layouts/samples
+Rendering samples/index
+Rendered samples/_part (7.7ms)
+Completed in 20ms (View: 18, DB: 0) | 200 OK [http://localhost/samples]
+
+
+Processing SamplesController#clear_cookie (for 127.0.0.1 at 2009-10-25 03:34:40) [GET]
+Redirected to http://localhost:3000/samples
+Completed in 3ms (DB: 0) | 302 Found [http://localhost/samples/clear_cookie]
+
+
+Processing SamplesController#index (for 127.0.0.1 at 2009-10-25 03:34:40) [GET]
+Rendering template within layouts/samples
+Rendering samples/index
+Rendered samples/_part (8.1ms)
+Completed in 22ms (View: 19, DB: 0) | 200 OK [http://localhost/samples]
+  SQL (1.2ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+
+
+Processing ApplicationController#index (for 127.0.0.1 at 2009-11-08 22:02:14) [GET]
+
+ActionController::RoutingError (No route matches "/test" with {:method=>:get}):
+  /usr/lib/ruby/1.8/webrick/httpserver.rb:104:in `service'
+  /usr/lib/ruby/1.8/webrick/httpserver.rb:65:in `run'
+  /usr/lib/ruby/1.8/webrick/server.rb:173:in `start_thread'
+  /usr/lib/ruby/1.8/webrick/server.rb:162:in `start'
+  /usr/lib/ruby/1.8/webrick/server.rb:162:in `start_thread'
+  /usr/lib/ruby/1.8/webrick/server.rb:95:in `start'
+  /usr/lib/ruby/1.8/webrick/server.rb:92:in `each'
+  /usr/lib/ruby/1.8/webrick/server.rb:92:in `start'
+  /usr/lib/ruby/1.8/webrick/server.rb:23:in `start'
+  /usr/lib/ruby/1.8/webrick/server.rb:82:in `start'
+
+Rendering rescues/layout (not_found)
+  SQL (0.3ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+
+
+Processing SamplesController#index (for 127.0.0.1 at 2009-11-08 22:02:33) [GET]
+Rendering template within layouts/samples
+Rendering samples/index
+Rendered samples/_part (7.1ms)
+Completed in 57ms (View: 53, DB: 0) | 200 OK [http://localhost/]
+
+
+Processing SamplesController#index (for 127.0.0.1 at 2009-11-08 22:02:40) [GET]
+  Parameters: {"lang"=>"pt_BR"}
+Rendering template within layouts/samples
+Rendering samples/index
+Rendered samples/_part (9.3ms)
+Completed in 30ms (View: 27, DB: 0) | 200 OK [http://localhost/samples?lang=pt_BR]
+
+
+Processing SamplesController#index (for 127.0.0.1 at 2009-11-08 22:02:45) [GET]
+  Parameters: {"lang"=>"zh_CN"}
+Rendering template within layouts/samples
+Rendering samples/index
+Rendered samples/_part (13.5ms)
+Completed in 29ms (View: 27, DB: 0) | 200 OK [http://localhost/samples?lang=zh_CN]
+
+
+Processing SamplesController#index (for 127.0.0.1 at 2009-11-08 22:02:51) [GET]
+  Parameters: {"lang"=>"en_Latn_US_NYNORSK"}
+Rendering template within layouts/samples
+Rendering samples/index
+Rendered samples/_part (32.1ms)
+Completed in 65ms (View: 63, DB: 0) | 200 OK [http://localhost/samples?lang=en_Latn_US_NYNORSK]

data/test/app/controllers/articles_controller.rb

@@ -5,4 +5,9 @@ class ArticlesController < ApplicationController
 
   def list
   end
+
+  def expire_cache
+    expire_action(:action => "list")
+    render :text => "OK"
+  end
 end

data/test/config/environment.rb

@@ -1,7 +1,7 @@
 # Be sure to restart your server when you modify this file
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.2' unless defined? RAILS_GEM_VERSION
+#RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')

data/test/config/routes.rb

@@ -1,6 +1,7 @@
 ActionController::Routing::Routes.draw do |map|
   map.resources :articles
-  map.root :controller => :articles
+  map.root :controller => :articles, :collection => {:expire_cache => :get}
+
   # The priority is based upon order of creation: first created -> highest priority.
 
   # Sample of regular route:

data/test/log/development.log

@@ -0,0 +1,172 @@
+# Logfile created on Sun Oct 25 02:06:19 +0900 2009  SQL (0.6ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.3ms)   select sqlite_version(*)
+  SQL (8.3ms)   CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+  SQL (3.4ms)   CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  SQL (0.3ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.2ms)   SELECT version FROM schema_migrations
+  SQL (0.5ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+  SQL (0.5ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+  SQL (0.6ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+  SQL (0.5ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+  SQL (0.6ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+  SQL (0.6ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+  SQL (0.5ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+  SQL (0.5ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+  SQL (0.6ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+  SQL (0.6ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+  SQL (0.5ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+  SQL (0.6ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.2ms)   SELECT version FROM schema_migrations
+  SQL (0.5ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+  SQL (0.6ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+  SQL (0.5ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+  SQL (0.6ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+  SQL (0.5ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+  SQL (0.5ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+  SQL (0.6ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+  SQL (0.5ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+  SQL (0.5ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+  SQL (0.6ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+  SQL (0.5ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+  SQL (0.6ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+  SQL (1.0ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.3ms)   SELECT version FROM schema_migrations
+  SQL (0.7ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.2ms)   SELECT version FROM schema_migrations
+  SQL (1.1ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.2ms)   SELECT version FROM schema_migrations
+  SQL (0.6ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   SELECT version FROM schema_migrations
+  SQL (0.7ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.2ms)   SELECT version FROM schema_migrations
+  SQL (0.7ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.2ms)   SELECT version FROM schema_migrations
+  SQL (1.0ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.2ms)   SELECT version FROM schema_migrations
+  SQL (0.7ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.2ms)   SELECT version FROM schema_migrations