RubyGems - bcms_news - Versions diffs - 1.2.4 → 1.4.0 - Mend

bcms_news 1.2.4 → 1.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (33) hide show

data/Gemfile +6 -0
data/README.markdown +7 -5
data/app/assets/javascripts/bcms_news/application.js +9 -0
data/app/assets/stylesheets/bcms_news/application.css +7 -0
data/app/controllers/bcms_news/news_articles_controller.rb +14 -0
data/app/helpers/bcms_news/application_helper.rb +5 -0
data/app/models/{news_article.rb → bcms_news/news_article.rb} +24 -22
data/app/portlets/news_archive_portlet.rb +4 -4
data/app/portlets/news_article_portlet.rb +2 -2
data/app/portlets/recent_news_portlet.rb +21 -7
data/app/views/{cms → bcms_news}/news_articles/_form.html.erb +1 -1
data/app/views/{news_articles/index.rss.builder → bcms_news/news_articles/feed.rss.builder} +3 -3
data/app/views/bcms_news/news_articles/render.html.erb +5 -0
data/app/views/layouts/templates/default.html.erb +1 -1
data/config/routes.rb +10 -0
data/db/bcms_news.seeds.rb +9 -9
data/db/migrate/{20090410193313_create_news_articles.rb → 20111229220000_create_news_articles.rb} +2 -2
data/db/migrate/20120103165543_bcms_news_130.rb +13 -0
data/lib/bcms_news.rb +3 -2
data/lib/bcms_news/engine.rb +2 -1
data/lib/bcms_news/version.rb +1 -1
data/lib/generators/bcms_news/install/install_generator.rb +10 -2
data/test/bcms_news_test.rb +7 -0
data/test/integration/news_articles_test.rb +16 -6
data/test/test_helper.rb +42 -9
data/test/unit/news_article_test.rb +28 -26
data/test/unit/recent_news_portlet_test.rb +40 -32
metadata +35 -21
data/app/controllers/cms/news_articles_controller.rb +0 -2
data/app/controllers/news_articles_controller.rb +0 -7
data/app/views/cms/news_articles/render.html.erb +0 -5
data/lib/bcms_news/routes.rb +0 -11
data/lib/generators/bcms_news/install/USAGE +0 -10

data/Gemfile CHANGED Viewed

@@ -2,8 +2,14 @@ source 'http://rubygems.org'
 gemspec
+# Avoids unnecessary Content Length warnings that Rack 1.3.6/Rails 3.1.3 + Webrick throw
+#	Removed if http://stackoverflow.com/questions/7082364/what-does-warn-could-not-determine-content-length-of-response-body-mean-and-h is ever fixed.
+# Must run with `rails s thin`
+gem "thin"
 # Gem Environments
 group :development do
   gem "mysql"
+  gem "mocha"
 end

data/README.markdown CHANGED Viewed

@@ -28,20 +28,22 @@ The News Module defines a new content type, "News Article" which comes with the
 ### 1. Install Module
-The news module uses the standard BrowserCMS module instructions as detailed here: http://guides.browsercms.org/installing_modules.html
-Note: If you have already run `rake db:seed` on your local database, you should run the following task to add the News specific seed data.
+As per the [standard module installation guide](http://guides.browsercms.org/installing_modules.html), you can install this module using the following steps:
 ```
+$ rails g cms:install bcms_news
+$ bundle install
+$ rake db:migrate
 $ rake db:seed:bcms_news
 ```
+Note: The last step is required if you have ever run `rake db:seed` on your local database, as you need to add the news specific seed data to your project. On a brand new project, `rake db:seed` would also install this content.
 ### 2. Configure RSS Feeds
-To have autodiscovery links to the News RSS feed, add the following to your project page templates in the <head> element.
+To have autodiscovery links to the News RSS feed, add the following to your page templates in the `head` element.
 ```
-<%= auto_discovery_link_tag( :rss, news_articles_url, {:title => "RSS Feed for News Articles"}) %>
+<%= auto_discovery_link_tag( :rss, bcms_news.news_feed_url, {:title => "RSS Feed for News Articles"}) %>
 ```
 ### 3. Publish Pages

data/app/assets/javascripts/bcms_news/application.js ADDED Viewed

@@ -0,0 +1,9 @@
+// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+//= require jquery
+//= require jquery_ujs
+//= require_tree .

data/app/assets/stylesheets/bcms_news/application.css ADDED Viewed

@@ -0,0 +1,7 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require_self
+ *= require_tree .
+*/

data/app/controllers/bcms_news/news_articles_controller.rb ADDED Viewed

@@ -0,0 +1,14 @@
+module BcmsNews
+  class NewsArticlesController < Cms::ContentBlockController
+    # Better as something like: allow :guests, :only=>:feed
+    skip_filter :redirect_to_cms_site, :only=>:feed
+    skip_filter :login_required, :only=>:feed
+    skip_filter :cms_access_required, :only=>:feed
+    # Different method to avoid clashing with the backend content library for this.
+    def feed
+      @articles = NewsArticle.released.all(:limit => 15, :order => "release_date desc")
+    end
+  end
+end

data/app/helpers/bcms_news/application_helper.rb ADDED Viewed

@@ -0,0 +1,5 @@
+module BcmsNews
+  module ApplicationHelper
+  end
+end

data/app/models/{news_article.rb → bcms_news/news_article.rb} RENAMED Viewed

@@ -1,32 +1,34 @@
-class NewsArticle < ActiveRecord::Base
-  acts_as_content_block :belongs_to_attachment => true, :taggable => true
+class BcmsNews::NewsArticle < ActiveRecord::Base
+  acts_as_content_block :taggable => true
+  has_attachment :file
-  belongs_to :category
+  belongs_to :category, :class_name=>"Cms::Category"
   validates_presence_of :name, :release_date
   before_validation :set_slug
-  scope :released, :conditions =>
-    ["news_articles.published = ? and news_articles.release_date <= ?", true, Time.now]
-  scope :released_on, lambda {|date|
-    d = if date.kind_of?(Hash)
-      Date.new(date[:year].to_i, date[:month].to_i, date[:day].to_i)
-    else
-      date
+  class << self
+    def released
+      where(:published => true).where("release_date <= ?", Time.now)
     end
-    {:conditions => [
-      "news_articles.release_date >= ? AND news_articles.release_date < ?",
-      d.beginning_of_day,
-      (d.beginning_of_day + 1.day)
-    ]}
-  }
-  scope :with_slug, lambda{|slug| {:conditions => ["news_articles.slug = ?",slug]}}
+    def released_on(date)
+      d = if date.kind_of?(Hash)
+        Date.new(date[:year].to_i, date[:month].to_i, date[:day].to_i)
+      else
+        date
+      end
+      where("release_date >= ? AND release_date < ?", d.beginning_of_day, (d.beginning_of_day + 1.day))
+    end
+    def with_slug(slug)
+      where(:slug => slug)
+    end
+  end
   def category_name
     category ? category.name : nil
   end
@@ -52,7 +54,7 @@ class NewsArticle < ActiveRecord::Base
   def set_attachment_section
     if !attachment_file.blank?
-      attachment.section = Section.first(:conditions => {:name => 'News'})
+      attachment.section = Cms::Section.first(:conditions => {:name => 'News'})
     end
   end

data/app/portlets/news_archive_portlet.rb CHANGED Viewed

@@ -1,14 +1,14 @@
-class NewsArchivePortlet < Portlet
+class NewsArchivePortlet < Cms::Portlet
   # Mark this as 'true' to allow the portlet's template to be editable via the CMS admin UI.
   enable_template_editor false
   def render
     if self.category_id.blank?
-      @articles = NewsArticle.released.all(:order => "release_date desc", :limit => self.limit)
+      @articles = BcmsNews::NewsArticle.released.all(:order => "release_date desc", :limit => self.limit)
     else
-      @category = Category.find(self.category_id)
-      @articles = NewsArticle.released.all(:conditions => ["category_id = ?", @category.id], :order => "release_date desc", :limit => self.limit)
+      @category = Cms::Category.find(self.category_id)
+      @articles = BcmsNews::NewsArticle.released.all(:conditions => ["category_id = ?", @category.id], :order => "release_date desc", :limit => self.limit)
     end
   end

data/app/portlets/news_article_portlet.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-class NewsArticlePortlet < Portlet
+class NewsArticlePortlet < Cms::Portlet
   # Mark this as 'true' to allow the portlet's template to be editable via the CMS admin UI.
   enable_template_editor false
@@ -6,7 +6,7 @@ class NewsArticlePortlet < Portlet
   def render
     # @news_article should already be set by the page route
     if !@news_article && params[:news_article_id]
-      @news_article = NewsArticle.find(params[:news_article_id])
+      @news_article = BcmsNews::NewsArticle.find(params[:news_article_id])
     end
   end

data/app/portlets/recent_news_portlet.rb CHANGED Viewed

@@ -1,20 +1,34 @@
-class RecentNewsPortlet < Portlet
+class RecentNewsPortlet < Cms::Portlet
   # Mark this as 'true' to allow the portlet's template to be editable via the CMS admin UI.
   enable_template_editor false
   def render
     order = "release_date DESC"
-    if !@portlet.sort_by.blank? and !@portlet.sort_order.blank?
-      order = "#{@portlet.sort_by} #{@portlet.sort_order}"
+    if !attributes.sort_by.blank? and !attributes.sort_order.blank?
+      order = "#{attributes.sort_by} #{attributes.sort_order}"
     end
-    if @portlet.category_id.blank?
-      @articles = NewsArticle.released.all(:order => order, :limit => @portlet.limit)
+    if attributes.category_id.blank?
+      @articles = BcmsNews::NewsArticle.released.all(:order => order, :limit => attributes.limit)
     else
-      @category = Category.find(@portlet.category_id)
-      @articles = NewsArticle.released.all(:conditions => ["category_id = ?", @category.id], :order => order, :limit => @portlet.limit)
+      @category = Cms::Category.find(attributes.category_id)
+      @articles = BcmsNews::NewsArticle.released.all(:conditions => ["category_id = ?", @category.id],
+          :order => order, :limit => attributes.limit)
     end
   end
+  def category
+    @category
+  end
+  # For testing
+  def articles
+    @articles
+  end
+  # For testing
+  def attributes
+    @portlet
+  end
 end

data/app/views/{cms → bcms_news}/news_articles/_form.html.erb RENAMED Viewed

@@ -3,5 +3,5 @@
 <%= f.cms_drop_down :category_id, categories_for('News Article').map{|c| [c.path, c.id]} %>
 <%= f.cms_text_area :summary, :style => "height: 100px" %>
 <%= f.cms_text_editor :body %>
-<%= f.cms_file_field :attachment_file, :label => "File" %>
+<%= f.cms_file_field :file, :label => "File" %>
 <%= f.cms_tag_list %>

data/app/views/{news_articles/index.rss.builder → bcms_news/news_articles/feed.rss.builder} RENAMED Viewed

@@ -2,7 +2,7 @@ xml.instruct! :xml, :version=>"1.0"
 xml.rss(:version=>"2.0") do
   xml.channel do
     xml.title("News Articles")
-    xml.link(news_articles_url(:format => "rss"))
+    xml.link(news_feed_url(:format => "rss"))
     xml.description("")
     xml.language('en-us')
       for article in @articles
@@ -10,8 +10,8 @@ xml.rss(:version=>"2.0") do
           xml.title(article.name)
           xml.description(article.summary) unless article.summary.blank?
           xml.pubDate(article.release_date.strftime("%a, %d %b %Y %H:%M:%S %z")) unless article.release_date.blank?
-          xml.link(news_article_url(article.route_params))
-          xml.guid(news_article_url(article.route_params))
+          xml.link(main_app.news_article_url(article.route_params))
+          xml.guid(main_app.news_article_url(article.route_params))
         end
       end
   end

data/app/views/bcms_news/news_articles/render.html.erb ADDED Viewed

@@ -0,0 +1,5 @@
+<h2><%=h @content_block.name %></h2>
+<p><%= @content_block.body.html_safe %></p>
+<% if @content_block.file %>
+<%= link_to "Attachment", attachment_path_for(@content_block.file) %>
+<% end %>

data/app/views/layouts/templates/default.html.erb CHANGED Viewed

@@ -4,7 +4,7 @@
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
     <title><%= page_title %></title>
     <%= yield :html_head %>
-	<%= auto_discovery_link_tag( :rss, news_articles_url, {:title => "RSS Feed for News Articles"}) %>
+	<%= auto_discovery_link_tag( :rss, bcms_news.news_feed_url, {:title => "RSS Feed for News Articles"}) %>
   </head>
   <body style="margin: 0; padding: 0; text-align: center;">
     <%= cms_toolbar %>

data/config/routes.rb ADDED Viewed

@@ -0,0 +1,10 @@
+BcmsNews::Engine.routes.draw do
+  # This is going to be added under /bcms_news/news/articles.rss
+  # Add a routing extension (w/ mount_bcms_news or ), or make a non-isolated engine.
+  # Alternatively, just mount as /news rather than /bcms_news then update the match.
+  get '/articles/feed', :to=>"news_articles#feed", :defaults => { :format => 'rss' }, :as=>'news_feed'
+  content_blocks :news_articles
+end

data/db/bcms_news.seeds.rb CHANGED Viewed

@@ -1,13 +1,13 @@
 # Create the content type, category type and section for news
-ContentType.create!(:name => "NewsArticle", :group_name => "News")
-CategoryType.create!(:name => "News Article")
-news = Section.create!(:name => "News",
+Cms::ContentType.create!(:name => "BcmsNews::NewsArticle", :group_name => "News")
+Cms::CategoryType.create!(:name => "News Article")
+news = Cms::Section.create!(:name => "News",
   :path => "/news",
-  :parent => Section.root.first,
-  :group_ids => Group.all.map(&:id))
+  :parent => Cms::Section.root.first,
+  :group_ids => Cms::Group.all.map(&:id))
 # Create the page to display the recent news
-overview = Page.create!(:name => "Overview",
+overview = Cms::Page.create!(:name => "Overview",
   :path => "/news/articles",
   :section => news,
   :template_file_name => "default.html.erb")
@@ -20,7 +20,7 @@ RecentNewsPortlet.create!(:name => "Recent News Portlet",
 # Create the page to display the news archives
-archives = Page.create!(:name => "Archive",
+archives = Cms::Page.create!(:name => "Archive",
   :path => "/news/archive",
   :section => news,
   :template_file_name => "default.html.erb")
@@ -30,7 +30,7 @@ NewsArchivePortlet.create!(:name => "News Archive Portlet",
   :connect_to_container => "main")
 # Create the page to display a given news article
-article = Page.create!(:name => "Article",
+article = Cms::Page.create!(:name => "Article",
   :path => "/news/article",
   :section => news,
   :template_file_name => "default.html.erb")
@@ -43,7 +43,7 @@ NewsArticlePortlet.create!(:name => "News Article Portlet",
 route = article.page_routes.build(
   :name => "News Article",
   :pattern => "/news/articles/:year/:month/:day/:slug",
-  :code => "@news_article = NewsArticle.released_on(params).with_slug(params[:slug]).first")
+  :code => "@news_article = BcmsNews::NewsArticle.released_on(params).with_slug(params[:slug]).first")
 route.add_condition(:method, "get")
 route.add_requirement(:year, '\d{4,}')
 route.add_requirement(:month, '\d{2,}')

data/db/migrate/{20090410193313_create_news_articles.rb → 20111229220000_create_news_articles.rb} RENAMED Viewed

@@ -13,8 +13,8 @@ class CreateNewsArticles < ActiveRecord::Migration
   end
   def self.down
-    ContentType.delete_all(['name = ?', 'NewsArticle'])
-    CategoryType.all(:conditions => ['name = ?', 'News Article']).each(&:destroy)
+    Cms::ContentType.delete_all(['name = ?', 'NewsArticle'])
+    Cms::CategoryType.all(:conditions => ['name = ?', 'News Article']).each(&:destroy)
     drop_table :news_release_versions
     drop_table :news_releases
   end

data/db/migrate/20120103165543_bcms_news_130.rb ADDED Viewed

@@ -0,0 +1,13 @@
+# Upgrade to BcmsNew v1.3.0
+class BcmsNews130 < ActiveRecord::Migration
+  def change
+    # These need to be done since v1.2 had a different table name
+    rename_table :news_articles, :bcms_news_news_articles
+    rename_table :news_article_versions, :bcms_news_news_article_versions
+    # This is needed to match new BrowserCMS 3.4 naming convention for versioning column.
+    if column_exists? :bcms_news_news_article_versions, :news_article_id
+      rename_column :bcms_news_news_article_versions, :news_article_id, :original_record_id
+    end
+  end
+end

data/lib/bcms_news.rb CHANGED Viewed

@@ -1,3 +1,4 @@
-require 'bcms_news/routes'
-require 'bcms_news/engine'
+require "bcms_news/engine"
+module BcmsNews
+end

data/lib/bcms_news/engine.rb CHANGED Viewed

@@ -2,6 +2,7 @@ require 'browsercms'
 module BcmsNews
   class Engine < Rails::Engine
+    isolate_namespace BcmsNews
     include Cms::Module
   end
-end
+end

data/lib/bcms_news/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module BcmsNews
-  VERSION = "1.2.4"
+  VERSION = "1.4.0"
 end

data/lib/generators/bcms_news/install/install_generator.rb CHANGED Viewed

@@ -3,10 +3,18 @@ require 'cms/module_installation'
 class BcmsNews::InstallGenerator < Cms::ModuleInstallation
   add_migrations_directory_to_source_root __FILE__
-  copy_migration_file '20090410193313_create_news_articles.rb'
+  def copy_migrations
+    rake 'bcms_news:install:migrations'
+  end
   def add_seed_data_to_project
     copy_file "../bcms_news.seeds.rb", "db/bcms_news.seeds.rb"
-    append_to_file "db/seeds.rb", "load File.expand_path('../bcms_news.seeds.rb', __FILE__)"
+    append_to_file "db/seeds.rb", "load File.expand_path('../bcms_news.seeds.rb', __FILE__)\n"
+  end
+  def add_routes
+    mount_engine(BcmsNews)
   end
 end

data/test/bcms_news_test.rb ADDED Viewed

@@ -0,0 +1,7 @@
+require 'test_helper'
+class BcmsNewsTest < ActiveSupport::TestCase
+  test "truth" do
+    assert_kind_of Module, BcmsNews
+  end
+end

data/test/integration/news_articles_test.rb CHANGED Viewed

@@ -1,12 +1,22 @@
 require 'test_helper'
 class NewsArticlesTest < ActionController::IntegrationTest
-  test "login and browse site" do
-    get "/news/articles.rss"
+  def setup
+    Factory(:article_type)
+    Factory(:article)
-    assert_response :success
-    assert_select "rss"
+    silence_stream(STDOUT) do
+      file = File.expand_path(File.join(File.dirname(__FILE__), '../../test/dummy/db/seeds.rb'))
+      require file
+    end
   end
-end
+  test "Access the RSS feed via the 'ugly' URL" do
+    get "/bcms_news/articles/feed"
+    assert_response :success, "What the heck is a 406 response code?"
+    assert @response.body.include?("<rss")
+    # Checking vs @response.body rather than using assert_select since the later throws invalid warnings when parsing XML
+  end
+end

data/test/test_helper.rb CHANGED Viewed

@@ -1,13 +1,46 @@
+# Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
-require File.expand_path('../../config/environment', __FILE__)
-require 'rails/test_help'
-class ActiveSupport::TestCase
-  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
-  #
-  # Note: You'll currently still have to declare fixtures explicitly in integration tests
-  # -- they do not yet inherit this setting
-  fixtures :all
+require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require "rails/test_help"
+Rails.backtrace_cleaner.remove_silencers!
+# Load support files
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-  # Add more helper methods to be used by all tests here...
+module FakeFactoryGirl
+  mattr_accessor :count
+  # To clean up tests without actually adding factory girl yet.
+  def Factory(name, options={})
+    FakeFactoryGirl.count += 1
+    if name == :article
+      create_article(options)
+    else
+      create_content_type(options)
+    end
+  end
+  def create_content_type(options)
+    Cms::ContentType.create!(:name=>'BcmsNews::NewsArticle', :group_name=>"Not Blank")
+  end
+  def create_article(options)
+    defaults =
+    {
+      name: "News Item #{FakeFactoryGirl.count}",
+      release_date: 1.week.ago,
+      publish_on_save: true,
+    }
+    defaults.merge!(options)
+    BcmsNews::NewsArticle.create!(defaults)
+  end
+end
+class ActiveSupport::TestCase
+  include FakeFactoryGirl
+  FakeFactoryGirl.count = 0
 end

data/test/unit/news_article_test.rb CHANGED Viewed

@@ -1,40 +1,42 @@
 require 'test_helper'
-class NewsArticleTest < ActiveSupport::TestCase
+module BcmsNews
+  class NewsArticleTest < ActiveSupport::TestCase
-  def test_news_article
-    a = NewsArticle.create!(:name => "Test Article", :release_date => Date.parse("2008-12-25"))
-    assert a.save
+    def test_news_article
+      a = NewsArticle.create!(:name => "Test Article", :release_date => Date.parse("2008-12-25"))
+      assert a.save
-    b = NewsArticle.released_on(Date.parse("2008-12-25")).with_slug("test-article").first
-    assert_equal a, b
+      b = NewsArticle.released_on(Date.parse("2008-12-25")).with_slug("test-article").first
+      assert_equal a, b
-    b = NewsArticle.released_on(:year => "2008", :month => "12", :day => "25").with_slug("test-article").first
-    assert_equal a, b
+      b = NewsArticle.released_on(:year => "2008", :month => "12", :day => "25").with_slug("test-article").first
+      assert_equal a, b
-    assert_equal({
-      :year => "2008",
-      :month => "12",
-      :day => "25",
-      :slug => "test-article"
-    }, b.route_params)
-  end
+      assert_equal({
+        :year => "2008",
+        :month => "12",
+        :day => "25",
+        :slug => "test-article"
+      }, b.route_params)
+    end
-  def test_released_should_show_articles_from_today_and_previous_dates
-    today = NewsArticle.create!(:name => "Today", :release_date => Date.today, :publish_on_save => true)
-    tomorrow = NewsArticle.create!(:name => "Tomorrow", :release_date => Date.tomorrow, :publish_on_save => true)
-    yesterday = NewsArticle.create!(:name => "Yesterday", :release_date => Date.yesterday, :publish_on_save => true)
+    def test_released_should_show_articles_from_today_and_previous_dates
+      today = Factory(:article, :name=>"Today", release_date: Date.today)
+      tomorrow = Factory(:article,:name => "Tomorrow", :release_date => 1.day.from_now)
+      yesterday = Factory(:article,:name => "Yesterday", :release_date => 1.day.ago)
-    # only published articles are considered to be releasable
-    assert today.published?
-    assert tomorrow.published?
-    assert yesterday.published?
+      # only published articles are considered to be releasable
+      assert today.published?
+      assert tomorrow.published?
+      assert yesterday.published?
-    released = NewsArticle.released.all(:order => "release_date asc")
+      released = NewsArticle.released.order("release_date asc").all
-    assert_equal [yesterday, today], released
-  end
+      assert_equal [yesterday, today], released
+    end
+  end
 end

data/test/unit/recent_news_portlet_test.rb CHANGED Viewed

@@ -1,46 +1,54 @@
 require 'test_helper'
-class RecentNewsArticleTest < ActiveSupport::TestCase
+module BcmsNews
+  class RecentNewsArticleTest < ActiveSupport::TestCase
+    def setup
+      @past_article_1 = Factory(:article)
+      @past_article_2 = Factory(:article)
+    end
-  # Note: There is probably a more elegant way to correctly set the
-  # parameters for a portlet than this. But it works for testing purposes.
-  class StubPortlet
-    attr_accessor :sort_by, :category_id, :limit
-  end
-  def test_finds_all_articles
-    article_1 = NewsArticle.create!(:name => "News Item A",  :release_date => Date.parse("2009-1-1"))
-    article_2 = NewsArticle.create!(:name => "News Item B",  :release_date => Date.parse("2009-1-1"))
-    p = RecentNewsPortlet.new
-    params = StubPortlet.new
-    p.instance_variable_set(:@portlet, params)
-    p.render
+    # Note: There is probably a more elegant way to correctly set the
+    # parameters for a portlet than this. But it works for testing purposes.
+    class StubAttributes
+      attr_accessor :sort_by, :category_id, :limit
+    end
-    assert_equal [article_1, article_2], p.instance_variable_get(:@articles)
+    def test_finds_all_articles
+      p = RecentNewsPortlet.new
+      expects_attributes(p)
-  end
+      p.render
+      assert_equal [@past_article_1, @past_article_2], p.articles
+    end
-  def test_looks_up_articles_based_on_category_id
-    c_type = CategoryType.create!(:name => "News")
-    c = Category.create!(:name => "Category A", :category_type => c_type)
-    article_1 = NewsArticle.create!(:name => "News Item A", :category => c, :release_date => Date.parse("2009-1-1"))
-    article_2 = NewsArticle.create!(:name => "News Item B",  :release_date => Date.parse("2009-1-1"))
+    def test_looks_up_articles_based_on_category_id
+      c_type = Cms::CategoryType.create!(:name => "News")
+      assert_equal true, c_type.persisted?
+      c = Cms::Category.create!(:name => "Category A", :category_type_id => c_type.id)
+      @article_in_category = Factory(:article, :category_id => c.id)
-    p = RecentNewsPortlet.new
+      p = RecentNewsPortlet.new
+      params = expects_attributes(p)
+      params.category_id = c.id
-    params = StubPortlet.new
-    params.category_id = c.id
-    p.instance_variable_set(:@portlet, params)
-    p.render
+      p.render
-    assert_equal(c, p.instance_variable_get(:@category))
-    assert_equal([article_1], p.instance_variable_get(:@articles))
-  end
+      assert_equal(c, p.category)
+      assert_equal([@article_in_category], p.articles)
+    end
+    private
+    def expects_attributes(portlet)
+      params = StubAttributes.new
+      portlet.expects(:attributes).returns(params).at_least_once
+      params
+    end
+  end
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bcms_news
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.4.0
   prerelease:
 platform: ruby
 authors:
@@ -9,57 +9,70 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-01-13 00:00:00.000000000Z
+date: 2011-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: browsercms
-  requirement: &70336228228100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - <
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.6.0
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.5.0.rc2
   type: :runtime
   prerelease: false
-  version_requirements: *70336228228100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.6.0
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.5.0.rc2
 description: The News Module for BrowserCMS
 email: github@browsermedia.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- LICENSE.txt
 - README.markdown
 files:
-- LICENSE.txt
-- README.markdown
-- app/controllers/cms/news_articles_controller.rb
-- app/controllers/news_articles_controller.rb
-- app/models/news_article.rb
+- app/assets/javascripts/bcms_news/application.js
+- app/assets/stylesheets/bcms_news/application.css
+- app/controllers/bcms_news/news_articles_controller.rb
+- app/helpers/bcms_news/application_helper.rb
+- app/models/bcms_news/news_article.rb
 - app/portlets/news_archive_portlet.rb
 - app/portlets/news_article_portlet.rb
 - app/portlets/recent_news_portlet.rb
-- app/views/cms/news_articles/_form.html.erb
-- app/views/cms/news_articles/render.html.erb
+- app/views/bcms_news/news_articles/_form.html.erb
+- app/views/bcms_news/news_articles/feed.rss.builder
+- app/views/bcms_news/news_articles/render.html.erb
 - app/views/layouts/templates/default.html.erb
-- app/views/news_articles/index.rss.builder
 - app/views/portlets/news_archive/_form.html.erb
 - app/views/portlets/news_archive/render.html.erb
 - app/views/portlets/news_article/_form.html.erb
 - app/views/portlets/news_article/render.html.erb
 - app/views/portlets/recent_news/_form.html.erb
 - app/views/portlets/recent_news/render.html.erb
-- db/migrate/20090410193313_create_news_articles.rb
+- config/routes.rb
 - db/bcms_news.seeds.rb
+- db/migrate/20111229220000_create_news_articles.rb
+- db/migrate/20120103165543_bcms_news_130.rb
 - lib/bcms_news/engine.rb
-- lib/bcms_news/routes.rb
 - lib/bcms_news/version.rb
 - lib/bcms_news.rb
 - lib/generators/bcms_news/install/install_generator.rb
-- lib/generators/bcms_news/install/USAGE
 - lib/tasks/install.rake
+- README.markdown
 - Gemfile
+- LICENSE.txt
 - COPYRIGHT.txt
 - GPL.txt
+- test/bcms_news_test.rb
 - test/integration/news_articles_test.rb
 - test/test_helper.rb
 - test/unit/news_article_test.rb
@@ -78,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4242334688394424183
+      hash: 898571447684150772
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -87,14 +100,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4242334688394424183
+      hash: 898571447684150772
 requirements: []
 rubyforge_project: bcms_news
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key:
 specification_version: 3
 summary: The News Module for BrowserCMS
 test_files:
+- test/bcms_news_test.rb
 - test/integration/news_articles_test.rb
 - test/test_helper.rb
 - test/unit/news_article_test.rb

data/app/controllers/cms/news_articles_controller.rb DELETED Viewed

	@@ -1,2 +0,0 @@
1	- class Cms::NewsArticlesController < Cms::ContentBlockController
2	- end

data/app/controllers/news_articles_controller.rb DELETED Viewed

@@ -1,7 +0,0 @@
-class NewsArticlesController < ApplicationController
-  def index
-    @articles = NewsArticle.released.all(:limit => 15, :order => "release_date desc")
-  end
-end

data/app/views/cms/news_articles/render.html.erb DELETED Viewed

@@ -1,5 +0,0 @@
-<h2><%=h @content_block.name %></h2>
-<p><%= @content_block.body.html_safe %></p>
-<% if @content_block.attachment %>
-<%= link_to "Attachment", @content_block.attachment_file_path %>
-<% end %>

data/lib/bcms_news/routes.rb DELETED Viewed

@@ -1,11 +0,0 @@
-module Cms
-  module Routes
-    def routes_for_bcms_news
-      match '/news/articles.rss', :to=>"news_articles#index", :as=>'news_articles', :method=>:get, :defaults => { :format => 'rss' }
-      namespace(:cms) do
-        content_blocks :news_articles
-      end
-    end
-  end
-end

data/lib/generators/bcms_news/install/USAGE DELETED Viewed

@@ -1,10 +0,0 @@
-Description:
-    Installs the bcms_news module.
-Example:
-    rails generate bcms_news:install
-    This will:
-		Copy the migrations from the gem into the project.
-		Add the routes to the config/routes.rb