routing 0.0.2 → 0.0.3

data/.gitignore

@@ -1,3 +1,4 @@
+nbproject
 *.gem
 *.rbc
 .bundle
@@ -19,4 +20,4 @@ test/tmp
 test/version_tmp
 tmp
 **/.DS_Store
-.DS_Store
+.DS_Store

data/lib/routing/adapter/navteq.rb

@@ -9,43 +9,29 @@ class Routing
     # Array of {GeoPoint}s, representing the calculated route.
     class Navteq
 
-      ATTR_ACCESSIBLE = [ :host, :default_params ]
-
       def initialize(options = {})
-        options.each do |attribute, value|
-          send("#{attribute}=", value) if ATTR_ACCESSIBLE.include?(attribute)
-        end
+        @options = {
+          :service_path => '/routing/6.2/calculateroute.json',
+          :parser => ::Routing::Parser::NavteqSimple
+        }.merge(options)
       end
 
       def calculate(geo_points)
-        parse get(geo_points)
-      end
-
-      def get(geo_points)
-        params = default_params.merge geo_points_to_params(geo_points)
-
         response = connection.get do |request|
-          request.url(service_path)
-          request.params = params
+          request.url(options[:service_path])
+          request.params = default_params.merge(geo_points_to_params(geo_points))
         end
-
-        response.body
+        parse(response.body)
       end
 
-      attr_writer :host
-
-      def host
-        @host
-      end
+      private
 
       def parse(response)
-        ::Routing::Parser::NavteqSimple.new(response).to_geo_points
+        options[:parser].new(response).to_geo_points
       end
 
-      attr_writer :default_params
-
       def default_params
