textutils 0.6.0 → 0.6.1

data/lib/textutils/helper/value_helper.rb

@@ -5,9 +5,24 @@ module TextUtils
   module ValueHelper
 
 
+  ## todo/check: add to pair of matchers??
+  # e.g. match_country and match_country!
+  #  - match_country will use find_by_key and match_country will use find_by_key! - why? why not?
+
   def match_country( value )
-    if value =~ /^country:/   ## country:
-      country_key = value[8..-1]  ## cut off country: prefix
+    if value =~ /^country:/       # country:
+      country_key = value[8..-1]  # cut off country: prefix
+      country = Country.find_by_key!( country_key )
+      yield( country )
+      true # bingo - match found
+    else
+      false # no match found
+    end
+  end
+
+  def match_supra( value )
+    if value =~ /^supra:/         # supra:
+      country_key = value[6..-1]  # cut off supra: prefix
       country = Country.find_by_key!( country_key )
       yield( country )
       true # bingo - match found
@@ -16,6 +31,17 @@ module TextUtils
     end
   end
 
+  def match_supra_flag( value )  # supranational (country)
+    if value =~ /^supra$/   # supra(national)
+      yield( true )
+      true # bingo - match found
+    else
+      false # no match found
+    end
+  end
+
+
+
 
   def is_region?( value )
     # assume region code e.g. TX or N
@@ -39,7 +65,7 @@ module TextUtils
   end
 
 
-  def match_city( value )
+  def match_city( value )  # NB: might be nil (city not found)
     if value =~ /^city:/   ## city:
       city_key = value[5..-1]  ## cut off city: prefix
       city = City.find_by_key( city_key )
@@ -51,6 +77,39 @@ module TextUtils
   end
 
 
+  def match_metro( value )
+    if value =~ /^metro:/   ## metro:
+      city_key = value[6..-1]  ## cut off metro: prefix
+      city = City.find_by_key!( city_key )   # NB: parent city/metro required, that is, lookup w/ !
+      yield( city )
+      true # bingo - match found
+    else
+      false # no match found
+    end
+  end
+
+  def match_metro_flag( value )
+    if value =~ /^metro$/   # metro(politan area)
+      yield( true )
+      true # bingo - match found
+    else
+      false # no match found
+    end
+  end
+
+  def match_metro_pop( value )
+    if value =~ /^m:/   # m:
+      num = value[2..-1].gsub(/[ _]/, '').to_i   # cut off m: prefix; allow space and _ in number
+      yield( num )
+      true # bingo - match found
+    else
+      false # no match found
+    end
+  end
+
+
+
+
   def match_brewery( value )
     if value =~ /^by:/   ## by:  -brewed by/brewery
       brewery_key = value[3..-1]  ## cut off by: prefix
@@ -78,6 +137,31 @@ module TextUtils
   end
 
 
+  def match_km_squared( value )
+    ## allow numbers like 453 km² or 45_000 km2
+    if value =~ /^([0-9][0-9 _]+[0-9]|[0-9]{1,2})(?:\s*(?:km2|km²)\s*)$/
+      num = value.gsub( 'km2', '').gsub( 'km²', '' ).gsub(/[ _]/, '').to_i
+      yield( num )
+      true # bingo - match found
+    else
+      false # no match found
+    end
+  end
+
+  def match_number( value )
+    ## numeric (nb: can use any _ or spaces inside digits e.g. 1_000_000 or 1 000 000)
+    if value =~ /^([0-9][0-9 _]+[0-9])|([0-9]{1,2})$/
+      num = value.gsub(/[ _]/, '').to_i
+      yield( num )
+      true # bingo - match found
+    else
+      false # no match found
+    end
+  end
+
+
+
+
   def is_website?( value )
     # check for url/internet address e.g. www.ottakringer.at
     #  - must start w/  www. or

data/lib/textutils/version.rb

@@ -1,6 +1,6 @@
 
 module TextUtils
 
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 
 end   # module TextUtils

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: textutils
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &84354180 !ruby/object:Gem::Requirement
+  requirement: &79931880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *84354180
+  version_requirements: *79931880
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &84353960 !ruby/object:Gem::Requirement
+  requirement: &79931660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *84353960
+  version_requirements: *79931660
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &84353740 !ruby/object:Gem::Requirement
+  requirement: &79931440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *84353740
+  version_requirements: *79931440
 description: textutils - Text Filters, Helpers, Readers and More
 email: webslideshow@googlegroups.com
 executables: []