lazier 3.5.1 → 3.5.2

data/doc/top-level-namespace.html

@@ -6,7 +6,7 @@
 <title>
   Top Level Namespace
   
-    &mdash; Documentation by YARD 0.8.7.3
+    &mdash; Documentation by YARD 0.8.7.4
   
 </title>
 
@@ -17,7 +17,7 @@
 <script type="text/javascript" charset="utf-8">
   hasFrames = window.top.frames.main ? true : false;
   relpath = '';
-  framesUrl = "frames.html#!" + escape(window.location.href);
+  framesUrl = "frames.html#!top-level-namespace.html";
 </script>
 
 
@@ -103,9 +103,9 @@
 </div>
 
     <div id="footer">
-  Generated on Sun Feb 23 15:47:02 2014 by
+  Generated on Sun Apr 27 17:16:41 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.7.3 (ruby-2.1.0).
+  0.8.7.4 (ruby-2.1.0).
 </div>
 
   </body>

data/lazier.gemspec

@@ -28,6 +28,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency("json", "~> 1.8.1")
   gem.add_dependency("activesupport", ">= 3.2.13") # We don't use ~> to enable use with 4.0
   gem.add_dependency("tzinfo", ">= 0.3.37") # We don't use ~> to enable use with 0.3.37 (required by activesupport 4.0) and 1.x, which is the latest available
-  gem.add_dependency("r18n-desktop", "~> 1.1.7")
-  gem.add_dependency("hashie", "~> 2.0.5")
+  gem.add_dependency("r18n-desktop", "~> 1.1.10")
+  gem.add_dependency("hashie", "~> 2.1.1")
 end

data/lib/lazier.rb

@@ -6,11 +6,12 @@
 
 require "json"
 require "tzinfo"
+require "active_support"
 require "active_support/core_ext"
 require "r18n-desktop"
 require "hashie"
 
-require "lazier/version" if !defined?(Lazier::Version)
+require "lazier/version" unless defined?(Lazier::Version)
 require "lazier/exceptions"
 require "lazier/i18n"
 require "lazier/localizer"
@@ -47,7 +48,7 @@ module Lazier
   #   @option pathname Extensions for path objects.
   # @return [Settings] The settings for the extensions.
   def self.load!(*what)
-    modules = what.present? ? what.flatten.uniq.compact.map(&:to_s) : ["object", "boolean", "string", "hash", "datetime", "math", "pathname"]
+    modules = what.present? ? what.flatten.uniq.compact.map(&:to_s) : %w(object boolean string hash datetime math pathname)
     modules.each { |w| ::Lazier.send("load_#{w}") }
 
     yield if block_given?
@@ -79,6 +80,7 @@ module Lazier
 
   # Loads Hash extensions.
   def self.load_hash
+    clean_hash_compact
     ::Hash.class_eval { include ::Lazier::Hash }
   end
 
@@ -112,22 +114,15 @@ module Lazier
 
   # Finds a class to instantiate.
   #
-  # @param cls [Symbol|String|Object] If a `String` or a `Symbol` or a `Class`, then it will be the class to instantiate. Otherwise the class of the object will returned.
+  # @param cls [Symbol|String|Object] If a `String` or a `Symbol` or a `Class`, then it will be the class to instantiate.
+  #   Otherwise the class of the object will returned.
   # @param scope [String] An additional scope to find the class. `%CLASS%`, `%`, `$`, `?` and `@` will be substituted with the class name.
   # @param only_in_scope [Boolean] If only try to instantiate the class in the scope.
   # @return [Class] The found class.
   def self.find_class(cls, scope = "::%CLASS%", only_in_scope = false)
-    if cls.is_a?(::String) || cls.is_a?(::Symbol) then
-      rv = nil
-      cls = cls.to_s.camelize
-
-      if only_in_scope then
-        cls.gsub!(/^::/, "") # Mark only search only inside scope
-      else
-        rv = search_class(cls) # Search outside scope
-      end
-
-      rv = search_class(scope.to_s.gsub(/%CLASS%|[@%$?]/, cls)) if !rv && cls !~ /^::/ && scope.present? # Search inside scope
+    if cls.is_a?(::String) || cls.is_a?(::Symbol)
+      rv, cls = perform_initial_class_search(cls, only_in_scope)
+      rv = search_class_inside_scope(rv, cls, scope) # Search inside scope
       rv || raise(NameError.new("", cls))
     else
       cls.is_a?(::Class) ? cls : cls.class
@@ -139,18 +134,60 @@ module Lazier
   # @param message [String|NilClass] An optional message (see return value).
   # @param precision [Fixnum] The precision for the message (see return value)..
   # @param block [Proc] The block to evaluate.
