radiant-rss_reader-extension 1.0.0 → 1.0.1

data/Gemfile

@@ -0,0 +1,132 @@
+source 'http://devwww.con-way.com/gemserver/'
+# source 'https://rubygems.org'
+
+# If you make any changes in this file, please run `bundle install`.
+# If new versions of your installed gems are available, run `bundle update`
+
+gem 'rake', '~> 10.0.2'
+gem 'radiant', '~> 1.1.4'
+
+# Other dependencies
+gem "curb"
+gem "maxcdn"
+gem "yajl-ruby"
+gem "system_timer"
+gem 'compass-rails', '~> 1.0.3'
+gem 'iconv', :platform => :mri_19
+gem 'mime-types', '< 2.0'
+
+if RUBY_PLATFORM =~ /darwin/      # tested on Mavericks
+  gem "libv8", "~> 3.16.14.3", :platform => :mri_19
+  gem "therubyracer", "~> 0.12.1", :platform => :mri_19 # javascript runtime
+else
+  ## compatible on production Linux servers        
+  gem "libv8", "3.3.10.2"
+  gem "therubyracer", "0.10.2"    # javascript runtime
+end
+
+# SQLite is the default database connection but only suitable for local use
+# gem 'sqlite3', '~> 1.3.5'
+
+# To use MySQL
+# gem 'mysql', '~> 2.8.1'
+
+# Postgres
+# gem 'pg', '~> 0.11.0'
+
+# Default Extensions
+gem 'radiant-archive-extension',             '~> 1.0.7'
+# gem 'radiant-clipped-extension',             '~> 1.1.0'
+gem 'radiant-debug-extension',               '~> 1.0.2'
+gem 'radiant-exporter-extension',            '~> 1.1.0'
+gem 'radiant-markdown_filter-extension',     '~> 1.0.2'
+gem 'radiant-sheets-extension',              '~> 1.1.0'
+gem 'radiant-snippets-extension',            '~> 1.1.2'
+gem 'radiant-site_templates-extension',      '~> 1.0.6'
+gem 'radiant-smarty_pants_filter-extension', '~> 1.0.2'
+gem 'radiant-textile_filter-extension',      '~> 1.0.4'
+
+
+# Language packs
+# gem 'radiant-dutch_language_pack-extension',    '~> 1.0.1'
+# gem 'radiant-french_language_pack-extension',   '~> 1.0.0'
+# gem 'radiant-german_language_pack-extension',   '~> 1.0.1'
+# gem 'radiant-italian_language_pack-extension',  '~> 1.0.0'
+# gem 'radiant-japanese_language_pack-extension', '~> 1.0.0'
+# gem 'radiant-russian_language_pack-extension',  '~> 1.0.0'
+
+# A standard gem extension
+# gem 'radiant-example-extension', :version => '~> 1.0.0'
+gem 'radiant-banner_rotator-extension'
+gem 'radiant-cache_by_page-extension'
+gem 'radiant-concurrent_draft-extension'
+gem 'radiant-copy_move-extension'
+# gem 'radiant-file_sytem-extension', :git => 'git@github.com:avonderluft/radiant-file-system-extension.git' # no gemspec
+gem 'radiant-help-extension'
+gem 'radiant-import_export-extension'
+gem 'radiant-language_redirect-extension'
+gem 'radiant-mailer-extension'
+gem 'radiant-page_group_permissions-extension'
+gem 'radiant-page_list_view-extension'
+# gem 'radiant-polls-extension'
+gem 'radiant-rss_reader-extension'
+gem 'radiant-settings-extension'
+gem 'radiant-sitemap_search-extension'
+gem 'radiant-templates-extension'
+
+# Your own forked extension
+# gem 'radiant-modified-extension', :git => 'git://github.com/your/fork.git'
+
+# Gems you need for production, but not in your test or development environment
+group :production do
+  gem 'ruby-oci8'
+  gem 'activerecord-oracle_enhanced-adapter'
+end
+
+# A local extension in development
+# gem 'radiant-new-extension', :path => '/path/to/extension/root'
+
+# Gems you would like to have in your development environment
+group :development do
+  # you may need to install the mysql gem below manually on OSX with:
+  # $ ARCHFLAGS="-arch x86_64" gem install mysql -- --with-mysql-config=/usr/local/mysql/bin/mysql_config
+  # If that does not work, try $ brew install mysql
+  gem 'mysql', '~> 2.8.1'
+  # gem 'passenger', '3.0.14'  # not needed for prod, using apache module
+  gem 'jeweler'
+  gem 'wirble'
+  gem 'hirb'
+  gem 'pry'
+  gem 'ruby18_source_location', :platforms => :mri_18
+  gem "binding_of_caller", :platform => :ruby_19
+  gem "better_errors", :platform => :ruby_19
+end
+
+# If you're running tests or specs
+group :test do
+  gem "test-unit",        "~> 1.2.3"
+  gem 'cucumber-rails',   '~> 0.3.2'
+  gem 'database_cleaner', '~> 0.6.5'
+  gem 'webrat',           '~> 0.7.3'
+  gem 'rspec-rails',      '~> 1.3.3'
+  gem 'sqlite3',          '~> 1.3.4'
+  gem 'ZenTest',          '~> 4.6.2', :platforms => [:mri_18, :mri_19]
+  # gem 'ZenTest',          '~> 4.9.5'
+  # For Ruby 1.8.7
+  gem 'rdoc',             '~> 3.12.2', :platforms => :mri_18
+  gem 'rdoc-data',        '3.12', :platforms => :mri_18
+  # Custom
+  gem 'autotest', '~>4.4.5'
+  # gem 'autotest-fsevent', '~>0.2.3'  # not compatible with Mavericks
+  gem 'autotest-growl', '~>0.2.6'
+  gem 'autotest-rails', '~>4.1.0'
+  gem 'syntax', '~>1.0.0'
+  # Get rid of some deprecation warnings when running specs
+  # Rubygems
+  if (defined?(Deprecate))
+    Deprecate.skip = true
+  elsif (defined?(Gem::Deprecate))
+    Gem::Deprecate.skip = true
+  end
+end
+  

