open_gpx_2_kml 1.0.3 → 1.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    open_gpx_2_kml (1.0.3)
+    open_gpx_2_kml (1.0.4)
       builder (= 3.1.4)
       geo_swap (= 0.2.1)
       nokogiri (= 1.5.6)

data/lib/tf1_converter/gpx/waypoint.rb

@@ -12,27 +12,12 @@ module TF1Converter
       end
 
       def icon_name
-        if symbol_name
-          map_entry = @icon_map[symbol_name]
-          return map_entry['icon'] if map_entry
-        end
-
-        if name
-          @icon_map.values.each do |icon_data|
-            if icon_data['name']
-              return icon_data['icon'] if icon_data['name'].upcase == name.slice(0,3).upcase
-            end
-          end
-        end
-
+        return icon_map_entry['icon'] if icon_map_entry
         'default.png'
       end
 
       def icon_meaning
-        if symbol_name
-          map_entry = @icon_map[symbol_name]
-          return map_entry['meaning'] if map_entry
-        end
+        return icon_map_entry['meaning'] if icon_map_entry
         'Default'
       end
 
@@ -78,6 +63,23 @@ module TF1Converter
         end
       end
 
+      def icon_map_entry
+        if symbol_name
+          map_entry = @icon_map[symbol_name]
+          return map_entry if map_entry
+        end
+
+        if name
+          @icon_map.values.each do |icon_data|
+            if icon_data['name']
+              return icon_data if icon_data['name'].upcase == name.slice(0,3).upcase
+            end
+          end
+        end
+
+        false
+      end
+
     end
   end
 end

data/lib/tf1_converter/version.rb

@@ -1,3 +1,3 @@
 module TF1Converter
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

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

@@ -67,6 +67,8 @@ module TF1Converter::Gpx
     end
 
     describe '#icon_meaning' do
+      before { node.stub_chain(:xpath, :first) { nil } }
+
       it 'returns a matching meaning from the map' do
         node.stub_chain(:children, :select, :first, :text){ 'meaningoflife' }
         icon_map['meaningoflife'] = {'meaning' => 'life'}
@@ -82,6 +84,12 @@ module TF1Converter::Gpx
         node.stub_chain(:children, :select, :first, :text){ '' }
         waypoint.icon_meaning.should == 'Default'
       end
+
+      it 'matches by name if theres no sym' do
+        waypoint = waypoint_from(waypoint_by_name_fragment)
+        icon_map['meaningoflife'] = { 'icon' => '42.png', 'name' => 'C05', 'meaning' => 'life, universe, everything'}
+        waypoint.icon_meaning.should == 'life, universe, everything'
+      end
     end
 
     describe '#timestamp' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: open_gpx_2_kml
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-02 00:00:00.000000000 Z
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -255,7 +255,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1250400582194875674
+      hash: -2034610430434596952
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -264,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1250400582194875674
+      hash: -2034610430434596952
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23