whowish_word 0.3.3 → 0.4.0

data/rails/Gemfile

@@ -1,7 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails'
-gem 'rake','0.8.7'
+gem 'rails', '3.2.3'
 
 gem 'rspec-rails'
 gem 'watir-webdriver-rails'

data/rails/Gemfile.lock

@@ -1,118 +1,121 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.3)
-      actionpack (= 3.1.3)
-      mail (~> 2.3.0)
-    actionpack (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
+    actionmailer (3.2.3)
+      actionpack (= 3.2.3)
+      mail (~> 2.4.4)
+    actionpack (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.5)
-      rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.3)
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      arel (~> 2.2.1)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-    activesupport (3.1.3)
+    activeresource (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (2.2.1)
-    bson (1.5.1)
-    bson_ext (1.5.1)
+    addressable (2.2.8)
+    arel (3.0.2)
+    bson (1.6.4)
+    bson_ext (1.6.4)
+      bson (~> 1.6.4)
     builder (3.0.0)
-    childprocess (0.2.3)
+    childprocess (0.3.2)
       ffi (~> 1.0.6)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     ffi (1.0.11)
     hike (1.2.1)
     i18n (0.6.0)
-    json (1.6.3)
-    mail (2.3.0)
+    journey (1.0.4)
+    json (1.7.3)
+    libwebsocket (0.1.3)
+      addressable
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    mongo (1.5.1)
-      bson (= 1.5.1)
-    mongoid (2.3.4)
+    mime-types (1.18)
+    mongo (1.6.2)
+      bson (~> 1.6.2)
+    mongoid (2.4.11)
       activemodel (~> 3.1)
-      mongo (~> 1.3)
+      mongo (<= 1.6.2)
       tzinfo (~> 0.3.22)
-    multi_json (1.0.4)
+    multi_json (1.3.6)
     polyglot (0.3.3)
-    rack (1.3.5)
-    rack-cache (1.1)
+    rack (1.4.1)
+    rack-cache (1.2)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.3)
-      actionmailer (= 3.1.3)
-      actionpack (= 3.1.3)
-      activerecord (= 3.1.3)
-      activeresource (= 3.1.3)
-      activesupport (= 3.1.3)
+    rails (3.2.3)
+      actionmailer (= 3.2.3)
+      actionpack (= 3.2.3)
+      activerecord (= 3.2.3)
+      activeresource (= 3.2.3)
+      activesupport (= 3.2.3)
       bundler (~> 1.0)
-      railties (= 3.1.3)
-    railties (3.1.3)
-      actionpack (= 3.1.3)
-      activesupport (= 3.1.3)
+      railties (= 3.2.3)
+    railties (3.2.3)
+      actionpack (= 3.2.3)
+      activesupport (= 3.2.3)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
-    rake (0.8.7)
-    rdoc (3.11)
+    rake (0.9.2.2)
+    rdoc (3.12)
       json (~> 1.4)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    rspec-rails (2.7.0)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.7.0)
-    rubyzip (0.9.5)
-    selenium-webdriver (2.14.0)
-      childprocess (>= 0.2.1)
-      ffi (~> 1.0.9)
-      multi_json (~> 1.0.4)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+    rspec-rails (2.10.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.10.0)
+    rubyzip (0.9.9)
+    selenium-webdriver (2.22.2)
+      childprocess (>= 0.2.5)
+      ffi (~> 1.0)
+      libwebsocket (~> 0.1.3)
+      multi_json (~> 1.0)
       rubyzip
-    sprockets (2.0.3)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
+    sqlite3 (1.3.6)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
-    watir-webdriver (0.3.9)
-      selenium-webdriver (>= 2.12.0)
+    tzinfo (0.3.33)
+    watir-webdriver (0.6.1)
+      selenium-webdriver (>= 2.18.0)
     watir-webdriver-rails (0.0.7)
       watir-webdriver
 
@@ -122,8 +125,7 @@ PLATFORMS
 DEPENDENCIES
   bson_ext
   mongoid
-  rails
-  rake (= 0.8.7)
+  rails (= 3.2.3)
   rspec-rails
   sqlite3
   watir-webdriver-rails

data/rails/app/assets/javascripts/home2.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

data/rails/app/assets/stylesheets/home2.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

data/rails/app/controllers/application_controller.rb

@@ -16,7 +16,7 @@ class ApplicationController < ActionController::Base
     end
     
     session[:locale] ||= "en"
-    whowish_word.set_locale(session[:locale])
+    I18n.locale = session[:locale].to_sym
   end
   
   

data/rails/app/controllers/home2_controller.rb

