lazier 2.8.1 → 3.0.0

data/doc/top-level-namespace.html

@@ -6,13 +6,13 @@
 <title>
   Top Level Namespace
   
-    &mdash; Documentation by YARD 0.8.5.2
+    &mdash; Documentation by YARD 0.8.6.1
   
 </title>
 
-  <link rel="stylesheet" href="css/style.css" type="text/css" media="screen" charset="utf-8" />
+  <link rel="stylesheet" href="css/style.css" type="text/css" charset="utf-8" />
 
-  <link rel="stylesheet" href="css/common.css" type="text/css" media="screen" charset="utf-8" />
+  <link rel="stylesheet" href="css/common.css" type="text/css" charset="utf-8" />
 
 <script type="text/javascript" charset="utf-8">
   hasFrames = window.top.frames.main ? true : false;
@@ -103,9 +103,9 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Apr 13 11:56:53 2013 by
+  Generated on Fri May 17 12:03:20 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.5.2 (ruby-1.9.3).
+  0.8.6.1 (ruby-1.9.3).
 </div>
 
   </body>

data/lazier.gemspec

@@ -24,8 +24,9 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">= 1.9.3"
 
-  gem.add_dependency("json", "~> 1.7.7")
+  gem.add_dependency("json", "~> 1.8.0")
   gem.add_dependency("actionpack", ">= 3.2.13") # We don't use ~> to enable use with 4.0
-  gem.add_dependency("tzinfo", "~> 0.3.35")
-  gem.add_dependency("r18n-desktop", "~> 1.1.4")
+  gem.add_dependency("tzinfo", "~> 0.3.37")
+  gem.add_dependency("r18n-desktop", "~> 1.1.5")
+  gem.add_dependency("hashie", "~> 2.0.5")
 end

data/lib/lazier.rb

@@ -9,6 +9,7 @@ require "tzinfo"
 require "active_support/all"
 require "action_view"
 require "r18n-desktop"
+require "hashie"
 
 require "lazier/version" if !defined?(Lazier::Version)
 require "lazier/exceptions"
@@ -45,18 +46,14 @@ module Lazier
   #   @option pathname Extensions for path objects.
   # @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| ::Lazier.send("load_#{w}") }
-
+    (what.present? ? what : ["object", "boolean", "string", "hash", "datetime", "math", "pathname"]).each { |w| ::Lazier.send("load_#{w}") }
     yield if block_given?
     ::Lazier::Settings.instance
   end
 
   # Loads Object extensions.
   def self.load_object
-    ::Object.class_eval do
-      include ::Lazier::Object
-    end
+    ::Object.class_eval { include ::Lazier::Object }
   end
 
   # Loads Boolean extensions.
@@ -74,14 +71,13 @@ module Lazier
 
   # Loads String extensions.
   def self.load_string
-    ::String.class_eval do
-      include ::Lazier::String
-    end
+    ::String.class_eval { include ::Lazier::String }
   end
 
   # Loads Hash extensions.
   def self.load_hash
     ::Hash.class_eval do
+      include Hashie::Extensions::MethodAccess
       include ::Lazier::Hash
     end
   end
@@ -91,32 +87,22 @@ module Lazier
     Lazier.load_object
 
     [::Time, ::Date, ::DateTime].each do |c|
-      c.class_eval do
-        include ::Lazier::DateTime
-      end
+      c.class_eval { include ::Lazier::DateTime }
     end
 
-    ::ActiveSupport::TimeZone.class_eval do
-      include ::Lazier::TimeZone
-    end
+    ::ActiveSupport::TimeZone.class_eval { include ::Lazier::TimeZone }
   end
 
   # Loads Math extensions.
   def self.load_math
     Lazier.load_object
-
-    ::Math.class_eval do
-      include ::Lazier::Math
-    end
+    ::Math.class_eval { include ::Lazier::Math }
   end
 
   # Loads Pathname extensions.
   def self.load_pathname
     require "pathname"
-
-    ::Pathname.class_eval do
-      include ::Lazier::Pathname
-    end
+    ::Pathname.class_eval { include ::Lazier::Pathname }
   end
 
   # Finds a class to instantiate.

data/lib/lazier/boolean.rb

@@ -13,7 +13,7 @@ module Lazier
     #
     # @return [Fixnum] `1` for `true`, `0` for `false`.
     def to_i
-      self.is_a?(TrueClass) ? 1 : 0
+      is_a?(TrueClass) ? 1 : 0
     end
 
     # Returns the boolean itself for use in form helpers.

data/lib/lazier/datetime.rb

@@ -17,11 +17,9 @@ module Lazier
       # @param short [Boolean] If return the abbreviated representations.
       # @return [Array] Return string representations of days.
       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]}
