tf1_converter 0.3.0 → 0.3.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tf1_converter (0.3.0)
+    tf1_converter (0.3.1)
       builder
       geo_swap (= 0.2.1)
       nokogiri

data/lib/tf1_converter/gpx/track.rb

@@ -3,8 +3,9 @@ require_relative 'trackpoint'
 module TF1Converter
   module Gpx
     class Track
-      def initialize(xml_node)
+      def initialize(xml_node, color_map = TF1Converter::Config.colors)
         @node = xml_node
+        @color_map = color_map
       end
 
       def name
@@ -12,8 +13,12 @@ module TF1Converter
       end
 
       def display_color
-        color_name = @node.xpath('extensions/TrackExtension/DisplayColor').first.text
-        Config.colors[color_name]
+        color_node = @node.xpath('extensions/TrackExtension/DisplayColor').first
+        if color_node
+          @color_map[color_node.text]
+        else
+          'f0000080'
+        end
       end
 
       def coordinate_string

data/lib/tf1_converter/version.rb

@@ -1,3 +1,3 @@
 module TF1Converter
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/lib/tf1_converter/gpx/track_spec.rb

@@ -0,0 +1,20 @@
+require_relative '../../../../lib/tf1_converter/gpx/track'
+
+module TF1Converter::Gpx
+  describe Track do
+    describe '#display_color' do
+      it 'gets the mapped color name from the config' do
+        color_map = {'Orange' => 'aabbccdd' }
+        node = double(xpath: double(first: double(text: 'Orange')))
+        track = Track.new(node, color_map)
+        track.display_color.should == 'aabbccdd'
+      end
+
+      it 'returns a default color for nil' do
+        node = double(xpath: double(first: nil))
+        track = Track.new(node, {})
+        track.display_color.should == 'f0000080'
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tf1_converter
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -171,6 +171,7 @@ files:
 - spec/fixtures/expected.kml
 - spec/fixtures/test.gpx
 - spec/fixtures/test.kml
+- spec/lib/tf1_converter/gpx/track_spec.rb
 - spec/lib/tf1_converter/translation_spec.rb
 - tf1_converter.gemspec
 homepage: ''
@@ -187,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2100924703055666907
+      hash: -3878995865958803192
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -196,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2100924703055666907
+      hash: -3878995865958803192
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -207,4 +208,5 @@ test_files:
 - spec/fixtures/expected.kml
 - spec/fixtures/test.gpx
 - spec/fixtures/test.kml
+- spec/lib/tf1_converter/gpx/track_spec.rb
 - spec/lib/tf1_converter/translation_spec.rb