grosser-fast_gettext 0.3.3 → 0.3.4

data/README.markdown

@@ -108,11 +108,18 @@ Write your own TranslationRepository!
       end
     end
 
+TODO
+====
+ - default_locale=(x)  #atm the default is available_locales.first || 'en'
+ - default_text_domain=(x) #atm default is nil...
 
 Author
 ======
 Mo/Po-file parsing from Masao Mutoh, see vendor/README
 
+###Contributors
+ - [geekq](http://www.innoq.com/blog/vd)
+
 [Michael Grosser](http://pragmatig.wordpress.com)  
 grosser.michael@gmail.com  
 Hereby placed under public domain, do what you want, just do not hold me accountable...  

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 3
-:patch: 3
+:patch: 4

data/lib/fast_gettext/storage.rb

@@ -4,7 +4,11 @@ module FastGettext
   #  - provide error messages when repositories are unconfigured
   #  - accept/reject locales that are set by the user
   module Storage
-    class NoTextDomainConfigured < Exception;end
+    class NoTextDomainConfigured < RuntimeError
+      def to_s
+        "Current textdomain (#{FastGettext.text_domain.inspect}) was not added, use FastGettext.add_text_domain!"
+      end
+    end
 
     [:available_locales,:text_domain,:_locale,:current_cache].each do |method_name|
       key = "fast_gettext_#{method_name}".to_sym
@@ -38,7 +42,7 @@ module FastGettext
     end
 
     def current_repository
-      translation_repositories[text_domain] || NoTextDomainConfigured
+      translation_repositories[text_domain] || raise(NoTextDomainConfigured)
     end
 
     def locale
@@ -87,10 +91,8 @@ module FastGettext
 
     #turn off translation if none was defined to disable all resulting errors
     def silence_errors
-      if not self.current_repository or self.current_repository == NoTextDomainConfigured
-        require 'fast_gettext/translation_repository/base'
-        translation_repositories[text_domain] = TranslationRepository::Base.new('x')
-      end
+      require 'fast_gettext/translation_repository/base'
+      translation_repositories[text_domain] = TranslationRepository::Base.new('x')
     end
 
     private
@@ -101,4 +103,4 @@ module FastGettext
       self.current_cache = caches[text_domain][locale]
     end
   end
-end
+end

data/spec/aa_unconfigued_spec.rb

@@ -3,22 +3,19 @@ require File.join(File.dirname(__FILE__),'spec_helper')
 describe 'unconfigured' do
   it "gives a useful error message when trying to just translate" do
     FastGettext.text_domain = nil
-    x=1
     begin
       FastGettext._('x')
-    rescue
-      x=$!
+      "".should == "success!?"
+    rescue FastGettext::Storage::NoTextDomainConfigured
     end
-    x.to_s.should =~ /NoTextDomainConfigured/
   end
+
   it "gives a useful error message when only locale was set" do
     FastGettext.locale = 'de'
-    x=1
     begin
       FastGettext._('x')
-    rescue
-      x=$!
+      "".should == "success!?"
+    rescue FastGettext::Storage::NoTextDomainConfigured
     end
-    x.to_s.should =~ /NoTextDomainConfigured/
   end
 end

data/spec/fast_gettext/storage_spec.rb

@@ -87,11 +87,9 @@ describe 'Storage' do
     it "raises when a textdomain was empty" do
       begin 
         FastGettext._('x')
-        x=2
-      rescue
-        x=1
+        "".should == "success!?"
+      rescue FastGettext::Storage::NoTextDomainConfigured
       end
-      x.should == 1
     end
     
     it "can silence erros" do
@@ -117,4 +115,20 @@ describe 'Storage' do
       FastGettext.current_cache['abc'].should == 'abc'
     end
   end
+
+  describe NoTextDomainConfigured do
+    it "shows what to do" do
+      NoTextDomainConfigured.new.to_s.should =~ /FastGettext\.add_text_domain/
+    end
+
+    it "warns when text_domain is nil" do
+      FastGettext.text_domain = nil
+      NoTextDomainConfigured.new.to_s.should =~ /\(nil\)/
+    end
+
+    it "shows current text_domain" do
+      FastGettext.text_domain = 'xxx'
+      NoTextDomainConfigured.new('xxx').to_s.should =~ /xxx/
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grosser-fast_gettext
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Michael Grosser
@@ -62,7 +62,6 @@ files:
 - spec/vendor/fake_load_path/iconv.rb
 - spec/vendor/iconv_spec.rb
 - spec/vendor/string_spec.rb
-- vendor/CHANGELOG
 - vendor/README.rdoc
 - vendor/empty.mo
 - vendor/iconv.rb

data/vendor/CHANGELOG

@@ -1 +0,0 @@
-0.3 -- pluralisation methods accept/return n plural forms, contrary to singular/plural before