-  # @return [Float|String] If a `message` is provided, then the message itself plus the duration under parenthesis will be returned, otherwise the duration alone as a number.
+  # @return [Float|String] If a `message` is provided, then the message itself plus the duration under parenthesis will be returned,
+  #   otherwise the duration alone as a number.
   def self.benchmark(message = nil, precision = 0, &block)
     rv = Benchmark.ms(&block)
-    message ? ("%s (%0.#{precision}f ms)" % [message, rv]) : rv
+    message ? format("%s (%0.#{precision}f ms)", message, rv) : rv
   end
 
   private
-    # Tries to search a class.
-    #
-    # @param cls [String] The class to search.
-    # @return [Class] The instantiated class or `nil`, if the class was not found.
-    def self.search_class(cls)
-      cls.constantize rescue nil
+
+  # Removes existing `compact` and `compact!` methods from the Hash class.
+  def self.clean_hash_compact
+    ::Hash.class_eval do
+      begin
+        remove_method(:compact)
+        remove_method(:compact!)
+      rescue
+        nil
+      end
+    end
+  end
+
+  # Performs the initial search to find a class.
+  # @param cls [Symbol|String|Object] If a `String` or a `Symbol` or a `Class`, then it will be the class to instantiate.
+  # @param only_in_scope [Boolean] If only try to instantiate the class in the scope.
+  # @return [Array] The found class (if any) and the sanitized name.
+  def self.perform_initial_class_search(cls, only_in_scope)
+    rv = nil
+    cls.to_s.camelize
+
+    if only_in_scope
+      cls.gsub!(/^::/, "") # Mark only search only inside scope
+    else
+      rv = search_class(cls) # Search outside scope
     end
+
+    [rv, cls]
+  end
+
+  # Tries to search a class.
+  #
+  # @param cls [String] The class to search.
+  # @return [Class] The instantiated class.
+  def self.search_class(cls)
+    cls.constantize rescue nil
+  end
+
+  # Finds a class inside a specific scope.
+  #
+  # @param current [Class] The class found outside the scope.
+  # @param cls [String] The class to search.
+  # @param scope [String] The scope to search the class into.
+  # @return [Class] The found class.
+  def self.search_class_inside_scope(current, cls, scope)
+    cls = cls.ensure_string
+    !current && cls !~ /^::/ && scope.present? ? search_class(scope.to_s.gsub(/%CLASS%|[@%$?]/, cls)) : current
+  end
 end

data/lib/lazier/boolean.rb

@@ -23,4 +23,4 @@ module Lazier
       self
     end
   end
-end
+end

data/lib/lazier/configuration.rb

@@ -30,7 +30,7 @@ module Lazier
     def self.property(property_name, options = {})
       super(property_name, options)
 
-      if options[:readonly] then
+      if options[:readonly]
         class_eval <<-ACCESSOR
           def #{property_name}=(_)
             raise ArgumentError.new(@lazier_i18n.configuration.readonly("#{property_name}", "#{name}"))
@@ -40,25 +40,26 @@ module Lazier
     end
 
     private
-      # Checks if a property exists.
-      #
-      # @param property [String|Symbol] The property to check.
-      def assert_property_exists!(property)
-        raise ArgumentError.new(@lazier_i18n.configuration.not_found(property, self.class.name)) if !self.class.property?(property)
-      end
 
-      # Checks if a property has been set.
-      #
-      # @param property [String|Symbol] The property to check.
-      def assert_property_set!(property)
-        raise ArgumentError.new(@lazier_i18n.configuration.required(property, self.class.name)) if send(property).nil?
-      end
+    # Checks if a property exists.
+    #
+    # @param property [String|Symbol] The property to check.
+    def assert_property_exists!(property)
+      raise(ArgumentError, @lazier_i18n.configuration.not_found(property, self.class.name)) unless self.class.property?(property)
+    end
 
-      # Checks if a property is required.
-      #
-      # @param property [String|Symbol] The property to check.
-      def assert_property_required!(property, value)
-        raise ArgumentError.new(@lazier_i18n.configuration.required(property, self.class.name)) if self.class.required?(property) && value.nil?
-      end
+    # Checks if a property has been set.
+    #
+    # @param property [String|Symbol] The property to check.
+    def assert_property_set!(property)
+      raise(ArgumentError, @lazier_i18n.configuration.required(property, self.class.name)) if send(property).is_a?(NilClass)
+    end
+
+    # Checks if a property is required.
+    #
+    # @param property [String|Symbol] The property to check.
+    def assert_property_required!(property, value)
+      raise(ArgumentError, @lazier_i18n.configuration.required(property, self.class.name)) if self.class.required?(property) && value.is_a?(NilClass)
+    end
   end
-end
+end

data/lib/lazier/datetime.rb

@@ -91,7 +91,7 @@ module Lazier
       # @param with_offset [Boolean] If to include offset into the representation.
       # @return [String] A string representation which can be used for searches.
       def parameterize_zone(tz, with_offset = true)
-        ::ActiveSupport::TimeZone::parameterize_zone(tz, with_offset)
+        ::ActiveSupport::TimeZone.parameterize_zone(tz, with_offset)
       end
 
       # Finds a parameterized timezone.
@@ -102,7 +102,7 @@ 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)
-        ::ActiveSupport::TimeZone::unparameterize_zone(tz, as_string, dst_label)
+        ::ActiveSupport::TimeZone.unparameterize_zone(tz, as_string, dst_label)
       end
 
       # Returns an offset in rational value.
@@ -119,13 +119,13 @@ module Lazier
       # @param year [Fixnum] The year to compute the date for. Defaults to the current year.
       # @return [Date] The Easter date for the year.
       def easter(year = nil)
-        year = ::Date.today.year if !year.is_integer?
+        year = ::Date.today.year unless year.is_integer?
 
         # Compute using Anonymous Gregorian Algorithm: http://en.wikipedia.org/wiki/Computus#Anonymous_Gregorian_algorithm
         data = easter_start(year)
-        data = easter_part_1(data)
-        data = easter_part_2(year, data)
-        data = easter_part_3(year, data)
+        data = easter_divide(data)
+        data = easter_aggregate(year, data)
+        data = easter_prepare(year, data)
         day, month = easter_end(data)
 
         ::Date.civil(year, month, day)
@@ -146,61 +146,66 @@ module Lazier
       # @param value [String] The value to check.
       # @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")
-        !(::DateTime.strptime(value, self.custom_format(format)) rescue nil).nil?
+      def valid?(value, format = "%F %T")
+        ::DateTime.strptime(value, custom_format(format))
+        true
+      rescue
+        false
       end
+      alias_method :is_valid?, :valid?
 
       private
-        # Part one of Easter calculation.
-        #
-        # @param year [Fixnum] The year to compute the date for.
-        # @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 data [Fixnum] Partial variables from #easter_start.
-        # @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,
-            (c / 4.0).floor,
-            c % 4
-          ]
-        end
+      # Part one of Easter calculation.
+      #
+      # @param year [Fixnum] The year to compute the date for.
+      # @return [Array] Partial variables for #easter_divide.
+      def easter_start(year)
+        [year % 19, (year / 100.0).floor, year % 100]
+      end
 
