refinerycms-news 1.1.0 → 1.2.0

data/app/models/news_item.rb

@@ -1,12 +1,10 @@
 class NewsItem < ActiveRecord::Base
-  belongs_to :image, :class_name => 'Image'
-
   translates :title, :body, :external_url
   
   attr_accessor :locale # to hold temporarily
 
   alias_attribute :content, :body
-  validates_presence_of :title, :content, :publish_date
+  validates :title, :content, :publish_date, :presence => true
 
   has_friendly_id :title, :use_slug => true
 
@@ -16,8 +14,12 @@ class NewsItem < ActiveRecord::Base
 
   # If you're using a named scope that includes a changing variable you need to wrap it in a lambda
   # This avoids the query being cached thus becoming unaffected by changes (i.e. Time.now is constant)
+  scope :not_expired, lambda {
+    news_items = Arel::Table.new(NewsItem.table_name)
+    where(news_items[:expiration_date].eq(nil).or(news_items[:expiration_date].gt(Time.now)))
+  }
   scope :published, lambda {
-    where( "publish_date < ?", Time.now )
+    not_expired.where("publish_date < ?", Time.now)
   }
   scope :latest, lambda { |*l_params|
     published.limit( l_params.first || 10)

data/app/views/admin/news_items/_form.html.erb

@@ -21,18 +21,14 @@
   </div>
 
   <div class='field'>
-    <%= f.label :content %>
-    <%= f.text_area :content, :rows => "20", :class => "wymeditor widest" %>
+    <%= f.label :expiration_date %>
+    <%= f.datetime_select :expiration_date, :start_year => Time.now.year,
+                                            :include_blank => true %>
   </div>
 
   <div class='field'>
-    <%= f.label :external_url %>
-    <%= f.text_field :external_url, :class => "larger widest" %>
-  </div>
-
-  <div class='field'>
-    <%= f.label :image %>
-    <%= render :partial => "/shared/admin/image_picker", :locals => {:f => f, :field => :image_id, :image => @news_item.image } %>
+    <%= f.label :content %>
+    <%= f.text_area :content, :rows => "20", :class => "wymeditor widest" %>
   </div>
 
   <%= render :partial => "/shared/admin/form_actions",

data/app/views/admin/news_items/_news_item.html.erb

@@ -4,7 +4,7 @@
     <span class="preview">
       <%= t('.published') %> <%= l(news_item.publish_date, :format => :short) %>
     </span>
-    <% if ::Refinery::I18n.frontend_locales.many? and
+    <% if defined?(::Refinery::I18n) and ::Refinery::I18n.frontend_locales.many? and
           (locales = news_item.translations.collect{|t| t.locale}).present? %>
       <span class='preview'>
         <% locales.each do |locale| %>

data/app/views/news_items/index.html.erb

@@ -1,9 +1,5 @@
-<% content_for :body_content_title do %>
-  <%= t('plugins.refinerycms_news.title') %>
-<% end %>
-
 <% content_for :body_content_left do %>
-  <%= @page[:body] if @news_items.offset == 0 %>
+  <%=raw @page[:body] if @news_items.offset == 0 %>
 
   <% if @news_items.any? %>
     <% @news_items.each do |item| %>

data/config/locales/cs.yml

@@ -32,11 +32,5 @@ cs:
         title: Název
         body: Obsah
         publish_date: Datum zveřejnění
-        external_url: Veřejná URL
-        image: &image Obrázek
     models:
       news_item: Novinka
-  shared:
-    admin:
-      image_picker:
-        image: *image

data/config/locales/de.yml

@@ -32,11 +32,5 @@ de:
         title: Titel
         body: Inhalt
         publish_date: Veröffentlichungsdatum
-        external_url: Externe URL
-        image: &image Image
     models:
       news_item: News-Eintrag
-  shared:
-    admin:
-      image_picker:
-        image: *image

data/config/locales/en.yml

@@ -32,11 +32,6 @@ en:
         title: Title
         body: Body
         publish_date: Publish date
-        external_url: External URL
-        image: &image Image
+        expiration_date: Expiration date
     models:
       news_item: News Item
-  shared:
-    admin:
-      image_picker:
-        image: *image

data/config/locales/es-MX.yml

@@ -30,11 +30,5 @@ es-MX:
         title: Título
         body: Contenido
         publish_date: Fecha de publicación
-        external_url: URL externa
-        image: &image Imagen
     models:
       news_item: Noticia
-  shared:
-    admin:
-      image_picker:
-        image: *image

data/config/locales/es.yml

@@ -32,12 +32,5 @@ es:
         title: Título
         body: Contenido
         publish_date: Fecha de publicación
-        external_url: URL externa
-        image: &image Imagen
     models:
       news_item: Noticia
-  shared:
-    admin:
-      image_picker:
-        image: *image
-      

data/config/locales/fr.yml

@@ -32,11 +32,5 @@ fr:
         title: Titre
         body: Texte
         publish_date: Date de publication
-        external_url: Lien externe
-        image: &image Image
     models:
       news_item: Nouvelle
-  shared:
-    admin:
-      image_picker:
-        image: *image

data/config/locales/it.yml

@@ -32,12 +32,5 @@ it:
         title: Titolo
         body: Corpo
         publish_date: Data di pubblicazione
-        external_url: URL esterni
-        image: &image Immagine
     models:
       news_item: Notizia
-  shared:
-    admin:
-      image_picker:
-        image: *image
-      

data/config/locales/lv.yml

@@ -31,12 +31,6 @@ lv:
         body: Saturs
         content: Saturs
         publish_date: Publikācijas datums
-        external_url: ārējo URL
-        image: &image Attēlu
+        expiration_date: Publikācijas beigu datums
     models:
       news_item: jaunums
-  shared:
-    admin:
-      image_picker:
-        image: *image
-      

data/config/locales/nb.yml

@@ -32,12 +32,5 @@ nb:
         title: Tittel
         body: Tekst
         publish_date: Publiseringsdato
-        external_url: Ekstern adresse
-        image: &image Bilde
     models:
       news_item: Nyhet
-  shared:
-    admin:
-      image_picker:
-        image: *image
-        

data/config/locales/nl.yml

@@ -32,12 +32,5 @@ nl:
         title: Titel
         body: Inhoud
         publish_date: Publiceer datum
-        external_url: Externe URL
-        image: &image Beeld
     models:
       news_item: Nieuws Item
-  shared:
-    admin:
-      image_picker:
-        image: *image
-      

data/config/locales/ru.yml

@@ -30,12 +30,5 @@ ru:
         title: "Заголовок"
         body: "Публикация"
         publish_date: "Дата публикации"
-        external_url: "внешний URL"
-        image: &image "Изображение"
     models:
       news_item: "Новость"
-  shared:
-    admin:
-      image_picker:
-        image: *image
-

data/config/locales/sk.yml

@@ -32,11 +32,5 @@ sk:
         title: Názov
         body: Obsah
         publish_date: Dátum zverejnenia
-        external_url: Verejná URL
-        image: &image Obrázok
     models:
       news_item: Novinka
-  shared:
-    admin:
-      image_picker:
-        image: *image

data/config/locales/sl.yml

@@ -32,11 +32,5 @@ sl:
         title: Naslov
         body: Opis
         publish_date: Datum objave
-        external_url: Externé URL
-        image: &image "obrázok"
     models:
       news_item: Novice
-  shared:
-    admin:
-      image_picker:
-        image: *image

data/db/migrate/5_add_expiration_date_to_news_items.rb

@@ -0,0 +1,15 @@
+class AddExpirationDateToNewsItems < ActiveRecord::Migration
+
+  def self.up
+    unless ::NewsItem.column_names.map(&:to_sym).include?(:expiration_date)
+      add_column ::NewsItem.table_name, :expiration_date, :datetime
+    end
+  end
+
+  def self.down
+    if ::NewsItem.column_names.map(&:to_sym).include?(:expiration_date)
+      remove_column ::NewsItem.table_name, :expiration_date
+    end
+  end
+
+end

data/db/migrate/6_remove_image_id_and_external_url_from_news.rb

@@ -0,0 +1,19 @@
+class RemoveImageIdAndExternalUrlFromNews < ActiveRecord::Migration
+  def self.up
+    if ::NewsItem.column_names.map(&:to_sym).include?(:external_url)
+      remove_column ::NewsItem.table_name, :external_url
+    end
+    if ::NewsItem.column_names.map(&:to_sym).include?(:image_id)
+      remove_column ::NewsItem.table_name, :image_id
+    end
+  end
+
+  def self.down
+    unless ::NewsItem.column_names.map(&:to_sym).include?(:external_url)
+      add_column ::NewsItem.table_name, :external_url, :string
+    end
+    unless ::NewsItem.column_names.map(&:to_sym).include?(:image_id)
+      add_column ::NewsItem.table_name, :image_id, :integer
+    end
+  end
+end

data/lib/gemspec.rb

@@ -18,14 +18,11 @@ Gem::Specification.new do |s|
   s.authors           = %w(Resolve\\ Digital)
   s.require_paths     = %w(lib)
 
-  s.add_dependency    'refinerycms-core', '~> 0.9.9.15'
+  s.add_dependency    'refinerycms-core', '~> 1.0.0'
 
   s.files             = [
     '#{files.join("',\n    '")}'
   ]
-  #{"s.test_files        = [
-    '#{Dir.glob("test/**/*.rb").join("',\n    '")}'
-  ]" if File.directory?("test")}
 end
 EOF
 

data/lib/news.rb

@@ -2,7 +2,7 @@ module Refinery
   module News
     class << self
       def version
-        %q{1.1.0}
+        %q{1.2.0}
       end
     end
   end

data/spec/models/news_item_spec.rb

@@ -3,33 +3,28 @@ require 'spec_helper'
 Dir[File.expand_path('../../../features/support/factories.rb', __FILE__)].each {|f| require f}
 
 describe NewsItem do
-  describe "validations" do
-    before(:each) do
-      @attr = {
-        :title => "RefinyerCMS",
-        :content => "Some random text ...",
-        :publish_date => Date.today
-      }
-    end
-
-    it "rejects empty title" do
-      NewsItem.new(@attr.merge(:title => "")).should_not be_valid
-    end
+  
+  let(:time_now) { Time.now }
+  let(:news_item) { Factory(:news_item) }
 
-    it "rejects empty content" do
-      NewsItem.new(@attr.merge(:content => "")).should_not be_valid
+  describe "validations" do
+    subject do
+      news_item = NewsItem.create! :title => "RefinyerCMS",
+                                   :content => "Some random text ...",
+                                   :publish_date => time_now
+      news_item
     end
 
-    it "rejects empty publish date" do
-      NewsItem.new(@attr.merge(:publish_date => "")).should_not be_valid
-    end
+    it { should be_valid }
+    its(:errors) { should be_empty }
+    its(:title) { should == "RefinyerCMS" }
+    its(:content) { should == "Some random text ..." }
+    its(:publish_date) { should == time_now }
   end
 
   describe "attribute aliasing" do
