lazier 2.3.1 → 2.4.0

data/doc/top-level-namespace.html

@@ -103,7 +103,7 @@
 </div>
 
     <div id="footer">
-  Generated on Tue Jan 29 19:28:50 2013 by
+  Generated on Tue Jan 29 20:37:32 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.3 (ruby-1.9.3).
 </div>

data/lib/lazier.rb

@@ -12,6 +12,7 @@ require "r18n-desktop"
 
 require "lazier/version" if !defined?(Lazier::Version)
 require "lazier/exceptions"
+require "lazier/i18n"
 require "lazier/settings"
 require "lazier/object"
 require "lazier/boolean"
@@ -27,7 +28,6 @@ module Lazier
   #
   # @return [Settings] The settings for the extensions.
   def self.settings
-    ::Lazier.localize if !Lazier.localized?
     ::Lazier::Settings.instance
   end
 
@@ -44,8 +44,6 @@ module Lazier
   #   @option pathname Extensions for path objects.
   # @return [Settings] The settings for the extensions.
   def self.load!(*what)
-    ::Lazier.localize if !Lazier.localized?
-
     what = ["object", "boolean", "string", "hash", "datetime", "math", "pathname"] if what.count == 0
     what.collect! { |w| ::Lazier.send("load_#{w}") }
 
@@ -125,28 +123,4 @@ module Lazier
       include ::Lazier::Pathname
     end
   end
-
-  # Get the list of available translation for the current locale.
-  #
-  # @return [R18N::Translation] The translation object.
-  def self.i18n
-    Lazier.localize if !Lazier.localized?
-    @i18n
-  end
-
-  # Set the current locale for messages.
-  #
-  # @param locale [String] The new locale. Default is the current system locale.
-  # @return [R18n::Translation] The new translation object.
-  def self.localize(locale = nil)
-    @i18n_locales_path ||= ::File.absolute_path(::Pathname.new(::File.dirname(__FILE__)).to_s + "/../locales/")
-    @i18n = R18n::I18n.new([locale, ENV["LANG"], R18n::I18n.system_locale].compact, @i18n_locales_path).t.lazier
-  end
-
-  # Check whether the i18n support have been enabled.
-  #
-  # @return [Boolean] Whether the i18n support have been enabled or not.
-  def self.localized?
-    @i18n.present?
-  end
 end

data/lib/lazier/i18n.rb

@@ -0,0 +1,42 @@
+# encoding: utf-8
+#
+# This file is part of the lazier gem. Copyright (C) 2013 and above Shogun <shogun_panda@me.com>.
+# Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
+#
+
+module Lazier
+  module I18n
+    # Setup all I18n translations.
+    #
+    # @param root [Symbol] The root level of translation.
+    # @param path [String] The path where the translation are stored.
+    def i18n_setup(root, path)
+      @i18n_root = root.to_sym
+      @i18n_locales_path = path
+    end
+
+    # Get the list of available translation for the current locale.
+    #
+    # @return [R18N::Translation] The translation object.
+    def i18n
+      @i18n ||= i18n_load_locale(nil)
+    end
+
+    # Set the current locale for messages.
+    #
+    # @param locale [String] The new locale. Default is the current system locale.
+    # @return [R18n::Translation] The new translation object.
+    def i18n=(locale)
+      @i18n = i18n_load_locale(locale)
+    end
+
+    private
+      # Loads a locale for messages.
+      #
+      # @param locale [Symbol] The new locale. Default is the current system locale.
+      # @return [R18n::Translation] The new translation object.
+      def i18n_load_locale(locale)
+        R18n::I18n.new([locale, ENV["LANG"], R18n::I18n.system_locale].compact, @i18n_locales_path.ensure_string).t.send(@i18n_root.ensure_string)
+      end
+  end
+end

data/lib/lazier/settings.rb

@@ -11,12 +11,16 @@ module Lazier
   # @attr [Hash] boolean_names String representations of booleans.
   # @attr [Hash] date_names String representations of days and months.
   # @attr [Hash] date_formats Custom date and time formats.
+  # @attr [R18n::Translation] i18n The translation object.
+
   class Settings
     attr_reader :format_number
     attr_reader :boolean_names
     attr_reader :date_names
     attr_reader :date_formats
 
+    include Lazier::I18n
+
     # Returns the singleton instance of the settings.
     #
     # @param force [Boolean] If to force recreation of the instance.
@@ -28,12 +32,27 @@ module Lazier
 
     # Initializes a new settings object.
     def initialize
