lazier 2.4.0 → 2.5.0

data/doc/Lazier/Version.html

@@ -134,7 +134,7 @@
 
 </div>
         </dt>
-        <dd><pre class="code"><span class='int'>3</span></pre></dd>
+        <dd><pre class="code"><span class='int'>5</span></pre></dd>
       
         <dt id="PATCH-constant" class="">PATCH =
           <div class="docstring">
@@ -149,7 +149,7 @@
 
 </div>
         </dt>
-        <dd><pre class="code"><span class='int'>1</span></pre></dd>
+        <dd><pre class="code"><span class='int'>0</span></pre></dd>
       
         <dt id="STRING-constant" class="">STRING =
           <div class="docstring">
@@ -180,7 +180,7 @@
 </div>
 
     <div id="footer">
-  Generated on Tue Jan 29 20:37:33 2013 by
+  Generated on Thu Jan 31 20:15:55 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/doc/_index.html

@@ -312,7 +312,7 @@
 </div>
 
     <div id="footer">
-  Generated on Tue Jan 29 20:37:32 2013 by
+  Generated on Thu Jan 31 20:15:55 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/doc/file.README.html

@@ -102,7 +102,7 @@ See documentation for more informations.</p>
 </div></div>
 
     <div id="footer">
-  Generated on Tue Jan 29 20:37:32 2013 by
+  Generated on Thu Jan 31 20:15:55 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/doc/index.html

@@ -102,7 +102,7 @@ See documentation for more informations.</p>
 </div></div>
 
     <div id="footer">
-  Generated on Tue Jan 29 20:37:32 2013 by
+  Generated on Thu Jan 31 20:15:55 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/doc/top-level-namespace.html

@@ -103,7 +103,7 @@
 </div>
 
     <div id="footer">
-  Generated on Tue Jan 29 20:37:32 2013 by
+  Generated on Thu Jan 31 20:15:55 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

@@ -89,16 +89,10 @@ module Lazier
   def self.load_datetime
     Lazier.load_object
 
-    ::Time.class_eval do
-      include ::Lazier::DateTime
-    end
-
-    ::Date.class_eval do
-      include ::Lazier::DateTime
-    end
-
-    ::DateTime.class_eval do
-      include ::Lazier::DateTime
+    [::Time, ::Date, ::DateTime].each do |c|
+      c.class_eval do
+        include ::Lazier::DateTime
+      end
     end
 
     ::ActiveSupport::TimeZone.class_eval do

data/lib/lazier/datetime.rb

@@ -125,9 +125,11 @@ 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, b, c = easter_independent(year)
-        x, e, i, k = easter_dependent(b, c)
-        day, month = easter_summarize(easter_finalize(a, x, e, i, k))
+        data = easter_start(year)
+        data = easter_part_1(data)
+        data = easter_part_2(year, data)
+        data = easter_part_3(year,  data)
+        day, month = easter_end(data)
 
         ::Date.civil(year, month, day)
       end
@@ -165,17 +167,16 @@ module Lazier
         # 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)
+        # @return [Array] Partial variables for #easter_part_1.
+        def easter_start(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)
+        # @param data [Fixnum] Partial variables from #easter_start.
+        # @return [Array] Partial variables for #easter_part_2.
+        def easter_part_1(data)
+          a, b, c = data
           [
             b - (b / 4.0).floor - ((b - ((b + 8) / 25.0).floor + 1) / 3.0).floor,
             b % 4,
@@ -186,25 +187,30 @@ module Lazier
 
         # 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)
+        # @param data [Fixnum] Partial variables from #easter_part_1.
+        # @return [Array] Partial variables for #easter_part_3.
+        def easter_part_2(year, data)
+          a = year % 19
+          x, e, i, k = data
           h = ((19 * a) + x + 15) % 30
-          l = (32 + (2 * e) + (2 * i) - h - k) % 7
+          [h, (32 + (2 * e) + (2 * i) - h - k) % 7]
+        end
 
+        # Part four of Easter calculation
+        # @param data [Arrays] Partial variables from #easter_part_2.
+        # @return [Array] Partial variables for #easter_end.
+        def easter_part_3(year, data)
+          a = year % 19
+          h, l = data
           [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
+        # @param data [Fixnum] Variable from #easter_part_3.
+        # @return [Array] Day and month of Easter day.
+        def easter_end(data)
+          h, l, m = data
           [((h + l - (7 * m) + 114) % 31) + 1, ((h + l - (7 * m) + 114) / 31.0).floor]
         end
     end
@@ -244,10 +250,7 @@ module Lazier
     # @param format [String] A format or a custom format name to use for formatting.
     # @return [String] The formatted date.
     def lstrftime(format = nil)
-      rv = nil
-      names = ::Lazier.settings.date_names
-      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] })
+      self.strftime(::DateTime.custom_format(format).ensure_string.gsub(/(?<!%)(%[ab])/i) {|mo| localize_time_component(mo) })
     end
 
     # Formats a datetime in the current timezone.
