active_road 0.0.2 → 0.0.3

data/spec/spec_helper.rb

@@ -1,21 +1,22 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path("../dummy/config/environment", __FILE__)
+require File.expand_path("../dummy/config/environment.rb", __FILE__)
 
 require 'rspec/rails'
-require 'rspec/autorun'
-
 require 'factory_girl_rails'
-require 'saxerator'
-require 'activerecord-import'
-require 'georuby-ext'
-require 'enumerize'
+
+require 'ruby-prof'
+require 'bullet'
+
+require 'coveralls'
+Coveralls.wear!
 
 ENGINE_RAILS_ROOT=File.join(File.dirname(__FILE__), '../')
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+Dir[File.join(ENGINE_RAILS_ROOT, "spec/support/**/*.rb")].each {|f| require f }
+Dir[File.join(ENGINE_RAILS_ROOT, "spec/models/active_road/shared_examples/**/*.rb")].each {|f| require f}
 
 RSpec.configure do |config|
   # == Mock Framework
@@ -26,7 +27,7 @@ RSpec.configure do |config|
   # config.mock_with :flexmock
   # config.mock_with :rr
   config.mock_with :rspec
-
+  
   # Factory Girl
   config.include FactoryGirl::Syntax::Methods
 
@@ -43,4 +44,8 @@ RSpec.configure do |config|
   # rspec-rails.
   config.infer_base_class_for_anonymous_controllers = false
 
+  # Exclude performance test for rspec
+  # To include test with profile run bundle exec rake spec --tag profile:true 
+  config.filter_run_excluding :profile => true
+
 end

data/spec/support/geometry_support.rb

@@ -0,0 +1,36 @@
+def geometry_from_text(text, srid = 4326)
+  GeoRuby::SimpleFeatures::Geometry.from_ewkt "SRID=#{srid};#{text}"
+end
+
+def point(x=0.0, y=0.0, srid = 4326)
+  GeoRuby::SimpleFeatures::Point.from_x_y x, y, srid
+end
+
+def line_string(*points)
+  if points.one? and String === points.first
+     geometry_from_text("LINESTRING(#{points.first})")
+  else
+    GeoRuby::SimpleFeatures::LineString.from_points(points, points.first.srid)
+  end
+end
+
+def linear_ring(*points)
+  if points.one? and String === points.first
+    geometry_from_text("LINESTRING(#{points.first})")
+  else
+    GeoRuby::SimpleFeatures::LinearRing.from_points(points, points.first.srid)
+  end
+end
+
+def polygon(*points)
+  if points.one? and String === points.first
+    geometry_from_text("POLYGON(#{points})")
+  else
+    GeoRuby::SimpleFeatures::Polygon.from_points([points], points.first.srid)
+  end
+end
+
+def multi_polygon(polygons)
+  GeoRuby::SimpleFeatures::MultiPolygon.from_polygons(polygons, polygons.first.srid)
+end
+

data/spec/support/profile.rb

@@ -0,0 +1,19 @@
+RSpec.configure do |c|
+  def profile
+    result = RubyProf.profile { yield }
+    name = RSpec.current_example.metadata[:full_description].downcase.gsub(/[^a-z0-9_-]/, "-").gsub(/-+/, "-")
+    printer = RubyProf::CallTreePrinter.new(result)
+    p "profile method"
+    open( ENGINE_RAILS_ROOT + "tmp/performance/callgrind.#{name}.#{Time.now.to_i}.trace", "w") do |f|
+      printer.print(f)
+    end
+  end
+
+  c.around(:each) do |example|
+    if example.metadata[:profile]
+      profile { example.run }
+    else
+      example.run
+    end
+  end
+end

data/travis/before_install.sh

@@ -1,10 +1,6 @@
-if [[ "$POSTGIS" == "2.0" ]]; then
-  echo "yes" | sudo apt-add-repository ppa:ubuntugis/ubuntugis-unstable
-fi
+sudo apt-get update -qq
 