+      self.i18n_setup(:lazier, ::File.absolute_path(::Pathname.new(::File.dirname(__FILE__)).to_s + "/../../locales/"))
+      self.setup
+    end
+
+    # Setups the current instance.
+    def setup
       self.setup_format_number
       self.setup_boolean_names
       self.setup_date_formats
       self.setup_date_names
     end
 
+    # Set the current locale for messages.
+    #
+    # @param locale [String] The new locale. Default is the current system locale.
+    # @return [R18n::Translation] The new translation object.
+    def i18n=(locale)
+      super(locale)
+      self.setup
+    end
+
     # Setups formatters for a number.
     # @see Object#format_number
     #
@@ -53,8 +72,8 @@ module Lazier
     # @param false_name [String] The string representation of `false`. Defaults to `No`.
     # @return [Hash] The new representations.
     def setup_boolean_names(true_name = nil, false_name = nil)
-      true_name ||= Lazier.i18n.boolean[0]
-      false_name ||= Lazier.i18n.boolean[1]
+      true_name ||= self.i18n.boolean[0]
+      false_name ||= self.i18n.boolean[1]
       @boolean_names = {true => true_name, false => false_name}
     end
 
@@ -92,10 +111,10 @@ module Lazier
     # @param short_days [Array] The abbreviated string representation of days.
     # @return [Hash] The new representations.
     def setup_date_names(long_months = nil, short_months = nil, long_days = nil, short_days = nil)
-      long_months = Lazier.i18n.date.long_months if long_months.blank?
-      short_months = Lazier.i18n.date.short_months if short_months.blank?
-      long_days = Lazier.i18n.date.long_days if long_days.blank?
-      short_days = Lazier.i18n.date.short_days if short_days.blank?
+      long_months = self.i18n.date.long_months if long_months.blank?
+      short_months = self.i18n.date.short_months if short_months.blank?
+      long_days = self.i18n.date.long_days if long_days.blank?
+      short_days = self.i18n.date.short_days if short_days.blank?
 
       @date_names = { long_months: long_months, short_months: short_months, long_days: long_days, short_days: short_days }
     end

data/lib/lazier/version.rb

@@ -13,10 +13,10 @@ module Lazier
     MAJOR = 2
 
     # The minor version.
-    MINOR = 3
+    MINOR = 4
 
     # The patch version.
-    PATCH = 1
+    PATCH = 0
 
     # The current version of lazier.
     STRING = [MAJOR, MINOR, PATCH].compact.join(".")

data/spec/lazier/datetime_spec.rb

@@ -13,9 +13,8 @@ describe Lazier::DateTime do
   let(:zone_without_dst) { ::ActiveSupport::TimeZone["International Date Line West"] }
 
   before(:all) do
-    ::Lazier.localize(:en)
-    ::Lazier::Settings.instance(true)
-    ::Lazier.load!
+    Lazier.load!
+    ::Lazier::Settings.instance.i18n = :en
   end
 
   describe ".days" do
@@ -206,8 +205,9 @@ describe Lazier::TimeZone do
   let(:zone_without_dst) { ::ActiveSupport::TimeZone["International Date Line West"] }
 
   before(:all) do
+    ::Lazier::Settings.instance(true)
+    ::Lazier::Settings.instance.i18n = :en
     ::Lazier.load!
-    ::Lazier.localize(:en)
   end
 
   describe ".rationalize_offset" do

data/spec/lazier/i18n_spec.rb

@@ -0,0 +1,63 @@
+# encoding: utf-8
+#
+# This file is part of the lazier gem. Copyright (C) 2013 and above Shogun <shogun_panda@me.com>.
+# Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
+#
+
+require "spec_helper"
+
+class Container
+  include Lazier::I18n
+end
+
+describe Lazier::I18n do
+  let(:object) { Container.new }
+
+  describe "#i18n_setup" do
+    it "should set the root and the path" do
+      object.i18n_setup("ROOT", "PATH")
+      expect(object.instance_variable_get(:@i18n_root)).to eq(:ROOT)
+      expect(object.instance_variable_get(:@i18n_locales_path)).to eq("PATH")
+    end
+  end
+
+  describe "#i18n" do
+    it "should call the private method if nothing is set" do
+      object.instance_variable_set(:@i18n, nil)
+      object.should_receive(:i18n_load_locale)
+      object.i18n
+    end
+  end
+
+  describe "#i18n=" do
+    it "should call the private method if nothing is set" do
+      object.should_receive(:i18n_load_locale).and_return("LOCALE")
+      object.i18n = :en
+      expect(object.instance_variable_get(:@i18n)).to eq("LOCALE")
+    end
+
+  end
+
+  describe "#i18n_load_locale" do
+    it "should set using system locale if called without arguments" do
+      object.i18n_setup("ROOT", "PATH")
+      R18n::I18n.should_receive(:new).with([ENV["LANG"], R18n::I18n.system_locale].compact, "PATH").and_call_original
+      object.i18n = nil
+    end
+
+    it "should set the requested locale" do
+      object.i18n_setup("ROOT", "PATH")
+      R18n::I18n.should_receive(:new).with([:it, ENV["LANG"], R18n::I18n.system_locale].compact, "PATH").and_call_original
+      object.i18n = :it
+    end
+
+    it "should call the root" do
+      Lazier.load!
+      t = Object.new
+      object.i18n_setup("ROOT", ::File.absolute_path(::Pathname.new(::File.dirname(__FILE__)).to_s + "/../../locales/"))
+      R18n::I18n.any_instance.should_receive(:t).and_return(t)
+      t.should_receive("ROOT")
+      object.i18n = :it
+    end
+  end
+end

