refinerycms-news 0.9.7.3 → 0.9.8

data/app/controllers/news_items_controller.rb

@@ -14,7 +14,7 @@ protected
   end
 
   def find_page
-    @page = Page.find_by_link_url("/news", :include => [:parts, :slugs])
+    @page = Page.find_by_link_url("/news")
   end
 
 end

data/app/models/news_item.rb

@@ -1,13 +1,14 @@
 class NewsItem < ActiveRecord::Base
 
-  validates_presence_of :title, :body, :publish_date
+  alias_attribute :content, :body
+  validates_presence_of :title, :content, :publish_date
 
   has_friendly_id :title, :use_slug => true
 
-  acts_as_indexed :fields => [:title, :body],
-                  :index_file => %W(#{Rails.root} tmp index)
+  acts_as_indexed :fields => [:title, :body]
 
   default_scope :order => "publish_date DESC"
+
   # 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)
   named_scope :latest, lambda { { :conditions => ["publish_date < ?", Time.now], :limit => 10 } }
@@ -17,6 +18,7 @@ class NewsItem < ActiveRecord::Base
     publish_date > Time.now
   end
 
+  # for will_paginate
   def self.per_page
     20
   end

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

@@ -1,19 +1,25 @@
-<%= error_messages_for :news_item %>
 <% form_for [:admin, @news_item] do |f| %>
+  <%= f.error_messages %>
+
   <div class='field'>
     <%= f.label :title %>
-    <%= f.text_field :title, :class => "larger", :style => 'width: 954px' %>
+    <%= f.text_field :title, :class => "larger widest" %>
   </div>
+
   <div class='field'>
     <%= f.label :publish_date %>
     <%= f.datetime_select :publish_date %>
   </div>
-  <div class='clearfix' style='width:963px'>
-    <div class='field'>
-      <%= f.label :body %>
-      <%= f.text_area :body, :rows => "20", :class => "wymeditor" %>
-    </div>
+
+  <div class='field'>
+    <%= f.label :content %>
+    <%= f.text_area :content, :rows => "20", :class => "wymeditor widest" %>
   </div>
-  <%= render :partial => "/shared/admin/form_actions", :locals => {:f => f,
-                                                                   :continue_editing => true} %>
+
+  <%= render :partial => "/shared/admin/form_actions",
+             :locals => {
+               :f => f,
+               :continue_editing => true
+             } %>
+
 <% end %>

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

@@ -1,15 +1,16 @@
 <li class='clearfix record <%= cycle("on", "on-hover") %>'>
   <span class='title'>
-    <span class='actions'>
-      <%= link_to refinery_icon_tag('application_go.png'), news_item_url(news_item),
-                  :title => 'View this news item live <br/><em>(opens in a new window)</em>',
-                  :target => "_blank" %>
-      <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_news_item_path(news_item),
-                  :title => 'Edit this news item' %>
-      <%= link_to refinery_icon_tag('delete.png'), admin_news_item_path(news_item),
-                  :class => "cancel confirm-delete",
-                  :title => "Remove this news item forever" %>
-    </span>
-    <%=h news_item.title %> <span class="preview">&nbsp;</span>
+    <%=h news_item.title %>
+    <span class="preview">&nbsp;</span>
+  </span>
+  <span class='actions'>
+    <%= link_to refinery_icon_tag('application_go.png'), news_item_url(news_item),
+                :title => t('.view_live'),
+                :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') %>
   </span>
 </li>

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

@@ -1 +1 @@
-<%= render :partial => "form" %>
+<%= render :partial => "form" %>

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

@@ -4,12 +4,12 @@
       <%= render :partial => "/shared/admin/search", :locals => {:url => admin_news_items_url} %>
     </li>
     <li>
-      <%= link_to "Create News Item", new_admin_news_item_url, :class => "add_icon" %>
+      <%= link_to t('.create'), new_admin_news_item_url, :class => "add_icon" %>
     </li>
   </ul>
 </div>
 <div id='records'>
-  <%= "<h2>Search Results for \"#{params[:search]}\"</h2>" if searching? %>
+  <%= "<h2>#{t('admin.search_results_for', :query => params[:search])}</h2>" if searching? %>
   <% if @news_items.any? %>
     <%= will_paginate @news_items, :previous_label => '&laquo;', :next_label => '&raquo;' %>
     <ul>
@@ -19,13 +19,10 @@
   <% else %>
     <% unless searching? %>
       <p>
-        <strong>
-          There are no news items yet.
-          Click "Create News Item" to add your first news item.
-        </strong>
+        <strong><%= t('.no_items_yet') %></strong>
       </p>
     <% else %>
-      <p>Sorry, no results found.</p>
+      <p><%= t('admin.search_no_results') %></p>
     <% end %>
   <% end %>
 </div>

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

@@ -1 +1 @@
-<%= render :partial => "form" %>
+<%= render :partial => "form" %>

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

@@ -1,4 +1,4 @@
-<h2>Recent Posts</h2>
+<h2><%= t('.recent_posts') %></h2>
 <ul>
   <% @news_items.each do |item| %>
     <li>

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

@@ -5,14 +5,19 @@
     <% @news_items.each do |item| %>
       <h3><%= link_to item.title, news_item_url(item) %></h3>
       <p>
-        <small>Published <%= item.publish_date.strftime("%A %d of %B, %Y") %></small>
+        <small><%= t('.published') %> <%= l(item.publish_date) %></small>
       </p>
-      <%= truncate(item.body, :length => 200, :omission => " ... #{link_to "Read more", news_item_url(item)}", :preserve_html_tags => true) %>
+      <%= truncate  item.body, :length => 200,
+                    :omission => " ... #{link_to t('.read_more'), news_item_url(item)}",
+                    :preserve_html_tags => true %>
     <% end %>
+
     <%= will_paginate(@news_items) %>
   <% else %>
-    <p><em>Sorry we haven't posted up any news yet.</em></p>
+    <p><em><%= t('.no_items_yet') %></em></p>
   <% end %>
-<% end %>
+<% end -%>
+
 <% content_for :body_content_right, "&nbsp;" if @news_items.offset > 0 -%>
+
 <%= render :partial => "/shared/content_page" %>

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

@@ -1,11 +1,11 @@
 <% content_for :body_content_title, "<h1>#{@news_item.title}</h1>" %>
 <% content_for :body_content_left do %>
   <p>
-    <small>Published <%= @news_item.publish_date.strftime("%A %d of %B, %Y") %></small>
+    <small><%= t('.published') %> <%= l(@news_item.publish_date, :format => :long) %></small>
   </p>
   <%= @news_item.body %>
   <p>
-    <%= link_to "Back to all news", news_items_url %>
+    <%= link_to t('.back_to_index'), news_items_url %>
   </p>
 <% end %>
 <% content_for :body_content_right, render(:partial => 'recent_posts') %>

data/config/locales/en.yml

@@ -0,0 +1,34 @@
+en:
+  plugins:
+    news:
+      title: News
+  admin:
+    news_items:
+      news_item:
+        view_live: "View this news item live <br/><em>(opens in a new window)</em>"
+        edit: "Edit this news item"
+        delete: "Remove this news item forever"
+      index:
+        actions: Actions
+        create: "Create News Item"
+        news_item: News
+        no_items: "Sorry, no results found."
+        no_items_yet: 'There are no news item entries yet. Click "Create News Item" to add your first news item entries.'
+  news_items:
+    show:
+      back_to_index: "Back to all news"
+      published: Published
+      no_items: "Sorry we haven't posted up any news yet."
+      read_more: Read more
+    recent_posts:
+      recent_posts: Recent Posts
+    index:
+      published: Published
+  activerecord:
+    attributes:
+      news_item:
+        title: Title
+        body: Body
+        publish_date: Publish date
+    models:
+      news_item: News Item

data/config/locales/nl.yml

@@ -0,0 +1,33 @@
+nl:
+  plugins:
+    news:
+      title: Nieuws
+  activerecord:
+    attributes:
+      news_item:
+        title: Titel
+        content: Inhoud
+        publish_date: Publiceer Datum
+    models:
+      news_item: Nieuws Item
+  admin:
+    news_items:
+      news_item:
+        view_live: Bekijk dit bericht op de website.<br/><em>(opent in een nieuw venster.)</em>
+        edit: Bewerk dit bericht
+        delete: Verwijder dit bericht permanent
+      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.
+  news_items:
+    recent_posts:
+      recent_posts: Laatste nieuws item
+    index:
+      create: Maak Nieuws Item
+      published: "Gepubliceerd op"
+      read_more: Lees meer
+      no_items_yet: "Sorry, er zijn nog geen nieuwsberichten geplaatst."
+    show:
+      published: Gepubliceerd op
+      back_to_index: Terug naar de andere berichten
+

data/config/locales/pt-BR.yml

@@ -0,0 +1,34 @@
+pt-BR:
+  plugins:
+    news:
+      title: Notícias
+  activerecord:
+    attributes:
+      news_item:
+        title: Título
+        content: Contéudo
+        publish_date: Data de publicação
+    models:
+      news_item: Notícia
+  admin:
+    news_items:
+      news_item:
+        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"
+      index:
+        actions: Ações
+        create: "Criar Notícia"
+        news_item: Notícia
+        no_items: 'Não há notícias cadastradas.'
+        no_items_yet: 'Não há notícias cadastradas. Clique em "Criar Notícia" para cadastrar sua primeira notícia.'
+  news_items:
+    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."
+      read_more: Leia mais
+    recent_posts:
+      recent_posts: Notícias recentes
+    index:
+     published: Publicado

data/generators/news/news_generator.rb

@@ -0,0 +1,29 @@
+class NewsGenerator < Rails::Generator::NamedBase
+
+  def initialize(*runtime_args)
+    # set first argument to the table's name so that the user doesn't have to pass it in.
+    runtime_args[0] = ["news_items"]
+    super(*runtime_args)
+  end
+
+  def banner
+    "Usage: script/generate news"
+  end
+
+  def manifest
+    record do |m|
+      m.migration_template 'migration.rb', 'db/migrate',
+        :migration_file_name => "create_structure_for_news",
+        :assigns => {
+          :migration_name => "CreateStructureForNews",
+          :table_name => "news_items",
+          :attributes => [
+            Rails::Generator::GeneratedAttribute.new("title", "string"),
+            Rails::Generator::GeneratedAttribute.new("body", "text"),
+            Rails::Generator::GeneratedAttribute.new("publish_date", "datetime")
+          ]
+        }
+    end
+  end
+
+end if defined?(Rails::Generator::NamedBase)

data/generators/news/templates/migration.rb

@@ -0,0 +1,42 @@
+class <%= migration_name %> < ActiveRecord::Migration
+
+  def self.up
+    create_table :<%= table_name %> do |t|
+<% attributes.each do |attribute| -%>
+      t.<%= attribute.type %> :<%= attribute.name %>
+<% end -%>
+      t.timestamps
+    end
+
+    add_index :<%= table_name %>, :id
+
+    User.find(:all).each do |user|
+      user.plugins.create(:name => "News", :position => (user.plugins.maximum(:position) || -1) + 1)
+    end
+
+    page = Page.create(:title => "News",
+                :link_url => "/news",
+                :menu_match => "^/news.*$",
+                :deletable => false,
+                :position => Page.count)
+
+    RefinerySetting.find_or_set(:default_page_parts, ["Body", "Side Body"]).each do |default_page_part|
+      page.parts.create(:title => default_page_part, :body => nil)
+    end
+
+  end
+
+  def self.down
+    UserPlugin.destroy_all({:title => "News"})
+
+    Page.find_all_by_link_url("/news").each do |page|
+      page.link_url, page.menu_match = nil
+      page.deletable = true
+      page.destroy
+    end
+    Page.destroy_all({:link_url => "/news"})
+
+    drop_table :<%= table_name %>
+  end
+
+end

data/lib/gemspec.rb

@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
 require File.expand_path('../news.rb', __FILE__)
-version = Refinery::Portfolio::Version::STRING
+version = ::Refinery::News.version
 raise "Could not get version so gemspec can not be built" if version.nil?
-files = %w( readme.md license.md  )
-%w(app bin config db lib public rails test vendor).each do |dir|
-  files += Dir.glob("#{dir}/**/*") if File.directory?(dir)
+files = Dir.glob("**/*").flatten.reject do |file|
+  file =~ /\.gem(spec)?$/
 end
 
 gemspec = <<EOF
@@ -16,9 +15,8 @@ Gem::Specification.new do |s|
   s.summary           = %q{Ruby on Rails news engine for RefineryCMS.}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
-  s.authors           = %w(Resolve\\ Digital Philip\\ Arndt David\\ Jones)
+  s.authors           = %w(Resolve\\ Digital)
   s.require_paths     = %w(lib)
-  s.executables       = %w()
 
   s.files             = [
     '#{files.join("',\n    '")}'
@@ -29,11 +27,4 @@ Gem::Specification.new do |s|
 end
 EOF
 
-if (save = ARGV.delete('-s'))
-  if File.exist?(file = File.expand_path("../../refinerycms-news.gemspec", __FILE__))
-    File.delete(file)
-  end
-  File.open(file, 'w') { |f| f.puts gemspec }
-else
-  puts gemspec
-end
+File.open(File.expand_path("../../refinerycms-news.gemspec", __FILE__), 'w').puts(gemspec)

data/lib/news.rb

@@ -1,12 +1,9 @@
 module Refinery
-  module Portfolio
-    class Version
-      MAJOR = 0
-      MINOR = 9
-      TINY = 7
-      BUILD = 3
-
-      STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
+  module News
+    class << self
+      def version
+        %q{0.9.8}
+      end
     end
   end
 end

data/rails/init.rb

@@ -2,10 +2,12 @@ Refinery::Plugin.register do |plugin|
   plugin.title = "News"
   plugin.description = "Provides a blog-like news section"
   plugin.version = 1.0
-  plugin.menu_match = /admin\/news(_items)?$/
+  plugin.menu_match = /(admin|refinery)\/news(_items)?$/
+  plugin.url = '/refinery/news'
   plugin.activity = {
     :class => NewsItem,
     :title => 'title',
     :url_prefix => 'edit'
   }
+  plugin.directory = directory
 end

data/readme.md

@@ -1,6 +1,6 @@
 # News
 
-![Refinery News](http://refinerycms.com/system/images/0000/0646/news.png)
+![Refinery News](http://refinerycms.com/system/images/0000/0876/news.png)
 
 ## About
 
@@ -15,21 +15,25 @@ Key features:
 
 To install the news engine, you can either include the gem or install as a plugin.
 
-### RubyGems Installation
+## Requirements
 
-Include the latest (gem)[http://rubygems.org/gems/refinerycms-news] into your config/application.rb file like so:
+[RefineryCMS](http://refinerycms.com) version 0.9.6 or later.
 
-    config.gem "refinerycms-news", :lib => "news", :source => "rubygems.org", :version => "~> 0.9.7.1"
+### Gem Installation using Bundler
+
+Include the latest [gem](http://rubygems.org/gems/refinerycms-news) into your Refinery CMS application's Gemfile:
+
+    gem "refinerycms-news", '~> 0.9.8', :require => "news"
 
 Then type the following at command line inside your Refinery CMS application's root directory:
 
-    rake gems:install
+    bundle install
     script/generate news
     rake db:migrate
 
 ### Rails Engine Installation
 
-If you do not want to install the engine via RubyGems then you can install it as an engine inside your application's vendor directory.
+If you do not want to install the engine via bundler then you can install it as an engine inside your application's vendor directory.
 Type the following at command line inside your Refinery CMS application's root directory:
 
     script/plugin install git://github.com/resolve/refinerycms-news.git

data/test/fixtures/news_items.yml

@@ -0,0 +1,14 @@
+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

@@ -0,0 +1,34 @@
+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

metadata

@@ -1,23 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-news
 version: !ruby/object:Gem::Version 
+  hash: 43
   prerelease: false
   segments: 
   - 0
   - 9
-  - 7
-  - 3
-  version: 0.9.7.3
+  - 8
+  version: 0.9.8
 platform: ruby
 authors: 
 - Resolve Digital
-- Philip Arndt
-- David Jones
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-06-15 00:00:00 +12:00
+date: 2010-07-12 00:00:00 +12:00
 default_executable: 
 dependencies: []
 
@@ -30,8 +28,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- readme.md
-- license.md
 - app/controllers/admin/news_items_controller.rb
 - app/controllers/news_items_controller.rb
 - app/models/news_item.rb
@@ -44,11 +40,19 @@ files:
 - app/views/news_items/index.html.erb
 - app/views/news_items/index.rss.builder
 - app/views/news_items/show.html.erb
-- config/locale/en.yml
+- config/locales/en.yml
+- config/locales/nl.yml
+- config/locales/pt-BR.yml
 - config/routes.rb
+- generators/news/news_generator.rb
+- generators/news/templates/migration.rb
 - lib/gemspec.rb
 - lib/news.rb
+- license.md
 - rails/init.rb
+- readme.md
+- test/fixtures/news_items.yml
+- test/unit/news_items_test.rb
 has_rdoc: true
 homepage: http://refinerycms.com
 licenses: []
@@ -63,6 +67,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -71,6 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -81,5 +87,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby on Rails news engine for RefineryCMS.
-test_files: []
-
+test_files: 
+- test/unit/news_items_test.rb