RubyGems - lazier - Versions diffs - 1.0.7 → 2.0.0 - Mend

lazier 1.0.7 → 2.0.0

Files changed (37) hide show

data/.travis.yml +1 -1
data/README.md +5 -2
data/doc/Lazier.html +472 -174
data/doc/Lazier/Boolean.html +9 -11
data/doc/Lazier/DateTime.html +59 -113
data/doc/Lazier/DateTime/ClassMethods.html +87 -121
data/doc/Lazier/Exceptions.html +3 -3
data/doc/Lazier/Exceptions/Dump.html +3 -3
data/doc/Lazier/Hash.html +17 -19
data/doc/Lazier/Math.html +3 -3
data/doc/Lazier/Math/ClassMethods.html +14 -48
data/doc/Lazier/Object.html +127 -139
data/doc/Lazier/Pathname.html +11 -12
data/doc/Lazier/Settings.html +189 -169
data/doc/Lazier/String.html +23 -27
data/doc/Lazier/TimeZone.html +202 -249
data/doc/Lazier/TimeZone/ClassMethods.html +110 -137
data/doc/Lazier/Version.html +7 -11
data/doc/_index.html +4 -4
data/doc/file.README.html +12 -9
data/doc/frames.html +1 -1
data/doc/index.html +12 -9
data/doc/method_list.html +72 -24
data/doc/top-level-namespace.html +3 -3
data/lazier.gemspec +8 -8
data/lib/lazier.rb +55 -59
data/lib/lazier/datetime.rb +74 -88
data/lib/lazier/math.rb +2 -18
data/lib/lazier/object.rb +14 -13
data/lib/lazier/settings.rb +8 -25
data/lib/lazier/version.rb +2 -2
data/spec/lazier/datetime_spec.rb +12 -20
data/spec/lazier/hash_spec.rb +1 -1
data/spec/lazier/object_spec.rb +3 -3
data/spec/lazier/settings_spec.rb +3 -3
data/spec/lazier_spec.rb +1 -19
metadata +145 -160

data/doc/frames.html CHANGED Viewed

