open_gpx_2_kml 0.10.0 → 0.10.1

data/Gemfile.lock

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

data/lib/tf1_converter/config.rb

@@ -4,48 +4,12 @@ module TF1Converter
   class Config
 
     def self.load(path)
-      last_key = nil
-      current_control = nil
+      @last_key = nil
+      @current_control = nil
       @constant_color_switch = false
 
       CSV.read(path).each do |row|
-        if last_key == 'INPUT'
-          @input = row[0]
-        elsif last_key == 'OUTPUT'
-          @output = row[0]
-        elsif last_key == 'ICON_PATH'
-          @icon_path = row[0]
-        elsif last_key == 'ICONS'
-          @icons = {}
-          current_control = 'ICONS'
-        elsif last_key == 'COLORS'
-          @colors = {}
-          current_control = 'COLORS'
-        elsif last_key == 'USE_CONSTANT_COLOR'
-          @use_constant_color = row[0].strip.downcase == 'true'
-        elsif last_key == 'CONSTANT_COLOR'
-          @constant_color = row[0]
-        end
-
-        if current_control == 'ICONS'
-          if row.empty?
-            current_control = nil
-          else
-            @icons[row[0]] = {
-              'icon' => row[1],
-              'meaning' => row[2], 
-              'name' => row[3] 
-            }
-          end
-        elsif current_control == 'COLORS'
-          if row.empty?
-            current_control = nil
-          else
-            @colors[row[0]] = row[1]
-          end
-        end
-
-        last_key = row[0] ? row[0].upcase : nil
+        parse_row(row)
       end
     end
 
@@ -55,9 +19,47 @@ module TF1Converter
       end
     end
 
-  end
+    def self.parse_row(row)
+      if @last_key == 'INPUT'
+        @input = row[0]
+      elsif @last_key == 'OUTPUT'
+        @output = row[0]
+      elsif @last_key == 'ICON_PATH'
+        @icon_path = row[0]
+      elsif @last_key == 'ICONS'
+        @icons = {}
+        @current_control = 'ICONS'
+      elsif @last_key == 'COLORS'
+        @colors = {}
+        @current_control = 'COLORS'
+      elsif @last_key == 'USE_CONSTANT_COLOR'
+        @use_constant_color = row[0].strip.downcase == 'true'
+      elsif @last_key == 'CONSTANT_COLOR'
+        @constant_color = row[0]
+      end
+      if @current_control == 'ICONS'
+        if row.compact.empty?
+          @current_control = nil
+        else
+          @icons[row[0]] = {
+            'icon' => row[1],
+            'meaning' => row[2],
+            'name' => row[3]
+          }
+        end
+      elsif @current_control == 'COLORS'
+        if row.compact.empty?
+          @current_control = nil
+        else
+          @colors[row[0]] = row[1]
+        end
+      end
+      @last_key = row[0] ? row[0].upcase : nil
+    end
+
+    def self.constant_color
+      colors[@constant_color]
+    end
 
-  def self.constant_color
-    colors[@constant_color]
   end
 end

data/lib/tf1_converter/version.rb

@@ -1,3 +1,3 @@
 module TF1Converter
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

data/spec/lib/tf1_converter/config_spec.rb

@@ -0,0 +1,14 @@
+require_relative '../../../lib/tf1_converter/config'
+
+describe TF1Converter::Config do
+  it 'does not overwrite colors later' do
+    TF1Converter::Config.parse_row(['COLORS'])
+    TF1Converter::Config.parse_row(['Red', '00ff1155'])
+    TF1Converter::Config.parse_row(['Blue', '00ff1155'])
+    TF1Converter::Config.parse_row(['Green', '00ff1155'])
+    TF1Converter::Config.parse_row([nil, nil])
+    TF1Converter::Config.parse_row(['USE_CONSTANT_COLOR'])
+    TF1Converter::Config.parse_row(['Blue', nil])
+    TF1Converter::Config.colors['Blue'].should_not be_nil
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: open_gpx_2_kml
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -194,6 +194,7 @@ files:
 - spec/fixtures/ftwood2_expected.kml
 - spec/fixtures/test.gpx
 - spec/fixtures/waypoint-by-name.gpx
+- spec/lib/tf1_converter/config_spec.rb
 - spec/lib/tf1_converter/gpx/track_spec.rb
 - spec/lib/tf1_converter/gpx/waypoint_spec.rb
 - spec/lib/tf1_converter/kml/track_color_spec.rb
@@ -213,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1834710226190470283
+      hash: 1970865931088980454
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -222,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1834710226190470283
+      hash: 1970865931088980454
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -235,6 +236,7 @@ test_files:
 - spec/fixtures/ftwood2_expected.kml
 - spec/fixtures/test.gpx
 - spec/fixtures/waypoint-by-name.gpx
+- spec/lib/tf1_converter/config_spec.rb
 - spec/lib/tf1_converter/gpx/track_spec.rb
 - spec/lib/tf1_converter/gpx/waypoint_spec.rb
 - spec/lib/tf1_converter/kml/track_color_spec.rb