Merge branch 'master' of github.com:noted/scholar

noted · Apr 8, 2013 · 8f974a3 · 8f974a3
2 parents b631d32 + 496e7b9
commit 8f974a3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/lib/scholar/citation.rb b/lib/scholar/citation.rb
@@ -47,6 +47,14 @@ def initialize(options = {})
       @raw = @attributes.clone
       @attributes.delete(:type)
 
+      @attributes.each do |k, v|
+        if v.is_a?(Fixnum)
+          @attributes[k] = v.to_s
+        end
+      end
+
+      @attributes.delete_if {|k, v| v.nil? || v.empty? }
+
       if @attributes[:contributors]
         @attributes = Scholar::Utilities.contributors!(@attributes)
       end

diff --git a/lib/scholar/utilities/contributor.rb b/lib/scholar/utilities/contributor.rb
@@ -40,6 +40,8 @@ def initialize(data, order = :first)
           data[:role] = :author
         end
 
+        data.delete_if {|k, v| v.nil? || v.empty? }
+
         @order = order
 
         @attributes = order!(data)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -8,7 +8,6 @@
 
 SimpleCov.start
 
-
 require 'spork'
 
 Spork.prefork do