@@ -0,0 +1,2 @@
+class Home2Controller < ApplicationController
+end

data/rails/app/helpers/home2_helper.rb

@@ -0,0 +1,2 @@
+module Home2Helper
+end

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

@@ -1,3 +1,4 @@
+<%=I18n.locale%>
 <a href="/home?locale=en">en</a><br/>
 <a href="/home?locale=th">th</a><br/>
 <a href="/home?locale=jp">jp</a>
@@ -20,62 +21,62 @@
 			%>
 		</span>
 		<span>
-			<b>Text: </b> <%=word_for :text%>
+			<b>Text: </b> <%=t :text%>
 		</span>
 		<span>
 			<b>Bullet: </b> <ul>
-								<li><%=word_for :text1%></li>
-								<li><%=word_for :text2%></li>
+								<li><%=t :text1%></li>
+								<li><%=t :text2%></li>
 							</ul>
 		</span>
 		<span>
-			<b>Anchor: </b> <a href="#"><%=word_for :text3%></a>
+			<b>Anchor: </b> <a href="#"><%=t :text3%></a>
 		</span>
 		<span>
-			<b>Label: </b> <label for="some_textbox"><%=word_for_attr :label_text%></label>
+			<b>Label: </b> <label for="some_textbox"><%=ta :label_text%></label>
 			<input type="text" name="some_textbox">
 		</span>
 		<span>
-			<b>Textbox: </b> <input type="textbox" name="<%=rand(1000)%>"
-									title="<%=word_for_attr :textbox_title%>" 
-									value="<%=word_for_attr :textbox_value%>" 
-									placeholder="<%=word_for_attr :textbox_placeholder%>">
+			<b>Textbox: </b> <input type="textbox" name="<%=Time.now.to_i%>_0"
+									title="<%=ta :textbox_title%>" 
+									value="<%=ta :textbox_value%>" 
+									placeholder="<%=ta :textbox_placeholder%>">
 		</span>
 		<span>
-			<b>Textarea: </b> <textarea name="<%=rand(1000)%>"
-									title="<%=word_for_attr :textarea_title%>"
-									placeholder="<%=word_for_attr :textarea_placeholder%>"><%=word_for_attr :textarea_value%></textarea>
+			<b>Textarea: </b> <textarea name="<%=Time.now.to_i%>_1"
+									title="<%=ta :textarea_title%>"
+									placeholder="<%=ta :textarea_placeholder%>"><%=ta :textarea_value%></textarea>
 		</span>
 		<span>
-			<b>Checkbox: </b> <input type="checkbox"  name="<%=rand(1000)%>"
-								title="<%=word_for_attr :checkbox_title%>" 
-								value="<%=word_for_attr :checkbox_value%>">
+			<b>Checkbox: </b> <input type="checkbox"  name="<%=Time.now.to_i%>_2"
+								title="<%=ta :checkbox_title%>" 
+								value="<%=ta :checkbox_value%>">
 		</span>
 		<span>
-			<b>Radio: </b> <input type="radio"  name="<%=rand(1000)%>"
-								title="<%=word_for_attr :radio_title%>" 
-								value="<%=word_for_attr :radio_value%>">
+			<b>Radio: </b> <input type="radio"  name="<%=Time.now.to_i%>_3"
+								title="<%=ta :radio_title%>" 
+								value="<%=ta :radio_value%>">
 		</span>
 		<span>
-			<b>Select: </b> <select title="<%=word_for_attr :select_title%>">
-								<option value="<%=word_for_attr :option_value_0%>"><%=word_for_attr :option_text_0%></option>
-								<option value="<%=word_for_attr :option_value_1%>"><%=word_for_attr :option_text_1%></option>
+			<b>Select: </b> <select title="<%=ta :select_title%>">
+								<option value="<%=ta :option_value_0%>"><%=ta :option_text_0%></option>
+								<option value="<%=ta :option_value_1%>"><%=ta :option_text_1%></option>
 							</select>
 		</span>
 		<span>
 			<b>Button(Input): </b> <input type="button" 
-									title="<%=word_for_attr :input_button_title%>" 
-									value="<%=word_for_attr :input_button_value%>" 
+									title="<%=ta :input_button_title%>" 
+									value="<%=ta :input_button_value%>" 
 									onclick="alert('hello');">
 		</span>
 		<span>
 			<b>Submit(Input): </b> <input type="submit" 
-									title="<%=word_for_attr :submit_title%>" 
-									value="<%=word_for_attr :submit_value%>" 
+									title="<%=ta :submit_title%>" 
+									value="<%=ta :submit_value%>" 
 									onclick="alert('hello');">
 		</span>
 		<span>