-sudo apt-get update
-sudo apt-get install -qq libgeos-dev libproj-dev postgresql-9.1-postgis
-
-if [[ "$POSTGIS" == "2.0" ]]; then
-  sudo apt-get install -qq libgeos++-dev
-fi
+# leveldb => libleveldb-dev libsnappy-dev
+# rgeo =>
+# postgres + postgis => 
+sudo apt-get install -qq libgeos++-dev libproj-dev build-essential liblzo2-dev liblzma-dev zlib1g-dev libprotobuf-c0-dev postgresql-contrib-9.3 postgresql-9.3-postgis-2.1-scripts libprotobuf-c0 zlib1g libleveldb-dev libsnappy-dev

data/travis/before_script.sh

@@ -1,9 +1,9 @@
 createdb -U postgres template_postgis
 
-if [[ "$POSTGIS" == "2.0" ]]; then
-  psql -U postgres -d template_postgis -c "CREATE EXTENSION postgis;"
-else
-  createlang -U postgres plpgsql template_postgis
-  psql -U postgres -d template_postgis -f /usr/share/postgresql/9.1/contrib/postgis-1.5/postgis.sql
-  psql -U postgres -d template_postgis -f /usr/share/postgresql/9.1/contrib/postgis-1.5/spatial_ref_sys.sql
-fi
+psql -U postgres -d template_postgis -c "CREATE EXTENSION postgis;"
+psql -U postgres -d template_postgis -c "CREATE EXTENSION postgis_topology;"
+
+ls -al /usr/share/postgresql/9.2/contrib/postgis-2.1
+
+# Problem with postgresql 9.3 no script anymore for postgis
+psql -U postgres -d template_postgis -f "/usr/share/postgresql/9.2/contrib/postgis-2.1/legacy_gist.sql"

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_road
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.3
 platform: ruby
 authors:
 - Alban Peignier
@@ -11,12 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -24,7 +22,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -32,7 +29,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -40,7 +36,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,7 +43,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -56,79 +50,69 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-migrate
+  name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.11.4
+        version: 3.1.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.11.4
+        version: 3.1.12
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.13
-  type: :development
+        version: 3.2.18
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 3.2.18
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: activerecord-postgres-hstore
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -136,172 +120,165 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord-postgres-hstore
+  name: dr-postgis_adapter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.4
+- !ruby/object:Gem::Dependency
+  name: pg
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
-  name: dr-postgis_adapter
+  name: georuby-ext
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: saxerator
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord-import
+  name: shortest_path
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
-  name: georuby-ext
+  name: enumerize
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: pbf_parser
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
-  name: saxerator
+  name: leveldb-native
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: shortest_path
+  name: snappy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: enumerize
+  name: postgres-copy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.O
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
-description: Find street numbers and road ways
+        version: 0.6.O
+description: Import openstreetmap datas and make an itinerary research
 email:
 - alban@tryphon.eu
 - luc.donnet@free.fr
@@ -311,6 +288,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .rvmrc
 - .travis.yml
 - Gemfile
@@ -322,15 +300,19 @@ files:
 - app/models/active_road/access_link.rb
 - app/models/active_road/access_point.rb
 - app/models/active_road/base.rb
+- app/models/active_road/boundary.rb
 - app/models/active_road/junction.rb
 - app/models/active_road/junction_conditionnal_cost.rb
+- app/models/active_road/junctions_physical_road.rb
 - app/models/active_road/logical_road.rb
+- app/models/active_road/osm_pbf_importer.rb
+- app/models/active_road/osm_pbf_importer_level_db.rb
 - app/models/active_road/path.rb
 - app/models/active_road/physical_road.rb
 - app/models/active_road/physical_road_conditionnal_cost.rb
-- app/models/active_road/physical_road_filter.rb
+- app/models/active_road/request_conditionnal_cost_linker.rb
 - app/models/active_road/street_number.rb