+        ::Lazier.settings.date_names[short ? :short_days : :long_days].collect.with_index {|label, index|
+          {value: (index + 1).to_s, label: label}
         }
-
       end
 
       # Returns strings representations of months.
@@ -30,9 +28,8 @@ module Lazier
       # @param short [Boolean] If return the abbreviated representations.
       # @return [Array] Return string representations of months.
       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)}
+        ::Lazier.settings.date_names[short ? :short_months : :long_months].collect.with_index {|label, index|
+          {value: (index + 1).to_s.rjust(2, "0"), label: label}
         }
       end
 
@@ -128,7 +125,7 @@ module Lazier
         data = easter_start(year)
         data = easter_part_1(data)
         data = easter_part_2(year, data)
-        data = easter_part_3(year,  data)
+        data = easter_part_3(year, data)
         day, month = easter_end(data)
 
         ::Date.civil(year, month, day)
@@ -140,7 +137,7 @@ module Lazier
       # @param key [Symbol] The name of the format to search.
       # @return [String] The format or the name itself (if the format has not been found).
       def custom_format(key)
-        ::Lazier.settings.date_formats.fetch(key.to_sym, key).ensure_string
+        ::Lazier.settings.date_formats.fetch(key, key)
       end
 
       # Checks if the date is valid against to a specific format.
@@ -150,17 +147,7 @@ module Lazier
       # @param format [String] The format to check the value against.
       # @return [Boolean] `true` if the value is valid against the format, `false` otherwise.
       def is_valid?(value, format = "%F %T")
-        rv = true
-
-        format = self.custom_format(format)
-
-        begin
-          ::DateTime.strptime(value.ensure_string, format)
-        rescue => _
-          rv = false
-        end
-
-        rv
+        !(::DateTime.strptime(value, self.custom_format(format)) rescue nil).nil?
       end
 
       private
@@ -177,6 +164,7 @@ module Lazier
         # @return [Array] Partial variables for #easter_part_2.
         def easter_part_1(data)
           _, b, c = data
+
           [
             b - (b / 4.0).floor - ((b - ((b + 8) / 25.0).floor + 1) / 3.0).floor,
             b % 4,
@@ -219,8 +207,7 @@ module Lazier
     #
     # @return [UTC::Time] The UTC::Time representation of the current datetime.
     def utc_time
-      ua = (self.respond_to?(:utc) ? self : self.to_datetime).utc
-      ::Time.utc(ua.year, ua.month, ua.day, ua.hour, ua.min, ua.sec)
+      utc.to_time
     end
 
     # Returns the number of months passed between the beginning of the base year and the current date.
@@ -233,15 +220,14 @@ module Lazier
     # @param base [DateTime] The base year to start computation from. Default to current year.
     # @return [Fixnum] Returns the number of months passed between the beginning of the base year and the current date.
     def in_months(base = nil)
-      base ||= ::Date.today.year
-      ((self.year) - base) * 12 + self.month
+      (year - (base || ::Date.today.year)) * 12 + month
     end
 
     # Returns the current month number with leading 0.
     #
     # @return [String] The current month number with leading 0.
     def padded_month
-      self.month.to_s.rjust(2, "0")
+      month.indexize
     end
 
     # Formats a datetime, looking up also custom formats.
@@ -250,7 +236,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)
-      self.strftime(::DateTime.custom_format(format).ensure_string.gsub(/(?<!%)(%[ab])/i) {|mo| localize_time_component(mo) })
+      strftime(::DateTime.custom_format(format.to_s).gsub(/(?<!%)(%[ab])/i) {|mo| localize_time_component(mo) })
     end
 
     # Formats a datetime in the current timezone.
@@ -258,7 +244,7 @@ module Lazier
     # @param format [String] The format to use for formatting.
     # @return [String] The formatted date.
     def local_strftime(format = nil)
-      (self.respond_to?(:in_time_zone) ? self.in_time_zone : self).strftime(::DateTime.custom_format(format))
+      (respond_to?(:in_time_zone) ? in_time_zone : self).strftime(::DateTime.custom_format(format))
     end
 
     # Formats a datetime in the current timezone, looking up also custom formats.
@@ -267,7 +253,7 @@ module Lazier
     # @param format [String] A format or a custom format name.
     # @return [String] The formatted date.
     def local_lstrftime(format = nil)
-      (self.respond_to?(:in_time_zone) ? self.in_time_zone : self).lstrftime(format)
+      (respond_to?(:in_time_zone) ? in_time_zone : self).lstrftime(format)
     end
 
     private
@@ -277,8 +263,8 @@ module Lazier
       # @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]
+        index = component =~ /%a/i ? wday : month - 1
+        ::Lazier.settings.date_names[type][index]
       end
   end
 
@@ -293,8 +279,7 @@ module Lazier
       # @param offset [Fixnum] The offset to convert.
       # @return [Rational] The converted offset.
       def rationalize_offset(offset)
-        offset = offset.try(:offset) if !offset.is_a?(::Fixnum)
-        ::TZInfo::OffsetRationals.rational_for_offset(offset.to_integer)
+        ::TZInfo::OffsetRationals.rational_for_offset(offset.is_a?(::Fixnum) ? offset : offset.offset)
       end
 
       # Returns a +HH:MM formatted representation of the offset.
@@ -303,8 +288,7 @@ module Lazier
       # @param colon [Boolean] If to put the colon in the output string.
       # @return [String] The formatted offset.
       def format_offset(offset, colon = true)
-        offset = (offset * 86400).to_i if offset.is_a?(::Rational)
-        offset.is_a?(::Fixnum) ? self.seconds_to_utc_offset(offset, colon) : nil
+        self.seconds_to_utc_offset(offset.is_a?(::Rational) ? (offset * 86400).to_i : offset, colon)
       end
 
       # Find a zone by its name.
@@ -367,20 +351,18 @@ module Lazier
       # @param dst_label [String] Label for the DST indication. Defaults to `(DST)`.
       # @return [String|TimeZone] The found timezone or `nil` if the zone is not valid.
       def unparameterize_zone(tz, as_string = false, dst_label = nil)
-        tz = self.parameterize_zone(tz, false)
+        tz = parameterize_zone(tz, false)
+        matcher = /(#{Regexp.quote(tz)})$/
+
         rv = catch(:zone) do
-          self.list_all(true, dst_label).each do |zone|
-            throw(:zone, zone) if self.parameterize_zone(zone, false) =~ /(#{Regexp.quote(tz)})$/
+          list_all(true, dst_label).each do |zone|
+            throw(:zone, zone) if parameterize_zone(zone, false) =~ matcher
           end
 
           nil
         end
 
-        if rv then
-          (as_string ? rv : self.find(rv, dst_label))
-        else
-          nil
-        end
+        rv ? (as_string ? rv : self.find(rv, dst_label)) : nil
       end
 
       # Compares two timezones. They are sorted by the location name.
@@ -400,8 +382,10 @@ module Lazier
         # @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)")
+          matcher = /(#{Regexp.quote(dst_label)})$/
+
           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]
+            [zone.to_str(zone_alias), (zone.uses_dst? && zone_alias !~ matcher) ? zone.to_str_with_dst(dst_label, nil, zone_alias) : nil]
           }
         end
     end
@@ -409,7 +393,7 @@ module Lazier
     # 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("_", " ")
+      reference = self.class::MAPPING.fetch(name, name).gsub("_", " ")
       @aliases ||= ([reference] + self.class::MAPPING.collect { |name, zone| format_alias(name, zone, reference) }).uniq.compact.sort
     end
 
@@ -420,20 +404,22 @@ module Lazier
     # @return [Fixnum|Rational] The offset of this timezone.
     def current_offset(rational = false, date = nil)
       date ||= ::DateTime.now
-      rv = (self.period_for_utc(date.utc).dst? ? self.dst_offset : self.offset)
+      rv = (period_for_utc(date.utc).dst? ? dst_offset : offset)
       rational ? self.class.rationalize_offset(rv) : rv
     end
 
-    # Return the current alias for this timezone.
+    # Returns the current alias for this timezone.
+    #
+    # @return [String] The current alias or the first alias of the current timezone.
     def current_alias
-      identifier = self.tzinfo.identifier
+      identifier = tzinfo.identifier
 
       catch(:alias) do
-        self.aliases.each do |a|
+        aliases.each do |a|
           throw(:alias, a) if a == identifier
         end
 
-        self.aliases.first
+        aliases.first
       end
     end
 
@@ -442,8 +428,7 @@ module Lazier
     # @param rational [Boolean] If to return the offset as a Rational.
     # @return [Fixnum|Rational] The offset of this timezone.
     def offset(rational = false)
-      rv = self.utc_offset
-      rational ? self.class.rationalize_offset(rv) : rv
+      rational ? self.class.rationalize_offset(utc_offset) : utc_offset
     end
 
     # Gets a period for this timezone when the Daylight Saving Time (DST) is active (it takes care of different hemispheres).
@@ -454,7 +439,7 @@ module Lazier
       year ||= ::Date.today.year
 
       northern_summer = ::DateTime.civil(year, 7, 15).utc # This is a representation of a summer period in the Northern Hemisphere.
-      southern_summer = ::DateTime.civil(year, 1, 15).utc # This is a representation of a summer period in the Northern Hemisphere.
+      southern_summer = ::DateTime.civil(year, 1, 15).utc # This is a representation of a summer period in the Southern Hemisphere.
 
       period = self.period_for_utc(northern_summer)
       period = self.period_for_utc(southern_summer) if !period.dst?
@@ -467,9 +452,9 @@ module Lazier
     # @return [Boolean] `true` if the zone uses DST for that date or year, `false` otherwise.
     def uses_dst?(reference = nil)
       if reference.respond_to?(:year) && reference.respond_to?(:utc) then # This is a date like object
-        self.dst_period(reference.year).present? && self.period_for_utc(reference.utc).dst?
+        dst_period(reference.year).present? && period_for_utc(reference.utc).dst?
       else
-        self.dst_period(reference).present?
+        dst_period(reference).present?
       end
     end
 
@@ -479,7 +464,7 @@ 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)
-      self.dst_offset(rational, year, :std_offset)
+      dst_offset(rational, year, :std_offset)
     end
 
     # Returns the standard offset for this timezone timezone when the Daylight Saving Time (DST) is active.
