refinerycms-news 0.9.9.5 → 0.9.9.6

data/app/controllers/news_items_controller.rb

@@ -1,25 +1,25 @@
 class NewsItemsController < ApplicationController
-
-  before_filter :find_latest_news_items, :find_page
-  before_filter :find_published_news_items, :find_page, :only => [:index]
-  before_filter :find_news_item, :only => [:show]
+  before_filter :find_page
+  before_filter :find_published_news_items, :only => [:index]
+  before_filter :find_news_item, :find_latest_news_items, :only => [:show]
 
   def index
-    render 'index'
+    # render 'index'
   end
 
   def show
-    render 'show'
+    # render 'show'
   end
 
 protected
 
   def find_latest_news_items
-    @news_items = NewsItem.latest.paginate(:page => params[:page]) # 10 items
+    @news_items = NewsItem.latest
   end
 
   def find_published_news_items
-    @news_items = NewsItem.published.paginate(:page => params[:page])
+    @news_items = NewsItem.published.paginate(:page => params[:page],
+                                              :per_page => NewsItem.per_page)
   end
 
   def find_news_item

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

@@ -1,4 +1,4 @@
-<% form_for [:admin, @news_item] do |f| %>
+<%= form_for [:admin, @news_item] do |f| %>
   <%= render :partial => "/shared/admin/error_messages",
              :locals => {
                :object => @news_item,

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

@@ -1,18 +1,20 @@
 <li class='clearfix record <%= cycle("on", "on-hover") %>'>
   <span class='title'>
-    <%=h news_item.title %>
-    <span class="preview">&nbsp;</span>
+    <%= news_item.title %>
+    <span class="preview">
+      <%= t('.published') %> <%= l(news_item.publish_date, :format => :short) %>
+    </span>
   </span>
   <span class='actions'>
     <%= link_to refinery_icon_tag('application_go.png'), news_item_url(news_item),
-                :title => t('.view_live'),
+                :title => t('.view_live_html'),
                 :target => "_blank" %>
     <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_news_item_path(news_item),
                 :title => t('.edit') %>
     <%= link_to refinery_icon_tag('delete.png'), admin_news_item_path(news_item),
                 :class => "cancel confirm-delete",
                 :title => t('.delete'),
-                :'data-method' => :delete,
-                :'data-confirm' => t('shared.admin.delete.message', :title => news_item.title) %>
+                :method => :delete,
+                :confirm => t('shared.admin.delete.message', :title => news_item.title) %>
   </span>
 </li>

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

@@ -9,7 +9,9 @@
   </ul>
 </div>
 <div id='records'>
-  <%= "<h2>#{t('admin.search_results_for', :query => params[:search])}</h2>" if searching? %>
+  <% if searching? %>
+    <h2><%= t('shared.admin.search.results_for', :query => params[:search]) %></h2>
+  <% end %>
   <% if @news_items.any? %>
     <%= will_paginate @news_items, :previous_label => '&laquo;', :next_label => '&raquo;' %>
     <ul>
@@ -17,12 +19,12 @@
     </ul>
     <%= will_paginate @news_items, :previous_label => '&laquo;', :next_label => '&raquo;' %>
   <% else %>
-    <% unless searching? %>
-      <p>
+    <p>
+      <% unless searching? %>
         <strong><%= t('.no_items_yet') %></strong>
-      </p>
-    <% else %>
-      <p><%= t('admin.search_no_results') %></p>
-    <% end %>
+      <% else %>
+        <%= t('shared.admin.search.no_results') %>
+      <% end %>
+    </p>
   <% end %>
 </div>

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

@@ -1,3 +1,7 @@
+<% 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 %>
 
@@ -5,7 +9,7 @@
     <% @news_items.each do |item| %>
       <h3><%= link_to item.title, news_item_url(item) %></h3>
       <p>
-        <small><%= t('.published') %> <%= l(item.publish_date) %></small>
+        <small><%= t('.published') %> <%= l(item.publish_date, :format => :long) %></small>
       </p>
       <%= truncate  item.body, :length => 200,
                     :omission => " ... #{link_to t('.read_more'), news_item_url(item)}",
@@ -18,6 +22,4 @@
   <% end %>
 <% end -%>
 
-<% content_for :body_content_right, "&nbsp;" if @news_items.offset > 0 -%>
-
 <%= render :partial => "/shared/content_page" %>

data/config/locales/en.yml

@@ -2,24 +2,24 @@ en:
   plugins:
     refinerycms_news:
       title: News
-      description: Provides a blog-like news section
+      description: Provides a simple news section
   admin:
     news_items:
       news_item:
-        view_live: "View this news item live <br/><em>(opens in a new window)</em>"
+        view_live_html: "View this news item live <br/><em>(opens in a new window)</em>"
         edit: "Edit this news item"
         delete: "Remove this news item forever"
+        published: Published
       index:
         actions: Actions
-        create: "Create News Item"
+        create: "Add News Item"
         news_item: News
         no_items: "Sorry, no results found."
-        no_items_yet: 'There are no news items yet. Click "Create News Item" to add your first news item.'
+        no_items_yet: 'There are no news items yet. Click "Add News Item" to add your first news item.'
   news_items:
     show:
       back_to_index: "Back to all news"
       published: Published
-      no_items: "Sorry we haven't posted up any news yet."
     recent_posts:
       recent_posts: Recent Posts
     index:
@@ -33,4 +33,4 @@ en:
         body: Body
         publish_date: Publish date
     models:
-      news_item: News Item
+      news_item: News Item

data/config/locales/es-MX.yml

@@ -0,0 +1,34 @@
+es-MX:
+  plugins:
+    news:
+      title: Noticias
+  admin:
+    news_items:
+      news_item:
+        view_live: "View this news item live <br/><em>(opens in a new window)</em>"
+        edit: "Modificar esta noticia"
+        delete: "Eliminar esta noticia"
+      index:
+        actions: Acciones
+        create: "Crear una noticia"
+        news_item: Noticias
+        no_items: "Lo sentimos no hay resultados."
+        no_items_yet: 'Aun no hay noticias. Haga click en "Crear una noticia" para agregar la primera noticia.'
+  news_items:
+    show:
+      back_to_index: "Regresar a noticias"
+      published: Publicada
+      no_items: "Lo sentimos, aun no ha publicado noticias."
+    recent_posts:
+      recent_posts: Publicaciones recientes
+    index:
+      published: Publicada
+      read_more: Leer mas
+  activerecord:
+    attributes:
+      news_item:
+        title: Título
+        body: Contenido
+        publish_date: Fecha de publicación
+    models:
+      news_item: Noticia

data/config/locales/es.yml

@@ -6,9 +6,10 @@ es:
   admin:
     news_items:
       news_item:
-        view_live: "Ver este elemento en tu web <br/><em>(abre una nueva ventana)</em>"
+        view_live_html: "Ver este elemento en tu web <br/><em>(abre una nueva ventana)</em>"
         edit: "Editar esta noticia"
         delete: "Borrar completament esta noticia"
+        published: Publicada
       index:
         actions: Acciones
         create: "Crear noticia"
@@ -19,7 +20,6 @@ es:
     show:
       back_to_index: "Volver al listado de noticias"
       published: Publicada
-      no_items: "Lo sentimos, aún no hemos publicado ninguna noticia."
     recent_posts:
       recent_posts: Posts recientes
     index:
@@ -34,4 +34,3 @@ es:
         publish_date: Data de publicación
     models:
       news_item: Noticia
-

data/config/locales/it.yml

@@ -0,0 +1,36 @@
+it:
+  plugins:
+    refinerycms_news:
+      title: Notizie
+      description: Fornisce una sezione notizie in stile blog
+  admin:
+    news_items:
+      news_item:
+        view_live_html: "Visualzza questa notizia live <br/><em>(si apre in una nuova finestra)</em>"
+        edit: "Modifica questa notizia"
+        delete: "Rimuovi questa notizia per sempre"
+        published: Pubblicata
+      index:
+        actions: Azioni
+        create: "Crea Notizia"
+        news_item: Notizia
+        no_items: "Spiacente, nessun risultato trovato."
+        no_items_yet: 'Non ci sono ancora notizie. Fare clic su "Crea Notizia" per aggiungere la prima notizie.'
+  news_items:
+    show:
+      back_to_index: "Torna a tutte le notizie"
+      published: Pubblicata
+    recent_posts:
+      recent_posts: Messaggi Recenti
+    index:
+      published: Pubblicata
+      read_more: Per saperne di più
+      no_items_yet: Non ci sono ancora notizie.
+  activerecord:
+    attributes:
+      news_item:
+        title: Titolo
+        body: Corpo
+        publish_date: Data di pubblicazione
+    models:
+      news_item: Notizia

data/config/locales/lv.yml

@@ -0,0 +1,35 @@
+lv:
+  plugins:
+    refinerycms_news:
+      title: Jaunumi
+      description: Piedāvā blogveidīgu jaunumu sadaļu
+  admin:
+    news_items:
+      news_item:
+        view_live_html: Apskatīt šo jaunumu <br/><em>Atvērsies jaunā logā</em>
+        delete: Dzēst šo jaunumu
+        edit: Labot šo jaunumu
+        published: Ievietots
+      index:
+        create: Izveidot Jaunumu
+        news_item: Jaunumi
+        no_items_yet: Vēl nav neviena jaunuma. Spied "Izveidot Jaunumu", lai izveidotu pirmo jaunumu.
+  news_items:
+    show:
+      back_to_index: Atgriezties pie visiem jaunumiem
+      published: Ievietots
+    recent_posts:
+      recent_posts: Pēdējie jaunumi
+    index:
+      published: Ievietots
+      read_more: Lasīt vairāk
+      no_items_yet: Vēl nav neviena jaunuma.
+  activerecord:
+    attributes:
+      news_item:
+        title: Virsraksts
+        body: Saturs
+        content: Saturs
+        publish_date: Publikācijas datums
+    models:
+      news_item: jaunums

data/config/locales/nl.yml

@@ -13,9 +13,10 @@ nl:
   admin:
     news_items:
       news_item:
-        view_live: Bekijk dit bericht op de website.<br/><em>(opent in een nieuw venster.)</em>
+        view_live_html: Bekijk dit bericht op de website.<br/><em>(opent in een nieuw venster.)</em>
         edit: Bewerk dit bericht
         delete: Verwijder dit bericht permanent
+        published: Gepubliceerd op
       index:
         create: Maak een nieuw nieuwsbericht
         no_items_yet: Er zijn nog geen nieuwsberichten. Klik op "Maak een nieuw niewsbericht" om het eerste bericht te maken.
@@ -30,4 +31,3 @@ nl:
     show:
       published: Gepubliceerd op
       back_to_index: Terug naar de andere berichten
-

data/config/locales/pt-BR.yml

@@ -16,6 +16,7 @@ pt-BR:
         view_live: "Ver esta notícia no site<br/><em>(abrirá em uma nova janela)</em>"
         edit: "Alterar esta notícia"
         delete: "Remover esta notícia para sempre"
+        published: Publicado
       index:
         actions: Ações
         create: "Criar Notícia"
@@ -27,8 +28,7 @@ pt-BR:
     show:
       back_to_index: "Voltar para todas as notícias"
       published: Publicado
-      no_items: "Nos desculpe, nós não postamos nenhuma notícia ainda."
     recent_posts:
       recent_posts: Notícias recentes
     index:
-     published: Publicado
+     published: Publicado

data/config/locales/ru.yml

@@ -5,9 +5,10 @@ ru:
   admin:
     news_items:
       news_item:
-        view_live: "Просмотреть новость <br/><em>(будет открыто в новом окне)</em>"
+        view_live_html: "Просмотреть новость <br/><em>(будет открыто в новом окне)</em>"
         edit: "Редактировать новость"
         delete: "Удалить новость"
+        published: Опубликовано
       index:
         actions: "Действия"
         create: "Создать новость"
@@ -18,7 +19,6 @@ ru:
     show:
       back_to_index: "Вернуться к новостям"
       published: "Опубликована"
-      no_items: "Пока новостей нет."
     recent_posts:
       recent_posts: "Последние публикации"
     index:

data/config/locales/sl.yml

@@ -6,9 +6,10 @@ sl:
   admin:
     news_items:
       news_item:
-        view_live: "Poglej si to novico v živo <br/><em>(odpre se v novem oknu)</em>"
+        view_live_html: "Poglej si to novico v živo <br/><em>(odpre se v novem oknu)</em>"
         edit: "Uredi novico"
         delete: "Odstrani novico"
+        published: Objavljeno
       index:
         actions: Akcije
         create: "Ustvari novico"
@@ -19,7 +20,6 @@ sl:
     show:
       back_to_index: "Nazaj na seznam novic"
       published: Objavljeno
-      no_items: "Oprostite, nismo še objavili nobene novice."
     recent_posts:
       recent_posts: Zadnji vnosi      
     index:
@@ -33,4 +33,4 @@ sl:
         body: Opis
         publish_date: Datum objave
     models:
-      news_item: Novice
+      news_item: Novice

data/config/routes.rb

@@ -2,7 +2,7 @@ Refinery::Application.routes.draw do
   resources :news, :as => :news_items, :controller => :news_items, :only => [:show, :index]
 
   scope(:path => 'refinery', :as => 'admin', :module => 'admin') do
-    resources :news, :as => :news_items, :controller => :news_items
+    resources :news, :except => :show, :as => :news_items, :controller => :news_items
   end
 end
 

data/features/manage_news_items.feature

@@ -0,0 +1,56 @@
+@refinerycms @news-items @news-items-manage
+Feature: Manage News Items
+  In order to have news bulletins on my website
+  As an administrator
+  I want to create and manage news items
+
+  Background:
+    Given I am a logged in refinery user
+    And I have no news items
+
+  Scenario: News Items List
+    Given I have news items titled Home, About
+    When I go to the list of news items
+    Then I should see "Home"
+    And I should see "About"
+
+  Scenario: Create Valid News Item
+    When I go to the list of news items
+    And I follow "Add News Item"
+    And I fill in "Title" with "News Items are a fun way to share what's going on"
+    And I fill in "Content" with "It really is the most exciting thing you could hear about today."
+    And I press "Save"
+    Then I should see "'News Items are a fun way to share what's going on' was successfully added."
+    And I should have 1 news item
+
+  Scenario: Create Invalid News Item (without title)
+    When I go to the list of news items
+    And I follow "Add News Item"
+    And I fill in "Content" with "But you won't ever see this published"
+    And I press "Save"
+    Then I should see "Title can't be blank"
+    And I should have 0 news items
+
+  Scenario: Create Invalid News Item (without content)
+    When I go to the list of news items
+    And I follow "Add News Item"
+    And I fill in "Title" with "Good luck ever seeing this title"
+    And I press "Save"
+    Then I should see "Content can't be blank"
+    And I should have 0 news items
+
+
+  Scenario: Create Duplicate News Item
+    Given I only have news items titled Home, About
+    When I go to the list of news items
+    And I follow "Add News Item"
+    And I fill in "Title" with "About"
+    And I press "Save"
+    Then I should have 2 news items
+
+  Scenario: Delete News Item
+    Given I only have a news item titled "test"
+    When I go to the list of news items
+    And I follow "Remove this news item forever"
+    Then I should see "'test' was successfully removed."
+    And I should have 0 news items

data/features/step_definitions/news_steps.rb

@@ -0,0 +1,25 @@
+Given /^I (only )?have a news item titled "?([^\"]*)"?$/ do |only, title|
+  NewsItem.delete_all if only
+
+  Factory(:news_item, :title => title)
+end
+
+Given /^I (only )?have news items titled "?([^\"]*)"?$/ do |only, titles|
+  NewsItem.delete_all if only
+
+  titles.split(', ').each do |title|
+    Factory(:news_item, :title => title)
+  end
+end
+
+Given /^I have no news items$/ do
+  NewsItem.delete_all
+end
+
+Given /^the news item titled "?([^\"]*)"? is not published$/ do |title|
+  NewsItem.find_by_title(title).update_attribute(:publish_date, Time.now + 1.day)
+end
+
+Then /^I should have ([0-9]+) news items?$/ do |count|
+  NewsItem.count.should == count.to_i
+end

data/features/support/factories.rb

@@ -0,0 +1,7 @@
+require 'factory_girl'
+
+Factory.define :news_item do |ni|
+  ni.title "RefineryCMS News Item"
+  ni.content "Some random text ..."
+  ni.publish_date Time.now - 5.minutes
+end

data/features/support/paths.rb

@@ -0,0 +1,26 @@
+module NavigationHelpers
+  module Refinery
+    module News
+      def path_to(page_name)
+        case page_name
+        when /the home\s?page/
+          root_path
+        when /the list of news items/
+          admin_news_items_path
+        when /the new news item form/
+          new_admin_news_item_path
+        else
+          begin
+            if page_name =~ /the news item titled "?([^\"]*)"?/ and (news_item = NewsItem.find_by_title($1)).present?
+              self.url_for(news_item)
+            else
+              nil
+            end
+          rescue
+            nil
+          end
+        end
+      end
+    end
+  end
+end

data/features/visit_news_items.feature

@@ -0,0 +1,27 @@
+@refinerycms @news-items @news-items-visit @visit-news-items
+Feature: Visit News Items
+  In order to view the content on this website
+  As a visitor
+  I want to view news items
+
+  Background:
+    Given A Refinery user exists
+    And I have a page titled "Home" with a custom url "/"
+    And I have a page titled "News" with a custom url "/news"
+    Given I only have a news item titled "Extra - Read all about it"
+    And I have a news item titled "Unpublished News Item"
+    And the news item titled "Unpublished News Item" is not published
+
+  @menu
+  Scenario: News appears in menu
+    When I go to the home page
+    Then I should see "Home"
+    And I should see "News"
+
+  @show
+  Scenario: Show News Item
+    When I go to the news item titled "Extra - Read all about it"
+    Then I should see "Home"
+    And I should see "Extra - Read all about it"
+    And I should see "News" within ".selected"
+    And I should not see "Unpublished News Item"

data/lib/news.rb

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

data/spec/models/news_item_spec.rb

@@ -0,0 +1,74 @@
+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
+
+    it "rejects empty content" do
+      NewsItem.new(@attr.merge(:content => "")).should_not be_valid
+    end
+
+    it "rejects empty publish date" do
+      NewsItem.new(@attr.merge(:publish_date => "")).should_not be_valid
+    end
+  end
+
+  describe "attribute aliasing" do
+    it "aliases content to body" do
+      news_item = Factory(:news_item)
+      news_item.content.should == news_item.body
+    end
+  end
+
+  describe "default scope" do
+    it "orders by publish date in DESC order" do
+      news_item1 = Factory(:news_item, :publish_date => 1.hour.ago)
+      news_item2 = Factory(:news_item, :publish_date => 2.hours.ago)
+      news_items = NewsItem.all
+      news_items.first.should == news_item1
+      news_items.second.should == news_item2
+    end
+  end
+
+  describe ".published" do
+    it "returns only published news items" do
+      Factory(:news_item)
+      Factory(:news_item, :publish_date => Time.now + 1.hour)
+      NewsItem.published.count.should == 1
+    end
+  end
+
+  describe ".latest" do
+    it "returns 10 latest news items by default" do
+      5.times { Factory(:news_item) }
+      5.times { Factory(:news_item, :publish_date => Time.now + 1.hour) }
+      NewsItem.latest.count.should == 5
+      7.times { Factory(:news_item) }
+      NewsItem.latest.count.should == 10
+    end
+
+    it "returns latest n news items" do
+      4.times { Factory(:news_item) }
+      NewsItem.latest(3).count.should == 3
+    end
+  end
+
+  describe ".not_published?" do
+    it "returns not published news items" do
+      news_item = Factory(:news_item, :publish_date => Time.now + 1.hour)
+      news_item.not_published?.should be_true
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-news
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 47
   prerelease: false
   segments: 
   - 0
   - 9
   - 9
-  - 5
-  version: 0.9.9.5
+  - 6
+  version: 0.9.9.6
 platform: ruby
 authors: 
 - Resolve Digital
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-22 00:00:00 +13:00
+date: 2010-11-11 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,12 +57,20 @@ files:
 - app/views/news_items/index.rss.builder
 - app/views/news_items/show.html.erb
 - config/locales/en.yml
+- config/locales/es-MX.yml
 - config/locales/es.yml
+- config/locales/it.yml
+- config/locales/lv.yml
 - config/locales/nl.yml
 - config/locales/pt-BR.yml
 - config/locales/ru.yml
 - config/locales/sl.yml
 - config/routes.rb
+- features/manage_news_items.feature
+- features/step_definitions/news_steps.rb
+- features/support/factories.rb
+- features/support/paths.rb
+- features/visit_news_items.feature
 - lib/gemspec.rb
 - lib/generators/refinerycms_news/templates/db/migrate/migration_number_create_singular_name.rb
 - lib/generators/refinerycms_news/templates/db/seeds/seed.rb
@@ -71,6 +79,7 @@ files:
 - lib/refinerycms-news.rb
 - license.md
 - readme.md
+- spec/models/news_item_spec.rb
 - test/fixtures/news_items.yml
 - test/unit/news_items_test.rb
 has_rdoc: true