-- app/models/active_road/terra_import.rb
+- app/models/active_road/terra_importer.rb
 - config/database.yml
 - config/database.yml.ci
 - config/routes.rb
@@ -357,15 +339,27 @@ files:
 - db/migrate/20130801151637_add_constraints_to_physical_roads.rb
 - db/migrate/20130809155019_add_height_and_waiting_constraint_to_junction.rb
 - db/migrate/20130812143049_fix_waiting_constraint_type_for_junction.rb
+- db/migrate/20140206091734_create_boundaries.rb
+- db/migrate/20140210132933_add_attributes_to_physical_road.rb
+- db/migrate/20140219095521_add_boundary_id_to_logical_road.rb
+- db/migrate/20140228072448_add_boundary_id_to_physical_road.rb
+- db/migrate/20140304141150_add_marker_to_physical_road.rb
+- db/migrate/20140310083550_add_tags_to_street_number.rb
+- db/migrate/20140317153437_add_index_to_conditionnal_costs.rb
+- db/migrate/20140602160047_add_physical_road_index_to_junctions_physical_road.rb
 - lib/active_road.rb
 - lib/active_road/engine.rb
 - lib/active_road/migration.rb
 - lib/active_road/shortest_path.rb
 - lib/active_road/shortest_path/finder.rb
+- lib/active_road/simulation_tool.rb
 - lib/active_road/version.rb
 - lib/tasks/activeroad_tasks.rake
 - log/.gitignore
+- script/benchmark_import_kyotocabinet.rb
+- script/benchmark_shortest_path.rb
 - script/console
+- script/count_tag_in_osm_data.rb
 - script/import-tiger-numbers
 - script/rails
 - spec/dummy/README.rdoc
@@ -402,6 +396,7 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
+- spec/factories/boundary.rb
 - spec/factories/junction.rb
 - spec/factories/junction_conditionnal_cost.rb
 - spec/factories/logical_road.rb
@@ -410,51 +405,53 @@ files:
 - spec/factories/street_number.rb
 - spec/fixtures/terra.xml
 - spec/fixtures/terra_minimal.xml
+- spec/fixtures/test.osm
+- spec/fixtures/test.osm.bz2
+- spec/fixtures/test.osm.pbf
 - spec/fixtures/trajectory_arc.xml
 - spec/fixtures/trajectory_node.xml
 - spec/lib/active_road/shortest_path/finder_spec.rb
+- spec/lib/active_road/shortest_path/performance_finder_spec.rb
 - spec/models/active_road/access_point_spec.rb
 - spec/models/active_road/junction_conditionnal_cost_spec.rb
 - spec/models/active_road/junction_spec.rb
 - spec/models/active_road/logical_road_spec.rb
+- spec/models/active_road/osm_pbf_importer_level_db_spec.rb
 - spec/models/active_road/path_spec.rb
 - spec/models/active_road/physical_road_conditionnal_cost_spec.rb
-- spec/models/active_road/physical_road_filter_spec.rb
 - spec/models/active_road/physical_road_spec.rb
+- spec/models/active_road/request_conditionnal_cost_linker_spec.rb
+- spec/models/active_road/shared_examples/osm_pbf_importer_spec.rb
 - spec/models/active_road/street_number_spec.rb
-- spec/models/active_road/terra_import_spec.rb
+- spec/models/active_road/terra_importer_spec.rb
 - spec/spec_helper.rb
-- spec/support/georuby_ext.rb
+- spec/support/geometry_support.rb
+- spec/support/profile.rb
+- tmp/performance/.gitignore
 - travis/before_install.sh
 - travis/before_script.sh
-homepage: ''
-licenses: []
+homepage: https://rubygems.org/gems/active_road
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -3220100186324110221
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3220100186324110221
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.2
 signing_key: 
-specification_version: 3
-summary: Rails engine to manage roads and rails model
+specification_version: 4
+summary: Rails engine to import openstreetmap datas and make an itinerary research
 test_files: []