@@ -489,7 +474,7 @@ module Lazier
     # @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, method = :utc_total_offset)
-      period = self.dst_period(year)
+      period = dst_period(year)
       rv = period ? period.send(method) : 0
       rational ? self.class.rationalize_offset(rv) : rv
     end
@@ -501,10 +486,7 @@ module Lazier
     # @param name [String] The name to use for this zone. Defaults to the zone name.
     # @return [String] The name for the zone with DST or `nil`, if the timezone doesn't use DST for that year.
     def dst_name(dst_label = nil, year = nil, name = nil)
-      dst_label ||= "(DST)"
-      name ||= self.name
-
-      self.uses_dst?(year) ? "#{name} #{dst_label}" : nil
+      uses_dst?(year) ? "#{name || self.name} #{dst_label || "(DST)"}" : nil
     end
 
     # Returns the name for this zone with Daylight Saving Time (DST) active.
@@ -513,8 +495,7 @@ module Lazier
     # @param colon [Boolean] If to put the colon in the output string.
     # @return [String] The name for this zone.
     def to_str(name = nil, colon = true)
-      name ||= self.current_alias
-      "(GMT#{self.formatted_offset(colon)}) #{name}"
+      "(GMT#{self.formatted_offset(colon)}) #{name || current_alias}"
     end
 
     # Returns a string representation for this zone with Daylight Saving Time (DST) active.
@@ -524,16 +505,7 @@ module Lazier
     # @param name [String] The name to use for this zone. Defaults to the zone name.
     # @return [String] The string representation for the zone with DST or `nil`, if the timezone doesn't use DST for that year.
     def to_str_with_dst(dst_label = nil, year = nil, name = nil)
-      dst_label ||= "(DST)"
-      name ||= self.current_alias
-
-      if self.uses_dst?(year) then
-        period = self.dst_period(year)
-        offset = self.class.seconds_to_utc_offset(period.utc_total_offset)
-        "(GMT#{offset}) #{name} #{dst_label}"
-      else
-        nil
-      end
+      self.uses_dst?(year) ? "(GMT#{self.class.seconds_to_utc_offset(dst_period(year).utc_total_offset)}) #{name || current_alias} #{dst_label || "(DST)"}" : nil
     end
 
     # Returns a parameterized string representation for this zone.
@@ -542,7 +514,7 @@ module Lazier
     # @param name [String] The name to use for this zone. Defaults to the zone name.
     # @return [String] The parameterized string representation for this zone.
     def to_str_parameterized(with_offset = true, name = nil)
-      ::ActiveSupport::TimeZone.parameterize_zone(name || self.to_str, with_offset)
+      ::ActiveSupport::TimeZone.parameterize_zone(name || to_str, with_offset)
     end
 
     # Returns a parameterized string representation for this zone with Daylight Saving Time (DST) active.
@@ -552,7 +524,7 @@ module Lazier
     # @param name [String] The name to use for this zone. Defaults to the zone name.
     # @return [String] The parameterized string representation for this zone with DST or `nil`, if the timezone doesn't use DST for that year.
     def to_str_with_dst_parameterized(dst_label = nil, year = nil, name = nil)
-      rv = self.to_str_with_dst(dst_label, year, name)
+      rv = to_str_with_dst(dst_label, year, name)
       rv ? ::ActiveSupport::TimeZone.parameterize_zone(rv) : nil
     end
 
@@ -564,11 +536,7 @@ module Lazier
       # @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
+        zone.gsub("_", " ") == reference ? (["International Date Line West", "UTC"].include?(name) || name.include?("(US & Canada)")) ? name : reference.gsub(/\/.*/, "/#{name}") : nil
       end
   end
 end