-        # Part three of Easter calculation.
-        #
-        # @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
-          [h, (32 + (2 * e) + (2 * i) - h - k) % 7]
-        end
+      # Part two of Easter calculation.
+      # @param data [Fixnum] Partial variables from #easter_start.
+      # @return [Array] Partial variables for #easter_aggregate.
+      def easter_divide(data)
+        _, b, c = data
+
+        [
+          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 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
+      # Part three of Easter calculation.
+      #
+      # @param data [Fixnum] Partial variables from #easter_divide.
+      # @return [Array] Partial variables for #easter_prepare.
+      def easter_aggregate(year, data)
+        a = year % 19
+        x, e, i, k = data
+        h = ((19 * a) + x + 15) % 30
+        [h, (32 + (2 * e) + (2 * i) - h - k) % 7]
+      end
 
-        # Final part of Easter calculation.
-        #
-        # @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
+      # Part four of Easter calculation
+      # @param data [Arrays] Partial variables from #easter_aggregate.
+      # @return [Array] Partial variables for #easter_end.
+      def easter_prepare(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 data [Fixnum] Variable from #easter_prepare.
+      # @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
 
     # Returns the UTC::Time representation of the current datetime.
@@ -236,7 +241,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)
-      strftime(::DateTime.custom_format(format.to_s).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.
@@ -257,15 +262,16 @@ module Lazier
     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 ? wday : month - 1
-        ::Lazier.settings.date_names[type][index]
-      end
+
+    # 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 ? wday : month - 1
+      ::Lazier.settings.date_names[type][index]
+    end
   end
 
   # Extensions for timezone objects.
@@ -288,7 +294,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)
-        self.seconds_to_utc_offset(offset.is_a?(::Rational) ? (offset * 86400).to_i : offset, colon)
+        seconds_to_utc_offset(offset.is_a?(::Rational) ? (offset * 86_400).to_i : offset, colon)
       end
 
       # Find a zone by its name.
@@ -317,7 +323,9 @@ module Lazier
         dst_label ||= "(DST)"
 
         @zones_names ||= { "STANDARD" => ::ActiveSupport::TimeZone.all.map(&:to_s) }
-        @zones_names["DST[#{dst_label}]-STANDARD"] ||= ::ActiveSupport::TimeZone.all.map { |zone| fetch_aliases(zone, dst_label) }.flatten.compact.uniq.sort { |a,b| ::ActiveSupport::TimeZone.compare(a, b) } # Sort by name
+        @zones_names["DST[#{dst_label}]-STANDARD"] ||= ::ActiveSupport::TimeZone.all
+          .map { |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
@@ -332,10 +340,11 @@ module Lazier
       # @param with_offset [Boolean] If to include offset into the representation.
       # @return [String] A string representation which can be used for searches.
       def parameterize_zone(tz, with_offset = true)
-        tz = tz.to_s if !tz.is_a?(::String)
+        tz = tz.to_s unless tz.is_a?(::String)
+        mo = /^(\([a-z]+([+-])(\d{2})(:?)(\d{2})\)\s(.+))$/i.match(tz)
 
-        if tz =~ /^(\([a-z]+([+-])(\d{2})(:?)(\d{2})\)\s(.+))$/i then
-          with_offset ? "#{$2}#{$3}#{$5}@#{$6.parameterize}" : $6.parameterize
+        if mo
+          with_offset ? "#{mo[2]}#{mo[3]}#{mo[5]}@#{mo[6].to_s.parameterize}" : mo[6].to_s.parameterize
         elsif !with_offset then
           tz.gsub(/^([+-]?(\d{2})(:?)(\d{2})@)/, "")
         else
@@ -352,17 +361,13 @@ module Lazier
       # @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 = parameterize_zone(tz, false)
-        matcher = /(#{Regexp.quote(tz)})$/
-
-        rv = catch(:zone) do
-          list_all(true, dst_label).each do |zone|
-            throw(:zone, zone) if parameterize_zone(zone, false) =~ matcher
-          end
+        rv = find_parameterized_zone(dst_label, /(#{Regexp.quote(tz)})$/)
 
+        if rv
+          as_string ? rv : 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.
@@ -377,17 +382,33 @@ module Lazier
       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)")
-          matcher = /(#{Regexp.quote(dst_label)})$/
-
-          zone.aliases.map { |zone_alias|
-            [zone.to_str(zone_alias), (zone.uses_dst? && zone_alias !~ matcher) ? zone.to_str_with_dst(dst_label, nil, zone_alias) : nil]
-          }
+
+      # 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)")
+        matcher = /(#{Regexp.quote(dst_label)})$/
+
+        zone.aliases.map { |zone_alias|
+          [zone.to_str(zone_alias), (zone.uses_dst? && zone_alias !~ matcher) ? zone.to_str_with_dst(dst_label, nil, zone_alias) : nil]
+        }
+      end
+
+      # Finds a parameterized timezone.
+      #
+      # @param dst_label [String] Label for the DST indication. Defaults to `(DST)`.
+      # @param matcher [Regexp] The expression to match.
+      # @return [TimeZone] The found timezone or `nil` if the zone is not valid.
+      def find_parameterized_zone(dst_label, matcher)
+        catch(:zone) do
+          list_all(true, dst_label).each do |zone|
+            throw(:zone, zone) if parameterize_zone(zone, false) =~ matcher
+          end
+
+          nil
         end
+      end
     end
 
     # Returns a list of valid aliases (city names) for this timezone (basing on offset).
@@ -441,8 +462,8 @@ module Lazier
       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 Southern Hemisphere.
 
-      period = self.period_for_utc(northern_summer)
-      period = self.period_for_utc(southern_summer) if !period.dst?
+      period = period_for_utc(northern_summer)
+      period = period_for_utc(southern_summer) unless period.dst?
       period.dst? ? period : nil
     end
 
@@ -451,7 +472,7 @@ module Lazier
     # @param reference [Object] The date or year to check. Defaults to the current year.
     # @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
+      if reference.respond_to?(:year) && reference.respond_to?(:utc) # This is a date like object
         dst_period(reference.year).present? && period_for_utc(reference.utc).dst?
       else
         dst_period(reference).present?
@@ -495,7 +516,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)
-      "(GMT#{self.formatted_offset(colon)}) #{name || current_alias}"
+      "(GMT#{formatted_offset(colon)}) #{name || current_alias}"
     end
 
     # Returns a string representation for this zone with Daylight Saving Time (DST) active.
@@ -505,7 +526,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)
-      self.uses_dst?(year) ? "(GMT#{self.class.seconds_to_utc_offset(dst_period(year).utc_total_offset)}) #{name || current_alias} #{dst_label || "(DST)"}" : nil
+      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.
@@ -529,14 +550,19 @@ module Lazier
     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)
-        zone.gsub("_", " ") == reference ? (["International Date Line West", "UTC"].include?(name) || name.include?("(US & Canada)")) ? name : reference.gsub(/\/.*/, "/#{name}") : nil
+
+    # 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
+        ["International Date Line West", "UTC"].include?(name) || name.include?("(US & Canada)") ? name : reference.gsub(/\/.*/, "/#{name}")
+      else
+        nil
       end
+    end
   end
-end
+end