e9s 2.2.0 → 2.2.1

data/CHANGELOG

@@ -1,11 +1,17 @@
 = E9s CHANGELOG
 
+== Version 2.2.1 (November 9, 2010)
+
+* Fixed the Rails generators
+* Explicitly requiring E9s::Engine
+* Using Rich-CMS v2.1.2 and higher
+* Using Rich-i18n v1.3.2 and higher
+
 == Version 2.2.0 (November 8, 2010)
 
 * Made E9s Rails 2 and 3 compatible (woot!)
 * Using Rich-CMS v2.1.1 and higher
 * Using Rich-i18n v1.3.1 and higher
-* Using Rich-pluralization v1.0.6 and higher
 
 == Version 2.1.4 (October 20, 2010)
 

data/README.textile

@@ -46,7 +46,7 @@ Add E9s in @Gemfile@ as a gem dependency:
 Run the following in your console to install with Bundler:
 
 <pre>
-  bundle install
+  sudo bundle install
 </pre>
 
 h3. Using E9s as gem in Rails 2
@@ -75,6 +75,25 @@ h3. Using E9s as plugin in Rails 2
   script/plugin install git://github.com/archan937/e9s.git
 </pre>
 
+h3. Testing E9s out-of-the-box
+
+Run the Rails console:
+
+<pre>
+  rails c
+</pre>
+
+Start translating in Dutch:
+
+<pre>
+  >> I18n.locale = :nl
+  => :nl
+  >> "Male / Female".t.to_s
+  => "Man / Vrouw"
+  >> "MORE HOUSES".t.to_s
+  => "MEER HUIZEN"
+</pre>
+
 h2. Use the provided Rails generator
 
 In order to manage translations and/or CMS content. You need the following entities:
@@ -102,7 +121,7 @@ h4. In Rails 2
 Run the following in your console:
 
 <pre>
-  script/generate enrichments
+  script/generate enrichments -m
 </pre>
 
 h2. Start specifying translations
@@ -264,25 +283,25 @@ When translating text, you possibly want to know the @key@, the @value@, the @lo
   >> "MORE".t.class
   => Rich::I18n::Core::EnrichedString
   >> "MORE".t.meta_data
-  => {:locale=>:nl, :value=>"meer", :derivative_key=>"MORE", :key=>"word.more"}
+  => {"value"=>"meer", "locale"=>:nl, "derivative_key"=>"MORE", "key"=>"word.more"}
 </pre>
 
 Keep in mind that combined translations are possible and fortunately EnrichedString is able to cope with that. A concatenated translation has @merged_strings@ which contains every segments:
 
 <pre>
-  >> "More users".t
-  => "Meer gebruikers"
-  >> "More users".t.merged_strings
-  => ["Meer", " ", "gebruikers"]
-  >> "More users".t.meta_data
-  => nil
-  >> "More users".t.merged_strings.first.meta_data
-  => {:locale=>:nl, :value=>"meer", :derivative_key=>"More", :key=>"word.more"}
-  >> "More users".t.merged_strings.last.meta_data
-  => {:locale=>:nl, :value=>"gebruiker", :derivative_key=>"users", :key=>"word.user"}
-  >> "One".t + " " + "question".t
+  >> "More streets".t.to_s
+  => "Meer straten"
+  >> "More answers".t.merged_strings.collect(&:to_s)
+  => ["Meer", " ", "antwoorden"]
+  >> "More answers".t.meta_data
+  => {}
+  >> "More answers".t.merged_strings.first.meta_data
+  => {"value"=>"meer", "locale"=>:nl, "derivative_key"=>"More", "key"=>"word.more"}
+  >> "More answers".t.merged_strings.last.meta_data
+  => {"value"=>"antwoord", "locale"=>:nl, "derivative_key"=>"answers", "key"=>"word.answer"}
+  >> ("one".t + " " + "question".t).to_s
   => "één vraag"
-  >> ("One".t + " " + "question".t).merged_strings
+  >> ("one".t + " " + "question".t).merged_strings.collect(&:to_s)
   => ["één", " ", "vraag"]
 </pre>
 
@@ -293,8 +312,8 @@ E9s adds the @to_output@ method to the String class. This returns the an @i18n t
 <pre>
   >> E9s::Engine.enable_enriched_output = true
   => true
-  >> "More users".t.to_output
-  => "<i18n data-value=\"meer\" data-locale=\"nl\" data-key=\"word.more\" data-derivative_key=\"More\">Meer</i18n> <i18n data-value=\"gebruiker\" data-locale=\"nl\" data-key=\"word.user\" data-derivative_key=\"users\">gebruikers</i18n>"
+  >> "More answers".t.to_s
+  => "<i18n data-value='meer' data-locale='nl' data-key='word.more' data-derivative_key='More' data-editable_input_type='' data-i18n_translation='Meer'></i18n> <i18n data-value='antwoord' data-locale='nl' data-key='word.answer' data-derivative_key='answers' data-editable_input_type='' data-i18n_translation='antwoorden'></i18n>"
 </pre>
 
 This can be very handy when implementing a CMS in which users change translations. Please note that "http://github.com/archan937/e9s-demo":http://github.com/archan937/e9s-demo uses this feature to highlight translations. Later on this will also be used in "Rich-CMS":http://github.com/archan937/rich_cms, a gem / plugin that makes inplace translating possible (please be patient for this to be released).