-			<b>Button: </b> <button title="<%=word_for_attr :button_title%>" onclick="alert('hello');"><%=word_for_attr :button_value%></button>
+			<b>Button: </b> <button title="<%=ta :button_title%>" onclick="alert('hello');"><%=ta :button_value%></button>
 		</span>
 		<span>
 			<b>Late Text: </b> <span id="late_text"></span>
@@ -83,7 +84,7 @@
 			<script type="text/javascript">
 				
 				setTimeout(function() {
-					$('#late_text').html("<%=word_for :late_text%>");
+					$('#late_text').html("<%=t :late_text%>");
 				},5000);
 				
 			</script>
@@ -97,9 +98,9 @@
 			<script type="text/javascript">
 				
 				setTimeout(function() {
-					$('#late_textbox').attr("title","<%=word_for_attr :late_textbox_title%>");
-					$('#late_textbox').val("<%=word_for_attr :late_textbox_value%>");
-					$('#late_textbox').attr("placeholder","<%=word_for_attr :late_textbox_placeholder%>");
+					$('#late_textbox').attr("title","<%=ta :late_textbox_title%>");
+					$('#late_textbox').val("<%=ta :late_textbox_value%>");
+					$('#late_textbox').attr("placeholder","<%=ta :late_textbox_placeholder%>");
 				},5000);
 				
 			</script>

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

@@ -0,0 +1,4 @@
+<%=t :hello, :name => "Tanin" %><br/>
+<%=t :test%>
+<input type="text" name="<%=Time.now.to_i%>" value="<%=ta :test_attribute%>">
+<%=t :test_again%>

data/rails/app/views/integration/attr.html.erb

@@ -1 +1 @@
-<input type="text" title="<%=word_for_attr :text%>">
+<input type="text" title="<%=ta :text%>">

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

@@ -1 +1 @@
-<%=word_for :text%>
+<%=t :text%>

data/rails/app/views/integration/select.html.erb

@@ -1,3 +1,3 @@
 <select>
-	<option value="<%=word_for_attr :value%>"><%=word_for_attr :text%></option>
+	<option value="<%=ta :value%>"><%=ta :text%></option>
 </select>

data/rails/app/views/integration/value.html.erb

@@ -1 +1 @@
-<input type="text" value="<%=word_for_attr :text%>">
+<input type="text" value="<%=ta :text%>">

data/rails/config/application.rb

@@ -20,11 +20,9 @@ Bundler.require(:default, $ORM_ENGINE, Rails.env) if defined?(Bundler)
 module WhowishWordRails
   
   class Application < Rails::Application
-    
     config.encoding = "utf-8"
     config.filter_parameters += [:password]
     config.active_support.deprecation = :stderr
-    
   end
   
 end

data/rails/config/initializers/whowish_word.rb

@@ -1,3 +1,3 @@
 
-WhowishWord.init($ORM_ENGINE)
+WhowishWord.init()
 

data/rails/config/locales/whowish_word/en.yml

@@ -0,0 +1,4 @@
+---
+en:
+  text1: '456'
+  text: '123'

data/rails/config/locales/whowish_word/jp.yml

@@ -0,0 +1,4 @@
+---
+jp:
+  text: japanese
+  text1: '123'

data/rails/config/locales/whowish_word/th.yml

@@ -0,0 +1,4 @@
+---
+th:
+  text1: ไทย
+  text: ไทย1

data/rails/spec/controllers/whowish_word_controller_spec.rb

@@ -1,10 +1,9 @@
 require 'spec_helper'
 
 describe WhowishWordController do
-  
   it "adds a word correctly" do
     
-    word_id = "some_controller/some_view.html.erb:some_word(en)"
+    word_id = "test"
     content = "Hello"
     
     post :change_word, {
@@ -15,42 +14,6 @@ describe WhowishWordController do
     body = expect_json_response    
     body['ok'].should be_true
     
-    commit_database
-    
-    word = WhowishWordHtml.first(:conditions=>{:word_id=>word_id})
-    word.content.should == content
-    
-    WhowishWord.words[word_id].should == content
-    WhowishWord.words.length.should == 1
-    
-  end
-  
-  it "changes a word correctly" do
-    
-    word_id = "some_controller/some_view.html.erb:some_word(en)"
-    content = "Hello"
-    
-    WhowishWord.add_or_set_word(word_id, content)
-    WhowishWordHtml.create(:word_id=>word_id, :content=>content)
-    
-    new_content = "Yo!"
-    
-    post :change_word, {
-                          :word_id => word_id,
-                          :content => new_content
-                        }
-                        
-    body = expect_json_response    
-    body['ok'].should be_true
-    
-    commit_database
-    
-    word = WhowishWordHtml.first(:conditions=>{:word_id=>word_id})
-    word.content.should == new_content
-    
-    WhowishWord.words[word_id].should == new_content
-    WhowishWord.words.length.should == 1
-    
+    I18n.t(word_id.to_sym).should == content
   end
-  
 end

data/rails/spec/integration/whowish_word_spec.rb

@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe 'WhowishWord workflow spec' do
-  
   it "edits a normal text" do
-    
     goto '/integration?edit_mode=yes'
     sleep(1)
     
@@ -14,7 +12,6 @@ describe 'WhowishWord workflow spec' do
     
     html('whowishWordId0').should == "Some new word"
     
-    commit_database
     
     goto '/integration?edit_mode=yes'
     sleep(1)
@@ -23,11 +20,9 @@ describe 'WhowishWord workflow spec' do
     
     click 'whowishWordId0_____html'
     value("whowishWordDialogContent").should == "Some new word"
-    
   end
   
   it "edits a value" do
-    
     goto '/integration/value?edit_mode=yes'
     sleep(1)
     
@@ -38,7 +33,6 @@ describe 'WhowishWord workflow spec' do
     
     value('whowishWordId0').should == "Some new word"
     
-    commit_database
     
     goto '/integration/value?edit_mode=yes'
     sleep(1)
@@ -47,11 +41,9 @@ describe 'WhowishWord workflow spec' do
     
     click 'whowishWordId0_____value'
     value("whowishWordDialogContent").should == "Some new word"
-    
   end
   
   it "edits an attribute" do
-    
     goto '/integration/attr?edit_mode=yes'
      sleep(1)
     
@@ -62,7 +54,6 @@ describe 'WhowishWord workflow spec' do
     
     element(:id=>'whowishWordId0').attribute_value("title").should == "Some new word"
     
-    commit_database
     
     goto '/integration/attr?edit_mode=yes'
     
@@ -70,11 +61,9 @@ describe 'WhowishWord workflow spec' do
     
     click 'whowishWordId0_____title'
     element(:id=>'whowishWordId0').attribute_value("title").should == "Some new word"
-    
   end
   
   it "edits an option" do
-    
     goto '/integration/select?edit_mode=yes'
     sleep(1)
     
@@ -93,9 +82,7 @@ describe 'WhowishWord workflow spec' do
     click "whowishWordDialogSaveButton"
     
     execute_script('return $("#whowishWordId0").text();').should == "Some new text"
-    
-    
-    commit_database
+
     
     goto '/integration/select?edit_mode=yes'
     sleep(1)
@@ -111,7 +98,5 @@ describe 'WhowishWord workflow spec' do
     click 'whowishWordId0_____text'
     value("whowishWordDialogContent").should == "Some new text"
     click 'whowishWordDialogCloseButton'
-    
   end
-  
 end

data/rails/spec/spec_helper.rb

@@ -6,7 +6,6 @@ ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../../config/environment", __FILE__)
 
 require 'rspec/rails'
-
 require 'watir-webdriver-rails'
 
 WatirWebdriverRails.host = "localhost"
@@ -14,20 +13,11 @@ WatirWebdriverRails.port = 57124
 
 Dir[File.expand_path("../support/**/*.rb", __FILE__)].each {|f| require f}
 
-
 RSpec.configure do |config|
-  
   config.include Browser
-  config.include MongoidHelper
   config.include JsonRspecHelper
   
-  config.before(:each) do
-    
-    WhowishWordHtml.delete_all
-    WhowishWord.words = {}
-    
-  end
-  
+  config.mock_with :rspec
 end
 
 

data/spec/spec_helper.rb

@@ -5,6 +5,8 @@ require File.expand_path("../../lib/whowish_word",__FILE__)
 
 RSpec.configure do |config|
   
+  config.mock_with :rspec
+  
   String.class_eval do
     def html_safe
       return self

data/whowish_word.gemspec

@@ -3,13 +3,13 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "whowish_word"
-  s.version     = "0.3.3"
+  s.version     = "0.4.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Tanin Na Nakorn"]
   s.email       = ["tanin47@yahoo.com"]
   s.homepage    = "http://github.com/tanin47/whowish_word"
   s.summary     = %q{WhowishWord}
-  s.description = %q{A Rails gem that make static content editable}
+  s.description = %q{Inline internationlization for Rails 3.2.*}
 
   s.rubyforge_project = "whowish_word"