-    it "aliases content to body" do
-      news_item = Factory(:news_item)
-      news_item.content.should == news_item.body
-    end
+    subject { news_item }
+    its(:content) { should == news_item.body }
   end
 
   describe "default scope" do
@@ -42,6 +37,26 @@ describe NewsItem do
     end
   end
 
+  describe ".not_expired" do
+    let!(:news_item) { Factory(:news_item) }
+
+    specify "expiration date not set" do
+      NewsItem.not_expired.count.should == 1
+    end
+
+    specify "expiration date set in future" do
+      news_item.expiration_date = Time.now + 1.hour
+      news_item.save!
+      NewsItem.not_expired.count.should == 1
+    end
+
+    specify "expiration date in past" do
+      news_item.expiration_date = Time.now - 1.hour
+      news_item.save!
+      NewsItem.not_expired.count.should == 0
+    end
+  end
+
   describe ".published" do
     it "returns only published news items" do
       Factory(:news_item)

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-news
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Resolve Digital
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-07 00:00:00 +12:00
+date: 2011-05-27 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.15
+        version: 1.0.0
   type: :runtime
   version_requirements: *id001
 description: A really straightforward open source Ruby on Rails news engine designed for integration with RefineryCMS.
@@ -65,6 +65,8 @@ files:
 - db/migrate/2_add_external_url_to_news_items.rb
 - db/migrate/3_translate_news_items.rb
 - db/migrate/4_add_image_id_to_news_items.rb
+- db/migrate/5_add_expiration_date_to_news_items.rb
+- db/migrate/6_remove_image_id_and_external_url_from_news.rb
 - db/seeds/refinerycms_news.rb
 - features/manage_news_items.feature
 - features/step_definitions/news_steps.rb
@@ -78,8 +80,6 @@ files:
 - license.md
 - readme.md
 - spec/models/news_item_spec.rb
-- test/fixtures/news_items.yml
-- test/unit/news_items_test.rb
 has_rdoc: true
 homepage: http://refinerycms.com
 licenses: []
@@ -104,9 +104,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby on Rails news engine for RefineryCMS.
-test_files: 
-- test/unit/news_items_test.rb
+test_files: []
+

data/test/fixtures/news_items.yml

@@ -1,14 +0,0 @@
-website_launched:
-  title: New website launched!
-  body: Oh yes our brand new website is here and it is running on Refinery CMS.
-  publish_date: <%= Date.today - 4.days %>
-
-new_team_member:
-  title: Amanda joins Resolve Digital
-  body: Welcome Amanda to the Resolve Digital team.
-  publish_date: <%= Date.today - 2.days %>
-
-product_launch:
-  title: Secret new product launched
-  body: Oh yes our brand new website is here and it is running on Refinery CMS.
-  publish_date: <%= Date.today.tomorrow %>

data/test/unit/news_items_test.rb

@@ -1,34 +0,0 @@
-require 'test_helper'
-
-class NewsItemsTest < ActiveSupport::TestCase
-
-  self.fixture_path = File.expand_path("../../fixtures", __FILE__)
-  fixtures :news_items
-
-  def setup
-    @new_news_item = NewsItem.new
-    @new_valid_news_item = NewsItem.new(:title => "valid post", :content => "yep looks valid", :publish_date => Date.today)
-  end
-
-  def test_should_not_save_without_title_and_body
-    assert !@new_news_item.save
-
-    assert_equal "can't be blank", @new_news_item.errors.on('title')
-    assert_equal "can't be blank", @new_news_item.errors.on('content')
-    assert_equal "can't be blank", @new_news_item.errors.on('publish_date')
-
-    assert @new_valid_news_item.save
-  end
-
-  def test_per_page
-    assert_equal 20, NewsItem.per_page
-  end
-
-  def test_named_scopes
-    assert_equal 2, NewsItem.published.size
-    assert NewsItem.latest.size < 10
-
-    assert_equal news_items(:new_team_member), NewsItem.latest.first
-  end
-
-end