-        @default_params || {
+        options[:default_params] || {
           departure:          Time.now.utc.iso8601,
           mode0:              "fastest;car",
           language:           "de_DE",
@@ -54,30 +40,21 @@ class Routing
         }
       end
 
-      protected
-
-      # The path on the server to the routing service.
-      # This is determined by the server and should not be changed.
-      #
-      # @returns [String]
-      #   Path to the routing service.
-      def service_path
-        "/routing/6.2/calculateroute.json"
-      end
-
       def geo_points_to_params(geo_points)
         Hash[geo_points.each_with_index.map { |point, i| [ "waypoint#{i}", "geo!#{point.lat},#{point.lng}" ] }]
       end
 
       def connection
-        @connection ||= Faraday.new(:url => host) do |builder|
+        @connection ||= Faraday.new(:url => options[:host]) do |builder|
           builder.request  :url_encoded
-          builder.response :logger
           builder.adapter  :net_http
         end
       end
 
-    end
+      def options
+        @options || {}
+      end
 
+    end
   end
 end

data/lib/routing/parser/navteq_simple.rb

@@ -16,8 +16,6 @@ class Routing
         @route = response["Response"]["Route"].first
         @overall_covered_distance  = 0
         @overall_relative_time = 0
-
-        self
       end
 
       # Converts the server response in an Array of {GeoPoint}s

data/lib/routing/version.rb

@@ -1,3 +1,3 @@
 class Routing
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/routing.gemspec

@@ -2,8 +2,8 @@
 require File.expand_path('../lib/routing/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Christian Bäuerlein"]
-  gem.email         = ["christian@ffwdme.com"]
+  gem.authors       = ["Christian Bäuerlein", "Benedikt Deicke"]
+  gem.email         = ["christian@ffwdme.com", "benedikt@synatic.net"]
   gem.summary       = %q{A ruby interface for route calculation services}
   gem.description   = %q{
     Provides a generic interface for routing services that can by used to calculate directions between geolocations.

data/spec/routing/adapter/navteq_spec.rb

@@ -2,58 +2,84 @@ require 'spec_helper'
 
 describe Routing::Adapter::Navteq do
 
-  context 'creating a new instance' do
+  let(:response) { mock(:response).as_null_object }
+  let(:request) { mock(:request).as_null_object }
+  let(:connection) { mock(:connection).as_null_object }
+  let(:parser_class) { mock(:parser_class, :new => parser) }
+  let(:parser) { mock(:parser).as_null_object }
+
+  let(:options) { { :host => 'http://example.com', :parser => parser_class } }
+
+  let(:geo_points) { [stub(:lat => 1, :lng => 2), stub(:lat => 3, :lng => 4), stub(:lat => 5, :lng => 6)] }
+
+
+  subject { described_class.new(options) }
+
+  before do
+    connection.stub(:get).and_yield(request).and_return(response)
+    Faraday.stub(:new).and_return(connection)
+  end
 
+  after { subject.calculate(geo_points) }
+
+  context 'creating a new instance' do
     it 'can be instantiated without arguments' do
-      expect { Routing::Adapter::Navteq.new }.to_not raise_error
+      expect { described_class.new }.to_not raise_error
     end
 
-    it 'sets the host in its options' do
-      described_class.new(:host => "new_host").host.should == "new_host"
+    it 'allows setting the host' do
+      Faraday.should_receive(:new).with(:url => 'http://other.com')
+      options.merge!(:host => 'http://other.com')
     end
 
-    it 'sets the default params in its options' do
+    it 'allows setting the default params' do
       params = { :hello => "world" }
-      described_class.new(:default_params => params).default_params == params
+      options.merge!(:default_params => params)
+      request.should_receive(:params=).with(hash_including(params))
     end
 
-    it 'ignores unknown options' do
-      expect { described_class.new(:hello => "world") }.to_not raise_error
+    it 'should allow setting the service path' do
+      options.merge!(:service_path => '/some/path.json')
+      request.should_receive(:url).with('/some/path.json')
     end
 
-  end
-
-  its(:service_path){ should be_a String }
-
-  its(:default_params){ should be_a Hash }
+    it 'should use a default service path when none is given' do
+      request.should_receive(:url).with('/routing/6.2/calculateroute.json')
+    end
 
-  describe '#connection' do
+    it 'should allow setting the parser' do
+      options.merge!(:parser => parser_class)
+      parser_class.should_receive(:new)
+    end
 
-    it 'returns a faraday connection' do
-      subject.send(:connection).should be_a Faraday::Connection
+    it 'should use a default parser when none is given' do
+      options.delete(:parser)
+      Routing::Parser::NavteqSimple.should_receive(:new).and_return(parser)
     end
 
+    it 'ignores unknown options' do
+      expect { described_class.new(:hello => "world") }.to_not raise_error
+    end
   end
 
   describe '#calculate' do
-    pending
-  end
-
-  describe '#get' do
-    pending
-  end
-
-  describe '#geo_points_to_params' do
-
-    let(:geo_points) { [stub(:lat => 1, :lng => 2), stub(:lat => 3, :lng => 4), stub(:lat => 5, :lng => 6)] }
-    let(:params){ subject.send(:geo_points_to_params, geo_points) }
+    it 'passes the response body to the parser' do
+      response.stub(:body => '...')
+      parser_class.should_receive(:new).with('...')
+    end
 
-    it 'creates a hash with enumerated waypoint keys and the navteq special geo! syntax as values' do
-      params['waypoint0'].should == 'geo!1,2'
-      params['waypoint1'].should == 'geo!3,4'
-      params['waypoint2'].should == 'geo!5,6'
+    it 'should return the parser\'s result' do
+      result = [double, double, double]
+      parser.stub(:to_geo_points => result)
+      subject.calculate(geo_points).should be(result)
     end
 
+    it 'should convert the geo points into a compatible format' do
+      request.should_receive(:params=).with hash_including({
+        'waypoint0' => 'geo!1,2',
+        'waypoint1' => 'geo!3,4',
+        'waypoint2' => 'geo!5,6'
+      })
+    end
   end
-
 end

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: routing
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
 - Christian Bäuerlein
+- Benedikt Deicke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-11 00:00:00.000000000 Z
+date: 2012-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70233528536000 !ruby/object:Gem::Requirement
+  requirement: &70283743036520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +22,10 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70233528536000
+  version_requirements: *70283743036520
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70233528535500 !ruby/object:Gem::Requirement
+  requirement: &70283743036060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70233528535500
+  version_requirements: *70283743036060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70233528534920 !ruby/object:Gem::Requirement
+  requirement: &70283743035460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,12 +44,13 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70233528534920
+  version_requirements: *70283743035460
 description: ! "\n    Provides a generic interface for routing services that can by
   used to calculate directions between geolocations.\n    Makes parsing and use-case
   specific data handling easy trough an extendable middleware stack.\n  "
 email:
 - christian@ffwdme.com
+- benedikt@synatic.net
 executables: []
 extensions: []
 extra_rdoc_files: []