condensation 1.5.0 → 1.6.0

data/lib/condensation/filters/weeks_until.rb

@@ -3,16 +3,20 @@ require 'time'
 module Condensation
   module Filters
     module WeeksUntil
-      SECONDS_PER_WEEK = 86400 * 7
+      SECONDS_PER_WEEK = 86_400 * 7
 
       def weeks_until(input)
         return if input.nil?
 
-        if input.is_a?(Time)
-          value = input
-        else
-          value = Time.parse(input) rescue nil
-        end
+        value = if input.is_a?(Time)
+                  input
+                else
+                  begin
+                    Time.parse(input)
+                  rescue
+                    nil
+                  end
+                end
 
         return unless value.is_a?(Time)
 

data/lib/condensation/sanitizer.rb

@@ -7,7 +7,9 @@ module Condensation
     end
 
     def escape_html
-      CGI.escapeHTML(input) rescue input
+      CGI.escapeHTML(input)
+    rescue
+      input
     end
   end
-end
+end

data/lib/condensation/version.rb

@@ -1,3 +1,3 @@
 module Condensation
-  VERSION = "1.5.0"
+  VERSION = '1.6.0'.freeze
 end

data/spec/condensation/filters/advance_date_to_next_spec.rb

@@ -2,14 +2,14 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 describe Condensation::Filters::AdvanceDateToNext do
   def render_with_filter(template, context)
-    template.render(context, :filters => [Condensation::Filters::AdvanceDateToNext])
+    template.render(context, filters: [Condensation::Filters::AdvanceDateToNext])
   end
 
-  it "should handle UTC ISO 8601 dates" do
-    created_at = "2015-06-11T10:00:00Z" # a Thursday
-    template = Liquid::Template.parse("{{ created_at | advance_date_to_next: \"Saturday\" }}")
-    result = render_with_filter(template, { "created_at" => created_at })
-    result.must_equal "2015-06-13 10:00:00 UTC"
+  it 'should handle UTC ISO 8601 dates' do
+    created_at = '2015-06-11T10:00:00Z' # a Thursday
+    template = Liquid::Template.parse('{{ created_at | advance_date_to_next: "Saturday" }}')
+    result = render_with_filter(template, 'created_at' => created_at)
+    result.must_equal '2015-06-13 10:00:00 UTC'
   end
 
   # it "should handle non-UTC ISO 8601 dates" do
@@ -26,53 +26,53 @@ describe Condensation::Filters::AdvanceDateToNext do
   #   result.must_equal "2015-06-13 00:00:00 UTC"
   # end
 
-  it "should handle UTC Time input" do
+  it 'should handle UTC Time input' do
     created_at = Time.utc(2015, 6, 11, 10, 0, 0) # a Thursday
-    template = Liquid::Template.parse("{{ created_at | advance_date_to_next: \"Saturday\" }}")
-    result = render_with_filter(template, { "created_at" => created_at })
-    result.must_equal "2015-06-13 10:00:00 UTC"
+    template = Liquid::Template.parse('{{ created_at | advance_date_to_next: "Saturday" }}')
+    result = render_with_filter(template, 'created_at' => created_at)
+    result.must_equal '2015-06-13 10:00:00 UTC'
   end
 
-  it "should handle non-UTC ActiveSupport::TimeWithZone input" do
-    zone = ActiveSupport::TimeZone["Indian/Maldives"] # UTC+05:00
+  it 'should handle non-UTC ActiveSupport::TimeWithZone input' do
+    zone = ActiveSupport::TimeZone['Indian/Maldives'] # UTC+05:00
     created_at = Time.utc(2015, 6, 11, 10, 0, 0).in_time_zone(zone) # Thu, 11 Jun 2015 15:00:00 MVT +05:00
-    template = Liquid::Template.parse("{{ created_at | advance_date_to_next: \"Saturday\" }}")
-    result = render_with_filter(template, { "created_at" => created_at })
-    result.must_equal "2015-06-13 15:00:00 +0500"
+    template = Liquid::Template.parse('{{ created_at | advance_date_to_next: "Saturday" }}')
+    result = render_with_filter(template, 'created_at' => created_at)
+    result.must_equal '2015-06-13 15:00:00 +0500'
   end
 
-  it "never return the same day" do
-    created_at = "2015-06-11T10:00:00Z" # a Thursday
-    template = Liquid::Template.parse("{{ created_at | advance_date_to_next: \"Thursday\" }}")
-    result = render_with_filter(template, { "created_at" => created_at })
-    result.must_equal "2015-06-18 10:00:00 UTC"
+  it 'never return the same day' do
+    created_at = '2015-06-11T10:00:00Z' # a Thursday
+    template = Liquid::Template.parse('{{ created_at | advance_date_to_next: "Thursday" }}')
+    result = render_with_filter(template, 'created_at' => created_at)
+    result.must_equal '2015-06-18 10:00:00 UTC'
   end
 
-  it "should handle malformed dates" do
-    created_at = "foo"
-    template = Liquid::Template.parse("{{ created_at | advance_date_to_next: \"Saturday\" }}")
-    result = render_with_filter(template, { "created_at" => created_at })
-    result.must_equal "foo"
+  it 'should handle malformed dates' do
+    created_at = 'foo'
+    template = Liquid::Template.parse('{{ created_at | advance_date_to_next: "Saturday" }}')
+    result = render_with_filter(template, 'created_at' => created_at)
+    result.must_equal 'foo'
   end
 
-  it "should handle empty string input" do
-    created_at = ""
-    template = Liquid::Template.parse("{{ created_at | advance_date_to_next: \"Saturday\" }}")
-    result = render_with_filter(template, { "created_at" => created_at })
-    result.must_equal ""
+  it 'should handle empty string input' do
+    created_at = ''
+    template = Liquid::Template.parse('{{ created_at | advance_date_to_next: "Saturday" }}')
+    result = render_with_filter(template, 'created_at' => created_at)
+    result.must_equal ''
   end
 
-  it "should handle nil input" do
+  it 'should handle nil input' do
     created_at = nil
-    template = Liquid::Template.parse("{{ created_at | advance_date_to_next: \"Saturday\" }}")
-    result = render_with_filter(template, { "created_at" => created_at })
-    result.must_equal ""
+    template = Liquid::Template.parse('{{ created_at | advance_date_to_next: "Saturday" }}')
+    result = render_with_filter(template, 'created_at' => created_at)
+    result.must_equal ''
   end
 
-  it "should render an error given an invalid day" do
-    created_at = "2015-06-11T10:00:00Z" # a Thursday
-    template = Liquid::Template.parse("{{ created_at | advance_date_to_next: \"fooday\" }}")
-    result = render_with_filter(template, { "created_at" => created_at })
-    result.must_equal "Liquid error: fooday is not a valid day"
+  it 'should render an error given an invalid day' do
+    created_at = '2015-06-11T10:00:00Z' # a Thursday
+    template = Liquid::Template.parse('{{ created_at | advance_date_to_next: "fooday" }}')
+    result = render_with_filter(template, 'created_at' => created_at)
+    result.must_equal 'Liquid error: fooday is not a valid day'
   end
 end

data/spec/condensation/filters/at_midnight_spec.rb

@@ -2,21 +2,21 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 describe Condensation::Filters::AtMidnight do
   def render_with_filter(template, context)
-    template.render(context, :filters => [Condensation::Filters::AtMidnight])
+    template.render(context, filters: [Condensation::Filters::AtMidnight])
   end
 
-  it "should handle UTC ISO 8601 dates" do
-    created_at = "2015-06-11T10:00:00Z" # a Thursday
-    template = Liquid::Template.parse("{{ created_at | at_midnight }}")
-    result = render_with_filter(template, { "created_at" => created_at })
-    result.must_equal "2015-06-11 00:00:00 UTC"
+  it 'should handle UTC ISO 8601 dates' do
+    created_at = '2015-06-11T10:00:00Z' # a Thursday
+    template = Liquid::Template.parse('{{ created_at | at_midnight }}')
+    result = render_with_filter(template, 'created_at' => created_at)
+    result.must_equal '2015-06-11 00:00:00 UTC'
   end
 
-  it "should handle non-UTC ISO 8601 dates" do
-    created_at = "2015-06-11T20:00:00-07:00" # a Thursday
-    template = Liquid::Template.parse("{{ created_at | at_midnight }}")
-    result = render_with_filter(template, { "created_at" => created_at })
-    result.must_equal "2015-06-11 00:00:00 -0700"
+  it 'should handle non-UTC ISO 8601 dates' do
+    created_at = '2015-06-11T20:00:00-07:00' # a Thursday
+    template = Liquid::Template.parse('{{ created_at | at_midnight }}')
+    result = render_with_filter(template, 'created_at' => created_at)
+    result.must_equal '2015-06-11 00:00:00 -0700'
   end
 
   # it "should handle YMD formatted dates" do
@@ -26,31 +26,31 @@ describe Condensation::Filters::AtMidnight do
   #   result.must_equal "2015-06-11 00:00:00 UTC"
   # end
 
-  it "should handle Time input" do
+  it 'should handle Time input' do
     created_at = Time.utc(2015, 6, 11, 10, 0, 0) # a Thursday
-    template = Liquid::Template.parse("{{ created_at | at_midnight }}")
-    result = render_with_filter(template, { "created_at" => created_at })
-    result.must_equal "2015-06-11 00:00:00 UTC"
+    template = Liquid::Template.parse('{{ created_at | at_midnight }}')
+    result = render_with_filter(template, 'created_at' => created_at)
+    result.must_equal '2015-06-11 00:00:00 UTC'
   end
 
-  it "should handle malformed dates" do
-    created_at = "foo"
-    template = Liquid::Template.parse("{{ created_at | at_midnight }}")
-    result = render_with_filter(template, { "created_at" => created_at })
-    result.must_equal "foo"
+  it 'should handle malformed dates' do
+    created_at = 'foo'
+    template = Liquid::Template.parse('{{ created_at | at_midnight }}')
+    result = render_with_filter(template, 'created_at' => created_at)
+    result.must_equal 'foo'
   end
 
-  it "should handle empty string input" do
-    created_at = ""
-    template = Liquid::Template.parse("{{ created_at | at_midnight }}")
-    result = render_with_filter(template, { "created_at" => created_at })
-    result.must_equal ""
+  it 'should handle empty string input' do
+    created_at = ''
+    template = Liquid::Template.parse('{{ created_at | at_midnight }}')
+    result = render_with_filter(template, 'created_at' => created_at)
+    result.must_equal ''
   end
 
-  it "should handle nil input" do
+  it 'should handle nil input' do
     created_at = nil
-    template = Liquid::Template.parse("{{ created_at | at_midnight }}")
-    result = render_with_filter(template, { "created_at" => created_at })
-    result.must_equal ""
+    template = Liquid::Template.parse('{{ created_at | at_midnight }}')
+    result = render_with_filter(template, 'created_at' => created_at)
+    result.must_equal ''
   end
 end

data/spec/condensation/filters/days_since_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 describe Condensation::Filters::DaysSince do
   def render_with_filter(template, context)
-    template.render(context, :filters => [Condensation::Filters::DaysSince])
+    template.render(context, filters: [Condensation::Filters::DaysSince])
   end
 
   let(:now) do
@@ -17,52 +17,52 @@ describe Condensation::Filters::DaysSince do
     Timecop.return
   end
 
-  it "should handle UTC ISO 8601 dates" do
-    created_at = "2014-05-15T10:00:00Z"
-    template = Liquid::Template.parse("{{ created_at | days_since }}")
-    result = render_with_filter(template, { "created_at" => created_at })
-    result.must_equal "14"
+  it 'should handle UTC ISO 8601 dates' do
+    created_at = '2014-05-15T10:00:00Z'
+    template = Liquid::Template.parse('{{ created_at | days_since }}')
+    result = render_with_filter(template, 'created_at' => created_at)
+    result.must_equal '14'
   end
 
-  it "should handle non-UTC ISO 8601 dates" do
-    created_at = "2014-05-15T20:00:00-07:00"
-    template = Liquid::Template.parse("{{ created_at | days_since }}")
-    result = render_with_filter(template, { "created_at" => created_at })
-    result.must_equal "13"
+  it 'should handle non-UTC ISO 8601 dates' do
+    created_at = '2014-05-15T20:00:00-07:00'
+    template = Liquid::Template.parse('{{ created_at | days_since }}')
+    result = render_with_filter(template, 'created_at' => created_at)
+    result.must_equal '13'
   end
 
-  it "should handle Time input" do
+  it 'should handle Time input' do
     created_at = Time.utc(2014, 5, 20, 0, 0, 0)
-    template = Liquid::Template.parse("{{ created_at | days_since }}")
-    result = render_with_filter(template, { "created_at" => created_at })
-    result.must_equal "10"
+    template = Liquid::Template.parse('{{ created_at | days_since }}')
+    result = render_with_filter(template, 'created_at' => created_at)
+    result.must_equal '10'
   end
 
-  it "should handle malformed dates" do
-    created_at = "foo"
-    template = Liquid::Template.parse("{{ created_at | days_since }}")
-    result = render_with_filter(template, { "created_at" => created_at })
-    result.must_equal ""
+  it 'should handle malformed dates' do
+    created_at = 'foo'
+    template = Liquid::Template.parse('{{ created_at | days_since }}')
+    result = render_with_filter(template, 'created_at' => created_at)
+    result.must_equal ''
   end
 
-  it "should be zero for days in the future" do
-    created_at = "2014-06-01T20:00:00Z"
-    template = Liquid::Template.parse("{{ created_at | days_since }}")
-    result = render_with_filter(template, { "created_at" => created_at })
-    result.must_equal "0"
+  it 'should be zero for days in the future' do
+    created_at = '2014-06-01T20:00:00Z'
+    template = Liquid::Template.parse('{{ created_at | days_since }}')
+    result = render_with_filter(template, 'created_at' => created_at)
+    result.must_equal '0'
   end
 
-  it "should handle empty string input" do
-    created_at = ""
-    template = Liquid::Template.parse("{{ created_at | days_since }}")
-    result = render_with_filter(template, { "created_at" => created_at })
-    result.must_equal ""
+  it 'should handle empty string input' do
+    created_at = ''
+    template = Liquid::Template.parse('{{ created_at | days_since }}')
+    result = render_with_filter(template, 'created_at' => created_at)
+    result.must_equal ''
   end
 
-  it "should handle nil input" do
+  it 'should handle nil input' do
     created_at = nil
-    template = Liquid::Template.parse("{{ created_at | days_since }}")
-    result = render_with_filter(template, { "created_at" => created_at })
-    result.must_equal ""
+    template = Liquid::Template.parse('{{ created_at | days_since }}')
+    result = render_with_filter(template, 'created_at' => created_at)
+    result.must_equal ''
   end
 end

data/spec/condensation/filters/days_until_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 describe Condensation::Filters::DaysUntil do
   def render_with_filter(template, context)
-    template.render(context, :filters => [Condensation::Filters::DaysUntil])
+    template.render(context, filters: [Condensation::Filters::DaysUntil])
   end
 
   let(:now) do
@@ -17,59 +17,59 @@ describe Condensation::Filters::DaysUntil do
     Timecop.return
   end
 
-  it "should handle UTC ISO 8601 dates" do
-    created_at = "2014-05-30T10:00:00Z"
-    template = Liquid::Template.parse("{{ created_at | days_until }}")
-    result = render_with_filter(template, { "created_at" => created_at })
-    result.must_equal "15"
+  it 'should handle UTC ISO 8601 dates' do
+    created_at = '2014-05-30T10:00:00Z'
+    template = Liquid::Template.parse('{{ created_at | days_until }}')
+    result = render_with_filter(template, 'created_at' => created_at)
+    result.must_equal '15'
   end
 
-  it "should handle non-UTC ISO 8601 dates" do
-    created_at = "2014-05-30T20:00:00-07:00"
-    template = Liquid::Template.parse("{{ created_at | days_until }}")
-    result = render_with_filter(template, { "created_at" => created_at })
-    result.must_equal "16"
+  it 'should handle non-UTC ISO 8601 dates' do
+    created_at = '2014-05-30T20:00:00-07:00'
+    template = Liquid::Template.parse('{{ created_at | days_until }}')
+    result = render_with_filter(template, 'created_at' => created_at)
+    result.must_equal '16'
   end
 
-  it "should handle YMD formatted dates" do
-    created_at = "2014-05-30"
-    template = Liquid::Template.parse("{{ created_at | days_until }}")
-    result = render_with_filter(template, { "created_at" => created_at })
-    result.must_equal "15"
+  it 'should handle YMD formatted dates' do
+    created_at = '2014-05-30'
+    template = Liquid::Template.parse('{{ created_at | days_until }}')
+    result = render_with_filter(template, 'created_at' => created_at)
+    result.must_equal '15'
   end
 
-  it "should handle Time input" do
+  it 'should handle Time input' do
     created_at = Time.utc(2014, 5, 20, 0, 0, 0)
-    template = Liquid::Template.parse("{{ created_at | days_until }}")
-    result = render_with_filter(template, { "created_at" => created_at })
-    result.must_equal "5"
+    template = Liquid::Template.parse('{{ created_at | days_until }}')
+    result = render_with_filter(template, 'created_at' => created_at)
+    result.must_equal '5'
   end
 
-  it "should handle malformed dates" do
-    created_at = "foo"
-    template = Liquid::Template.parse("{{ created_at | days_until }}")
-    result = render_with_filter(template, { "created_at" => created_at })
-    result.must_equal ""
+  it 'should handle malformed dates' do
+    created_at = 'foo'
+    template = Liquid::Template.parse('{{ created_at | days_until }}')
+    result = render_with_filter(template, 'created_at' => created_at)
+    result.must_equal ''
   end
 
-  it "should be zero for days in the past" do
-    created_at = "2014-05-01T20:00:00Z"
-    template = Liquid::Template.parse("{{ created_at | days_until }}")
-    result = render_with_filter(template, { "created_at" => created_at })
-    result.must_equal "0"
+  it 'should be zero for days in the past' do
+    created_at = '2014-05-01T20:00:00Z'
+    template = Liquid::Template.parse('{{ created_at | days_until }}')
+    result = render_with_filter(template, 'created_at' => created_at)
+    result.must_equal '0'
   end
 
-  it "should handle empty string input" do
-    created_at = ""
-    template = Liquid::Template.parse("{{ created_at | days_until }}")
-    result = render_with_filter(template, { "created_at" => created_at })
-    result.must_equal ""
+  it 'should handle empty string input' do
+    created_at = ''
+    template = Liquid::Template.parse('{{ created_at | days_until }}')
+    result = render_with_filter(template, 'created_at' => created_at)
+    result.must_equal ''
   end
 
-  it "should handle nil input" do
+  it 'should handle nil input' do
     created_at = nil
-    template = Liquid::Template.parse("{{ created_at | days_until }}")
-    result = render_with_filter(template, { "created_at" => created_at })
-    result.must_equal ""
+    template = Liquid::Template.parse('{{ created_at | days_until }}')
+    result = render_with_filter(template, 'created_at' => created_at)
+    result.must_equal ''
   end
 end

data/spec/condensation/filters/default_spec.rb

@@ -2,42 +2,42 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 describe Condensation::Filters::Default do
   def render_with_filter(template, context)
-    template.render(context, :filters => [Condensation::Filters::Default])
+    template.render(context, filters: [Condensation::Filters::Default])
   end
 
-  it "should return input if it is not blank" do
+  it 'should return input if it is not blank' do
     template = Liquid::Template.parse("{{ name | default: 'Bar' }}")
-    result = render_with_filter(template, { "name" => "Foo" })
-    result.must_equal "Foo"
+    result = render_with_filter(template, 'name' => 'Foo')
+    result.must_equal 'Foo'
   end
 
-  it "should return default value if input is nil" do
+  it 'should return default value if input is nil' do
     template = Liquid::Template.parse("{{ name | default: 'Bar' }}")
-    result = render_with_filter(template, { "name" => nil })
-    result.must_equal "Bar"
+    result = render_with_filter(template, 'name' => nil)
+    result.must_equal 'Bar'
   end
 
-  it "should return default value if input is an empty string" do
+  it 'should return default value if input is an empty string' do
     template = Liquid::Template.parse("{{ name | default: 'Bar' }}")
-    result = render_with_filter(template, { "name" => "" })
-    result.must_equal "Bar"
+    result = render_with_filter(template, 'name' => '')
+    result.must_equal 'Bar'
   end
 
-  it "should return default value if input is an empty hash" do
+  it 'should return default value if input is an empty hash' do
     template = Liquid::Template.parse("{{ name | default: 'Bar' }}")
-    result = render_with_filter(template, { "name" => {} })
-    result.must_equal "Bar"
+    result = render_with_filter(template, 'name' => {})
+    result.must_equal 'Bar'
   end
 
-  it "should return default value if input is an empty array" do
+  it 'should return default value if input is an empty array' do
     template = Liquid::Template.parse("{{ name | default: 'Bar' }}")
-    result = render_with_filter(template, { "name" => [] })
-    result.must_equal "Bar"
+    result = render_with_filter(template, 'name' => [])
+    result.must_equal 'Bar'
   end
 
-  it "should return default value if input is false" do
+  it 'should return default value if input is false' do
     template = Liquid::Template.parse("{{ name | default: 'Bar' }}")
-    result = render_with_filter(template, { "name" => false })
-    result.must_equal "Bar"
+    result = render_with_filter(template, 'name' => false)
+    result.must_equal 'Bar'
   end
 end