citero 1.0.0.alpha → 1.0.0.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a420fcb5e2a2984a8075c248070be78ba1523017
-  data.tar.gz: 8728f7f6805f7713e84e4586606a31f7c5af7bb9
+  metadata.gz: 50f0b73776691252a7f3bfc0ee4aaca8a2db0a38
+  data.tar.gz: 952b09dba40b178bb5f6dd88eafc9f16f5c95a13
 SHA512:
-  metadata.gz: 0c5fd7a6553dd5be250cbf512f5f9fca8e5ac5c6c60d184797913992d9cc4cdb49fba005bdc1b25f37de2aae93f43391544d1abbec917a8c416ce4190ccff599
-  data.tar.gz: b8663ea856531cc639cda15902992d0caeb7b2a6855be5595a72607a939d5ba21fad9909677ec4fcf047dbccc0f293624713151768d3539cb387af516f2515f2
+  metadata.gz: aaecd9a89c67cbedec54da979d8510629649dae12dc92569c09ee6a0057217b463129aca6e357edcfe72ee87e0aa50cce6dae44bdeef28a0f1d3549457a3a452
+  data.tar.gz: 237304a7c1c66cef113c5e06d3d739448670c2f5795eba98e293c4116ed9afd5e92d21277579980f82c6b8da5db046c6f606db16af53532af8e2c674885ce173

data/lib/citero.rb

@@ -46,6 +46,7 @@ module Citero
 
   def self.to_(format)
     @to_format = format.to_sym
+    return @input if @from_format.eql?(@to_format)
 
     case @from_format
       when :csf
@@ -74,6 +75,7 @@ module Citero
       when :csf
         str = ""
         from.csf.each do |k,v|
+          next if v.nil?
           if v.kind_of?(Array)
             v.each do |va|
               str = "#{str}#{k}: #{va.gsub('.','\.').gsub(',','\,')}\n"

data/lib/citero/csf.rb

@@ -22,8 +22,10 @@ module Citero
     end
 
     private
-    def element_or_list(new_value, old_value)
-      temp_arr = [new_value, old_value].flatten.compact
+    def element_or_list(old_value, new_value)
+      return old_value if new_value.nil?
+      temp_arr = [old_value, new_value].flatten.compact
+      return nil if temp_arr.empty?
       return temp_arr.first if temp_arr.size == 1
       return temp_arr
     end

data/lib/citero/inputs/readers/pnx_reader.rb

@@ -122,7 +122,9 @@ module Citero
         end
 
         def get_all_values_from_pnx(path)
-          @data.locate(path).flatten.collect(&:text)
+          return_val = @data.locate(path).flatten.collect(&:text)
+          return if return_val.nil?
+          return_val
         end
 
         def method_missing(method_sym, *arguments, &block)

data/lib/citero/outputs/bibtex.rb

@@ -29,7 +29,7 @@ module Citero
         start << publicationTitle
         start << pages
         start << webpage
-        start.compact.join(",\n\t")
+        start.compact.join(",\n")
       end
 
       def publisher
@@ -85,7 +85,10 @@ module Citero
       end
 
       def add_to_bibtex_output(key,value)
-        return if value.nil? || !value.class.eql?(Array) && value.strip.empty?
+        return if value.nil?
+        return if value.class.eql?(String) && value.strip.empty?
+        return if value.class.eql?(Array) && value.empty?
+        return if value.class.eql?(Hash) && value.empty?
         value = value.join(', ') if value.class.eql?(Array)
         output = "#{key} = "
         value = "{#{value}}" unless expects_number_value?(key,value)

data/lib/citero/version.rb

@@ -1,3 +1,3 @@
 module Citero
-  VERSION = "1.0.0.alpha"
+  VERSION = "1.0.0.alpha2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: citero
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha
+  version: 1.0.0.alpha2
 platform: ruby
 authors:
 - hab278