routing 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a49e29dbffb57a00e02111ebb486d6ef57c48d9
-  data.tar.gz: 0a4104acf4545f919bee3a4c7b22cdc8eb14076b
+  metadata.gz: 0496d5dae61032467bd57c62c09305d6cb83f447
+  data.tar.gz: e955918eee030aa93d33382da5da4b5ae8a0372a
 SHA512:
-  metadata.gz: 10aa9dc049fe739036ce6149ec156735179a51bb8a33cb72ea2902d5a55d530402e40e35011801bfd631e104690b1022a3c1a9ca28fbda23199e82f5b32b331d
-  data.tar.gz: 98ebd1ea41a04d78d9aa8712fd2503bead5fd27640387a5fd54640e5d68d016d188906d4b74e7e278f153f9de0cfe5e6c7ef1ad03800a0e2f60e90584e456424
+  metadata.gz: c4b677a117f2d0983f3737bc0dc315c580348f1c1400dcf3c952f66c40da071c19c3afc0e202de32d2b8ed25609cf99631e3c109493df9ad66e41feeb8ea3577
+  data.tar.gz: 206a6f81707fb9e95622bc746354ecea2ff33fd1c3d8828e437ba84cb43220f505f22371597a4be163c053517fa577848287777b50ae088c24a16a43afc7f5f6

data/lib/routing/adapter/rest_adapter.rb

@@ -52,7 +52,14 @@ class Routing
       end
 
       def convert_geo_points_to_params(geo_points)
-        Hash[geo_points.each_with_index.map { |point, i| [ "waypoint#{i}", "geo!#{point.lat},#{point.lng}" ] }]
+        Hash[geo_points.each_with_index.map do |point, i|
+          lat = point[:lat]
+          lng = point[:lng]
+
+          raise ArgumentError, "latitude or longitude missing" unless lat && lng
+
+          ["waypoint#{i}", "geo!#{lat},#{lng}"]
+        end]
       end
     end
   end

data/lib/routing/adapter/test.rb

@@ -7,11 +7,16 @@ class Routing
 
       def calculate(geo_points)
         geo_points.collect do |point|
+          lat = point[:lat]
+          lng = point[:lng]
+
+          raise ArgumentError, "latitude or longitude missing" unless lat && lng
+
           GeoPoint.new(
-            :lat => point.lat,
-            :lng => point.lng,
-            :original_lat => point.lat,
-            :original_lng => point.lng,
+            :lat => lat,
+            :lng => lng,
+            :original_lat => lat,
+            :original_lng => lng,
             :relative_time => 100,
             :distance => 100,
             :waypoint => true
@@ -21,4 +26,4 @@ class Routing
     end
 
   end
-end
+end

data/lib/routing/geo_point.rb

@@ -30,5 +30,17 @@ class Routing
       !!waypoint
     end
 
+    def fetch(key, *args)
+      raise ArgumentError, "wrong number of arguments (#{args.length + 1} for 1..2)" if args.length > 1
+
+      case key
+      when *self.class.members
+        send(key)
+      else
+        return yield(key) if block_given?
+        return args.first unless args.empty?
+        raise KeyError, "key #{key} not found"
+      end
+    end
   end
-end
+end

data/lib/routing/version.rb

@@ -1,3 +1,3 @@
 class Routing
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/routing/adapter/here_spec.rb

@@ -16,7 +16,13 @@ describe Routing::Adapter::Here do
     { :parser => parser_class, :credentials => credentials}
   end
 
-  let(:geo_points) { [double(:lat => 1, :lng => 2), double(:lat => 3, :lng => 4), double(:lat => 5, :lng => 6)] }
+  let(:geo_points) do
+    [
+      Routing::GeoPoint.new(lat: 1, lng: 2),
+      Routing::GeoPoint.new(lat: 3, lng: 4),
+      Routing::GeoPoint.new(lat: 5, lng: 6)
+    ]
+  end
 
   subject(:adapter) { described_class.new(options) }
 

data/spec/routing/adapter/navteq_spec.rb

@@ -11,7 +11,14 @@ describe Routing::Adapter::Navteq do
   end
   let(:parser) { double(:parser).as_null_object }
   let(:options) { { host: 'example.com', parser: parser_class } }
-  let(:geo_points) { [double(lat: 1, lng: 2), double(lat: 3, lng: 4), double(lat: 5, lng: 6)] }
+
+  let(:geo_points) do
+    [
+      Routing::GeoPoint.new(lat: 1, lng: 2),
+      Routing::GeoPoint.new(lat: 3, lng: 4),
+      Routing::GeoPoint.new(lat: 5, lng: 6)
+    ]
+  end
 
   subject(:adapter) { described_class.new(options) }
 

data/spec/routing/adapter/test_spec.rb

@@ -8,7 +8,14 @@ describe Routing::Adapter::Test do
   end
 
   describe '#calculate' do
-    let(:geo_points) { [double(lat: 1, lng: 2), double(lat: 3, lng: 4), double(lat: 5, lng: 6)] }
+    let(:geo_points) do
+      [
+        Routing::GeoPoint.new(lat: 1, lng: 2),
+        Routing::GeoPoint.new(lat: 3, lng: 4),
+        Routing::GeoPoint.new(lat: 5, lng: 6)
+      ]
+    end
+
 
     it 'returns an array of geopoints with values that are passed to the method' do
       subject.calculate(geo_points).each_with_index do |new_geo_point, index|

data/spec/routing/geo_point_spec.rb

@@ -1,28 +1,47 @@
 require 'spec_helper'
 
 describe Routing::GeoPoint do
-
   context 'creating a new instance' do
     it 'can be instantiated without arguments' do
       expect { described_class.new }.to_not raise_error
     end
 
+    describe '#fetch' do
+      subject(:geo_point) { described_class.new }
+
+      it 'raises if the key is not a struct member and no default has been specified' do
+        expect { geo_point.fetch(:unknown) }.to raise_error(KeyError)
+      end
+
+      it 'returns the second argument or the return value of an optional block when #fetch is invoked with a key that is not a struct member (the block has precedence)' do
+        expect(geo_point.fetch(:unknown, 42)).to eq(42)
+        expect(geo_point.fetch(:unknown, 42) { 13 }).to eq(13)
+      end
+    end
+
     context 'initialized with attributes' do
-      subject { described_class.new(:lat => 1, :lng => 2) }
+      subject(:geo_point) { described_class.new(:lat => 1, :lng => 2) }
 
-      describe '#lat' do
-        subject { super().lat }
-        it { should be(1) }
+      it "should respond with 1 when #lat is invoked" do
+        expect(geo_point.lat).to eq(1)
       end
 
-      describe '#lng' do
-        subject { super().lng }
-        it { should be(2) }
+      it "should respond with 1 when #fetch(:lat) is invoked" do
+        expect(geo_point.fetch(:lat)).to eq(1)
+      end
+
+      it "should respond with 2 when #lng is invoked" do
+        expect(geo_point.lng).to eq(2)
+      end
+
+      it "should respond with 2 when #fetch(:lng) is invoked" do
+        expect(geo_point.fetch(:lng)).to eq(2)
       end
 
       it 'ignores passed attributes that dont exist' do
         expect { described_class.new(:hello => :world) }.to_not raise_error
       end
+
     end
   end
 
@@ -43,5 +62,4 @@ describe Routing::GeoPoint do
       it { should_not be_waypoint }
     end
   end
-
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: routing
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Christian Bäuerlein
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday