condensation 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f1c7731be7d1adc39464da39cfcb0c3739c59a6
-  data.tar.gz: b4d5a9297f02fded79667ef7a4f1ca671662a87f
+  metadata.gz: 39333154e19007dc82061393ece503e3da8b5904
+  data.tar.gz: af24e07e4f2a0a3541f36e5d11e879e0a28c8111
 SHA512:
-  metadata.gz: 4568209ad4434b20227a1b6c74c97d66be42f5852be47921d4b6b516df2c16764b1e2360f121965c02c0b5f366d401be6c676284820b473def0947bd0cdb9b5c
-  data.tar.gz: f2c05ca8cf688c5f28618f7a44b1370df1cac7f0ea822bce2e11a47702cae0ff4fe3ef404dc4add71b3cd1625f3777a7aef72229bd559dd6ec284d1876cbd7d6
+  metadata.gz: 1ee704b9cc8b14be441ddea8b36c1c3fc6314f02ba8f62dbfba4f6f1bffc764bab9c4ba9a611a1caa49701a41de21232b2a88637178e4c3cf252f19b2be00872
+  data.tar.gz: 79d694031a622e764e1701cf5d2e9a577aa96b8c4b2d46e0d8b6e559241048137e489163c7eeca4fe6726a633306ba139224ba904be5493882837448233e6a9c

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2015 Derrick Reimer
+Copyright (c) 2013-2016 Derrick Reimer
 
 MIT License
 

data/lib/condensation/filters/days_since.rb

@@ -3,6 +3,8 @@ require 'time'
 module Condensation
   module Filters
     module DaysSince
+      SECONDS_PER_DAY = 86400
+
       def days_since(input)
         return if input.nil?
 
@@ -15,7 +17,7 @@ module Condensation
         return unless value.is_a?(Time)
 
         diff = Time.now - value
-        [diff.to_i / 86400, 0].max
+        [diff.to_i / SECONDS_PER_DAY, 0].max
       end
     end
   end

data/lib/condensation/filters/days_until.rb

@@ -3,6 +3,8 @@ require 'time'
 module Condensation
   module Filters
     module DaysUntil
+      SECONDS_PER_DAY = 86400
+
       def days_until(input)
         return if input.nil?
 
@@ -15,7 +17,7 @@ module Condensation
         return unless value.is_a?(Time)
 
         diff = value - Time.now
-        [diff.to_i / 86400, 0].max
+        [diff.to_i / SECONDS_PER_DAY, 0].max
       end
     end
   end

data/lib/condensation/filters/weeks_since.rb

@@ -0,0 +1,24 @@
+require 'time'
+
+module Condensation
+  module Filters
+    module WeeksSince
+      SECONDS_PER_WEEK = 86400 * 7
+
+      def weeks_since(input)
+        return if input.nil?
+
+        if input.is_a?(Time)
+          value = input
+        else
+          value = Time.parse(input) rescue nil
+        end
+
+        return unless value.is_a?(Time)
+
+        diff = Time.now - value
+        [diff.to_i / SECONDS_PER_WEEK, 0].max
+      end
+    end
+  end
+end

data/lib/condensation/filters/weeks_until.rb

@@ -0,0 +1,24 @@
+require 'time'
+
+module Condensation
+  module Filters
+    module WeeksUntil
+      SECONDS_PER_WEEK = 86400 * 7
+
+      def weeks_until(input)
+        return if input.nil?
+
+        if input.is_a?(Time)
+          value = input
+        else
+          value = Time.parse(input) rescue nil
+        end
+
+        return unless value.is_a?(Time)
+
+        diff = value - Time.now
+        [diff.to_i / SECONDS_PER_WEEK, 0].max
+      end
+    end
+  end
+end

data/lib/condensation/filters.rb

@@ -9,3 +9,5 @@ require "condensation/filters/advance_date_to_next"
 require "condensation/filters/at_midnight"
 require "condensation/filters/in_time_zone"
 require "condensation/filters/timestamp"
+require "condensation/filters/weeks_since"
+require "condensation/filters/weeks_until"

data/lib/condensation/version.rb

@@ -1,3 +1,3 @@
 module Condensation
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/lib/condensation.rb

@@ -16,7 +16,9 @@ module Condensation
     Filters::AdvanceDateToNext,
     Filters::AtMidnight,
     Filters::InTimeZone,
-    Filters::Timestamp
+    Filters::Timestamp,
+    Filters::WeeksSince,
+    Filters::WeeksUntil
   ]
 
   def self.register_filters

data/spec/condensation/filters/days_until_spec.rb

@@ -61,7 +61,7 @@ describe Condensation::Filters::DaysUntil do
 
   it "should handle empty string input" do
     created_at = ""
-    template = Liquid::Template.parse("{{ created_at | days_since }}")
+    template = Liquid::Template.parse("{{ created_at | days_until }}")
     result = render_with_filter(template, { "created_at" => created_at })
     result.must_equal ""
   end

data/spec/condensation/filters/weeks_since_spec.rb

@@ -0,0 +1,68 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+describe Condensation::Filters::WeeksSince do
+  def render_with_filter(template, context)
+    template.render(context, :filters => [Condensation::Filters::WeeksSince])
+  end
+
+  let(:now) do
+    Time.utc(2014, 5, 30, 0, 0, 0)
+  end
+
+  before do
+    Timecop.freeze(now)
+  end
+
+  after 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 | weeks_since }}")
+    result = render_with_filter(template, { "created_at" => created_at })
+    result.must_equal "2"
+  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 | weeks_since }}")
+    result = render_with_filter(template, { "created_at" => created_at })
+    result.must_equal "1"
+  end
+
+  it "should handle Time input" do
+    created_at = Time.utc(2014, 5, 1, 0, 0, 0)
+    template = Liquid::Template.parse("{{ created_at | weeks_since }}")
+    result = render_with_filter(template, { "created_at" => created_at })
+    result.must_equal "4"
+  end
+
+  it "should handle malformed dates" do
+    created_at = "foo"
+    template = Liquid::Template.parse("{{ created_at | weeks_since }}")
+    result = render_with_filter(template, { "created_at" => created_at })
+    result.must_equal ""
+  end
+
+  it "should be zero for times in the future" do
+    created_at = "2014-06-01T20:00:00Z"
+    template = Liquid::Template.parse("{{ created_at | weeks_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 | weeks_since }}")
+    result = render_with_filter(template, { "created_at" => created_at })
+    result.must_equal ""
+  end
+
+  it "should handle nil input" do
+    created_at = nil
+    template = Liquid::Template.parse("{{ created_at | weeks_since }}")
+    result = render_with_filter(template, { "created_at" => created_at })
+    result.must_equal ""
+  end
+end

data/spec/condensation/filters/weeks_until_spec.rb

@@ -0,0 +1,75 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+describe Condensation::Filters::WeeksUntil do
+  def render_with_filter(template, context)
+    template.render(context, :filters => [Condensation::Filters::WeeksUntil])
+  end
+
+  let(:now) do
+    Time.utc(2014, 5, 15, 0, 0, 0)
+  end
+
+  before do
+    Timecop.freeze(now)
+  end
+
+  after 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 | weeks_until }}")
+    result = render_with_filter(template, { "created_at" => created_at })
+    result.must_equal "2"
+  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 | weeks_until }}")
+    result = render_with_filter(template, { "created_at" => created_at })
+    result.must_equal "2"
+  end
+
+  it "should handle YMD formatted dates" do
+    created_at = "2014-05-30"
+    template = Liquid::Template.parse("{{ created_at | weeks_until }}")
+    result = render_with_filter(template, { "created_at" => created_at })
+    result.must_equal "2"
+  end
+
+  it "should handle Time input" do
+    created_at = Time.utc(2014, 6, 15, 0, 0, 0)
+    template = Liquid::Template.parse("{{ created_at | weeks_until }}")
+    result = render_with_filter(template, { "created_at" => created_at })
+    result.must_equal "4"
+  end
+
+  it "should handle malformed dates" do
+    created_at = "foo"
+    template = Liquid::Template.parse("{{ created_at | weeks_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 | weeks_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 | weeks_until }}")
+    result = render_with_filter(template, { "created_at" => created_at })
+    result.must_equal ""
+  end
+
+  it "should handle nil input" do
+    created_at = nil
+    template = Liquid::Template.parse("{{ created_at | weeks_until }}")
+    result = render_with_filter(template, { "created_at" => created_at })
+    result.must_equal ""
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: condensation
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Derrick Reimer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -127,6 +127,8 @@ files:
 - lib/condensation/filters/strip_commas.rb
 - lib/condensation/filters/timestamp.rb
 - lib/condensation/filters/url_encode.rb
+- lib/condensation/filters/weeks_since.rb
+- lib/condensation/filters/weeks_until.rb
 - lib/condensation/sanitizer.rb
 - lib/condensation/version.rb
 - spec/condensation/filters/advance_date_to_next_spec.rb
@@ -140,6 +142,8 @@ files:
 - spec/condensation/filters/strip_commas_spec.rb
 - spec/condensation/filters/timestamp_spec.rb
 - spec/condensation/filters/url_encode_spec.rb
+- spec/condensation/filters/weeks_since_spec.rb
+- spec/condensation/filters/weeks_until_spec.rb
 - spec/condensation/sanitizer_spec.rb
 - spec/condensation_spec.rb
 - spec/spec_helper.rb
@@ -180,6 +184,8 @@ test_files:
 - spec/condensation/filters/strip_commas_spec.rb
 - spec/condensation/filters/timestamp_spec.rb
 - spec/condensation/filters/url_encode_spec.rb
+- spec/condensation/filters/weeks_since_spec.rb
+- spec/condensation/filters/weeks_until_spec.rb
 - spec/condensation/sanitizer_spec.rb
 - spec/condensation_spec.rb
 - spec/spec_helper.rb