swissmatch-location 0.0.1.201208 → 0.1.1.201304

data/lib/swissmatch/location/version.rb

@@ -10,6 +10,6 @@ module SwissMatch
   module Location
 
     # The version of the swissmatch-location gem.
-    Version = Gem::Version.new("0.0.1")
+    Version = Gem::Version.new("0.1.1.201304")
   end
 end

data/lib/swissmatch/name.rb

@@ -38,6 +38,10 @@ module SwissMatch
       }
     end
 
+    def to_a
+      [to_s, @language, @sequence_number]
+    end
+
     # @private
     # @see Object#inspect
     def inspect

data/lib/swissmatch/zipcode.rb

@@ -57,6 +57,12 @@ module SwissMatch
     #   The official name of this zip code (max. 18 characters)
     attr_reader :name_short
 
+    # @note This method exists mostly for internal purposes
+    #
+    # @return [String]
+    #   All names, short and long, as strings, without sequence number nor language.
+    attr_reader :all_names
+
     # @return [Symbol]
     #   The main language in the area of this zip code. One of :de, :fr, :it or :rt.
     attr_reader :language
@@ -74,8 +80,12 @@ module SwissMatch
     attr_reader :delivery_by
 
     # @return [SwissMatch::Community]
-    #   The community this zip code belongs to.
-    attr_reader :community
+    #   The largest community which belongs to this zip code.
+    attr_reader :largest_community
+
+    # @return [SwissMatch::Communities]
+    #   The communities which belong to this zip code.
+    attr_reader :communities
 
     # @return [Date, nil]
     #   The date from which on this zip code starts to be in use
@@ -105,7 +115,8 @@ module SwissMatch
       language_alternative,
       sortfile_member,
       delivery_by,
-      community,
+      largest_community,
+      communities,
       valid_from,
       valid_until = nil
     )
@@ -120,28 +131,51 @@ module SwissMatch
       @name_short           = name_short.is_a?(Name) ? name_short : Name.new(name_short, language)
       @names                = (names || [@name]).sort_by(&:sequence_number)
       @names_short          = (names_short || [@name_short]).sort_by(&:sequence_number)
+      @all_names            = @names.map(&:to_s) | @names_short.map(&:to_s)
       @region_names         = region_names
       @region_names_short   = region_names_short
       @canton               = canton
       @sortfile_member      = sortfile_member
       @delivery_by          = delivery_by == :self ? self : delivery_by
-      @community            = community
+      @largest_community    = largest_community
+      @communities          = communities
       @valid_from           = valid_from
       @valid_until          = valid_until
     end
 
+    # @return [String]
+    #   The zip code add-on as 2 digit string, with leading zeros if necessary
+    def two_digit_add_on
+      "%02d" % @add_on
+    end
+
     # @return [Array<String>]
     #   The name of this zip code in all languages and normalizations (only unique values)
     def transliterated_names
-      names.flat_map { |name, ary|
-        name = name.to_s # convert from SwissMatch::Name
-        [
-          SwissMatch.transliterate1(name),
-          SwissMatch.transliterate2(name)  # TODO: use transliterate gem
-        ]
-      }.uniq
+      (
+        @all_names.map { |name| SwissMatch.transliterate1(name) } |
+        @all_names.map { |name| SwissMatch.transliterate2(name) }
+      ).uniq
+    end
+
+    # @return [Hash<String, String>]
+    #   A map to get the names which match a transliteration
+    def reverse_name_transliteration_map
+      result = {}
+      @all_names.map { |name|
+        trans_name1 = SwissMatch.transliterate1(name)
+        trans_name2 = SwissMatch.transliterate2(name)
+        result[trans_name1] ||= []
+        result[trans_name2] ||= []
+        result[trans_name1] << name
+        result[trans_name2] << name
+      }
+      result.each_value(&:uniq!)
+
+      result
     end
 
+
     # Since a zip code can - for any given language - have no name, exactly one name,
     # or even multiple names, it is sometimes difficult to write good code to
     # automatically provide well localized addresses. This method helps with that, in that
@@ -250,14 +284,16 @@ module SwissMatch
 
     # @param [Boolean] retain_references
     #   If set to false, :delivery_by will be set to the ordering number,
-    #   :community to the community_number and :canton to the canton's license_tag.
+    #   :largest_community to the community_number, :communities to their respective
+    #   community numbers and :canton to the canton's license_tag.
     #
     # @return [Hash]
     #   All properties of the zip code as a hash.
     def to_hash(retain_references=false)