@@ -304,21 +323,21 @@ h3. I18n examples
 As a result of the YAML file specified above, you will get the following translations in your Rails console:
 
 <pre>
-  >> "word.house".t
+  >> "word.house".t.to_s
   => "huis"
-  >> "word.Event".t
+  >> "word.Event".t.to_s
   => "Event"
-  >> "LETTERS".t
+  >> "LETTERS".t.to_s
   => "BRIEVEN"
-  >> "application.index.Welcome_to_our_site".t
+  >> "application.index.Welcome_to_our_site".t.to_s
   => "Welcome to our site"
-  >> "word.users".t
+  >> "word.users".t.to_s
   => "gebruikers"
-  >> "Signs".t
+  >> "Signs".t.to_s
   => "Tekens"
-  >> "MORE USERS".t
+  >> "MORE USERS".t.to_s
   => "MEER GEBRUIKERS"
-  >> "More houses".t
+  >> "More houses".t.to_s
   => "Meer huizen"
 </pre>
 

data/Rakefile

@@ -12,8 +12,8 @@ begin
     gemspec.homepage    = "http://codehero.es/rails_gems_plugins/e9s"
     gemspec.author      = "Paul Engel"
 
-    gemspec.add_dependency "rich_cms"          , ">= 2.1.1"
-    gemspec.add_dependency "rich_i18n"         , ">= 1.3.1"
+    gemspec.add_dependency "rich_cms"          , ">= 2.1.2"
+    gemspec.add_dependency "rich_i18n"         , ">= 1.3.2"
     gemspec.add_dependency "rich_pluralization", ">= 1.0.6"
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-2.2.0
+2.2.1

data/e9s.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{e9s}
-  s.version = "2.2.0"
+  s.version = "2.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Engel"]
-  s.date = %q{2010-11-08}
+  s.date = %q{2010-11-09}
   s.description = %q{E9s was created due to the need of simply implementing I18n within a Rails application. This simplifies internationalization of your Rails application making a Rails developers life much easier. E9s is divided into modules (as gem and plugin): Rich-CMS (http://github.com/archan937/rich_cms) , Rich-i18n (http://github.com/archan937/rich_i18n) and Rich-pluralization (http://github.com/archan937/rich_pluralization).}
   s.email = %q{paul.engel@holder.nl}
   s.extra_rdoc_files = [
@@ -50,17 +50,17 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rich_cms>, [">= 2.1.1"])
-      s.add_runtime_dependency(%q<rich_i18n>, [">= 1.3.1"])
+      s.add_runtime_dependency(%q<rich_cms>, [">= 2.1.2"])
+      s.add_runtime_dependency(%q<rich_i18n>, [">= 1.3.2"])
       s.add_runtime_dependency(%q<rich_pluralization>, [">= 1.0.6"])
     else
-      s.add_dependency(%q<rich_cms>, [">= 2.1.1"])
-      s.add_dependency(%q<rich_i18n>, [">= 1.3.1"])
+      s.add_dependency(%q<rich_cms>, [">= 2.1.2"])
+      s.add_dependency(%q<rich_i18n>, [">= 1.3.2"])
       s.add_dependency(%q<rich_pluralization>, [">= 1.0.6"])
     end
   else
-    s.add_dependency(%q<rich_cms>, [">= 2.1.1"])
-    s.add_dependency(%q<rich_i18n>, [">= 1.3.1"])
+    s.add_dependency(%q<rich_cms>, [">= 2.1.2"])
+    s.add_dependency(%q<rich_i18n>, [">= 1.3.2"])
     s.add_dependency(%q<rich_pluralization>, [">= 1.0.6"])
   end
 end

data/lib/e9s.rb

@@ -1,4 +1,5 @@
 
+require "e9s/engine"
 require "e9s/actionpack"
 
 module E9s

data/lib/generators/enrichments/enrichments_generator.rb

@@ -4,7 +4,7 @@ class EnrichmentsGenerator < Rails::Generators::Base
   class_option :user_model       , :type => :string , :default => "User"       , :aliases => "-u" , :desc => "The name of the Authlogic user model."
   class_option :content_model    , :type => :string , :default => "CmsContent" , :aliases => "-c" , :desc => "The name of the CMS content model."
   class_option :translation_model, :type => :string , :default => "Translation", :aliases => "-t" , :desc => "The name of the I18n translation model."
-  class_option :migrate          , :type => :boolean, :default => false        , :aliases => "-m" , :desc => "Run 'rake db:migrate' after generating model and migration"
+  class_option :migrate          , :type => :boolean, :default => false        , :aliases => "-m" , :desc => "Run 'rake db:migrate' after generating model and migration."
 
   def generate_rich_cms_files
     generate "rich:authlogic_user", options[:user_model]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: e9s
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 2
   - 2
-  - 0
-  version: 2.2.0
+  - 1
+  version: 2.2.1
 platform: ruby
 authors: 
 - Paul Engel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-08 00:00:00 +01:00
+date: 2010-11-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 15
         segments: 
         - 2
         - 1
-        - 1
-        version: 2.1.1
+        - 2
+        version: 2.1.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 31
         segments: 
         - 1
         - 3
-        - 1
-        version: 1.3.1
+        - 2
+        version: 1.3.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency