mormon 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc716b3e1ce51d7d6bc2da6aebd4015438b5998cfce3d08abcbfccbdf02e467f
-  data.tar.gz: 1fc718d5ec92bdc2ecb824f1c96c27e2fb2e611810ee1c12d5cb82fb69292d54
+  metadata.gz: 781038b964cfb50a23aa301f9373380b88e911fab492348a3bdf5678f8b11608
+  data.tar.gz: e9755b04e7f7608fe80cef9819a7093df55436ed5a00ea22f8710d323f015c1b
 SHA512:
-  metadata.gz: b8da4d1df4f858b633fcc476c042dceba19ccfde4c70ed689eb49a18f1f02b15027755084c21b1e8bb1f30ecc9875c9e1b299a5067902cfe113fbd2cd4669d03
-  data.tar.gz: 357cdddb94aff94615e355a5c6a5ce04d268e3695288d83c2f97d027b404cadf08489d8041b9548072240d09df91d57491ec4c5e8afb882fdaf07ce0eadd07f2
+  metadata.gz: 89c78a9e88e655baa4f37f80217bd0d8893c559cf8abb5d928d99fe4d9bde02e961415e7f3f8dc3e3b40750a5ee2b8f06439405ec37b181c442aecf450382ea0
+  data.tar.gz: 2a55e6fe0c15375434da0897cd7a2a1ab067707cef4b000d2aa4fa7c011af8acf1d60244bd67466701c6aeb73635a458c591c79c43cc869d08ccd8df3c41dfb2

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in mormon.gemspec
-gemspec
+gemspec

data/Gemfile.lock

@@ -1,22 +1,31 @@
 PATH
   remote: .
   specs:
-    mormon (2.0.1)
+    mormon (2.0.4)
       nokogiri
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.1.3)
-    nokogiri (1.5.5)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
+    diff-lcs (1.5.1)
+    mini_portile2 (2.8.7)
+    nokogiri (1.13.10)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
+    racc (1.8.0)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
 
 PLATFORMS
   ruby
@@ -24,3 +33,6 @@ PLATFORMS
 DEPENDENCIES
   mormon!
   rspec
+
+BUNDLED WITH
+   1.17.3

data/lib/mormon/osm_router.rb

@@ -141,27 +141,26 @@ module Mormon
       end
     end
 
-
     class Router
-      attr_reader :loader
+      attr_reader :loader, :algorithm
 
       def initialize(loader, options = {})
-        @loader = loader
+        @loader  = loader
         @options = options
 
         algorithm = @options.delete(:algorithm) || :astar
-        @algorithm_class = "Mormon::OSM::Algorithm::#{algorithm.to_s.capitalize}".constantize
+        algorithm_classname = algorithm.to_s.capitalize
+        algorithm_class = "Mormon::OSM::Algorithm::#{algorithm_classname}".constantize
+        @algorithm = algorithm_class.new(self, @options)
       end
 
       def find_route(node_start, node_end, transport)
-        algorithm = @algorithm_class.new(self, @options)
-
         result, nodes = algorithm.route(node_start.to_i, node_end.to_i, transport.to_sym)
 
         return [result,[]] if result != 'success'
 
         nodes.map! do |node|
-          data = @loader.nodes[node.to_s]
+          data = loader.nodes[node.to_s]
           [data[:lat], data[:lon]]
         end
 

data/lib/mormon/version.rb

@@ -1,3 +1,3 @@
 module Mormon
-  VERSION = "2.0.3"
+  VERSION = "2.0.4"
 end

data/spec/router_spec.rb

@@ -1,80 +1,75 @@
 require 'spec_helper'
 require 'mormon'
 
-def spec_osm_file
-  File.join File.dirname(__FILE__), "spec.osm"
-end
-
 describe Mormon::OSM::Router do
-  it "should find the route if the params are strings" do
-    @loader = Mormon::OSM::Loader.new spec_osm_file
-    @router = Mormon::OSM::Router.new @loader
+  let(:osm_filename) { "spec.osm" }
+  let(:osm_file)     { File.join(File.dirname(__FILE__), osm_filename) }
+  let(:loader)       { Mormon::OSM::Loader.new osm_file }
+  let(:router_args) do
+    {}
+  end
+  let(:router) { Mormon::OSM::Router.new loader, router_args }
 
-    response, route = @router.find_route "448193278", 448193334, "car"
+  it "should find the route if the params are strings" do
+    response, route = router.find_route "448193278", 448193334, "car"
     response.should eq "success"
     route.should eq [
-      [-37.3211676, -59.1269871], 
-      [-37.3223495, -59.1262886], 
-      [-37.3229002, -59.1277355], 
-      [-37.3234584, -59.1292045], 
+      [-37.3211676, -59.1269871],
+      [-37.3223495, -59.1262886],
+      [-37.3229002, -59.1277355],
+      [-37.3234584, -59.1292045],
       [-37.3246275, -59.1285124]
     ]
   end
 
   it "should do the routing without problems" do
-    @loader = Mormon::OSM::Loader.new spec_osm_file
-    @router = Mormon::OSM::Router.new @loader
-
-    response, route = @router.find_route 448193311, 453397968, :car
+    response, route = router.find_route 448193311, 453397968, :car
     response.should eq "success"
     route.should eq [
-      [-37.322900199999999, -59.1277355], 
-      [-37.3234584, -59.1292045], 
-      [-37.324045300000002, -59.130744], 
-      [-37.324662600000003, -59.132366099999999], 
-      [-37.325214799999998, -59.133816899999999], 
-      [-37.3263769, -59.133125100000001], 
-      [-37.327769600000003, -59.132296199999999], 
-      [-37.328298599999997, -59.133707200000003], 
+      [-37.322900199999999, -59.1277355],
+      [-37.3234584, -59.1292045],
+      [-37.324045300000002, -59.130744],
+      [-37.324662600000003, -59.132366099999999],
+      [-37.325214799999998, -59.133816899999999],
+      [-37.3263769, -59.133125100000001],
+      [-37.327769600000003, -59.132296199999999],
+      [-37.328298599999997, -59.133707200000003],
       [-37.328858799999999, -59.135200400000002]
     ]
   end
 
-  it "should support random algorithm" do
-    @loader = Mormon::OSM::Loader.new spec_osm_file
-    @router = Mormon::OSM::Router.new @loader, :algorithm => :random
-    
-    response, route = @router.find_route 448193311, 448193334, :car
-    response.should eq "success"
-    route.size.should be > 1
-  end
+  context 'Random algorithm' do
+    let(:router_args) do
+      { algorithm: :random }
+    end
 
-  it "should support change the breadth of random algorithm" do
-    @loader = Mormon::OSM::Loader.new spec_osm_file
-    @router = Mormon::OSM::Router.new @loader, :algorithm => :random
-    
-    @router.algorithm.breadth = 1
-    response, route = @router.find_route 448193311, 448193334, :car
-    response.should eq "success"
-    route.size.should be > 1
+    it "should support random algorithm" do
+      response, route = router.find_route 448193311, 448193334, :car
+      response.should eq "success"
+      route.size.should be > 1
+    end
 
-    @router.algorithm.breadth = 3
-    response1, route1 = @router.find_route 448193311, 448193334, :car
-    response1.should eq "success"
-    route1.size.should be > 1
+    it "should support change the breadth of random algorithm" do
+      router.algorithm.breadth = 1
+      response, route = router.find_route 448193311, 448193334, :car
 
-    route.should_not eq route1
-  end
+      response.should eq "success"
+      route.size.should be > 1
 
-  describe "with tandil.osm map" do
+      router.algorithm.breadth = 3
+      response1, route1 = router.find_route 448193311, 448193334, :car
 
-    before :each do
-      @loader = Mormon::OSM::Loader.new File.join(File.dirname(__FILE__), "tandil.osm"), :cache => true
-      @router = Mormon::OSM::Router.new @loader
+      response1.should eq "success"
+      route1.size.should be > 1
+      route.should_not eq route1
     end
+  end
+
+  describe "with tandil.osm map" do
+    let(:osm_filename) { "tandil.osm" }
 
     it "should find the route in tandil map" do
-      response, route = @router.find_route 1355012894, 1527759159, :car
+      response, route = router.find_route 1355012894, 1527759159, :car
       response.should eq "success"
       route.should eq [
         [-37.314227500000001, -59.083028499999998], [-37.315150099999997, -59.084156299999997], [-37.314264299999998, -59.085288499999997], [-37.315238600000001, -59.086456400000003], [-37.316189199999997, -59.087621499999997], [-37.317135299999997, -59.088781099999999], [-37.318047200000002, -59.0898988], [-37.3189803, -59.091042600000002], [-37.319898500000001, -59.092168000000001], [-37.320787299999999, -59.093257399999999], [-37.322678799999998, -59.0955759], [-37.324257199999998, -59.097501700000002], [-37.324342399999999, -59.0976675], [-37.323442, -59.0988349], [-37.322537599999997, -59.099982900000001], [-37.320699099999999, -59.102316899999998], [-37.322715600000002, -59.104815500000001], [-37.325489699999999, -59.1082538], [-37.324572699999997, -59.109404599999998], [-37.325524700000003, -59.1105327], [-37.326417999999997, -59.111670400000001], [-37.325528499999997, -59.112850700000003], [-37.326433199999997, -59.113965700000001], [-37.3267904, -59.114365900000003], [-37.326863699999997, -59.114550399999999], [-37.327440500000002, -59.116081100000002], [-37.327991900000001, -59.1175444], [-37.328552999999999, -59.119033799999997], [-37.329104200000003, -59.120496600000003], [-37.329658899999998, -59.121968600000002], [-37.330206199999999, -59.123420899999999], [-37.330755799999999, -59.124884399999999], [-37.331353300000004, -59.126429899999998], [-37.331652400000003, -59.127241400000003], [-37.331941100000002, -59.128025000000001], [-37.332166700000002, -59.1286238], [-37.332491400000002, -59.129485500000001], [-37.333024999999999, -59.130901999999999], [-37.333594699999999, -59.132413800000002], [-37.333622300000002, -59.132487500000003], [-37.334096700000003, -59.133752299999998], [-37.3345178, -59.134863600000003], [-37.335070399999999, -59.136329799999999], [-37.335618599999997, -59.137819700000001], [-37.3361801, -59.139275699999999], [-37.336721400000002, -59.140712100000002], [-37.337293500000001, -59.1422308], [-37.337850899999999, -59.143710200000001], [-37.338389300000003, -59.145182900000002], [-37.3386736, -59.145893600000001], [-37.338952499999998, -59.146633899999998], [-37.339135499999998, -59.147119699999998], [-37.3394239, -59.147885199999997], [-37.339503100000002, -59.148095499999997], [-37.339592099999997, -59.148331900000002], [-37.339890400000002, -59.149123400000001], [-37.340051299999999, -59.149550599999998], [-37.340075400000003, -59.149608000000001], [-37.340349500000002, -59.150260299999999], [-37.340552099999996, -59.150748700000001], [-37.3406783, -59.151004299999997], [-37.340945599999998, -59.151422500000002], [-37.343685100000002, -59.155270399999999], [-37.343783000000002, -59.155505300000002], [-37.344689199999998, -59.159352699999999], [-37.344747900000002, -59.159703200000003], [-37.344740799999997, -59.159876199999999], [-37.344758900000002, -59.159840699999997], [-37.344792099999999, -59.159806099999997], [-37.344832799999999, -59.159787899999998], [-37.344866199999998, -59.159786500000003], [-37.3449077, -59.159801299999998], [-37.344942699999997, -59.1598331], [-37.344966999999997, -59.159877999999999], [-37.344977100000001, -59.159948700000001], [-37.345046400000001, -59.159815899999998], [-37.345127400000003, -59.159665699999998], [-37.346329400000002, -59.158131699999998], [-37.347191299999999, -59.157031799999999], [-37.348837400000001, -59.154906699999998]
@@ -82,7 +77,7 @@ describe Mormon::OSM::Router do
     end
 
     it "should find routes :living_street tags" do
-      response, route = @router.find_route 1426632434, 1353196058, :car
+      response, route = router.find_route 1426632434, 1353196058, :car
       response.should eq "success"
       route.should eq [
         [-37.3345933, -59.1058391], [-37.3354931, -59.1069492], [-37.3342806, -59.1084889], [-37.33413, -59.1094705], [-37.3339058, -59.1102717], [-37.3341711, -59.1101928], [-37.3352592, -59.1095233], [-37.3354771, -59.1093932], [-37.3361037, -59.1090191], [-37.3362573, -59.1090405], [-37.3364535, -59.1092337], [-37.3366723, -59.1098382], [-37.3367507, -59.1099664], [-37.3373321, -59.1101778], [-37.33786, -59.1101467], [-37.3386116, -59.1100383], [-37.3394134, -59.1100169], [-37.3400105, -59.1102422], [-37.3401523, -59.1103108], [-37.3410888, -59.1091111]

data/spec/spec_helper.rb

@@ -2,6 +2,6 @@ require 'rubygems'
 require 'rspec'
 
 RSpec.configure do |config|
-  config.color_enabled = true
-  config.formatter     = 'documentation'
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mormon
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Geronimo Diaz