cyprus-street-names 0.1.0 → 0.2.0

data/.gitignore

@@ -1,2 +1,3 @@
 *.sw*
 .DS_Store
+*.gem

data/README.md

@@ -1,2 +1,33 @@
-# Cyprus's version of PAF
+# Cyprus Street Finder
 [![Build Status](https://secure.travis-ci.org/despo/cyprus-paf.png)](http://travis-ci.org/despo/cyprus-paf) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/despo/cyprus-paf)
+
+#### Data from ![Cyprus Postal Services] (http://www.mcw.gov.cy/mcw/dps/dps.nsf/index_en/index_en?opendocument)
+
+## Usage
+
+### Finding streets
+
+```ruby
+street_finder = StreetNames::Finder.new
+
+street_finder.find_by_postcode 8020
+street_finder.find_by_name "Demosthenous Georgiou"
+street_finder.find_by_area "Pafos"
+```
+#### Search στα Ελληνικά
+
+```ruby
+street_finder = StreetNames::Finder.new "gr" # load greek datastore
+
+street_finder.find_by_postcode 8020
+street_finder.find_by_name "Δημοσθένους Γεωργίου"
+street_finder.find_by_area "Πάφος"
+```
+
+**Note:** you may need to add `#encoding: utf-8` to the top of your file when searching using Greek characters
+
+## License
+
+Licensed under the [MIT] Licence
+
+[MIT]:https://raw.github.com/despo/cyprus-paf/master/MIT-LICENSE.txt

data/lib/street_names.rb

@@ -1,5 +1,6 @@
 require 'street_names/parser'
 require 'street_names/database'
+require 'street_names/finder'
 
 module StreetNames
 

data/lib/street_names/database.rb

@@ -15,15 +15,14 @@ module StreetNames
       datastore.transaction { datastore[:"streets_#{@locale}"] = data[:streets] }
     end
 
-    def path
-      "./data/street_names.dat"
-    end
-
     private
     def datastore
       @datastore ||= PStore.new(path)
     end
 
+    def path
+      "./data/street_names_#{@locale}.dat"
+    end
 
   end
 end

data/lib/street_names/finder.rb

@@ -0,0 +1,26 @@
+module StreetNames
+  class Finder
+    attr_reader :streets
+
+    def initialize locale=LOCALE
+      @database = StreetNames::Database.new locale
+      convert!
+    end
+
+    [ :postcode, :name, :area ].each do |key|
+      define_method(:"find_by_#{key}") do |value|
+        @streets.select { |street| eval("street.#{key}") == value }
+      end
+    end
+
+    private
+
+    def convert!
+      @streets = @database.load_streets.map do |street|
+        Street.new [ street[:name], street[:postcode], street[:area] ]
+      end
+    end
+
+
+  end
+end

data/lib/street_names/parser.rb

@@ -14,21 +14,11 @@ module StreetNames
       end.inject(:+)
     end
 
-    [ :postcode, :name, :area ].each do |key|
-      define_method(:"find_by_#{key}") do |value|
-        @streets.select { |street| eval("street.#{key}") == value }
-      end
-    end
-
     def save!
-      db = StreetNames::Database.new
+      db = StreetNames::Database.new @locale
       db.save! :streets => @streets.map(&:to_hash)
     end
 
-    def load_from_pstore
-      ::Database.new.load_streets
-    end
-
     private
     def spreadsheet
       @spreadsheet ||= Spreadsheet.open("./data/cyprus_postcode_dir_#{@locale}.xls")

data/lib/street_names/version.rb

@@ -1,3 +1,3 @@
 module StreetNames
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/street_names/database_spec.rb

@@ -2,29 +2,18 @@ require 'spec_helper'
 
 describe StreetNames::Database do
 
-  let(:streets) { [ { :name => "Road A" }, { :name => "Road B" }, { :name => "Not road C"} ] }
-  let(:database) { StreetNames::Database.new }
-
-  before(:all) do
-    `rm ./data/street_names.dat`
-  end
-
-  it 'is nil' do
-    database.load_streets.should == nil
-  end
+  let(:database) { StreetNames::Database.new "en" }
 
   it 'can store a hash of streets' do
-    database.save! :streets =>  streets
+    datastore = mock
+    database.should_receive(:datastore).and_return(datastore)
+    datastore.should_receive(:transaction)
 
-    database.load_streets.should == streets
+    database.save! :streets => :streets
   end
 
   it 'can retrieve a hash of streets' do
-
-    database.load_streets.should == streets
+    database.load_streets.first.should be_a Hash
   end
 
-  after(:all) do
-    `git checkout data/street_names.dat`
-  end
 end

data/spec/street_names/finder_spec.rb

@@ -0,0 +1,47 @@
+#encoding: utf-8
+require 'spec_helper'
+describe StreetNames::Finder do
+
+  let (:street_finder) { StreetNames::Finder.new "en" }
+
+  it 'load streets from spreadsheet' do
+    street = { :name => "Agias Marinas", :postcode => 8041, :area => "Pafos"}
+
+    street_finder.streets.map(&:to_json).should include street.to_json
+  end
+
+  context 'finders' do
+    let(:street) { {  :name => "Dimosthenous Georgiou", :postcode => 8020, :area => "Pafos"} }
+
+    it 'find streets by postcode' do
+      street_finder.find_by_postcode(8020).map(&:to_json).should include street.to_json
+    end
+
+    it 'find street by name' do
+      street_finder.find_by_name("Dimosthenous Georgiou").map(&:to_json).should include street.to_json
+    end
+
+    it 'find area by street name' do
+      street_finder.find_by_area("Pafos").map(&:to_json).should include street.to_json
+    end
+  end
+
+  context 'greek finders' do
+    let (:street_finder) { StreetNames::Finder.new "gr" }
+
+    let(:street) { {  :name => "Δημοσθένους Γεωργίου", :postcode => 8020, :area => "Πάφος"} }
+
+    it 'find streets by postcode' do
+      street_finder.find_by_postcode(8020).map(&:to_json).should include street.to_json
+    end
+
+    it 'find street by name' do
+      street_finder.find_by_name("Δημοσθένους Γεωργίου").map(&:to_json).should include street.to_json
+    end
+
+    it 'find area by street name' do
+      street_finder.find_by_area("Πάφος").map(&:to_json).should include street.to_json
+    end
+  end
+
+end

data/spec/street_names/parser_spec.rb

@@ -11,22 +11,6 @@ describe StreetNames::Parser do
 
       street_parser.streets.map(&:to_json).should include street.to_json
     end
-
-    context '#finders' do
-      let(:street) { {  :name => "Dimosthenous Georgiou", :postcode => 8020, :area => "Pafos"} }
-
-      it 'find streets by postcode' do
-        street_parser.find_by_postcode(8020).map(&:to_json).should include street.to_json
-      end
-
-      it 'find street by name' do
-        street_parser.find_by_name("Dimosthenous Georgiou").map(&:to_json).should include street.to_json
-      end
-
-      it 'find area by street name' do
-        street_parser.find_by_area("Pafos").map(&:to_json).should include street.to_json
-      end
-    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cyprus-street-names
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -75,14 +75,17 @@ files:
 - cyprus-paf.gemspec
 - data/cyprus_postcode_dir_en.xls
 - data/cyprus_postcode_dir_gr.xls
-- data/street_names.dat
+- data/street_names_en.dat
+- data/street_names_gr.dat
 - lib/street.rb
 - lib/street_names.rb
 - lib/street_names/database.rb
+- lib/street_names/finder.rb
 - lib/street_names/parser.rb
 - lib/street_names/version.rb
 - spec/spec_helper.rb
 - spec/street_names/database_spec.rb
+- spec/street_names/finder_spec.rb
 - spec/street_names/parser_spec.rb
 - spec/street_spec.rb
 homepage: https://github.com/despo/cyprus-paf