whowish_word 0.2.7 → 0.3.0

data/README.md

@@ -50,7 +50,7 @@ Now when you want to edit wording:
 
 1. Activate edit mode by calling:
 ```
-activate_whowish_word_edit_mode() 
+whowish_word.activate_edit_mode
 ```
  in any controller. 
  (The usual way is to use user's session to determine whether or not to activate WhowishWord's edit mode)
@@ -86,10 +86,29 @@ WhowishWord renders it as:
 You are here 10 times already
 ```
 
-Feature to be added
----------------------
+Multi-language support
+-----------------------
+
+You can change locale of WhowishWord by:
+
+```ruby
+whowish_word.set_locale("jp")
+```
 
-- Multi-language support
+In Rails, you should add before_filter in the application controller as shown below:
+
+```ruby
+before_filter :set_locale
+
+def set_locale
+  if params[:locale]
+    session[:locale] = params[:locale]
+  end
+
+  session[:locale] ||= "en"
+  whowish_word.set_locale(session[:locale])
+end
+```
 
 
 Prerequisite

data/lib/whowish_word/action_controller/base.rb

@@ -2,30 +2,40 @@
 if defined?(ActionController) and defined?(ActionController::Base)
 
   class ActionController::Base
+    
+    prepend_before_filter :initialize_whowish_word
+    attr_accessor :whowish_word_config
+
+
+    def initialize_whowish_word
+      @whowish_word_config = WhowishWord::Config.new
+    end
 
-    helper_method :activate_whowish_word_edit_mode
-    attr_accessor :whowish_word_edit_mode
+
+    helper_method :whowish_word
     
-    def activate_whowish_word_edit_mode
-      @whowish_word_edit_mode = true
+    def whowish_word
+      return @whowish_word_config
     end
 
+
     def word_for(namespace, id, *variables)
       
-      if @whowish_word_edit_mode == true
-        return WhowishWord.word_for_in_edit_mode(namespace, id, *variables)
+      if @whowish_word_config.edit_mode == true
+        return WhowishWord.word_for_in_edit_mode(namespace, id, @whowish_word_config.locale, *variables)
       else
-        return WhowishWord.word_for(namespace, id, *variables)
+        return WhowishWord.word_for(namespace, id, @whowish_word_config.locale, *variables)
       end
       
     end
     
+    
     def word_for_attr(namespace, id, *variables)
       
-      if @whowish_word_edit_mode == true
-        return WhowishWord.word_for_attr_in_edit_mode(namespace, id, *variables)
+      if @whowish_word_config.edit_mode == true
+        return WhowishWord.word_for_attr_in_edit_mode(namespace, id, @whowish_word_config.locale, *variables)
       else
-        return WhowishWord.word_for_attr(namespace, id, *variables)
+        return WhowishWord.word_for_attr(namespace, id, @whowish_word_config.locale, *variables)
       end
       
     end

data/lib/whowish_word/action_view/base.rb

@@ -2,10 +2,11 @@
 if defined?(ActionView) and defined?(ActionView::Base)
 
   class ActionView::Base
-    
+
+
     def whowish_word_javascript_and_css(force = false)
       
-      return "" if @whowish_word_edit_mode != true and force == false
+      return "" if @whowish_word_config.edit_mode != true and force == false
       
       script_text = <<-HTML
         <script type="text/javascript">
@@ -20,40 +21,45 @@ if defined?(ActionView) and defined?(ActionView::Base)
               script_text.html_safe
     end
 
+
     def global_word_for(namespace, id, *variables)
       
-      if @whowish_word_edit_mode == true
-        return WhowishWord.word_for_in_edit_mode(namespace, id, *variables)
+      if @whowish_word_config.edit_mode == true
+        return WhowishWord.word_for_in_edit_mode(namespace, id, @whowish_word_config.locale, *variables)
       else
-        return WhowishWord.word_for(namespace, id, *variables)
+        return WhowishWord.word_for(namespace, id, @whowish_word_config.locale, *variables)
       end
       
     end
-    
+
+
     def global_word_for_attr(namespace, id, *variables)
       
-      if @whowish_word_edit_mode == true
-        return WhowishWord.word_for_attr_in_edit_mode(namespace, id, *variables)
+      if @whowish_word_config.edit_mode == true
+        return WhowishWord.word_for_attr_in_edit_mode(namespace, id, @whowish_word_config.locale, *variables)
       else
-        return WhowishWord.word_for_attr(namespace, id, *variables)
+        return WhowishWord.word_for_attr(namespace, id, @whowish_word_config.locale, *variables)
       end
       
     end
-  
+
+
     def word_for(id, *variables)
       
       namespace = get_relative_view_path(@whowish_word_page)
       global_word_for(namespace, id, *variables)
       
     end
-    
+
+
     def word_for_attr(id, *variables)
       
       namespace = get_relative_view_path(@whowish_word_page)
       global_word_for_attr(namespace, id, *variables)
       
     end
-    
+
+
     private
       def get_relative_view_path(full_path)
         result = @whowish_word_page.match(/[\/\\](([^\/\\]+)[\/\\]([^\/\\]+))\Z/)

data/lib/whowish_word/config.rb

@@ -0,0 +1,22 @@
+module WhowishWord
+  
+  class Config
+    
+    attr_accessor :locale, :edit_mode
+    
+    def initialize
+      @locale = "en"
+      @edit_mode = false
+    end
+    
+    def activate_edit_mode
+      @edit_mode = true
+    end
+    
+    def set_locale(locale)
+      @locale = locale
+    end
+    
+  end
+  
+end

data/lib/whowish_word/whowish_word.rb

@@ -1,3 +1,4 @@
+require File.expand_path("../config", __FILE__)
 require File.expand_path("../constant", __FILE__)
 require File.expand_path("../initializer", __FILE__)
 require File.expand_path("../word_for", __FILE__)

data/lib/whowish_word/word_for.rb

@@ -5,29 +5,27 @@ module WhowishWord
   module WordFor
     include WhowishWord::Constant
     
-    def word_for(namespace, id, *variables)
-      return word_for_normal_mode(namespace, id, *variables)
+    def word_for(namespace, id, locale, *variables)
+      return word_for_normal_mode(namespace, id, locale, *variables)
     end
     
-    def word_for_attr(namespace, id, *variables)
-      return word_for_normal_mode(namespace, id, *variables)
+    def word_for_attr(namespace, id, locale, *variables)
+      return word_for_normal_mode(namespace, id, locale, *variables)
     end
     
-    def word_for_in_edit_mode(namespace, id, *variables)
-      return "<dfn>#{word_for_edit_mode(namespace, id, *variables)}</dfn>".html_safe
+    def word_for_in_edit_mode(namespace, id, locale, *variables)
+      return "<dfn>#{word_for_edit_mode(namespace, id, locale, *variables)}</dfn>".html_safe
     end
     
-    def word_for_attr_in_edit_mode(namespace, id, *variables)
-      return word_for_edit_mode(namespace, id, *variables)
+    def word_for_attr_in_edit_mode(namespace, id, locale, *variables)
+      return word_for_edit_mode(namespace, id, locale, *variables)
     end
     
     
-    def word_for_edit_mode(namespace, id, *variables)
+    def word_for_edit_mode(namespace, id, locale, *variables)
       
       variables = sanitize_variables_arg(variables)
       
-      locale = "en"
-      
       variable_suffix = ""
       if variables.length > 0
         
@@ -43,7 +41,7 @@ module WhowishWord
              get_whowish_word_id(namespace, id, locale) + \
              variable_suffix + \
              SEPARATOR + \
-             word_for_normal_mode(namespace, id, variables)
+             word_for_normal_mode(namespace, id, locale, variables)
       
     end
     
@@ -59,11 +57,10 @@ module WhowishWord
       
     end
   
-    def word_for_normal_mode(namespace, id, *variables)
+    def word_for_normal_mode(namespace, id, locale, *variables)
       
       variables = sanitize_variables_arg(variables)
       
-      locale = "en"
       word_id = get_whowish_word_id(namespace, id, locale)
    
       if @words[word_id]

data/rails/app/controllers/application_controller.rb

@@ -2,14 +2,21 @@ class ApplicationController < ActionController::Base
   
   layout "main"
   
-  before_filter :activate_whowish_word
+  before_filter :activate_whowish_word, :set_locale
   
   def activate_whowish_word
     if params[:edit_mode] == "yes"
-      activate_whowish_word_edit_mode
+      whowish_word.activate_edit_mode
+    end
+  end
+  
+  def set_locale
+    if params[:locale]
+      session[:locale] = params[:locale]
     end
     
-    
+    session[:locale] ||= "en"
+    whowish_word.set_locale(session[:locale])
   end
   
   

data/rails/app/views/home/index.html.erb

@@ -1,3 +1,6 @@
+<a href="/home?locale=en">en</a><br/>
+<a href="/home?locale=th">th</a><br/>
+<a href="/home?locale=jp">jp</a>
 <form autocomplete="off" onsubmit="return false;">
 	<div>
 		<span style="width:600px;">
@@ -5,7 +8,7 @@
 		</span>
 		<span>
 			<%
-				if @whowish_word_edit_mode == true
+				if @whowish_word_config.edit_mode == true
 			%>
 					<a href="/home">Dectivate edit mode</a>
 			<%

data/rails/spec/integration/whowish_word_generator_spec.rb

@@ -15,7 +15,7 @@ module WhowishWordRspecHelper
     variables_clause = ""
     variables_clause = "{#{var_keys.join(',')}}" if var_keys.length > 0
     
-    return "#{namespace}:#{id}(en)#{variables_clause}"
+    return "#{id}(en)#{variables_clause}"
     
   end
   
@@ -42,7 +42,7 @@ module WhowishWordRspecHelper
            SEPARATOR + \
            "#{namespace}:#{id}(en)#{variables_params}" + \
            SEPARATOR + \
-           "#{namespace}:#{id}(en)#{variables_clause}"
+           "#{id}(en)#{variables_clause}"
            
   end
   

data/spec/unit/word_for_attr_in_edit_mode_spec.rb

@@ -9,16 +9,16 @@ describe 'word_for' do
   
   it "no variables, no entry" do
     
-    value = WhowishWord.word_for_attr_in_edit_mode("namespace", "id")
-    value.should == "#{WhowishWord::PREFIX}#{WhowishWord::SEPARATOR}namespace:id(en)#{WhowishWord::SEPARATOR}namespace:id(en)"
+    value = WhowishWord.word_for_attr_in_edit_mode("namespace", "id", "en")
+    value.should == "#{WhowishWord::PREFIX}#{WhowishWord::SEPARATOR}namespace:id(en)#{WhowishWord::SEPARATOR}id(en)"
     
   end
   
   
   it "with variables, no entry" do
     
-    value = WhowishWord.word_for_attr_in_edit_mode("namespace", "id", :number=>5, :name=>"tanin")
-    value.should == "#{WhowishWord::PREFIX}#{WhowishWord::SEPARATOR}namespace:id(en)|number,name#{WhowishWord::SEPARATOR}namespace:id(en){number,name}"
+    value = WhowishWord.word_for_attr_in_edit_mode("namespace", "id", "en", :number=>5, :name=>"tanin")
+    value.should == "#{WhowishWord::PREFIX}#{WhowishWord::SEPARATOR}namespace:id(en)|number,name#{WhowishWord::SEPARATOR}id(en){number,name}"
     
   end
   
@@ -26,7 +26,7 @@ describe 'word_for' do
   it "no variables, with entry" do
     
     WhowishWord.words = {"namespace:id(en)" => "hello"}
-    value = WhowishWord.word_for_attr_in_edit_mode("namespace", "id")
+    value = WhowishWord.word_for_attr_in_edit_mode("namespace", "id", "en")
     value.should == "#{WhowishWord::PREFIX}#{WhowishWord::SEPARATOR}namespace:id(en)#{WhowishWord::SEPARATOR}hello"
     
   end
@@ -35,7 +35,7 @@ describe 'word_for' do
   it "with variables, with entry" do
     
     WhowishWord.words = {"namespace:id(en)" => "hello {name} for {number} times"}
-    value = WhowishWord.word_for_attr_in_edit_mode("namespace", "id", :number=>5, :name=>"tanin")
+    value = WhowishWord.word_for_attr_in_edit_mode("namespace", "id", "en", :number=>5, :name=>"tanin")
     value.should == "#{WhowishWord::PREFIX}#{WhowishWord::SEPARATOR}namespace:id(en)|number,name#{WhowishWord::SEPARATOR}hello tanin for 5 times"
     
   end

data/spec/unit/word_for_attr_spec.rb

@@ -9,16 +9,16 @@ describe 'word_for_attr' do
   
   it "no variables, no entry" do
     
-    value = WhowishWord.word_for_attr("namespace", "id")
-    value.should == "namespace:id(en)"
+    value = WhowishWord.word_for_attr("namespace", "id", "en")
+    value.should == "id(en)"
     
   end
   
   
   it "with variables, no entry" do
     
-    value = WhowishWord.word_for_attr("namespace", "id", :number=>5, :name=>"tanin")
-    value.should == "namespace:id(en){number,name}"
+    value = WhowishWord.word_for_attr("namespace", "id", "en", :number=>5, :name=>"tanin")
+    value.should == "id(en){number,name}"
     
   end
   
@@ -26,7 +26,7 @@ describe 'word_for_attr' do
   it "no variables, with entry" do
     
     WhowishWord.words = {"namespace:id(en)" => "hello"}
-    value = WhowishWord.word_for_attr("namespace", "id")
+    value = WhowishWord.word_for_attr("namespace", "id", "en")
     value.should == "hello"
     
   end
@@ -35,7 +35,7 @@ describe 'word_for_attr' do
   it "with variables, with entry" do
     
     WhowishWord.words = {"namespace:id(en)" => "hello {name} for {number} times"}
-    value = WhowishWord.word_for_attr("namespace", "id", :number=>5, :name=>"tanin")
+    value = WhowishWord.word_for_attr("namespace", "id", "en", :number=>5, :name=>"tanin")
     value.should == "hello tanin for 5 times"
     
   end

data/spec/unit/word_for_in_edit_mode_spec.rb

@@ -9,16 +9,16 @@ describe 'word_for' do
   
   it "no variables, no entry" do
     
-    value = WhowishWord.word_for_in_edit_mode("namespace", "id")
-    value.should == "<dfn>#{WhowishWord::PREFIX}#{WhowishWord::SEPARATOR}namespace:id(en)#{WhowishWord::SEPARATOR}namespace:id(en)</dfn>"
+    value = WhowishWord.word_for_in_edit_mode("namespace", "id", "en")
+    value.should == "<dfn>#{WhowishWord::PREFIX}#{WhowishWord::SEPARATOR}namespace:id(en)#{WhowishWord::SEPARATOR}id(en)</dfn>"
     
   end
   
   
   it "with variables, no entry" do
     
-    value = WhowishWord.word_for_in_edit_mode("namespace", "id", :number=>5, :name=>"tanin")
-    value.should == "<dfn>#{WhowishWord::PREFIX}#{WhowishWord::SEPARATOR}namespace:id(en)|number,name#{WhowishWord::SEPARATOR}namespace:id(en){number,name}</dfn>"
+    value = WhowishWord.word_for_in_edit_mode("namespace", "id", "en", :number=>5, :name=>"tanin")
+    value.should == "<dfn>#{WhowishWord::PREFIX}#{WhowishWord::SEPARATOR}namespace:id(en)|number,name#{WhowishWord::SEPARATOR}id(en){number,name}</dfn>"
     
   end
   
@@ -26,7 +26,7 @@ describe 'word_for' do
   it "no variables, with entry" do
     
     WhowishWord.words = {"namespace:id(en)" => "hello"}
-    value = WhowishWord.word_for_in_edit_mode("namespace", "id")
+    value = WhowishWord.word_for_in_edit_mode("namespace", "id", "en")
     value.should == "<dfn>#{WhowishWord::PREFIX}#{WhowishWord::SEPARATOR}namespace:id(en)#{WhowishWord::SEPARATOR}hello</dfn>"
     
   end
@@ -35,7 +35,7 @@ describe 'word_for' do
   it "with variables, with entry" do
     
     WhowishWord.words = {"namespace:id(en)" => "hello {name} for {number} times"}
-    value = WhowishWord.word_for_in_edit_mode("namespace", "id", :number=>5, :name=>"tanin")
+    value = WhowishWord.word_for_in_edit_mode("namespace", "id", "en", :number=>5, :name=>"tanin")
     value.should == "<dfn>#{WhowishWord::PREFIX}#{WhowishWord::SEPARATOR}namespace:id(en)|number,name#{WhowishWord::SEPARATOR}hello tanin for 5 times</dfn>"
     
   end

data/spec/unit/word_for_spec.rb

@@ -9,16 +9,16 @@ describe 'word_for' do
   
   it "no variables, no entry" do
     
-    value = WhowishWord.word_for("namespace", "id")
-    value.should == "namespace:id(en)"
+    value = WhowishWord.word_for("namespace", "id", "en")
+    value.should == "id(en)"
     
   end
   
   
   it "with variables, no entry" do
     
-    value = WhowishWord.word_for("namespace", "id", :number=>5, :name=>"tanin")
-    value.should == "namespace:id(en){number,name}"
+    value = WhowishWord.word_for("namespace", "id", "en", :number=>5, :name=>"tanin")
+    value.should == "id(en){number,name}"
     
   end
   
@@ -26,7 +26,7 @@ describe 'word_for' do
   it "no variables, with entry" do
     
     WhowishWord.words = {"namespace:id(en)" => "hello"}
-    value = WhowishWord.word_for("namespace", "id")
+    value = WhowishWord.word_for("namespace", "id", "en")
     value.should == "hello"
     
   end
@@ -35,7 +35,7 @@ describe 'word_for' do
   it "with variables, with entry" do
     
     WhowishWord.words = {"namespace:id(en)" => "hello {name} for {number} times"}
-    value = WhowishWord.word_for("namespace", "id", :number=>5, :name=>"tanin")
+    value = WhowishWord.word_for("namespace", "id", "en", :number=>5, :name=>"tanin")
     value.should == "hello tanin for 5 times"
     
   end

data/whowish_word.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "whowish_word"
-  s.version     = "0.2.7"
+  s.version     = "0.3.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Tanin Na Nakorn"]
   s.email       = ["tanin47@yahoo.com"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whowish_word
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-01 00:00:00.000000000Z
+date: 2011-11-09 00:00:00.000000000Z
 dependencies: []
 description: A Rails gem that make static content editable
 email:
@@ -31,6 +31,7 @@ files:
 - lib/whowish_word/action_view/base.rb
 - lib/whowish_word/action_view/template.rb
 - lib/whowish_word/authentication.rb
+- lib/whowish_word/config.rb
 - lib/whowish_word/constant.rb
 - lib/whowish_word/db_migration/active_record/whowish_word_html.rb
 - lib/whowish_word/initializer.rb