q_translate 0.0.1 → 0.0.2

data/.gitignore

@@ -14,5 +14,4 @@ rdoc
 spec/reports
 test/tmp
 test/version_tmp
-tmp
-/nbproject/
+tmp

data/.rvmrc

@@ -0,0 +1 @@
+rvm use 1.9.3-p385@q_translate --create

data/Gemfile

@@ -1,4 +1,2 @@
 source 'https://rubygems.org'
-
-# Specify your gem's dependencies in q_translate.gemspec
 gemspec

data/lib/q_translate.rb

@@ -1,40 +1,40 @@
 require "q_translate/version"
 
-module QTranslate
-  
+module QTranslate  
   class Translation
     
-    attr_accessor :original
+    attr_accessor :text, :locale, :fallback
 
-    def initialize text
-      @original = text
+    def initialize text, options={}
+      @text = text
+      @locale = options[:locale] || I18n.locale
+      @fallback = options[:fallback] || true
     end
     
-    def locale
-      I18n.locale
+    def translate
+      return @text if @text and @text.blank?
+      return translations[@locale] if translations.has_key?(@locale)
+      return translations[I18n.default_locale] if @fallback and translations.has_key?(I18n.default_locale)
+      return '' if translations.keys.any?
+      @text
     end
     
-    def translate      
-      return @original if @original.blank?
-      if translations.has_key? locale
-        translations[locale]
-      elsif translations.has_key? I18n.default_locale
-        translations[I18n.default_locale]
-      else
-        @original
-      end
+    def translations
+      @translations ||= split_locales
+      @translations
     end
     
-    def translations
-      @translations = {}
-      @original.split('<!--:-->').each do |t|
+    protected
+
+    def split_locales
+      translations_per_locale = {}
+      self.text.split('<!--:-->').each do |t|
         t.match(/^<!--:([\w]{2})/) do |lang|
-          @translations[lang[1].to_sym] = t.gsub(/<!--:#{lang[1]}-->(.*)/, '\1')
+          translations_per_locale[lang[1].to_sym] = t.gsub(/<!--:#{lang[1]}-->(.*)/, '\1')
         end
       end
-      @translations
+      translations_per_locale
     end
-    
-  end
-  
+
+  end  
 end

data/lib/q_translate/version.rb

@@ -1,3 +1,3 @@
 module QTranslate
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/q_translate.gemspec

@@ -4,17 +4,18 @@ require File.expand_path('../lib/q_translate/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.name          = "q_translate"
   gem.authors       = ["Mathieu Gagné"]
-  gem.email         = ["mathieu@orangebrule.com"]
+  gem.email         = ["gagne.mathieu@hotmail.com"]
   gem.description   = %q{Extends String with a 'translate' method. Returned value is the according translated text for a Wordpress Post translated by QTranslate plugin.}
   gem.summary       = %q{Extends String with a 'translate' method. Returned value is the according translated text for a Wordpress Post translated by QTranslate plugin. Useful for Wordpress integration in a Rails app where the admin bloggin side is handled by Wordpress Engine. The default value if translation is not provided is English.}
-  gem.homepage      = "http://github.com/orangebrule/q-translate"
+  gem.homepage      = "http://github.com/mathieugagne/q-translate"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.test_files    = gem.files.grep(%r{^(spec)/})
   gem.require_paths = ["lib"]
   gem.version       = QTranslate::VERSION
   
+  gem.add_development_dependency 'rails'
   gem.add_development_dependency 'rspec'
   
 end

data/spec/q_translate/q_translate_spec.rb

@@ -3,50 +3,62 @@ require 'spec_helper'
 TEST_STRING = "<!--:en-->And this is how the Universe ended.<!--:--><!--:fr-->Et c'est ainsi que l'univers connu cessa d'exister.<!--:-->"
 
 describe QTranslate::Translation do    
-      
-  before :each do
-    @text = QTranslate::Translation.new(TEST_STRING)
-  end
   
-  describe '.translate' do
-        
-    describe 'if translated' do
-      
-      it "should return French translation if locale is French" do
+  describe '#translate' do
+
+    context 'when translated' do
+
+      it "returns appropriate translation if locale is set" do
         I18n.locale = :fr
+        @text = QTranslate::Translation.new(TEST_STRING)
         @text.translate.should match "Et c'est ainsi que l'univers connu cessa d'exister."
       end
       
-      it "should return English translation if locale is English" do
-        I18n.locale = :en
+      it "returns appropriate translation and overrides default if locale is passed as option" do
+        I18n.locale = :fr
+        @text = QTranslate::Translation.new(TEST_STRING, locale: :en)
         @text.translate.should match "And this is how the Universe ended."
       end
-            
+
     end
     
-    describe 'if not translated' do
-      
-      it "should use default locale" do
-        I18n.locale = :es
-        @text.translate.should match 'And this is how the Universe ended.'
+    context 'when not translated' do
+
+      context 'when fallback is true' do
+        it "returns default locale" do
+          I18n.locale = :es
+          @text = QTranslate::Translation.new(TEST_STRING)
+          @text.translate.should match 'And this is how the Universe ended.'
+        end
+      end
+      context 'when fallback is false' do
+        it 'returns an empty string' do
+          I18n.locale = :es
+          @text = QTranslate::Translation.new(TEST_STRING)
+          @text.translate.should match ''
+        end
       end
       
-      it "should return itself" do
+      it "returns itself if no sign of translation" do
         @text = QTranslate::Translation.new("Whatever man!")
         @text.translate.should match "Whatever man!"
       end
+
+      it "returns an empty string if translations are present but none match" do
+      end
       
     end
   end
-    
-  describe '.translations' do
-      
-    it "should return a hash of locales and associated translated text" do
+
+  describe '#translations' do
+
+    it "returns a hash of locales and associated translated text" do
+      @text = QTranslate::Translation.new(TEST_STRING)
       @text.translations.should be_a Hash
       @text.translations.should have(2).keys
       @text.translations[:en].should match "And this is how the Universe ended."
       @text.translations[:fr].should match "Et c'est ainsi que l'univers connu cessa d'exister."
     end
-      
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: q_translate
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-23 00:00:00.000000000 Z
+date: 2013-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  name: rails
+  requirement: &18422460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,35 +21,39 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *18422460
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &18421980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *18421980
 description: Extends String with a 'translate' method. Returned value is the according
   translated text for a Wordpress Post translated by QTranslate plugin.
 email:
-- mathieu@orangebrule.com
+- gagne.mathieu@hotmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .rvmrc
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - lib/q_translate.rb
 - lib/q_translate/version.rb
-- nbproject/private/rake-d.txt
-- nbproject/project.properties
-- nbproject/project.xml
 - q_translate.gemspec
 - spec/q_translate/q_translate_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/orangebrule/q-translate
+homepage: http://github.com/mathieugagne/q-translate
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -69,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.18
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Extends String with a 'translate' method. Returned value is the according