data/spec/lazier/settings_spec.rb

@@ -13,6 +13,7 @@ describe Lazier::Settings do
 
   before(:all) do
     Lazier.load!
+    ::Lazier::Settings.instance.i18n = :en
   end
 
   describe ".instance" do
@@ -108,6 +109,7 @@ describe Lazier::Settings do
 
   describe "#setup_date_names" do
     it "should save names for days and months" do
+      reference.i18n = :en
       reference.setup_date_names
       reference.setup_date_formats({sdn: "%B %b %A %a"})
 

data/spec/lazier_spec.rb

@@ -42,38 +42,4 @@ describe Lazier do
       end
     end
   end
-
-  describe ".i18n" do
-    it "should run localize if needed" do
-      Lazier.instance_variable_set(:@i18n, nil)
-      Lazier.should_receive(:localize)
-      Lazier.i18n
-    end
-  end
-
-  describe ".localize" do
-    it "should set the right locale path" do
-      Lazier.localize
-      expect(Lazier.instance_variable_get(:@i18n_locales_path)).to eq(File.absolute_path(::Pathname.new(File.dirname(__FILE__)).to_s + "/../locales/"))
-    end
-
-    it "should set using system locale if called without arguments" do
-      R18n::I18n.should_receive(:new).with([ENV["LANG"], R18n::I18n.system_locale].compact, File.absolute_path(::Pathname.new(File.dirname(__FILE__)).to_s + "/../locales/")).and_call_original
-      Lazier.localize
-    end
-
-    it "should set the requested locale" do
-      R18n::I18n.should_receive(:new).with([:it, ENV["LANG"], R18n::I18n.system_locale].compact, File.absolute_path(::Pathname.new(File.dirname(__FILE__)).to_s + "/../locales/")).and_call_original
-      Lazier.localize(:it)
-    end
-  end
-
-  describe ".localize?" do
-    it "should respect the value of the internal variable" do
-      Lazier.instance_variable_set(:@i18n, nil)
-      expect(Lazier.localized?).to be_false
-      Lazier.localize(:en)
-      expect(Lazier.localized?).to be_true
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lazier
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -208,6 +208,7 @@ files:
 - doc/Lazier/Exceptions.html
 - doc/Lazier/Exceptions/Dump.html
 - doc/Lazier/Hash.html
+- doc/Lazier/I18n.html
 - doc/Lazier/Math.html
 - doc/Lazier/Math/ClassMethods.html
 - doc/Lazier/Object.html
@@ -237,6 +238,7 @@ files:
 - lib/lazier/datetime.rb
 - lib/lazier/exceptions.rb
 - lib/lazier/hash.rb
+- lib/lazier/i18n.rb
 - lib/lazier/math.rb
 - lib/lazier/object.rb
 - lib/lazier/pathname.rb
@@ -249,6 +251,7 @@ files:
 - spec/lazier/boolean_spec.rb
 - spec/lazier/datetime_spec.rb
 - spec/lazier/hash_spec.rb
+- spec/lazier/i18n_spec.rb
 - spec/lazier/math_spec.rb
 - spec/lazier/object_spec.rb
 - spec/lazier/pathname_spec.rb
@@ -285,6 +288,7 @@ test_files:
 - spec/lazier/boolean_spec.rb
 - spec/lazier/datetime_spec.rb
 - spec/lazier/hash_spec.rb
+- spec/lazier/i18n_spec.rb
 - spec/lazier/math_spec.rb
 - spec/lazier/object_spec.rb
 - spec/lazier/pathname_spec.rb