radiant-featured_pages-extension 2.0.0 → 2.0.1

data/lib/featured_pages_tags.rb

@@ -35,13 +35,9 @@ module FeaturedPagesTags
     find_options.merge!(:limit => limit) if limit
     
     date = tag.attr["date"] || nil
-    @i18n_date_formats ||= (I18n.config.backend.send(:translations)[I18n.locale][:date][:formats] rescue {})
+    
     format = tag.attr['format']
-    if format
-      format = @i18n_date_formats.keys.include?(format.to_sym) ? format.to_sym : format
-    else
-      format = "%m/%d/%Y"
-    end
+    format = i18n_date_formats[format] || "%m/%d/%Y"
     
     offset_pair = change_pairs(tag.attr['offset'])
     window_pair = change_pairs(tag.attr['window'])
@@ -107,6 +103,92 @@ module FeaturedPagesTags
     tag.expand unless tag.locals.page == tag.locals.featured_pages.first
   end
   
+  desc %{
+    Displays it's contents if the current page is featured in the given window of time.
+    Accepts these parameters:
+      
+      * date   - no default. Use a formatted date or 'today', 'future', or 'past'
+      * format - used only with the date parameters to specify the format of the date you are using
+      * window - '+3 days' no default, allows you to add(+n) or subtract(-n) days, weeks, months, years
+      * offset - '-1 month' no default, allows you to offset the actual date from the date given
+      
+    Selecting a date of 'future' or 'past' will expand the window to any time in the future or past
+    beyond the offset.
+      
+    *Usage:*
+    <pre><code><r:if_featured>...</r:if_featured></code></pre>
+  }
+  tag 'if_featured' do |tag|
+    date = tag.attr["date"] || nil
+    
+    if date
+      offset_pair = change_pairs(tag.attr['offset'])
+      window_pair = change_pairs(tag.attr['window'])
+      
+      format = tag.attr['format']
+      format = i18n_date_formats[format] || "%m/%d/%Y"
+      
+      focus_date = begin
+        I18n.l(date, :format => format).in_time_zone
+      rescue
+        Rails.env.test? ? Time.zone.now - 1.second : Time.zone.now
+      end
+      
+      date_with_offset = focus_date.in_time_zone + offset_pair.first.send(offset_pair.last)
+      date_with_window = date_with_offset + window_pair.first.send(window_pair.last)
+      range_dates = [date_with_offset, date_with_window].sort
+      
+      in_future_window = (date == 'future' && tag.locals.page.featured_date > date_with_offset)
+      in_past_window = (date == 'past' && tag.locals.page.featured_date < date_with_offset)
+      in_range_window = (tag.locals.page.featured_date >= range_dates.first.beginning_of_day && tag.locals.page.featured_date <= range_dates.last.end_of_day)
+      
+      if in_future_window || in_past_window || in_range_window
+        tag.expand
+      end
+    else
+      tag.expand if tag.locals.page.featured_date.present?
+    end
+  end
+  
+  desc %{
+    Displays it's contents if the current page is not featured in the given window of time.
+    Accepts the same parameters as if_featured.
+      
+    *Usage:*
+    <pre><code><r:unless_featured>...</r:unless_featured></code></pre>
+  }
+  tag 'unless_featured' do |tag|
+    date = tag.attr["date"] || nil
+    
+    if date
+      offset_pair = change_pairs(tag.attr['offset'])
+      window_pair = change_pairs(tag.attr['window'])
+      
+      format = tag.attr['format']
+      format = i18n_date_formats[format] || "%m/%d/%Y"
+      
+      focus_date = begin
+        I18n.l(date, :format => format).in_time_zone
+      rescue
+        Rails.env.test? ? Time.zone.now - 1.second : Time.zone.now
+      end
+      
+      date_with_offset = (focus_date.in_time_zone + offset_pair.first.send(offset_pair.last)).beginning_of_day
+      date_with_window = (date_with_offset + window_pair.first.send(window_pair.last)).end_of_day
+      range_dates = [date_with_offset, date_with_window].sort
+      
+      in_future_window = (date == 'future' && tag.locals.page.featured_date > date_with_offset)
+      in_past_window = (date == 'past' && tag.locals.page.featured_date < date_with_offset)
+      in_range_window = (tag.locals.page.featured_date >= range_dates.first.beginning_of_day && tag.locals.page.featured_date <= range_dates.last.end_of_day)
+
+      unless (in_future_window || in_past_window || in_range_window)
+        tag.expand
+      end
+    else
+      tag.expand unless tag.locals.page.featured_date.present?
+    end
+  end
+  
   private
   
   def change_pairs(text='')
@@ -116,4 +198,13 @@ module FeaturedPagesTags
     unit = change_parts.last =~ /^(second|minute|hour|day|week|month|year)s?$/ ? change_parts.last : 'days'
     [num, unit]
   end
+  
+  def date_change_amount(text_or_pair)
+    pair = change_pairs(text_or_pair)
+    pair.first.send(pair.second)
+  end
+  
+  def i18n_date_formats
+    @i18n_date_formats ||= I18n.t('date.formats')
+  end
 end

data/lib/radiant-featured_pages-extension/version.rb

@@ -1,3 +1,3 @@
 module RadiantFeaturedPagesExtension
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

data/spec/lib/featured_pages_tags_spec.rb

@@ -84,4 +84,92 @@ describe Page do
       page.should render('<r:featured_pages:each><r:unless_first><r:title /> </r:unless_first></r:featured_pages:each>').as('plus_2_months plus_2_weeks plus_1_day page minus_1_week ')
     end
   end
+  
+  describe '<r:if_featured>' do
+    subject{ page }
+    it "should expand contents for a page with a featured date" do
+      page.should render('<r:if_featured>YES!</r:if_featured>').as('YES!')
+    end
+    it 'should not render for a non-featured page' do
+      page.featured_date = nil
+      page.should render('<r:if_featured>YES!</r:if_featured>').as('')
+    end
+    context 'with saved featured pages' do
+      before do
+        save_pages
+      end
+      it {
+        should render(
+          '<r:featured_pages:each date="today" window="1 month"><r:if_featured date="today" window="1 week"><r:title /> </r:if_featured></r:featured_pages:each>'
+        ).as(
+          'plus_1_day page '
+        )
+      }
+      it {
+        should render(
+          '<r:featured_pages:each><r:if_featured date="today" window="1 week" offset="1 week"><r:title /> </r:if_featured></r:featured_pages:each>'
+        ).as(
+          'plus_2_weeks '
+        )
+      }
+      it {
+        should render(
+          '<r:featured_pages:each><r:if_featured date="future" offset="3 weeks"><r:title /> </r:if_featured></r:featured_pages:each>'
+        ).as(
+          'plus_2_years plus_2_months '
+        )
+      }
+      it {
+        should render(
+          '<r:featured_pages:each><r:if_featured date="past" offset="2 weeks"><r:title /> </r:if_featured></r:featured_pages:each>'
+        ).as(
+          'plus_2_weeks plus_1_day page minus_1_week '
+        )
+      }
+    end
+  end
+  
+  describe '<r:unless_featured>' do
+    subject{ page }
+    it "should not expand contents for a page with a featured date" do
+      page.should render('<r:unless_featured>YES!</r:unless_featured>').as('')
+    end
+    it 'should not render for a non-featured page' do
+      page.featured_date = nil
+      page.should render('<r:unless_featured>YES!</r:unless_featured>').as('YES!')
+    end
+    context 'with saved featured pages' do
+      before do
+        save_pages
+      end
+      it {
+        should render(
+          '<r:featured_pages:each date="today" window="1 month"><r:unless_featured date="today" window="1 week"><r:title /> </r:unless_featured></r:featured_pages:each>'
+        ).as(
+          'plus_2_weeks '
+        )
+      }
+      it {
+        should render(
+          '<r:featured_pages:each><r:unless_featured date="today" window="1 week" offset="1 week"><r:title /> </r:unless_featured></r:featured_pages:each>'
+        ).as(
+          'plus_2_years plus_2_months plus_1_day page minus_1_week '
+        )
+      }
+      it {
+        should render(
+          '<r:featured_pages:each><r:unless_featured date="future" offset="3 weeks"><r:title /> </r:unless_featured></r:featured_pages:each>'
+        ).as(
+          'plus_2_weeks plus_1_day page minus_1_week '
+        )
+      }
+      it {
+        should render(
+          '<r:featured_pages:each><r:unless_featured date="past" offset="2 weeks"><r:title /> </r:unless_featured></r:featured_pages:each>'
+        ).as(
+          'plus_2_years plus_2_months '
+        )
+      }
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-featured_pages-extension
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
+  hash: 13
+  prerelease: 
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - Jim Gay
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-08 00:00:00 -05:00
+date: 2011-03-12 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -60,7 +60,7 @@ has_rdoc: true
 homepage: http://github.com/saturnflyer/radiant-featured_pages-extension
 licenses: []
 
-post_install_message: "\n  Add this to your radiant project with:\n    config.gem 'radiant-featured_pages-extension', :version => '2.0.0'\n  "
+post_install_message: "\n  Add this to your radiant project with:\n    config.gem 'radiant-featured_pages-extension', :version => '2.0.1'\n  "
 rdoc_options: []
 
 require_paths: 
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Featured Pages Extension for Radiant CMS