-      delivery_by = retain_references ? @delivery_by : (@delivery_by && @delivery_by.ordering_number)
-      community   = retain_references ? @community : (@community && @community.community_number)
-      canton      = retain_references ? @canton : (@canton && @canton.license_tag)
+      delivery_by       = retain_references ? @delivery_by : (@delivery_by && @delivery_by.ordering_number)
+      largest_community = retain_references ? @largest_community : (@largest_community && @largest_community.community_number)
+      communities       = retain_references ? @communities : @communities.map(&:community_number)
+      canton            = retain_references ? @canton : (@canton && @canton.license_tag)
       {
         :ordering_number      => @ordering_number,
         :type                 => @type,
@@ -270,7 +306,8 @@ module SwissMatch
         :language_alternative => @language_alternative,
         :sortfile_member      => @sortfile_member,
         :delivery_by          => delivery_by,
-        :community            => community,
+        :largest_community    => largest_community,
+        :communities          => communities,
         :valid_from           => @valid_from,
         :valid_until          => @valid_until,
       }
@@ -285,7 +322,7 @@ module SwissMatch
     # @private
     # @see Object#eql?
     def eql?(other)
-      self.class == other.class && @ordering_number == other.ordering_number
+      self.class.eql?(other.class) && @ordering_number.eql?(other.ordering_number)
     end
 
     # @return [String]

data/lib/swissmatch/zipcodes.rb

@@ -3,6 +3,7 @@
 
 
 require 'autocompletion'
+require 'unicode'
 
 
 
@@ -175,6 +176,34 @@ module SwissMatch
       ZipCodes.new(@autocomplete.complete(*words))
     end
 
+    # @return [Array<String>]
+    #   An array of ZipCode names which match the given string in an autocompletion.
+    #   Sorted alphabetically (Umlaut-aware)
+    def autocompleted_names(name)
+      name_dc = Unicode.downcase(name)
+      len     = name_dc.length
+      base    = autocomplete(name)
+      names   = base.flat_map { |zip_code|
+        zip_code.reverse_name_transliteration_map.select { |transliterated_name, real_names|
+          Unicode.downcase(transliterated_name[0, len]) == name_dc
+        }.values.flatten(1)
+      }
+
+      names.uniq.sort(&Unicode.method(:strcmp))
+    end
+
+    # @return [Array<String>]
+    #   An array of ZipCode names suitable for presentation of a select.
+    def names_for_select(language=nil)
+      if language
+        names = flat_map { |zip_code| [zip_code.name, zip_code.suggested_name(I18n.language)] }
+      else
+        names = map(&:name)
+      end
+
+      names.uniq.sort(&Unicode.method(:strcmp))
+    end
+
     # @return [SwissMatch::ZipCodes]
     #   A SwissMatch::ZipCodes collection with zip codes of type 10 and 20.
     def residential
@@ -203,31 +232,26 @@ module SwissMatch
     # @return [SwissMatch::ZipCodes]
     #   A SwissMatch::ZipCodes collection with all SwissMatch::ZipCode objects having the given 4 digit code.
     def by_code(code)
-      @by_code ||= @zip_codes.group_by { |c| c.code }
-      ZipCodes.new(@by_code[code] || [])
+      ZipCodes.new(by_code_lookup_table[code] || [])
     end
 
     # @return [SwissMatch::ZipCode]
     #   The SwissMatch::ZipCode with the given 4 digit code and given 2 digit code add-on.
     def by_code_and_add_on(code, add_on)
-      @by_full_code ||= Hash[@zip_codes.map { |c| [c.full_code, c] }]
-      @by_full_code[code*100+add_on]
+      by_full_code_lookup_table[code*100+add_on]
     end
 
     # @return [SwissMatch::ZipCode]
     #   The SwissMatch::ZipCode with the given 4 digit code and name in any language.
     def by_code_and_name(code, name)
