change method name NUBIC#429

caboteria · Mar 26, 2013 · c08c047 · c08c047
1 parent b1933de
commit c08c047
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/surveyor/parser.rb b/lib/surveyor/parser.rb
@@ -11,8 +11,8 @@ class << self; attr_accessor :options, :log end
     attr_accessor :context
 
     # Class methods
-    def self.parsef(f, options={})
-      self.parse(File.read(f),{:source => f}.merge(options))
+    def self.parse_file(filename, options={})
+      self.parse(File.read(filename),{:source => filename}.merge(options))
     end
     def self.parse(str, options={})
       self.ensure_attrs

diff --git a/lib/tasks/surveyor_tasks.rake b/lib/tasks/surveyor_tasks.rake
@@ -7,7 +7,7 @@ namespace :surveyor do
     file = File.join(Rails.root, ENV["FILE"])
     raise "File does not exist: #{file}" unless FileTest.exists?(file)
     puts "--- Parsing #{file} ---"
-    Surveyor::Parser.parsef(file, {:trace => Rake.application.options.trace})
+    Surveyor::Parser.parse_file(file, {:trace => Rake.application.options.trace})
     puts "--- Done #{file} ---"
   end
   desc "generate and load survey from REDCap Data Dictionary (specify FILE=surveys/redcap.csv)"

diff --git a/spec/lib/parser_spec.rb b/spec/lib/parser_spec.rb
@@ -101,7 +101,7 @@
 END
 
           sf = Tempfile.new('surveyor:parser_spec.rb',dir);sf.write(s);sf.flush
-          Surveyor::Parser.parsef(sf)
+          Surveyor::Parser.parse_file(sf)
           survey = Survey.where(:title=>'One language is never enough').first
           survey.nil?.should == false
           survey.translation(:es)['title'].should == "Un idioma nunca es suficiente"