@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-	<title>Documentation by YARD 0.8.2.1</title>
+	<title>Documentation by YARD 0.8.3</title>
 </head>
 <script type="text/javascript" charset="utf-8">
 window.onload = function() {

data/doc/index.html CHANGED Viewed

@@ -2,11 +2,11 @@
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII" />
 <title>
   File: README
-    &mdash; Documentation by YARD 0.8.2.1
+    &mdash; Documentation by YARD 0.8.3
 </title>
@@ -69,12 +69,14 @@
 <p>Several Ruby object enhancements.</p>
-<p><a href="http://github.com/ShogunPanda/lazier">http://github.com/ShogunPanda/lazier</a></p>
+<p><a href="http://sw.cow.tc/lazier">http://sw.cow.tc/lazier</a></p>
+<p><a href="http://rdoc.info/gems/lazier">http://rdoc.info/gems/lazier</a></p>
 <h2>Usage</h2>
-<pre class="code ruby"><code><span class='rubyid_require identifier id'>require</span> <span class='string val'>&quot;lazier&quot;</span>
-<span class='rubyid_Lazier constant id'>Lazier</span><span class='dot token'>.</span><span class='rubyid_load! fid id'>load!</span>
+<pre class="code ruby"><code><span class='id identifier rubyid_require'>require</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>lazier</span><span class='tstring_end'>&quot;</span></span>
+<span class='const'>Lazier</span><span class='period'>.</span><span class='id identifier rubyid_load!'>load!</span>
 </code></pre>
 <p>That&#39;s all!
@@ -94,14 +96,15 @@ See documentation for more informations.</p>
 <h2>Copyright</h2>
-<p>Copyright (C) 2013 and above Shogun <shogun_panda@me.com>.
-Licensed under the MIT license, which can be found at <a href="http://www.opensource.org/licenses/mit-license.php">http://www.opensource.org/licenses/mit-license.php</a>.</p>
+<p>Copyright (C) 2013 and above Shogun (<a href="mailto:shogun_panda@me.com">shogun_panda@me.com</a>).</p>
+<p>Licensed under the MIT license, which can be found at <a href="http://www.opensource.org/licenses/mit-license.php">http://www.opensource.org/licenses/mit-license.php</a>.</p>
 </div></div>
     <div id="footer">
-  Generated on Wed Jan 16 10:02:55 2013 by
+  Generated on Mon Jan 28 20:23:45 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.2.1 (ruby-1.8.7).
+  0.8.3 (ruby-1.9.3).
 </div>
   </body>

data/doc/method_list.html CHANGED Viewed

@@ -215,17 +215,17 @@
   <li class="r2 ">
-    <span class='object_link'><a href="Lazier/Settings.html#format_number-instance_method" title="Lazier::Settings#format_number (method)">#format_number</a></span>
+    <span class='object_link'><a href="Lazier/Object.html#format_number-instance_method" title="Lazier::Object#format_number (method)">#format_number</a></span>
-      <small>Lazier::Settings</small>
+      <small>Lazier::Object</small>
   </li>
   <li class="r1 ">
-    <span class='object_link'><a href="Lazier/Object.html#format_number-instance_method" title="Lazier::Object#format_number (method)">#format_number</a></span>
+    <span class='object_link'><a href="Lazier/Settings.html#format_number-instance_method" title="Lazier::Settings#format_number (method)">#format_number</a></span>
-      <small>Lazier::Object</small>
+      <small>Lazier::Settings</small>
   </li>
@@ -295,39 +295,87 @@
   <li class="r2 ">
-    <span class='object_link'><a href="Lazier.html#is_ruby_18%3F-class_method" title="Lazier.is_ruby_18? (method)">is_ruby_18?</a></span>
+    <span class='object_link'><a href="Lazier/DateTime/ClassMethods.html#is_valid%3F-instance_method" title="Lazier::DateTime::ClassMethods#is_valid? (method)">#is_valid?</a></span>
-      <small>Lazier</small>
+      <small>Lazier::DateTime::ClassMethods</small>
   </li>
   <li class="r1 ">
-    <span class='object_link'><a href="Lazier/DateTime/ClassMethods.html#is_valid%3F-instance_method" title="Lazier::DateTime::ClassMethods#is_valid? (method)">#is_valid?</a></span>
+    <span class='object_link'><a href="Lazier/TimeZone/ClassMethods.html#list_all-instance_method" title="Lazier::TimeZone::ClassMethods#list_all (method)">#list_all</a></span>
+      <small>Lazier::TimeZone::ClassMethods</small>
+  </li>
+  <li class="r2 ">
+    <span class='object_link'><a href="Lazier/DateTime/ClassMethods.html#list_timezones-instance_method" title="Lazier::DateTime::ClassMethods#list_timezones (method)">#list_timezones</a></span>
       <small>Lazier::DateTime::ClassMethods</small>
   </li>
+  <li class="r1 ">
+    <span class='object_link'><a href="Lazier.html#load%21-class_method" title="Lazier.load! (method)">load!</a></span>
+      <small>Lazier</small>
+  </li>
   <li class="r2 ">
-    <span class='object_link'><a href="Lazier/TimeZone/ClassMethods.html#list_all-instance_method" title="Lazier::TimeZone::ClassMethods#list_all (method)">#list_all</a></span>
+    <span class='object_link'><a href="Lazier.html#load_boolean-class_method" title="Lazier.load_boolean (method)">load_boolean</a></span>
-      <small>Lazier::TimeZone::ClassMethods</small>
+      <small>Lazier</small>
   </li>
   <li class="r1 ">
-    <span class='object_link'><a href="Lazier/DateTime/ClassMethods.html#list_timezones-instance_method" title="Lazier::DateTime::ClassMethods#list_timezones (method)">#list_timezones</a></span>
+    <span class='object_link'><a href="Lazier.html#load_datetime-class_method" title="Lazier.load_datetime (method)">load_datetime</a></span>
-      <small>Lazier::DateTime::ClassMethods</small>
+      <small>Lazier</small>
   </li>
   <li class="r2 ">
-    <span class='object_link'><a href="Lazier.html#load%21-class_method" title="Lazier.load! (method)">load!</a></span>
+    <span class='object_link'><a href="Lazier.html#load_hash-class_method" title="Lazier.load_hash (method)">load_hash</a></span>
+      <small>Lazier</small>
+  </li>
+  <li class="r1 ">
+    <span class='object_link'><a href="Lazier.html#load_math-class_method" title="Lazier.load_math (method)">load_math</a></span>
+      <small>Lazier</small>
+  </li>
+  <li class="r2 ">
+    <span class='object_link'><a href="Lazier.html#load_object-class_method" title="Lazier.load_object (method)">load_object</a></span>
+      <small>Lazier</small>
+  </li>
+  <li class="r1 ">
+    <span class='object_link'><a href="Lazier.html#load_pathname-class_method" title="Lazier.load_pathname (method)">load_pathname</a></span>
+      <small>Lazier</small>
+  </li>
+  <li class="r2 ">
+    <span class='object_link'><a href="Lazier.html#load_string-class_method" title="Lazier.load_string (method)">load_string</a></span>
       <small>Lazier</small>
@@ -415,17 +463,17 @@
   <li class="r1 ">
-    <span class='object_link'><a href="Lazier/TimeZone/ClassMethods.html#parameterize_zone-instance_method" title="Lazier::TimeZone::ClassMethods#parameterize_zone (method)">#parameterize_zone</a></span>
+    <span class='object_link'><a href="Lazier/DateTime/ClassMethods.html#parameterize_zone-instance_method" title="Lazier::DateTime::ClassMethods#parameterize_zone (method)">#parameterize_zone</a></span>
-      <small>Lazier::TimeZone::ClassMethods</small>
+      <small>Lazier::DateTime::ClassMethods</small>
   </li>
   <li class="r2 ">
-    <span class='object_link'><a href="Lazier/DateTime/ClassMethods.html#parameterize_zone-instance_method" title="Lazier::DateTime::ClassMethods#parameterize_zone (method)">#parameterize_zone</a></span>
+    <span class='object_link'><a href="Lazier/TimeZone/ClassMethods.html#parameterize_zone-instance_method" title="Lazier::TimeZone::ClassMethods#parameterize_zone (method)">#parameterize_zone</a></span>
-      <small>Lazier::DateTime::ClassMethods</small>
+      <small>Lazier::TimeZone::ClassMethods</small>
   </li>
@@ -591,17 +639,17 @@
   <li class="r1 ">
-    <span class='object_link'><a href="Lazier/DateTime/ClassMethods.html#unparameterize_zone-instance_method" title="Lazier::DateTime::ClassMethods#unparameterize_zone (method)">#unparameterize_zone</a></span>
+    <span class='object_link'><a href="Lazier/TimeZone/ClassMethods.html#unparameterize_zone-instance_method" title="Lazier::TimeZone::ClassMethods#unparameterize_zone (method)">#unparameterize_zone</a></span>
-      <small>Lazier::DateTime::ClassMethods</small>
+      <small>Lazier::TimeZone::ClassMethods</small>
   </li>
   <li class="r2 ">
-    <span class='object_link'><a href="Lazier/TimeZone/ClassMethods.html#unparameterize_zone-instance_method" title="Lazier::TimeZone::ClassMethods#unparameterize_zone (method)">#unparameterize_zone</a></span>
+    <span class='object_link'><a href="Lazier/DateTime/ClassMethods.html#unparameterize_zone-instance_method" title="Lazier::DateTime::ClassMethods#unparameterize_zone (method)">#unparameterize_zone</a></span>
-      <small>Lazier::TimeZone::ClassMethods</small>
+      <small>Lazier::DateTime::ClassMethods</small>
   </li>
@@ -631,17 +679,17 @@
   <li class="r2 ">
-    <span class='object_link'><a href="Lazier/String.html#value-instance_method" title="Lazier::String#value (method)">#value</a></span>
+    <span class='object_link'><a href="Lazier/Boolean.html#value-instance_method" title="Lazier::Boolean#value (method)">#value</a></span>
-      <small>Lazier::String</small>
+      <small>Lazier::Boolean</small>
   </li>
   <li class="r1 ">
-    <span class='object_link'><a href="Lazier/Boolean.html#value-instance_method" title="Lazier::Boolean#value (method)">#value</a></span>
+    <span class='object_link'><a href="Lazier/String.html#value-instance_method" title="Lazier::String#value (method)">#value</a></span>
-      <small>Lazier::Boolean</small>
+      <small>Lazier::String</small>
   </li>

data/doc/top-level-namespace.html CHANGED Viewed

@@ -6,7 +6,7 @@
 <title>
   Top Level Namespace
-    &mdash; Documentation by YARD 0.8.2.1
+    &mdash; Documentation by YARD 0.8.3
 </title>
@@ -103,9 +103,9 @@
 </div>
     <div id="footer">
-  Generated on Wed Jan 16 10:02:55 2013 by
+  Generated on Mon Jan 28 20:23:45 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.2.1 (ruby-1.8.7).
+  0.8.3 (ruby-1.9.3).
 </div>
   </body>

data/lazier.gemspec CHANGED Viewed

@@ -22,15 +22,15 @@ Gem::Specification.new do |gem|
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  gem.add_dependency("json", "~> 1.7.0")
-  gem.add_dependency("actionpack", "~> 3.0")
-  gem.add_dependency("tzinfo", "~> 0.3.0")
+  gem.add_dependency("json", "~> 1.7.6")
+  gem.add_dependency("actionpack", ">= 3.2.11") # We don't use ~> to enable use with 4.0
+  gem.add_dependency("tzinfo", "~> 0.3.35")
-  gem.add_development_dependency("rspec", "~> 2.11.0")
-  gem.add_development_dependency("rake", "~> 0.9.0")
-  gem.add_development_dependency("simplecov", "~> 0.7.0")
+  gem.add_development_dependency("rspec", "~> 2.12.0")
+  gem.add_development_dependency("rake", "~> 10.0.3")
+  gem.add_development_dependency("simplecov", "~> 0.7.1")
   gem.add_development_dependency("pry", ">= 0")
-  gem.add_development_dependency("yard", "~> 0.8.0")
+  gem.add_development_dependency("yard", "~> 0.8.3")
   gem.add_development_dependency("redcarpet", "~> 2.2.2")
-  gem.add_development_dependency("github-markup", "~> 0.7.0")
+  gem.add_development_dependency("github-markup", "~> 0.7.5")
 end

data/lib/lazier.rb CHANGED Viewed

@@ -4,8 +4,6 @@
 # Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
 #
-$KCODE='UTF8' if RUBY_VERSION < '1.9'
 require "json"
 require "tzinfo"
 require "active_support/all"
@@ -24,13 +22,6 @@ require "lazier/pathname"
 # Several Ruby object enhancements.
 module Lazier
-  # Checks if we are running under Ruby 1.8
-  #
-  # @return [Boolean] `true` for Ruby 1.8, `false` otherwise.
-  def self.is_ruby_18?
-    RUBY_VERSION =~ /^1\.8/
-  end
   # Returns the settings for the extensions
   #
   # @return [Settings] The settings for the extensions.
@@ -51,77 +42,82 @@ module Lazier
   # @return [Settings] The settings for the extensions.
   def self.load!(*what)
     what = ["object", "boolean", "string", "hash", "datetime", "math", "pathname"] if what.count == 0
-    what.collect! { |w| w.to_s }
+    what.collect! { |w| Lazier.send("load_#{w}") }
-    # Dependency resolving
-    what << "object" if what.include?("datetime")
-    what << "object" if what.include?("math")
-    what.compact.uniq!
+    yield if block_given?
+    ::Lazier::Settings.instance
+  end
-    if what.include?("object") then
-      ::Object.class_eval do
-        include ::Lazier::Object
-      end
+  # Loads Object extensions.
+  def self.load_object
+    ::Object.class_eval do
+      include ::Lazier::Object
     end
+  end
-    if what.include?("boolean") then
-      ::TrueClass.class_eval do
-        include ::Lazier::Object
-        include ::Lazier::Boolean
-      end
+  # Loads Boolean extensions.
+  def self.load_boolean
+    ::TrueClass.class_eval do
+      include ::Lazier::Object
+      include ::Lazier::Boolean
+    end
-      ::FalseClass.class_eval do
-        include ::Lazier::Object
-        include ::Lazier::Boolean
-      end
+    ::FalseClass.class_eval do
+      include ::Lazier::Object
+      include ::Lazier::Boolean
     end
+  end
-    if what.include?("string") then
-      ::String.class_eval do
-        include ::Lazier::String
-      end
+  # Loads String extensions.
+  def self.load_string
+    ::String.class_eval do
+      include ::Lazier::String
     end
+  end
-    if what.include?("hash") then
-      ::Hash.class_eval do
-        include ::Lazier::Hash
-      end
+  # Loads Hash extensions.
+  def self.load_hash
+    ::Hash.class_eval do
+      include ::Lazier::Hash
     end
+  end
-    if what.include?("datetime") then
-      ::Time.class_eval do
-        include ::Lazier::DateTime
-      end
+  # Loads DateTime extensions.
+  def self.load_datetime
+    Lazier.load_object
-      ::Date.class_eval do
-        include ::Lazier::DateTime
-      end
+    ::Time.class_eval do
+      include ::Lazier::DateTime
+    end
-      ::DateTime.class_eval do
-        include ::Lazier::DateTime
-      end
+    ::Date.class_eval do
+      include ::Lazier::DateTime
+    end
-      ::ActiveSupport::TimeZone.class_eval do
-        include ::Lazier::TimeZone
-      end
+    ::DateTime.class_eval do
+      include ::Lazier::DateTime
     end
-    if what.include?("math") then
-      ::Math.class_eval do
-        include ::Lazier::Math
-      end
+    ::ActiveSupport::TimeZone.class_eval do
+      include ::Lazier::TimeZone
     end
+  end
-    if what.include?("pathname") then
-      require "pathname"
+  # Loads Math extensions.
+  def self.load_math
+    Lazier.load_object
-      ::Pathname.class_eval do
-        include ::Lazier::Pathname
-      end
+    ::Math.class_eval do
+      include ::Lazier::Math
     end
+  end
-    yield if block_given?
+  # Loads Pathname extensions.
+  def self.load_pathname
+    require "pathname"
-    ::Lazier::Settings.instance
+    ::Pathname.class_eval do
+      include ::Lazier::Pathname
+    end
   end
 end

data/lib/lazier/datetime.rb CHANGED Viewed

@@ -19,7 +19,7 @@ module Lazier
       def days(short = true)
         days = ::Lazier.settings.date_names[short ? :short_days : :long_days]
         (1..7).to_a.collect { |i|
-          {:value => i.to_s, :label=> days[i - 1]}
+          {value: i.to_s, label: days[i - 1]}
         }
       end
@@ -32,7 +32,7 @@ module Lazier
       def months(short = true)
         months = ::Lazier.settings.date_names[short ? :short_months : :long_months]
         (1..12).collect { |i|
-          {:value => i.to_s.rjust(2, "0"), :label=> months.at(i - 1)}
+          {value: i.to_s.rjust(2, "0"), label: months.at(i - 1)}
         }
       end
@@ -56,7 +56,7 @@ module Lazier
       # @return [Array] A range of years. Every entry is
       def years(offset = 10, also_future = true, reference = nil, as_objects = false)
         y = reference || ::Date.today.year
-        (y - offset..(also_future ? y + offset : y)).collect { |year| as_objects ? {:value => year, :label => year} : year }
+        (y - offset..(also_future ? y + offset : y)).collect { |year| as_objects ? {value: year, label: year} : year }
       end
       # Returns all the availabe timezones.
@@ -125,21 +125,10 @@ module Lazier
         year = ::Date.today.year if !year.is_integer?
         # Compute using Anonymouse Gregorian Algorithm: http://en.wikipedia.org/wiki/Computus#Anonymous_Gregorian_algorithm
-        a = year % 19
-        b = (year / 100.0).floor
-        c = year % 100
-        d = (b / 4.0).floor
-        e = b % 4
-        f = ((b + 8) / 25.0).floor
-        g = ((b - f + 1) / 3.0).floor
-        h = ((19 * a) + b - d - g + 15) % 30
-        i = (c / 4.0).floor
-        k = c % 4
-        l = (32 + (2 * e) + (2 * i) - h - k) % 7
-        m = ((a + (11 * h) + (22 * l)) / 451.0).floor
-        day = ((h + l - (7 * m) + 114) % 31) + 1
-        month = ((h + l - (7 * m) + 114) / 31.0).floor
+        a, b, c = easter_independent(year)
+        x, e, i, k = easter_dependent(b, c)
+        day, month = easter_summarize(easter_finalize(a, x, e, i, k))
         ::Date.civil(year, month, day)
       end
@@ -171,6 +160,53 @@ module Lazier
         rv
       end
+      private
+        # Part one of Easter calculation.
+        #
+        # @param year [Fixnum] The year to compute the date for.
+        # @return [Array] Partial variables for calculus.
+        def easter_independent(year)
+          [year % 19, (year / 100.0).floor, year % 100]
+        end
+        # Part two of Easter calculation.
+        #
+        # @param b [Fixnum] Variable from #easter_independent.
+        # @param c [Fixnum] Variable from #easter_independent.
+        # @return [Array] Partial variables for calculus.
+        def easter_dependent(b, c)
+          [
+            b - (b / 4.0).floor - ((b - ((b + 8) / 25.0).floor + 1) / 3.0).floor,
+            b % 4,
+            (c / 4.0).floor,
+            c % 4
+          ]
+        end
+        # Part three of Easter calculation.
+        #
+        # @param a [Fixnum] Variable from #easter_independent.
+        # @param x [Fixnum] Variable from #easter_independent.
+        # @param e [Fixnum] Variable from #easter_dependent.
+        # @param i [Fixnum] Variable from #easter_dependent.
+        # @param k [Fixnum] Variable from #easter_dependent.
+        # @return [Array] Partial variables for calculus.
+        def easter_finalize(a, x, e, i, k)
+          h = ((19 * a) + x + 15) % 30
+          l = (32 + (2 * e) + (2 * i) - h - k) % 7
+          [h, l, ((a + (11 * h) + (22 * l)) / 451.0).floor]
+        end
+        # Final part of Easter calculation.
+        #
+        # @param prev [Fixnum] Variable from #easter_finalize.
+        # @return [Array] Day and month of Easter daye.
+        def easter_summarize(prev)
+          h, l, m = prev
+          [((h + l - (7 * m) + 114) % 31) + 1, ((h + l - (7 * m) + 114) / 31.0).floor]
+        end
     end
     # Returns the UTC::Time representation of the current datetime.
@@ -210,32 +246,8 @@ module Lazier
     def lstrftime(format = nil)
       rv = nil
       names = ::Lazier.settings.date_names
-      final_format = ::DateTime.custom_format(format).ensure_string.gsub(/(%{1,2}:?[abz])/i) do |match|
-        mrv = match
-        # Handling of %z is to fix ruby 1.8 bug in OSX: http://bugs.ruby-lang.org/issues/2396
-        if match !~ /^%%/ then
-          case match
-            when "%a"
-              mrv = names[:short_days][self.wday]
-            when "%A"
-              mrv = names[:long_days][self.wday]
-            when "%b"
-              mrv = names[:short_months][self.month - 1]
-            when "%B"
-              mrv = names[:long_months][self.month - 1]
-            when "%z"
-              mrv = ::Lazier.is_ruby_18? ? self.formatted_offset(false) : nil
-            when "%:z"
-              mrv = ::Lazier.is_ruby_18? ? self.formatted_offset(true) : nil
-          end
-        end
-        mrv ? mrv.sub("%", "%%") : match
-      end
-      self.strftime(final_format)
+      substitutions = {"%a" => names[:short_days][self.wday], "%A" => names[:long_days][self.wday], "%b" => names[:short_months][self.month - 1], "%B" => names[:long_months][self.month - 1]}
+      self.strftime(::DateTime.custom_format(format).ensure_string.gsub(/(?<!%)(%[ab])/i) {|mo| substitutions[mo] })
     end
     # Formats a datetime in the current timezone.
@@ -305,23 +317,13 @@ module Lazier
       # @return [Array] A list of names of timezones.
       def list_all(with_dst = true, dst_label = nil)
         dst_label ||= "(DST)"
-        dst_key = "DST-#{dst_label}"
-        @zones_names ||= { "STANDARD" => ::ActiveSupport::TimeZone.all.collect(&:to_s) }
-        if with_dst && @zones_names[dst_key].blank? then
-          @zones_names[dst_key] = []
-          ::ActiveSupport::TimeZone.all.each do |zone|
-            zone.aliases.each do |zone_alias|
-              @zones_names[dst_key] << zone.to_str(zone_alias)
-              @zones_names[dst_key] << zone.to_str_with_dst(dst_label, nil, zone_alias) if zone.uses_dst? && zone_alias !~ /(#{Regexp.quote(dst_label)})$/
-            end
-          end
-          @zones_names[dst_key]= @zones_names[dst_key].uniq.compact.sort { |a,b| ::ActiveSupport::TimeZone.compare(a, b) } # Sort by name
-        end
+        @zones_names ||= { "STANDARD" => ::ActiveSupport::TimeZone.all.collect(&:to_s) }
+        @zones_names["DST[#{dst_label}]-STANDARD"] ||= ::ActiveSupport::TimeZone.all.collect { |zone|
+          zone.aliases.collect { |zone_alias| [zone.to_str(zone_alias), (zone.uses_dst? && zone_alias !~ /(#{Regexp.quote(dst_label)})$/) ? zone.to_str_with_dst(dst_label, nil, zone_alias) : nil] }
+        }.flatten.compact.uniq.sort { |a,b| ::ActiveSupport::TimeZone.compare(a, b) } # Sort by name
-        @zones_names[with_dst ? dst_key : "STANDARD"]
+        @zones_names["#{with_dst ? "DST[#{dst_label}]-" : ""}STANDARD"]
       end
       # Returns a string representation of a timezone.
@@ -382,32 +384,17 @@ module Lazier
     end
     # Returns a list of valid aliases (city names) for this timezone (basing on offset).
-    #
-    # @param dst_label [String] Label for the DST indication. Defaults to `(DST)`.
     # @return [Array] A list of aliases for this timezone
-    def aliases(dst_label = nil)
-      reference = self.name
-      reference = self.class::MAPPING[self.name] if self.class::MAPPING.has_key?(self.name) # We are an alias
-      reference = reference.gsub("_", " ")
-      if @aliases.blank? then
-        # First we search for aliases by name
-        @aliases = [reference]
-        self.class::MAPPING.each do |name, zone|
-          if zone.gsub("_", " ") == reference then
-            if name == "International Date Line West" || name == "UTC" || name.include?("(US & Canada)")
-              @aliases << name
-            else
-              @aliases << reference.gsub(/\/.*/, "/" + name)
-            end
-          end
-        end
+    def aliases
+      reference = self.class::MAPPING.fetch(self.name, self.name).gsub("_", " ")
-        @aliases = @aliases.uniq.compact.sort
-      end
-      @aliases
+      @aliases ||= ([reference] + self.class::MAPPING.collect { |name, zone|
+        if zone.gsub("_", " ") == reference then
+          (["International Date Line West", "UTC"].include?(name) || name.include?("(US & Canada)")) ? name : reference.gsub(/\/.*/, "/#{name}")
+        else
+          nil
+        end
+      }).uniq.compact.sort
     end
     # Returns the current offset for this timezone, taking care of Daylight Saving Time (DST).
@@ -479,19 +466,18 @@ module Lazier
     # @param year [Fixnum] The year to which refer to. Defaults to the current year.
     # @return [Fixnum|Rational] The correction for dst.
     def dst_correction(rational = false, year = nil)
-      period = self.dst_period(year)
-      rv = period ? period.std_offset : 0
-      rational ? self.class.rationalize_offset(rv) : rv
+      self.dst_offset(rational, year, :std_offset)
     end
     # Returns the standard offset for this timezone timezone when the Daylight Saving Time (DST) is active.
     #
     # @param rational [Boolean] If to return the offset as a Rational.
     # @param year [Fixnum] The year to which refer to. Defaults to the current year.
+    # @param method [Symbol] The method to use for getting the offset. Default is total offset from UTC.
     # @return [Fixnum|Rational] The DST offset for this timezone or `0`, if the timezone doesn't use DST for that year.
-    def dst_offset(rational = false, year = nil)
+    def dst_offset(rational = false, year = nil, method = :utc_total_offset)
       period = self.dst_period(year)
-      rv = period ? period.utc_total_offset : 0
+      rv = period ? period.send(method) : 0
       rational ? self.class.rationalize_offset(rv) : rv
     end