inkcite 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e391fed5c45670dba9e4bb01afdec27bb9ce9a8
-  data.tar.gz: 07dded169cb4a67d56cad26c7f39ead9c3118dfa
+  metadata.gz: 8b4814acacbf7cdc4b0b6c9ff9e124094ca1b08c
+  data.tar.gz: 276345f2b8b0205675c97734b2f297d6a15334ad
 SHA512:
-  metadata.gz: 541565fcca55aaa6253a29bc437f3350ea4376514da88c13ae1efad1ed2c5d8eff7449949136d406a336d3ee0d36b9c7468e21d63044f6f83bc0af38018153a4
-  data.tar.gz: 31fb64ab71c6973d79a92d706ce2328016db9e9f36c9364eba715838088a0f3e631c6ba6a4624c68c04b9d31db6977d03cbfeb778eee8f74da8e8e48f2a7b83c
+  metadata.gz: 40d16b2fc96750094b4b59f7ae3d6096fdcf03fcc9f77848dfb111291c9c748e7ff49f5fb0501d0ce02789206eeefcfc024439dbb6b4f2a097518bfc4409a7c4
+  data.tar.gz: 37e96c39c9856b921a2432047cfa3a59853ad7b1ee2e7e20f13a381697a336be1d506cea74e1c64e5429cc16350e96f3df7def95bb2dfff10863729f8fa27da8

data/lib/inkcite/renderer/footnote.rb

@@ -33,6 +33,10 @@ module Inkcite
           @symbol == @symbol.to_i.to_s
         end
 
+        def symbol?
+          !numeric?
+        end
+
         def to_s
           "#{symbol} #{text}"
         end
@@ -61,7 +65,7 @@ module Inkcite
             # there is one, increment the count.  Otherwise, start the count
             # off at one.
             last_instance = ctx.footnotes.select(&:numeric?).last
-            symbol = last_instance.nil?? 1 : last_instance.symbol.to_i + 1
+            symbol = last_instance.nil? ? 1 : last_instance.symbol.to_i + 1
 
           end
 
@@ -94,7 +98,7 @@ module Inkcite
         # on the format of the email.
         tmpl = opt[:tmpl] || opt[:template]
         if tmpl.blank?
-          tmpl = ctx.text?? "($symbol$) $text$\n\n" : "<sup>$symbol$</sup> $text$<br><br>"
+          tmpl = ctx.text? ? "($symbol$) $text$\n\n" : "<sup>$symbol$</sup> $text$<br><br>"
 
         elsif ctx.text?
 
@@ -104,23 +108,19 @@ module Inkcite
 
         end
 
+        # First, collect all symbols in the natural order they are defined
+        # in the email.
+        footnotes = ctx.footnotes.select(&:symbol?)
 
-        # Symbolic footnotes (e.g. daggers) always go ahead of
-        # the numeric footnotes - cause that's the way I like it
-        # uh huh, uh huh.
-        ctx.footnotes.sort! do |f1, f2|
-
-          next 1 if f1.numeric? && !f2.numeric?
-          next -1 if !f1.numeric? && f2.numeric?
-          f1.number <=> f2.number
-
-        end
+        # Now add to the list all numeric footnotes ordered naturally
+        # regardless of how they were ordered in the email.
+        footnotes += ctx.footnotes.select(&:numeric?).sort { |f1, f2| f1.number <=> f2.number }
 
         html = ''
 
         # Iterate through each of the footnotes and render them based on the
         # template that was provided.
-        ctx.footnotes.collect do |f|
+        footnotes.each do |f|
           html << tmpl.gsub('$symbol$', f.symbol).gsub('$text$', f.text)
         end
 

data/lib/inkcite/version.rb

@@ -1,3 +1,3 @@
 module Inkcite
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/test/renderer/footnote_spec.rb

@@ -37,6 +37,10 @@ describe Inkcite::Renderer::Footnote do
     Inkcite::Renderer.render('({footnote text="EPA-estimated fuel economy."})({footnote symbol="†" text="See Blackmur, especially chapters 3 and 4, for an insightful analysis of this trend."})({footnote text="Actual mileage may vary."})<br><br>{footnotes}', @view).must_equal("(1)(†)(2)<br><br><sup>†</sup> See Blackmur, especially chapters 3 and 4, for an insightful analysis of this trend.<br><br><sup>1</sup> EPA-estimated fuel economy.<br><br><sup>2</sup> Actual mileage may vary.<br><br>")
   end
 
+  it 'sorts symbols in the order they are defined' do
+    Inkcite::Renderer.render('({footnote text="EPA-estimated fuel economy."})({footnote symbol="†" text="See Blackmur, especially chapters 3 and 4, for an insightful analysis of this trend."})({footnote symbol="*" text="Actual mileage may vary."})<br><br>{footnotes}', @view).must_equal("(1)(†)(*)<br><br><sup>†</sup> See Blackmur, especially chapters 3 and 4, for an insightful analysis of this trend.<br><br><sup>*</sup> Actual mileage may vary.<br><br><sup>1</sup> EPA-estimated fuel economy.<br><br>")
+  end
+
   it 'can have a reusable, readable ID assigned to it' do
     Inkcite::Renderer.render('({footnote id="epa" text="EPA-estimated fuel economy."})({footnote id="epa"})', @view).must_equal("(1)(1)")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inkcite
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Jeffrey D. Hoffman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2015-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport