refinerycms-news 1.0 → 1.0.1

data/app/controllers/admin/news_items_controller.rb

@@ -1,5 +1,5 @@
 class Admin::NewsItemsController < Admin::BaseController
 
-  crudify :news_item, :order => "created_at DESC"
+  crudify :news_item, :order => "publish_date DESC"
 
 end

data/app/controllers/news_items_controller.rb

@@ -14,16 +14,16 @@ class NewsItemsController < ApplicationController
 protected
 
   def find_latest_news_items
-    @news_items = NewsItem.latest
+    @news_items = NewsItem.latest.translated
   end
 
   def find_published_news_items
-    @news_items = NewsItem.published.paginate(:page => params[:page],
+    @news_items = NewsItem.published.translated.paginate(:page => params[:page],
                                               :per_page => NewsItem.per_page)
   end
 
   def find_news_item
-    @news_item = NewsItem.published.find(params[:id])
+    @news_item = NewsItem.published.translated.find(params[:id])
   end
 
   def find_page

data/app/models/news_item.rb

@@ -1,4 +1,9 @@
 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
@@ -18,6 +23,15 @@ class NewsItem < ActiveRecord::Base
     published.limit( l_params.first || 10)
   }
 
+  # rejects any page that has not been translated to the current locale.
+  scope :translated, lambda {
+    pages = Arel::Table.new(NewsItem.table_name)
+    translations = Arel::Table.new(NewsItem.translations_table_name)
+
+    includes(:translations).where(
+      translations[:locale].eq(Globalize.locale)).where(pages[:id].eq(translations[:news_item_id]))
+  }
+
   def not_published? # has the published date not yet arrived?
     publish_date > Time.now
   end

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

@@ -5,6 +5,11 @@
                :include_object_name => true
              } %>
 
+  <%= render :partial => "locale_picker",
+             :locals => {
+               :current_locale => Thread.current[:globalize_locale]
+             } if defined?(::Refinery::I18n) %>
+
   <div class='field'>
     <%= f.label :title %>
     <%= f.text_field :title, :class => "larger widest" %>
@@ -20,6 +25,16 @@
     <%= f.text_area :content, :rows => "20", :class => "wymeditor widest" %>
   </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 } %>
+  </div>
+
   <%= render :partial => "/shared/admin/form_actions",
              :locals => {
                :f => f,

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

@@ -0,0 +1,11 @@
+<input type='hidden' name='switch_locale' id='switch_locale' value='<%= local_assigns[:current_locale] %>' />
+<% if (locales ||= ::Refinery::I18n.frontend_locales).present? and locales.many? %>
+  <ul id='switch_locale_picker' class='clearfix'>
+    <% locales.each do |locale| %>
+      <li<%= " class='selected'" if locale.to_s == local_assigns[:current_locale].to_s %>>
+        <%= link_to refinery_icon_tag("flags/#{locale}.png", :size => '48x33'),
+                    url_for(:switch_locale => locale) %>
+      </li>
+    <% end %>
+  </ul>
+<% end %>

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

@@ -4,6 +4,14 @@
     <span class="preview">
       <%= t('.published') %> <%= l(news_item.publish_date, :format => :short) %>
     </span>
+    <% if ::Refinery::I18n.frontend_locales.many? and
+          (locales = news_item.translations.collect{|t| t.locale}).present? %>
+      <span class='preview'>
+        <% locales.each do |locale| %>
+          <%= refinery_icon_tag "flags/#{locale}.png", :size => '16x11' %>
+        <% end %>
+      </span>
+    <% end %>
   </span>
   <span class='actions'>
     <%= link_to refinery_icon_tag('application_go.png'), news_item_url(news_item),

data/config/locales/cs.yml

@@ -0,0 +1,42 @@
+cs:
+  plugins:
+    refinerycms_news:
+      title: Novinky
+      description: Poskytuje jednoduchou správu novinek
+  admin:
+    news_items:
+      news_item:
+        view_live_html: "Zobrazit novinku v novém okně"
+        edit: "Editovať novinku"
+        delete: "Smazat novinku"
+        published: Zveřejněna
+      index:
+        actions: Možnosti
+        create: "Přidat novinku"
+        news_item: Novinka
+        no_items: "Litujeme, žádné výsledky nenalezeny."
+        no_items_yet: 'Momentálně nejsou žádné novinky. Klikni na "Přidat novinku" pro vytvoření první.'
+  news_items:
+    show:
+      back_to_index: "Návrat na seznam novinek"
+      published: Zveřejněné
+    recent_posts:
+      recent_posts: Poslední příspěvky
+    index:
+      published: Zveřejněné
+      read_more: Číst dále
+      no_items_yet: Neexistují žádné záznamy novinek.
+  activerecord:
+    attributes:
+      news_item:
+        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,5 +32,11 @@ 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,5 +32,11 @@ en:
         title: Title
         body: Body
         publish_date: Publish date
+        external_url: External URL
+        image: &image Image
     models:
       news_item: News Item
+  shared:
+    admin:
+      image_picker:
+        image: *image

data/config/locales/es-MX.yml

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

data/config/locales/es.yml

@@ -25,12 +25,19 @@ es:
     index:
       published: Publicada
       read_more: Leer mas
-      no_items_yet: Aún no hay ningu noticia.
+      no_items_yet: Aún no hay ninguna noticia.
   activerecord:
     attributes:
       news_item:
         title: Título
-        body: Cuerpo
-        publish_date: Data de publicación
+        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

@@ -0,0 +1,42 @@
+fr:
+  plugins:
+    refinerycms_news:
+      title: Actualités
+      description: 'Fournit une rubrique "Actualités"'
+  admin:
+    news_items:
+      news_item:
+        view_live_html: "Visualiser cette nouvelle <br/><em>(ouvre une nouvelle fenêtre)</em>"
+        edit: "Modifier cette actualité"
+        delete: "Détruire cette actualité à tout jamais"
+        published: Publiée
+      index:
+        actions: Actions
+        create: "Créer une actualité"
+        news_item: Actualité
+        no_items: "Désolé, aucun résultat."
+        no_items_yet: 'Aucune actualité. Cliquer sur "Créer une actualité" pour créer votre première actualité.'
+  news_items:
+    show:
+      back_to_index: "Retour à la liste des actualités"
+      published: Publiée le
+    recent_posts:
+      recent_posts: Dernières actualités
+    index:
+      published: Publiée le
+      read_more: Plus
+      no_items_yet: Aucune actualité pour le moment.
+  activerecord:
+    attributes:
+      news_item:
+        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,5 +32,12 @@ 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,5 +31,12 @@ lv:
         body: Saturs
         content: Saturs
         publish_date: Publikācijas datums
+        external_url: ārējo URL
+        image: &image Attēlu
     models:
       news_item: jaunums
+  shared:
+    admin:
+      image_picker:
+        image: *image
+      

data/config/locales/nb.yml

@@ -0,0 +1,43 @@
+nb:
+  plugins:
+    refinerycms_news:
+      title: Nyheter
+      description: Legger til en seksjon for nyheter
+  admin:
+    news_items:
+      news_item:
+        view_live_html: "Se hvordan nyheten ser ut for dine besøkende akkurat nå <br/><em>(åpnes i et nytt vindu)</em>"
+        edit: "Rediger denne nyheten"
+        delete: "Fjern denne nyheten permanent"
+        published: Publisert
+      index:
+        actions: Handlinger
+        create: "Legg til Nyhet"
+        news_item: Nyhet
+        no_items: "Beklager, fant ingen resultater."
+        no_items_yet: 'Det er ikke lagt til noen nyheter enda. Klikk "Legg til Nyhet" for å legge inn din første nyhet.'
+  news_items:
+    show:
+      back_to_index: "Tilbake til nyhetsoversikt"
+      published: Publisert
+    recent_posts:
+      recent_posts: Nylige Poster
+    index:
+      published: Publisert
+      read_more: Les mer
+      no_items_yet: Det er ingen nyheter enda.
+  activerecord:
+    attributes:
+      news_item:
+        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,5 +32,12 @@ nl:
         title: Titel
         body: Inhoud
         publish_date: Publiceer datum
+        external_url: Externe URL
+        image: &image Beeld
     models:
-      news_item: Nieuws Item
+      news_item: Nieuws Item
+  shared:
+    admin:
+      image_picker:
+        image: *image
+      

data/config/locales/pt-BR.yml

@@ -1,6 +1,6 @@
 pt-BR:
   plugins:
-    news:
+    refinerycms_news:
       title: Notícias
   activerecord:
     attributes:

data/config/locales/ru.yml

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

data/config/locales/sk.yml

@@ -0,0 +1,42 @@
+sk:
+  plugins:
+    refinerycms_news:
+      title: Novinky
+      description: Poskytuje jednoduchú správu noviniek
+  admin:
+    news_items:
+      news_item:
+        view_live_html: "Zobraziť novinku v novom okne"
+        edit: "Editovať novinku"
+        delete: "Zmazať novinku"
+        published: Uverejnená
+      index:
+        actions: Možnosti
+        create: "Pridať novinku"
+        news_item: Novinka
+        no_items: "Ľutujeme, žiadne výsledky nenájdené."
+        no_items_yet: 'Momentálne nie sú žiadne novinky. Klikni na "Pridať novinku" pre vytvorenie prvej.'
+  news_items:
+    show:
+      back_to_index: "Návrat na zoznam noviniek"
+      published: Zverejnené
+    recent_posts:
+      recent_posts: Posledné príspevky
+    index:
+      published: Zverejnené
+      read_more: Čítať viac
+      no_items_yet: Neexistujú žiadne záznamy noviniek.
+  activerecord:
+    attributes:
+      news_item:
+        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,5 +32,11 @@ 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/features/step_definitions/news_steps.rb

@@ -17,7 +17,7 @@ Given /^I have no news items$/ do
 end
 
 Given /^the news item titled "?([^\"]*)"? is not published$/ do |title|
-  NewsItem.find_by_title(title).update_attribute(:publish_date, Time.now + 1.day)
+  NewsItem.where(:title => title).first.update_attribute(:publish_date, Time.now + 1.day)
 end
 
 Then /^I should have ([0-9]+) news items?$/ do |count|

data/features/support/paths.rb

@@ -11,7 +11,7 @@ module NavigationHelpers
           new_admin_news_item_path
         else
           begin
-            if page_name =~ /the news item titled "?([^\"]*)"?/ and (news_item = NewsItem.find_by_title($1)).present?
+            if page_name =~ /the news item titled "?([^\"]*)"?/ and (news_item = NewsItem.where(:title => $1).first).present?
               self.url_for(news_item)
             else
               nil

data/lib/generators/refinerycms_news/templates/db/migrate/migration_number_create_singular_name.rb

@@ -9,6 +9,10 @@ class Create<%= table_name.camelize %> < ActiveRecord::Migration
     end
 
     add_index :<%= table_name %>, :id
+
+    <% translated_attributes = attributes.find_all { |attr| [:string, :text].include? attr.type } %>
+    <%= class_name %>.create_translation_table! <%= translated_attributes.map { |a| ":#{a.name} => :#{a.type}"}.join(', ') %>
+    
     load(Rails.root.join('db', 'seeds', 'refinerycms_news.rb').to_s)
   end
 
@@ -17,6 +21,8 @@ class Create<%= table_name.camelize %> < ActiveRecord::Migration
 
     Page.delete_all({:link_url => "/news"})
 
+    <%= class_name %>.drop_translation_table!
+
     drop_table :<%= table_name %>
   end
 

data/lib/generators/refinerycms_news_generator.rb

@@ -4,8 +4,8 @@ class RefinerycmsNewsGenerator < Rails::Generators::NamedBase
   include Rails::Generators::Migration
 
   source_root File.expand_path('../refinerycms_news/templates/', __FILE__)
-  argument :name, :type => :string, :default => 'news_items', :banner => ''
-  argument :attributes, :type => :array, :default => ["title:string", "body:text", "publish_date:datetime"]
+  argument :name, :type => :string, :default => 'news_item', :banner => ''
+  argument :attributes, :type => :array, :default => ["title:string", "body:text", "publish_date:datetime", "image_id:integer", "external_url:string"]
 
   def generate
     # seed file
@@ -13,8 +13,8 @@ class RefinerycmsNewsGenerator < Rails::Generators::NamedBase
 
     next_migration_number = ActiveRecord::Generators::Base.next_migration_number(File.dirname(__FILE__))
     template('db/migrate/migration_number_create_singular_name.rb',
-             Rails.root.join("db/migrate/#{next_migration_number}_create_#{singular_name}.rb"))
-
+             Rails.root.join("db/migrate/#{next_migration_number}_create_#{plural_name}.rb"))
+             
      unless self.behavior == :revoke
        puts "------------------------"
        puts "Now run:"

data/lib/news.rb

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

metadata

@@ -1,11 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-news
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  version: "1.0"
+  prerelease: 
+  version: 1.0.1
 platform: ruby
 authors: 
 - Resolve Digital
@@ -13,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-31 00:00:00 +13:00
+date: 2011-04-04 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,10 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 8
         version: 0.9.8
   type: :runtime
   version_requirements: *id001
@@ -44,6 +37,7 @@ files:
 - app/controllers/news_items_controller.rb
 - app/models/news_item.rb
 - app/views/admin/news_items/_form.html.erb
+- app/views/admin/news_items/_locale_picker.html.erb
 - app/views/admin/news_items/_news_item.html.erb
 - app/views/admin/news_items/edit.html.erb
 - app/views/admin/news_items/index.html.erb
@@ -52,15 +46,19 @@ files:
 - app/views/news_items/index.html.erb
 - app/views/news_items/index.rss.builder
 - app/views/news_items/show.html.erb
+- config/locales/cs.yml
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/es-MX.yml
 - config/locales/es.yml
+- config/locales/fr.yml
 - config/locales/it.yml
 - config/locales/lv.yml
+- config/locales/nb.yml
 - config/locales/nl.yml
 - config/locales/pt-BR.yml
 - config/locales/ru.yml
+- config/locales/sk.yml
 - config/locales/sl.yml
 - config/routes.rb
 - features/manage_news_items.feature
@@ -93,21 +91,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Ruby on Rails news engine for RefineryCMS.