-      @by_code_and_name ||= Hash[@zip_codes.flat_map { |c|
-        c.names.map { |name| [[c.code, name], c] }
-      }]
-      @by_code_and_name[[code,name]]
+      by_code_and_name_lookup_table[[code, name]]
     end
 
     # @return [SwissMatch::ZipCodes]
     #   A SwissMatch::ZipCodes collection with all SwissMatch::ZipCode objects having the given name.
     def by_name(name)
       @by_name ||= @zip_codes.each_with_object({}) { |zip_code, hash|
-        zip_code.names.map(&:to_s).uniq.each do |name|
+        (zip_code.names + zip_code.names_short).map(&:to_s).uniq.each do |name|
           hash[name] ||= []
           hash[name] << zip_code
         end
@@ -246,10 +270,31 @@ module SwissMatch
       @zip_codes.dup
     end
 
+    # @return [true, false] Whether this zip code collection contains any zip codes.
+    def empty?
+      @zip_codes.size.zero?
+    end
+    alias blank? empty?
+
     # @private
     # @see Object#inspect
     def inspect
       sprintf "\#<%s:%x size: %d>", self.class, object_id>>1, size
     end
+
+  private
+    def by_code_lookup_table
+      @by_code ||= @zip_codes.group_by { |c| c.code }
+    end
+
+    def by_full_code_lookup_table
+      @by_full_code ||= Hash[@zip_codes.map { |c| [c.full_code, c] }]
+    end
+
+    def by_code_and_name_lookup_table
+      @by_code_and_name ||= Hash[@zip_codes.flat_map { |c|
+        (c.names + c.names_short).map(&:to_s).uniq.map { |name| [[c.code, name], c] }
+      }]
+    end
   end
 end

data/swissmatch-location.gemspec

@@ -2,19 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name                      = "swissmatch-location"
-  s.version                   = "0.0.1.201208"
+  s.version                   = "0.1.1.201304"
   s.authors                   = "Stefan Rusterholz"
   s.email                     = "stefan.rusterholz@gmail.com"
   s.homepage                  = "http://github.com/apeiros/swissmatch-location"
 
   s.description               = <<-DESCRIPTION.gsub(/^    /, '').chomp
-    Deal with swiss cantons, communities and zip codes, as provided by the swiss postal
-    service.
+    Deal with swiss zip codes, communities, districts and cantons, using the official swiss post mat[ch] database.
     Additionally handle data updates provided by the swiss postal service.
   DESCRIPTION
 
   s.summary                   = <<-SUMMARY.gsub(/^    /, '').chomp
-    Deal with swiss zip codes, cantons and communities.
+    Deal with swiss zip codes, communities, districts and cantons, using the official swiss post mat[ch] database.
   SUMMARY
 
   s.files                     =
@@ -36,7 +35,8 @@ Gem::Specification.new do |s|
   end
 
   s.add_dependency "rubyzip"
-  s.add_dependency "autocompletion", ">= 0.0.2"
+  s.add_dependency "unicode"
+  s.add_dependency "autocompletion", ">= 0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1")
   s.rubygems_version          = "1.3.1"

metadata

@@ -1,18 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: swissmatch-location
 version: !ruby/object:Gem::Version
-  version: 0.0.1.201208
   prerelease: 
+  version: 0.1.1.201304
 platform: ruby
 authors:
 - Stefan Rusterholz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000 Z
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -21,32 +27,40 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
+- !ruby/object:Gem::Dependency
+  name: unicode
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: autocompletion
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: '0'
   type: :runtime
   prerelease: false
+- !ruby/object:Gem::Dependency
+  name: autocompletion
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.2
-description: ! 'Deal with swiss cantons, communities and zip codes, as provided by
-  the swiss postal
-
-  service.
+        version: 0.0.3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+description: ! 'Deal with swiss zip codes, communities, districts and cantons, using
+  the official swiss post mat[ch] database.
 
   Additionally handle data updates provided by the swiss postal service.'
 email: stefan.rusterholz@gmail.com
@@ -54,13 +68,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- data/swissmatch/plz_c_20120821.txt
-- data/swissmatch/plz_p1_20120821.txt
-- data/swissmatch/plz_p2_20120821.txt
+- data/swissmatch-location/communities_20120401.csv
+- data/swissmatch-location/districts_20120401.csv
+- data/swissmatch-location/plz_c_20130318.txt
+- data/swissmatch-location/plz_p1_20130318.txt
+- data/swissmatch-location/plz_p2_20130318.txt
 - lib/swissmatch/canton.rb
 - lib/swissmatch/cantons.rb
 - lib/swissmatch/communities.rb
 - lib/swissmatch/community.rb
+- lib/swissmatch/district.rb
+- lib/swissmatch/districts.rb
 - lib/swissmatch/loaderror.rb
 - lib/swissmatch/location/autoload.rb
 - lib/swissmatch/location/datafiles.rb
@@ -103,9 +121,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Deal with swiss zip codes, cantons and communities.
+summary: Deal with swiss zip codes, communities, districts and cantons, using the
+  official swiss post mat[ch] database.
 test_files: []
 has_rdoc: