Refs #6068; :fire: useless method

and fix specs

3 files changed, 10 insertions, 14 deletions

diff --git a/app/models/chouette/route.rb b/app/models/chouette/route.rb
index 445346745..3729deb7d 100644
--- a/app/models/chouette/route.rb
+++ b/app/models/chouette/route.rb
@@ -191,11 +191,6 @@ module Chouette
       journey_pattern
     end
 
-    def generated_name
-      return "" unless stop_points.size > 1
-      [stop_points.first, stop_points.last].map(&:name).join ' > '
-    end
-
     protected
 
     def self.vehicle_journeys_timeless(stop_point_id)
diff --git a/app/models/simple_interface.rb b/app/models/simple_interface.rb
index 5a1c3dca8..489419482 100644
--- a/app/models/simple_interface.rb
+++ b/app/models/simple_interface.rb
@@ -77,8 +77,9 @@ class SimpleInterface < ActiveRecord::Base
   protected
 
   def push_in_journal data
-    line = @current_line + 1
+    line = (@current_line || 0) + 1
     line += 1 if configuration.headers
+    @errors ||= []
     self.journal.push data.update(line: line, row: @current_row)
     if data[:kind] == :error || data[:kind] == :warning
       @errors.push data
@@ -178,10 +179,10 @@ class SimpleInterface < ActiveRecord::Base
     end
 
     def on_relation relation_name
-      @scope ||= []
-      @scope.push relation_name
+      @current_scope ||= []
+      @current_scope.push relation_name
       yield
-      @scope.pop
+      @current_scope.pop
     end
 
     def duplicate
@@ -228,8 +229,8 @@ class SimpleInterface < ActiveRecord::Base
     end
 
     def add_column name, opts={}
-      @scope ||= []
-      @columns.push Column.new({name: name.to_s, scope: @scope.dup}.update(opts))
+      @current_scope ||= []
+      @columns.push Column.new({name: name.to_s, scope: @current_scope.dup}.update(opts))
     end
 
     def add_value attribute, value
diff --git a/app/models/simple_json_exporter.rb b/app/models/simple_json_exporter.rb
index 44ecfcba2..7b031857f 100644
--- a/app/models/simple_json_exporter.rb
+++ b/app/models/simple_json_exporter.rb
@@ -138,10 +138,10 @@ class SimpleJsonExporter < SimpleExporter
 
     def add_node name, opts={}
       @nodes ||= []
-      @scope ||= []
-      node = Node.new({name: name.to_s, scope: @scope.dup}.update(opts))
+      @current_scope ||= []
+      node = Node.new({name: name.to_s, scope: @current_scope.dup}.update(opts))
       yield node.configuration
-      @nodes.push node
+      @current_scope.push node
     end
 
     def add_nodes name, opts={}, &block