data/Gemfile.lock

@@ -0,0 +1,266 @@
+GEM
+  remote: http://devwww.con-way.com/gemserver/
+  specs:
+    RedCloth (4.2.9)
+    ZenTest (4.6.2)
+    actionmailer (2.3.18)
+      actionpack (= 2.3.18)
+    actionpack (2.3.18)
+      activesupport (= 2.3.18)
+      rack (~> 1.1.0)
+    activerecord (2.3.18)
+      activesupport (= 2.3.18)
+    activerecord-oracle_enhanced-adapter (1.4.2)
+    activeresource (2.3.18)
+      activesupport (= 2.3.18)
+    activesupport (2.3.18)
+    acts_as_tree (0.1.1)
+    addressable (2.3.6)
+    autotest (4.4.6)
+      ZenTest (>= 4.4.1)
+    autotest-growl (0.2.16)
+    autotest-rails (4.1.2)
+      ZenTest (~> 4.5)
+    better_errors (0.9.0)
+      coderay (>= 1.0.0)
+      erubis (>= 2.6.6)
+    binding_of_caller (0.7.1)
+      debug_inspector (>= 0.0.1)
+    bluecloth (2.1.0)
+    builder (3.2.2)
+    chunky_png (1.3.0)
+    coderay (1.0.9)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.7.0)
+    compass (0.12.2)
+      chunky_png (~> 1.2)
+      fssm (>= 0.2.7)
+      sass (~> 3.1)
+    compass-rails (1.0.3)
+      compass (>= 0.12.2, < 0.14)
+    cucumber (1.3.14)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.1)
+    cucumber-rails (0.3.2)
+      cucumber (>= 0.8.0)
+    curb (0.8.5)
+    curb-fu (0.6.2)
+      curb (>= 0.5.4.0)
+      rack-test (>= 0.2.0)
+    database_cleaner (0.6.7)
+    debug_inspector (0.0.2)
+    delocalize (0.2.6)
+    diff-lcs (1.2.5)
+    erubis (2.7.0)
+    execjs (2.0.2)
+    faraday (0.9.0.rc7)
+      multipart-post (>= 1.2, < 3)
+    fssm (0.2.10)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    git (1.2.6)
+    haml (3.1.8)
+    highline (1.6.20)
+    hirb (0.7.1)
+    hoe (3.7.1)
+      rake (>= 0.8, < 11.0)
+    iconv (1.0.4)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.8.1)
+    jwt (0.1.11)
+      multi_json (>= 1.5)
+    libv8 (3.16.14.3)
+    maxcdn (0.1.4)
+      curb-fu
+      json
+      signet
+    method_source (0.8.2)
+    mime-types (1.25.1)
+    multi_json (1.8.4)
+    multi_test (0.1.1)
+    multipart-post (2.0.0)
+    mysql (2.8.1)
+    nokogiri (1.5.10)
+    pry (0.9.12)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rack (1.1.6)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    radiant (1.1.4)
+      RedCloth (~> 4.2.0)
+      acts_as_tree (~> 0.1.1)
+      bundler (>= 1.0.0)
+      compass (~> 0.12.2)
+      compass-rails (~> 1.0.3)
+      delocalize (~> 0.2.3)
+      haml (~> 3.1.1)
+      highline (~> 1.6.10)
+      rack (~> 1.1.6)
+      rack-cache (~> 1.2)
+      radius (~> 0.7.3)
+      rails (~> 2.3.18)
+      rake (>= 0.8.7)
+      rdoc (>= 3.9.2)
+      stringex (~> 1.3.0)
+      tzinfo (~> 0.3.31)
+      will_paginate (~> 2.3.11)
+    radiant-archive-extension (1.0.7)
+    radiant-banner_rotator-extension (1.0.3)
+      radiant (>= 0.9.1)
+    radiant-cache_by_page-extension (1.0.3)
+      radiant (>= 0.9.1)
+    radiant-concurrent_draft-extension (1.0.11)
+      radiant (>= 1.0.0.rc2)
+    radiant-copy_move-extension (2.4.5)
+      radiant (>= 1.0.0.rc2)
+    radiant-debug-extension (1.0.2)
+    radiant-exporter-extension (1.1.0)
+    radiant-help-extension (1.1.3)
+    radiant-import_export-extension (1.0.0)
+    radiant-language_redirect-extension (1.0.1)
+      radiant (>= 1.1.3)
+    radiant-mailer-extension (1.0.6)
+    radiant-markdown_filter-extension (1.0.2)
+      bluecloth (~> 2.1.0)
+    radiant-page_group_permissions-extension (1.0.1)
+      radiant (>= 0.9.1)
+    radiant-page_list_view-extension (1.0.3)
+      radiant (>= 0.9.1)
+    radiant-rss_reader-extension (1.0.0)
+      ruby-feedparser (= 0.7.0)
+    radiant-settings-extension (1.1.2)
+      radiant (>= 0.9.1)
+    radiant-sheets-extension (1.1.0)
+      coffee-script (~> 2.2.0)
+      sass (~> 3.2.1)
+    radiant-site_templates-extension (1.0.6)
+    radiant-sitemap_search-extension (1.0.4)
+      radiant (>= 1.0.0.rc2)
+    radiant-smarty_pants_filter-extension (1.0.2)
+      rubypants (~> 0.2.0)
+    radiant-snippets-extension (1.1.3)
+    radiant-templates-extension (1.0.8)
+      radiant (>= 1.0.0.rc2)
+    radiant-textile_filter-extension (1.0.4)
+      RedCloth (~> 4.2.0)
+    radius (0.7.4)
+    rails (2.3.18)
+      actionmailer (= 2.3.18)
+      actionpack (= 2.3.18)
+      activerecord (= 2.3.18)
+      activeresource (= 2.3.18)
+      activesupport (= 2.3.18)
+      rake (>= 0.8.3)
+    rake (10.0.2)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    rdoc-data (3.12)
+      rdoc (> 2.5, < 4.0)
+    ref (1.0.5)
+    rspec (1.3.2)
+    rspec-rails (1.3.4)
+      rack (>= 1.0.0)
+      rspec (~> 1.3.1)
+    ruby-feedparser (0.7)
+    ruby-oci8 (2.1.5)
+    ruby18_source_location (0.2)
+    rubypants (0.2.0)
+    sass (3.2.12)
+    signet (0.5.0)
+      addressable (>= 2.2.3)
+      faraday (>= 0.9.0.rc5)
+      jwt (>= 0.1.5)
+      multi_json (>= 1.0.0)
+    slop (3.4.4)
+    sqlite3 (1.3.8)
+    stringex (1.3.3)
+    syntax (1.0.0)
+    system_timer (1.2.4)
+    test-unit (1.2.3)
+      hoe (>= 1.5.1)
+    therubyracer (0.12.1)
+      libv8 (~> 3.16.14.0)
+      ref
+    tzinfo (0.3.38)
+    webrat (0.7.3)
+      nokogiri (>= 1.2.0)
+      rack (>= 1.0)
+      rack-test (>= 0.5.3)
+    will_paginate (2.3.16)
+    wirble (0.1.3)
+    yajl-ruby (1.2.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ZenTest (~> 4.6.2)
+  activerecord-oracle_enhanced-adapter
+  autotest (~> 4.4.5)
+  autotest-growl (~> 0.2.6)
+  autotest-rails (~> 4.1.0)
+  better_errors
+  binding_of_caller
+  compass-rails (~> 1.0.3)
+  cucumber-rails (~> 0.3.2)
+  curb
+  database_cleaner (~> 0.6.5)
+  hirb
+  iconv
+  jeweler
+  libv8 (~> 3.16.14.3)
+  maxcdn
+  mime-types (< 2.0)
+  mysql (~> 2.8.1)
+  pry
+  radiant (~> 1.1.4)
+  radiant-archive-extension (~> 1.0.7)
+  radiant-banner_rotator-extension
+  radiant-cache_by_page-extension
+  radiant-concurrent_draft-extension
+  radiant-copy_move-extension
+  radiant-debug-extension (~> 1.0.2)
+  radiant-exporter-extension (~> 1.1.0)
+  radiant-help-extension
+  radiant-import_export-extension
+  radiant-language_redirect-extension
+  radiant-mailer-extension
+  radiant-markdown_filter-extension (~> 1.0.2)
+  radiant-page_group_permissions-extension
+  radiant-page_list_view-extension
+  radiant-rss_reader-extension
+  radiant-settings-extension
+  radiant-sheets-extension (~> 1.1.0)
+  radiant-site_templates-extension (~> 1.0.6)
+  radiant-sitemap_search-extension
+  radiant-smarty_pants_filter-extension (~> 1.0.2)
+  radiant-snippets-extension (~> 1.1.2)
+  radiant-templates-extension
+  radiant-textile_filter-extension (~> 1.0.4)
+  rake (~> 10.0.2)
+  rdoc (~> 3.12.2)
+  rdoc-data (= 3.12)
+  rspec-rails (~> 1.3.3)
+  ruby-oci8
+  ruby18_source_location
+  sqlite3 (~> 1.3.4)
+  syntax (~> 1.0.0)
+  system_timer
+  test-unit (~> 1.2.3)
+  therubyracer (~> 0.12.1)
+  webrat (~> 0.7.3)
+  wirble
+  yajl-ruby

data/README.md

@@ -62,7 +62,7 @@ You can sort items and group headers by date, title, content, creator, or link (
 * BJ Clark (bjclark@scidept.com, http://www.scidept.com/)
 * Loren Johnson (loren@fn-group.com, http://www.fn-group.com)
 
-#### Update to new Extension Architecture, Gemify:
+#### Update to new Extension Architecture, Gemify, Add Tests
 
 * Andrew vonderLuft (avonderluft@avlux.net, https://avlux.net)
 

data/lib/radiant-rss_reader-extension.rb

@@ -1,8 +1,8 @@
 module RadiantRssReaderExtension
-  VERSION     = "1.0.0"
+  VERSION     = "1.0.1"
   SUMMARY     = "RSS Reader for Radiant CMS"
   DESCRIPTION = "This extension uses the ruby-feedparser gem to read external RSS feeds, cache them, and easily display them in your pages."
   URL         = "https://github.com/radiant/radiant-rss_reader-extension"
-  AUTHORS     = ["Andrew vonderLuft","Loren Johnson"]
-  EMAIL       = ["avonderluft@avlux.net","loren@hellovenado.com"]
+  AUTHORS     = ["Andrew vonderLuft"]
+  EMAIL       = ["avonderluft@avlux.net"]
 end

data/lib/rss_reader/page_extensions.rb

@@ -0,0 +1,44 @@
+require 'uri'
+require 'net/http'
+require 'net/https'
+require 'feedparser/feedparser'
+
+module RssReader::PageExtensions
+  
+  def fetch_rss(uri, cache_time)
+    c = File.join(ActionController::Base.page_cache_directory, uri.tr(':/','_'))
+    if (cached_feed = feed_for(IO.read(c)) rescue nil)
+      return cached_feed if File.mtime(c) > (Time.now - cache_time)
+      since = File.mtime(c).httpdate
+    else
+      since = "1970-01-01 00:00:00"
+    end
+    u = URI::parse(uri)
+    begin
+      http = Net::HTTP.new(u.host, u.port)
+      http.use_ssl = true if u.port == 443
+      answer = http.get("#{u.request_uri}", {"If-Modified-Since" => since, 'User-Agent' => "RadiantCMS rss_reader Extension #{RadiantRssReaderExtension::VERSION}"} )
+      feed = feed_for(answer.body)
+    rescue
+      return cached_feed
+    end
+    case answer.code
+    when '304'
+      return cached_feed
+    when '200'
+      File.open(c,'w+') { |fp| fp << answer.body }
+      return feed
+    else
+      raise StandardError, "#{answer.code} #{answer.message}"
+    end
+  end
+  
+  def feed_for(str)
+    FeedParser::Feed.new(str)
+  end
+
+  def cache?
+    false
+  end
+
+end

data/lib/{rss_reader.rb → rss_reader/tags.rb}

@@ -1,52 +1,10 @@
-require 'uri'
-require 'net/http'
-require 'net/https'
-require 'feedparser/feedparser'
-
-module RssReader
+module RssReader::Tags
   include Radiant::Taggable
   
-  def fetch_rss(uri, cache_time)
-    c = File.join(ActionController::Base.page_cache_directory, uri.tr(':/','_'))
-    if (cached_feed = feed_for(IO.read(c)) rescue nil)
-      return cached_feed if File.mtime(c) > (Time.now - cache_time)
-      since = File.mtime(c).httpdate
-    else
-      since = "1970-01-01 00:00:00"
-    end
-    u = URI::parse(uri)
-    begin
-      http = Net::HTTP.new(u.host, u.port)
-      http.use_ssl = true if u.port == 443
-      answer = http.get("#{u.request_uri}", {"If-Modified-Since" => since, 'User-Agent' => "RadiantCMS rss_reader Extension #{RadiantRssReaderExtension::VERSION}"} )
-      feed = feed_for(answer.body)
-    rescue
-      return cached_feed
-    end
-    case answer.code
-    when '304'
-      return cached_feed
-    when '200'
-      File.open(c,'w+') { |fp| fp << answer.body }
-      return feed
-    else
-      raise StandardError, "#{answer.code} #{answer.message}"
-    end
-  end
-  
-  def feed_for(str)
-    FeedParser::Feed.new(str)
-  end
-
-  def cache?
-    false
-  end
-
     tag "feed" do |tag|
       tag.expand
     end
 
-
  desc %{
     Iterates through items in an rss feed provided as an absolute url to the @url@ attribute.
     
@@ -55,10 +13,14 @@ module RssReader
     * @cache_time@: length of time to cache the feed before seeing if it's been updated
     * @order@:      works just like SQL 'ORDER BY' clauses, e.g. order='creator date desc' orders first by creator ascending, then date descending
     * @limit@:      only return the first x items (after any ordering)
+    * @if_title_contains@:  only return items whose title contains search term
+    * @unless_title_contains@:  only return items whose title does not contain search term
+    * @if_content_contains@:  only return items whose content contains search term
+    * @unless_content_contains@:  only return items whose content does not contain search term
     
     *Usage:*
 
-    <pre><code><r:find:items url="http://somefeed.com/rss" [cache_time="3600"] [order="creator date desc"] [limit="5"]>...</r:feed:items></code></pre>
+    <pre><code><r:feed:items url="http://somefeed.com/rss" [cache_time="3600"] [order="creator date desc"] [limit="5"] [if_title_contains="include text"] [unless_title_contains="exclude text"] [if_content_contains="include text"] [unless_content_contains="exclude text"]>...</r:feed:items></code></pre>
     }
     tag "feed:items" do |tag|
       attr = tag.attr.symbolize_keys
@@ -76,6 +38,18 @@ module RssReader
           end
         end
       end
+      if attr[:if_title_contains]
+        items = items.select { |item| item.title.downcase.include?(attr[:if_title_contains].downcase) }
+      end
+      if attr[:unless_title_contains]
+        items = items.select { |item| ! item.title.downcase.include?(attr[:unless_title_contains].downcase) }
+      end
+      if attr[:if_content_contains]
+        items = items.select { |item| item.content.downcase.include?(attr[:if_content_contains].downcase) }
+      end
+      if attr[:unless_content_contains]
+        items = items.select { |item| ! item.content.downcase.include?(attr[:unless_content_contains].downcase) }
+      end
       if attr[:limit]
         items = items.slice(0,attr[:limit].to_i)
       end
@@ -186,5 +160,4 @@ module RssReader
       tag.locals.item.creator
     end
 
-end
-  
+end

data/rss_reader_extension.rb

@@ -8,6 +8,7 @@ class RssReaderExtension < Radiant::Extension
   def activate
     cache_dir = ActionController::Base.page_cache_directory
     Dir.mkdir(cache_dir) unless File.exist?(cache_dir)
-    Page.send :include, RssReader
+    Page.send :include, RssReader::PageExtensions
+    Page.send :include, RssReader::Tags
   end
 end

data/spec/controllers/site_controller_spec.rb

@@ -0,0 +1,85 @@
+require 'spec_helper'
+include Webrat::Matchers
+
+describe SiteController do
+  dataset :rss_reader_pages
+
+  it "should read RSS feed generated by Radiant" do
+    get :show_page, :url => 'news-feed'
+    response.should be_success
+    response.body.should include('http://www.example.com/news/article-3/')
+  end
+  
+  describe "fetching and formatting feeds" do
+    
+    begin
+      pages = Page.find_by_slug('news-feed-pages').children
+    rescue NoMethodError => error_msg
+      puts "\n<h1>Unable to access pages - feed pages depend on viable internet connection.</h1>\n\n"
+    end
+    
+    pages.each do |page|
+  
+      describe "on #{page.title}" do
+        
+        before :each do
+          get :show_page, :url => "news-feed-pages/#{page.slug}"
+        end
+        it "should render page from external feed" do 
+          response.should be_success
+        end
+        it "should have the usual feed parts" do
+          [:title, :uri, :link, :content].each do |attr|
+            response.body.should have_selector('div', :class => "#{attr}") do |att|
+              att.should_not be_blank
+            end
+          end
+        end
+      end
+    end 
+  end
+  
+  describe "fetching, formatting and filtering feeds" do
+ 
+    term = 'extension'
+    
+    [1,2,3].each do |num|
+      it "should limit to #{num} feed item with attribute 'limit=\"#{num}\"'" do 
+        get :show_page, :url => "news-feed-page-limit-#{num}"
+        response.should be_success
+        response.body.should have_selector('div', :class => "title", :count => num)
+        response.body.should have_selector('div', :class => "content", :count => num)
+      end
+    end
+    it "should retrieve only items with '#{term}' in the title" do 
+      get :show_page, :url => "news-feed-page-by-words-in-title"
+      response.should be_success
+      response.body.should have_selector('div', :class => "title") do |title|
+        title.should contain("#{term}")
+      end
+    end
+    it "should retrieve only items without '#{term}' in the title" do 
+      get :show_page, :url => "news-feed-page-by-words-not-in-title"
+      response.should be_success
+      response.body.should have_selector('div', :class => "title") do |title|
+        title.should_not contain("#{term}")
+      end
+    end
+    it "should retrieve only items with '#{term}' in the content" do 
+      get :show_page, :url => "news-feed-page-by-words-in-content"
+      response.should be_success
+      response.body.should have_selector('div', :class => "content") do |content|
+        content.should contain("#{term}")
+      end
+    end
+    it "should retrieve only items without '#{term}' in the content" do 
+      get :show_page, :url => "news-feed-page-by-words-not-in-content"
+      response.should be_success
+      response.body.should have_selector('div', :class => "content") do |content|
+        content.should_not contain("#{term}")
+      end
+    end    
+    
+  end
+
+end

data/spec/datasets/rss_reader_pages_dataset.rb

@@ -0,0 +1,100 @@
+class RssReaderPagesDataset < Dataset::Base
+  uses :pages
+  
+  def load
+
+    create_page "News Feed", :body => <<-CONTENT
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <channel>
+    <title>Current News</title>
+    <link>http://www.example.com<r:url /></link>
+    <language>en-us</language>
+    <ttl>120</ttl>
+    <description>News Articles</description>
+    <r:find url="/news/">
+    <r:children:each limit="10" order="desc">
+        <item>
+          <title><r:title /></title>
+          <description><r:escape_html><r:content part="main_content" /></r:escape_html></description>
+          <pubDate><r:rfc1123_date /></pubDate>
+          <guid>http://www.example.com<r:url /></guid>
+          <link>http://www.example.com<r:url /></link>
+        </item>
+    </r:children:each>
+    </r:find>
+  </channel>
+</rss>
+      CONTENT
+
+    feed_urls = []
+    feed_urls << "https://github.com/radiant/radiant-rss_reader-extension/commits/master.atom"
+    feed_urls << "http://rubygems.org/gems/radiant-rss_reader-extension/versions.atom"
+    feed_urls << "http://radiantcms.org/rss.xml"  
+      
+    create_page "News Feed Pages" do
+      feed_urls.each do |feed_url|
+        create_page "News Feed Page #{feed_urls.index(feed_url).to_s}", :body => <<-CONTENT
+<r:feed:items url="#{feed_url}" order="date desc">
+  <div class="title"><r:feed:title /></div>
+  <div class="uri"><r:feed:uri /></div>
+  <div class="link"><r:feed:link /></div>
+  <div class="content"><r:feed:content/></div>
+</r:feed:items>
+          CONTENT
+      end
+    end
+    
+    feed_url = feed_urls.last
+    
+    create_page "News Feed Page Limit 1", :body => <<-CONTENT
+<r:feed:items url="#{feed_url}" order="date desc" limit="1">
+  <div class="title"><r:feed:title /></div>
+  <div class="content"><r:feed:content/></div>
+</r:feed:items>
+      CONTENT
+
+  create_page "News Feed Page Limit 2", :body => <<-CONTENT
+<r:feed:items url="#{feed_url}" order="date desc" limit="2">
+<div class="title"><r:feed:title /></div>
+<div class="content"><r:feed:content/></div>
+</r:feed:items>
+    CONTENT
+
+    create_page "News Feed Page Limit 3", :body => <<-CONTENT
+<r:feed:items url="#{feed_url}" order="date desc" limit="3">
+  <div class="title"><r:feed:title /></div>
+  <div class="content"><r:feed:content/></div>
+</r:feed:items>
+      CONTENT
+
+    create_page "News Feed Page By Words in Title", :body => <<-CONTENT
+<r:feed:items url="#{feed_url}" order="date desc" if_title_contains="extension">
+  <div class="title"><r:feed:title /></div>
+  <div class="content"><r:feed:content/></div>
+</r:feed:items>
+      CONTENT
+    
+    create_page "News Feed Page By Words not in Title", :body => <<-CONTENT
+<r:feed:items url="#{feed_url}" order="date desc" unless_title_contains="extension">
+  <div class="title"><r:feed:title /></div>
+  <div class="content"><r:feed:content/></div>
+</r:feed:items>
+      CONTENT
+   
+    create_page "News Feed Page By Words in Content", :body => <<-CONTENT
+<r:feed:items url="#{feed_url}" order="date desc" if_content_contains="extension">
+  <div class="title"><r:feed:title /></div>
+  <div class="content"><r:feed:content/></div>
+</r:feed:items>
+      CONTENT
+  
+    create_page "News Feed Page By Words not in Content", :body => <<-CONTENT
+<r:feed:items url="#{feed_url}" order="date desc" unless_content_contains="extension">
+  <div class="title"><r:feed:title /></div>
+  <div class="content"><r:feed:content/></div>
+</r:feed:items>
+      CONTENT
+    
+  end
+end

data/spec/models/page_extensions_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+describe "RssReader::PageExtensions" do
+  dataset :rss_reader_pages
+  
+  describe "Feed Page" do
+    before :all do
+      @page = pages(:news_feed)
+    end
+    it "should be valid" do
+      @page.should be_valid
+      @page.published?.should be_true
+    end
+    it "should have 1 page part" do
+      @page.parts.count.should == 1
+    end
+    it "should have XML content" do
+      @page.parts[0].content.should include('<?xml version="1.0" encoding="UTF-8"?>')
+    end
+  end
+    
+  feeds = {}  
+  feeds['atom'] = "http://rubygems.org/gems/radiant-rss_reader-extension/versions.atom"
+  feeds['rss'] = "http://radiantcms.org/rss.xml"
+  
+  feeds.each_pair do |feed_type,feed_url|
+    
+    describe "#{feed_type.capitalize} Feed" do 
+      before :all do
+        @page = pages(:home)
+        @feed = @page.fetch_rss("#{feed_url}", 900)
+      end
+      [:title, :encoding, :xml].each do |attr|
+        it "should have #{attr}" do
+          @feed.send("#{attr}").should_not be_blank
+        end
+      end
+      it "should have correct type" do
+        @feed.type.should == feed_type
+      end
+      it "should have at least one item" do
+        @feed.items.count.should > 0
+      end
+      describe "First Item" do
+        before :all do
+          @item = @feed.items[0]
+        end
+        [:title, :xml, :content, :link].each do |attr|
+          it "should have #{attr}" do
+            @item.send("#{attr}").should_not be_blank
+          end
+        end
+        it "should have a valid date" do
+          ParseDate.parsedate("#{@item.date}")[0].should_not be_nil
+        end
+        it "should have at least 1 creator" do
+          @item.creators.count.should > 0
+        end
+        it "should have a valid link" do
+          @item.link.should include(feed_url[0..10])
+        end
+      end 
+    end
+  end
+  
+end

metadata

@@ -1,24 +1,24 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-rss_reader-extension
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Andrew vonderLuft
-- Loren Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2014-07-31 00:00:00 Z
+date: 2014-08-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -32,12 +32,10 @@ dependencies:
         - 0
         version: 0.7.0
   version_requirements: *id001
-  prerelease: false
   name: ruby-feedparser
 description: This extension uses the ruby-feedparser gem to read external RSS feeds, cache them, and easily display them in your pages.
 email: 
 - avonderluft@avlux.net
-- loren@hellovenado.com
 executables: []
 
 extensions: []
@@ -51,13 +49,19 @@ files:
 - cucumber.yml
 - features/support/env.rb
 - features/support/paths.rb
+- Gemfile
+- Gemfile.lock
 - lib/radiant-rss_reader-extension.rb
-- lib/rss_reader.rb
+- lib/rss_reader/page_extensions.rb
+- lib/rss_reader/tags.rb
 - lib/tasks/rss_reader_extension_tasks.rake
 - radiant-rss_reader-extension.gemspec
 - Rakefile
 - README.md
 - rss_reader_extension.rb
+- spec/controllers/site_controller_spec.rb
+- spec/datasets/rss_reader_pages_dataset.rb
+- spec/models/page_extensions_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 homepage: https://github.com/radiant/radiant-rss_reader-extension
@@ -89,11 +93,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: RSS Reader for Radiant CMS
 test_files: 
+- spec/controllers/site_controller_spec.rb
+- spec/datasets/rss_reader_pages_dataset.rb
+- spec/models/page_extensions_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - features/support/env.rb