Merge pull request #86 from jekyll/param-fixe

Fix fetching of parameters from options hash
jekyll · Nov 18, 2013 · 6b5fb77 · 6b5fb77
2 parents 32c6d7a + cc47492
commit 6b5fb77
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/jekyll-import/importers/rss.rb b/lib/jekyll-import/importers/rss.rb
@@ -37,7 +37,7 @@ def self.require_deps
       #
       # Returns nothing.
       def self.process(options)
-        source = options.fetch('file')
+        source = options.fetch('source')
 
         content = ""
         open(source) { |s| content = s.read }

diff --git a/lib/jekyll-import/importers/s9y.rb b/lib/jekyll-import/importers/s9y.rb
@@ -28,7 +28,7 @@ def self.require_deps
       end
 
       def self.process(options)
-        source = options.fetch(:source)
+        source = options.fetch('source')
 
         FileUtils.mkdir_p("_posts")
 

diff --git a/lib/jekyll-import/importers/textpattern.rb b/lib/jekyll-import/importers/textpattern.rb
@@ -39,7 +39,7 @@ def self.specify_options(c)
       def self.process(options)
         dbname = options.fetch('dbname')
         user   = options.fetch('user')
-        pass   = options.fetch('password')
+        pass   = options.fetch('password', "")
         host   = options.fetch('host', "localhost")
 
         db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host, :encoding => 'utf8')