traducto 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99dd1a918d0bfe64138e0533d10b197279bc5950
-  data.tar.gz: cbfa96614c21a4ae3843812cf1faf0bf22e5e79b
+  metadata.gz: bd86a1273a19699c24b8dc31ff4f4b5354b0c109
+  data.tar.gz: 3f70e6e5c17240fda3b795d568a8975dddd0131d
 SHA512:
-  metadata.gz: 45fd895070fdcbd1b32ea034d8fb00a2b024e3d26bc147d816e058187d81af431000f59977d3ad6819a2e844ffc20e6275eeb795ff6ce08220741680d010fa46
-  data.tar.gz: 2a65ae1f35c75ff27e40e1469bb5f6e333032ccd141eb67de8e722c7fe1234f79be5ea50bc7bbe5349d08749c48ff26bec2db5e566b1cb936a31830e14c1e316
+  metadata.gz: 8fbb559494f65a298204c326f9a8b7e76d1fab5e81597ee48f3996c4cff7838045fdd3ac5573970f8c80b16392899e48357f79ef84d2539eb819bd7013e4c63d
+  data.tar.gz: 95e6fed7f5d176f31e2fe4253d850a5c6106411594cd800de010f5c9d26bbb00ef5e79c2a409b331bdc164207883f752f75cbaeed0cf97cd3ae662953820b503

data/README.md

@@ -1,4 +1,4 @@
-Traducto [![Build Status](https://secure.travis-ci.org/alchimikweb/traducto.png?branch=master)](http://travis-ci.org/alchimikweb/traducto) [![Code Climate](https://codeclimate.com/repos/527c039556b10201a000874c/badges/67a2619a2ba5c6777c81/gpa.png)](https://codeclimate.com/repos/527c039556b10201a000874c/feed) [![Coverage Status](https://coveralls.io/repos/alchimikweb/traducto/badge.png)](https://coveralls.io/r/alchimikweb/traducto)
+Traducto [![Build Status](https://secure.travis-ci.org/alchimikweb/traducto.png?branch=master)](http://travis-ci.org/alchimikweb/traducto) [![Code Climate](https://codeclimate.com/repos/527c039556b10201a000874c/badges/67a2619a2ba5c6777c81/gpa.png)](https://codeclimate.com/repos/527c039556b10201a000874c/feed) [![Coverage Status](https://coveralls.io/repos/alchimikweb/traducto/badge.png)](https://coveralls.io/r/alchimikweb/traducto) [![Gem Version](https://badge.fury.io/rb/traducto.png)](http://badge.fury.io/rb/traducto)
 ===============
 
 Rails helpers collection to simplify the localization code.
@@ -38,6 +38,8 @@ The lazy lookup will check three more path. Here's the full stack of checkup if
           title: "Title"
 ```
 
+This is for text in the persons view that is only present in the index action.
+
 ```yaml
   en:
     views:
@@ -45,12 +47,16 @@ The lazy lookup will check three more path. Here's the full stack of checkup if
         title: "Title"
 ```
 
+This is for text in the persons view that can be found in any actions.
+
 ```yaml
   en:
     views:
       title: "Title"
 ```
 
+This is for text that is used in any views.
+
 ```yaml
   # Rails default
   en:
@@ -59,6 +65,8 @@ The lazy lookup will check three more path. Here's the full stack of checkup if
         title: "Title"
 ```
 
+The reason I add the ```views``` key in front of ```persons``` is to clearly separate the translations of the views, models and helpers.
+
 ### Formatting
 You can also provide the format options to wrap the content by paragraphs.
 
@@ -73,6 +81,9 @@ You can also provide the format options to wrap the content by paragraphs.
 ```
 
 ```ruby
+  t('description.intro', format: nil)
+  #--> Let me start by
+
   t('description.intro', format: :text)
   #--> <p>Let me start by</p>
 
@@ -84,4 +95,4 @@ You can also provide the format options to wrap the content by paragraphs.
 Copyright
 ---------
 
-Copyright (c) 2013 Alchimik. See LICENSE for further details.
+Copyright (c) 2013 [Alchimik](http://www.alchimik.com). See [LICENSE](LICENCE) for further details.

data/lib/traducto/base.rb

@@ -21,7 +21,7 @@ module Traducto
 
       i18n_translate @base_key if translation_missing?
 
-      format_text if format?
+      format
 
       return @text.html_safe
     end
@@ -36,10 +36,21 @@ module Traducto
       request[:controller]
     end
 
+    def format
+      case @options[:format]
+        when :text then format_text
+        else format_base
+      end
+    end
+
     def format?
       @options[:format] ? true : false
     end
 
+    def format_base
+      @text = @text.join("\n") if @text.is_a? Array
+    end
+
     def format_text
       @text = [@text] if not @text.is_a? Array
 

data/spec/traducto/base_spec.rb

@@ -54,6 +54,14 @@ describe Traducto::Base do
     context "with the key intro having the value ['par1', 'par2', 'par3']" do
       before { I18n.stub('translate').with('intro', anything()).and_return(['par1', 'par2', 'par3']) }
 
+      context "when translating the key 'intro' without a text format" do
+        before { @base = Traducto::Base.new(ActionView::Base.new) }
+
+        subject { @base.translate('intro') }
+
+        it { should eql "par1\npar2\npar3" }
+      end
+
       context "when translating the key 'intro' with a text format" do
         before { @base = Traducto::Base.new(ActionView::Base.new) }
 

data/traducto.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |gem|
   gem.description = "Rails helpers collection to simplify the localization code."
   gem.summary     = "Rails helpers collection to simplify the localization code."
   gem.homepage    = "https://github.com/alchimikweb/traducto"
-  gem.version     = "1.0.0"
+  gem.version     = "1.0.1"
   gem.licenses    = ["MIT"]
 
   gem.authors     = ["Sebastien Rosa"]
@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.test_files  = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "rails", ['>= 4.0.0']
+  gem.add_dependency "rails", ['>= 3.0.0']
   gem.add_development_dependency "sqlite3"
   gem.add_development_dependency "rspec-rails"
   gem.add_development_dependency "simplecov"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: traducto
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Sebastien Rosa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement