snippr 0.15.14 → 0.15.15

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjljYWNkZjRjNWEyZjAyZmU5MTExNDAwZjRkNTdmOTUzODA4NjA4NQ==
+    NDUxZDgxNzQ4M2E0NDAzNzcxMDQyMDU5MzBlMTAyYmU1ZWZlYzQ2NQ==
   data.tar.gz: !binary |-
-    ZWFiYjcyYjI3NWQ3OTU1ZjllOWE5ODBmYjZlNTZiYjNhNTRjNjdhNg==
+    YzM1NGU3MDgxZWIwZDNhMWIzYmUxMWZhMmJhZjFmZmY2YTM4ZDFmZA==
 SHA512:
   metadata.gz: !binary |-
-    ZTk1YTY3ODk4NjNkODEwNzZiODAyZDUwOWIzYmIxZmRmZjcyNzQ0YmNmNTll
-    OWZkYzEyOWU1MTc2MWU1YjJiMTkzODFiN2U0MWJkNGIwMzM3MDYwZDQxYjFm
-    YzI1N2FjMzYyNjI3M2Y0OGFkNWYyZmEyZmEwNjc2MDc4YTU5Zjk=
+    ZTFlOTM3MTFiMmYwMDJlNDdkNGFmMDJiYjRkMDQxNDU3N2NmMzg4OThmZGZh
+    NTAwOGRlMDQ3ODc2NmIzYWQwNGQyMTVmMDIyMTk0ZDRiMGQ0NjQxZWFhZTMz
+    MGFjZTkwYzg5MmM0NjE1OTQxNGI1Njg1N2FmZTM4YmJlYzRhNTc=
   data.tar.gz: !binary |-
-    ZmVmMGM0ZmFlOGEyZmM0MmZjNTYzOTllYmM1ZWUyM2ZjN2ZhODM2N2I2MTZk
-    ODNkMmExNjIyYjU5ZGIzYWE5NzMyM2RiODcwMWQ0NjlmZDUyZGVmM2NiODg1
-    YWYyZjEyMDVkYjc5MGIyMTc5NmIyNTE4MWRjZThjZTY3MDYxMmE=
+    OWNjNzc1MTUzYWVkNmJhZDAzMjQxMWI5ODc1OGE5NzkyMTUyOTcyN2JkNTll
+    MzFiMGU0OTM1NjY3NTI3NGM5ZWQyN2VlNmFlY2JiNDk1OTNlYjRkMmExZTU5
+    MzgyYTk1ZTk2YzZiN2RlMzUzMGJjZjA5NGU2NzM2NzE0MzEwMWM=

data/.travis.yml

@@ -3,5 +3,6 @@ rvm:
   - 1.9.3
   - jruby-19mode # JRuby in 1.9 mode
   - 2.0.0
+  - 2.1.0
 notifications:
   email: false

data/README.md

@@ -151,6 +151,10 @@ Here the second segment would be the content on and after 2013-05-17 13:15:00.
 `valid_until: YYYY-MM-DD HH:MM:SS` :  
 Same as `valid_from` only the other way round
 
+#### valid_between
+`valid_between: YYYY-MM-DD HH:MM:SS - YYYY-MM-DD HH:MM::SS` :  
+Combines `valid_from` and `valid_until` segment filters
+
 #### on_rails_env
 `on_rails_env: production`:  
 Shows the snippet only in the given environment(s).  

data/lib/snippr.rb

@@ -18,6 +18,7 @@ require 'snippr/segment_parser'
 require 'snippr/segment_filter/base'
 require 'snippr/segment_filter/valid_from'
 require 'snippr/segment_filter/valid_until'
+require 'snippr/segment_filter/valid_between'
 require 'snippr/segment_filter/on_host'
 require 'snippr/segment_filter/on_rails_env' if defined?(Rails)
 

data/lib/snippr/segment_filter/valid_between.rb

@@ -0,0 +1,27 @@
+# -*- encoding : utf-8 -*-
+module Snippr
+  module SegmentFilter
+    class ValidBetween < Base
+      def active?
+        Snippr::Clock.now.to_s >= valid_from && Snippr::Clock.now.to_s <= valid_until
+      rescue ArgumentError
+        false
+      end
+
+      private
+
+      def valid_from
+        @valid_from ||= DateTime.strptime(@filter_value, "%Y-%m-%d %H:%M").to_s
+      end
+
+      def valid_until
+        @valid_until ||= begin
+          date_until = @filter_value.match(/([0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}(?::[0-9]{2})?)$/)
+          raise ArgumentError.new("valid_until date not parsable. Full filter value was: '#{@filter_value}'") if date_until.nil?
+          DateTime.strptime(date_until[1], "%Y-%m-%d %H:%M").to_s
+        end
+      end
+
+    end
+  end
+end

data/snippr.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = "snippr"
-  s.version     = "0.15.14"
+  s.version     = "0.15.15"
   s.date        = Time.now
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Daniel Harrington", "Thomas Jachmann", "Frank Schumacher"]

data/spec/snippr/segment_filter/base_spec.rb

@@ -3,6 +3,6 @@ require "spec_helper"
 
 describe "Snippr::SegmentFilter::Base" do
   it "remembers its subclasses" do
-    Snippr::SegmentFilter::Base.should have(4).filters
+    Snippr::SegmentFilter::Base.should have(5).filters
   end
 end

data/spec/snippr/segment_filter/valid_between_spec.rb

@@ -0,0 +1,20 @@
+# -*- encoding : utf-8 -*-
+require "spec_helper"
+
+describe "Snippr::SegmentFilter::ValidBetween" do
+  it "returns true if 'now' is between the filter dates" do
+    Snippr::SegmentFilter::ValidBetween.new("1976-03-10 09:00:00 - 9999-09-01 23:59:59").should be_active
+  end
+
+  it "returns false if 'now' is outside the filter dates" do
+    Snippr::SegmentFilter::ValidBetween.new("1976-03-10 09:00:00 - 1977-09-01 23:59:59").should_not be_active
+  end
+
+  it "returns false if the from date is not parsable" do
+    Snippr::SegmentFilter::ValidBetween.new("xxxx-03-10 09:00:00 - 1977-09-01 23:59:59").should_not be_active
+  end
+
+  it "returns false if the until date is not parsable" do
+    Snippr::SegmentFilter::ValidBetween.new("1976-03-10 09:00:00 - xxxx-09-01 23:59:59").should_not be_active
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: snippr
 version: !ruby/object:Gem::Version
-  version: 0.15.14
+  version: 0.15.15
 platform: ruby
 authors:
 - Daniel Harrington
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -138,6 +138,7 @@ files:
 - lib/snippr/segment_filter/base.rb
 - lib/snippr/segment_filter/on_host.rb
 - lib/snippr/segment_filter/on_rails_env.rb
+- lib/snippr/segment_filter/valid_between.rb
 - lib/snippr/segment_filter/valid_from.rb
 - lib/snippr/segment_filter/valid_until.rb
 - lib/snippr/segment_parser.rb
@@ -178,6 +179,7 @@ files:
 - spec/snippr/segment_filter/base_spec.rb
 - spec/snippr/segment_filter/on_host_spec.rb
 - spec/snippr/segment_filter/on_rails_env_spec.rb
+- spec/snippr/segment_filter/valid_between_spec.rb
 - spec/snippr/segment_filter/valid_from_spec.rb
 - spec/snippr/segment_filter/valid_until_spec.rb
 - spec/snippr/segment_parser_spec.rb
@@ -206,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: snippr
-rubygems_version: 2.1.4
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: File based content management
@@ -243,6 +245,7 @@ test_files:
 - spec/snippr/segment_filter/base_spec.rb
 - spec/snippr/segment_filter/on_host_spec.rb
 - spec/snippr/segment_filter/on_rails_env_spec.rb
+- spec/snippr/segment_filter/valid_between_spec.rb
 - spec/snippr/segment_filter/valid_from_spec.rb
 - spec/snippr/segment_filter/valid_until_spec.rb
 - spec/snippr/segment_parser_spec.rb