@@ -266,6 +269,17 @@ module Lazier
     def local_lstrftime(format = nil)
       (self.respond_to?(:in_time_zone) ? self.in_time_zone : self).lstrftime(format)
     end
+
+    private
+      # Returns a component of the date in the current locale.
+      #
+      # @param component [String] The component to localize.
+      # @return [String] The localized component.
+      def localize_time_component(component)
+        type = {"%a" => :short_days, "%A" => :long_days, "%b" => :short_months, "%B" => :long_months}.fetch(component, "")
+        index = component =~ /%a/i ? self.wday : self.month - 1
+        ::Lazier.settings.date_names.fetch(type, [])[index]
+      end
   end
 
   # Extensions for timezone objects.
@@ -319,9 +333,7 @@ module Lazier
         dst_label ||= "(DST)"
 
         @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["DST[#{dst_label}]-STANDARD"] ||= ::ActiveSupport::TimeZone.all.collect { |zone| fetch_aliases(zone, dst_label) }.flatten.compact.uniq.sort { |a,b| ::ActiveSupport::TimeZone.compare(a, b) } # Sort by name
 
         @zones_names["#{with_dst ? "DST[#{dst_label}]-" : ""}STANDARD"]
       end
@@ -381,20 +393,24 @@ module Lazier
         right = right.to_str if right.is_a?(::ActiveSupport::TimeZone)
         left.ensure_string.split(" ", 2)[1] <=> right.ensure_string.split(" ", 2)[1]
       end
+
+      private
+        # Returns a list of aliases for a given time zone.
+        #
+        # @param zone [ActiveSupport::TimeZone] The zone.
+        # @param dst_label [String] Label for the DST indication. Defaults to `(DST)`.
+        def fetch_aliases(zone, dst_label = "(DST)")
+          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]
+          }
+        end
     end
 
     # Returns a list of valid aliases (city names) for this timezone (basing on offset).
     # @return [Array] A list of aliases for this timezone
     def aliases
       reference = self.class::MAPPING.fetch(self.name, self.name).gsub("_", " ")
-
-      @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
+      @aliases ||= ([reference] + self.class::MAPPING.collect { |name, zone| format_alias(name, zone, reference) }).uniq.compact.sort
     end
 
     # Returns the current offset for this timezone, taking care of Daylight Saving Time (DST).
@@ -543,5 +559,20 @@ module Lazier
       rv = self.to_str_with_dst(dst_label, year, name)
       rv ? ::ActiveSupport::TimeZone.parameterize_zone(rv) : nil
     end
+
+    private
+      # Formats a time zone alias.
+      #
+      # @param name [String] The zone name.
+      # @param zone [String] The zone.
+      # @param reference [String] The main name for the zone.
+      # @return [String|nil] The formatted alias.
+      def format_alias(name, zone, reference)
+        if zone.gsub("_", " ") == reference then
+          (["International Date Line West", "UTC"].include?(name) || name.include?("(US & Canada)")) ? name : reference.gsub(/\/.*/, "/#{name}")
+        else
+          nil
+        end
+      end
   end
 end

data/lib/lazier/i18n.rb

@@ -5,6 +5,7 @@
 #
 
 module Lazier
+  # Provides an easy way to localized messages in a class.
   module I18n
     # Setup all I18n translations.
     #

data/lib/lazier/version.rb

@@ -13,7 +13,7 @@ module Lazier
     MAJOR = 2
 
     # The minor version.
-    MINOR = 4
+    MINOR = 5
 
     # The patch version.
     PATCH = 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lazier
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-30 00:00:00.000000000 Z
+date: 2013-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json