refinerycms-news 2.0.1 → 2.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a5eb03c40be74b743440b65a5f321d684a27fbaa
+  data.tar.gz: 5dec817e08d7d98232ea21d4301d53c36054f1b3
+SHA512:
+  metadata.gz: 6d6ac165e91096cf87e2e776e21308c176e753ed6997b3cbd6c16195dd0a7ad99d14ee5e52c45afdcc24efbd90cc76d2d481baadd3a37383d4b848a7b674843d
+  data.tar.gz: 207bde8a3c45dae4f7848765340cabbb0938a7e10ef5d2b8d267beed061acb6ae0beb64a0fdf023a78265af431f2e844890c79bcd215c1f16c783894f582b41d

data/.gitignore

@@ -1,3 +1,7 @@
 .DS_Store
 Gemfile.lock
 spec/dummy
+.idea
+
+# Local Gemfile for developing without sharing dependencies
+.gemfile

data/.rspec

@@ -0,0 +1 @@
+--color

data/.travis.yml

@@ -1,17 +1,30 @@
+language: ruby
+bundler_args: --without development
 before_script:
-  - "bundle exec rake refinery:testing:dummy_app > /dev/null"
-script: "bundle exec rspec ./spec"
+  - "sh -e /etc/init.d/xvfb start"
+  - "bundle exec rake refinery:testing:dummy_app"
+script:
+  - "DISPLAY=:99.0 bundle exec rspec spec"
 notifications:
-  email:
-    - parndt@gmail.com
-    - ugis.ozolss@gmail.com
-    - heinleng@gmail.com
+  email: true
+  irc:
+    use_notice: true
+    skip_join: true
+    channels:
+      - "irc.freenode.org#refinerycms"
+  campfire:
+    on_success: always
+    on_failure: always
+    rooms:
+      - secure: "JaX+Ckvdd2wqL2bD6t8PHvMDBHxWBlCrkBKPcDKxV0t0DOwzzzwxMryVqcRi\nPsmM/zvmWFATDyRmivhNOpu4lRg9RytSroxZ9nkmbLDqjCyEAZ6tv4yZXME/\nPaxPwmfwgS9g8TKjj3lSWS7rEpqqg0D5S0XIfIHrj6KB6LUmFHc="
 env:
   - DB=postgresql
   - DB=mysql
+matrix:
+  allow_failures:
+    - rvm: rbx-19mode
 rvm:
-  - 1.8.7
-  - 1.9.2
+  - 2.0.0
   - 1.9.3
-  - rbx
-  - jruby
+  - rbx-19mode
+  - jruby-19mode

data/Gemfile

@@ -2,63 +2,29 @@ source 'http://rubygems.org'
 
 gemspec
 
-gem 'refinerycms', '~> 2.0.1'
-
-group :development, :test do
-  gem 'refinerycms-testing', '~> 2.0.0'
-  gem 'guard-rspec', '~> 0.6.0'
-
-  platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter'
-    gem 'activerecord-jdbcmysql-adapter'
-    gem 'activerecord-jdbcpostgresql-adapter'
-    gem 'jruby-openssl'
-  end
-
-  unless defined?(JRUBY_VERSION)
-    gem 'sqlite3'
-    gem 'mysql2'
-    gem 'pg'
-  end
-
-  platforms :mswin, :mingw do
-    gem 'win32console'
-    gem 'rb-fchange', '~> 0.0.5'
-    gem 'rb-notifu', '~> 0.0.4'
-  end
-
-  platforms :ruby do
-    gem 'spork', '~> 0.9.0.rc'
-    gem 'guard-spork'
+gem 'refinerycms', '~> 2.1.0'
+gem 'refinerycms-settings', :github => 'refinery/refinerycms-settings'
+gem 'refinerycms-testing', '~> 2.1.0', :group => :test
+
+# Database Configuration
+unless ENV['TRAVIS']
+  gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
+  gem 'sqlite3', :platform => :ruby
+end
 
-    unless ENV['TRAVIS']
-      require 'rbconfig'
-      if RbConfig::CONFIG['target_os'] =~ /darwin/i
-        gem 'rb-fsevent', '>= 0.3.9'
-        gem 'ruby_gntp'
-      end
-      if RbConfig::CONFIG['target_os'] =~ /linux/i
-        gem 'rb-inotify', '>= 0.5.1'
-        gem 'libnotify',  '~> 0.1.3'
-        gem 'therubyracer', '~> 0.9.9'
-      end
-    end
-  end
+if !ENV['TRAVIS'] || ENV['DB'] == 'mysql'
+  gem 'activerecord-jdbcmysql-adapter', :platform => :jruby
+  gem 'jdbc-mysql', '= 5.1.13', :platform => :jruby
+  gem 'mysql2', :platform => :ruby
+end
 
-  platforms :jruby do
-    unless ENV['TRAVIS']
-      require 'rbconfig'
-      if RbConfig::CONFIG['target_os'] =~ /darwin/i
-        gem 'ruby_gntp'
-      end
-      if RbConfig::CONFIG['target_os'] =~ /linux/i
-        gem 'rb-inotify', '>= 0.5.1'
-        gem 'libnotify',  '~> 0.1.3'
-      end
-    end
-  end
+if !ENV['TRAVIS'] || ENV['DB'] == 'postgresql'
+  gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
+  gem 'pg', :platform => :ruby
 end
 
+gem 'jruby-openssl', :platform => :jruby
+
 # Refinery/rails should pull in the proper versions of these
 group :assets do
   gem 'sass-rails'
@@ -66,4 +32,7 @@ group :assets do
   gem 'uglifier'
 end
 
-gem 'jquery-rails'
+# Load local gems according to Refinery developer preference.
+if File.exist? local_gemfile = File.expand_path('../.gemfile', __FILE__)
+  eval File.read(local_gemfile)
+end

data/Rakefile

@@ -17,3 +17,5 @@ Refinery::Testing::Railtie.load_tasks
 Refinery::Testing::Railtie.load_dummy_tasks(ENGINE_PATH)
 
 load File.expand_path('../tasks/rspec.rake', __FILE__)
+
+task :default => :spec

data/app/controllers/refinery/news/items_controller.rb

@@ -15,30 +15,27 @@ module Refinery
 
       def archive
         if params[:month].present?
-          date = "#{params[:month]}/#{params[:year]}"
-          @archive_date = Time.parse(date)
-          @date_title = @archive_date.strftime('%B %Y')
-          @items = Refinery::News::Item.live.by_archive(@archive_date).page(params[:page])
+          @archive_for_month = true
+          @archive_date = Time.parse("#{params[:month]}/#{params[:year]}")
+          @items = Item.archived.translated.by_archive(@archive_date).page(params[:page])
         else
-          date = "01/#{params[:year]}"
-          @archive_date = Time.parse(date)
-          @date_title = @archive_date.strftime('%Y')
-          @items = Refinery::News::Item.live.by_year(@archive_date).page(params[:page])
+          @archive_date = Time.parse("01/#{params[:year]}")
+          @items = Item.archived.translated.by_year(@archive_date).page(params[:page])
         end
       end
 
       protected
 
       def find_latest_news_items
-        @items = Refinery::News::Item.latest.translated
+        @items = Item.latest.translated
       end
 
       def find_published_news_items
-        @items = Refinery::News::Item.published.translated.page(params[:page])
+        @items = Item.published.translated.page(params[:page])
       end
 
       def find_news_item
-        @item = Refinery::News::Item.published.translated.find(params[:id])
+        @item = Item.published.translated.find(params[:id])
       end
 
       def find_page

data/app/helpers/refinery/news/items_helper.rb

@@ -5,7 +5,7 @@ module Refinery
         items = Refinery::News::Item.select('publish_date').all_previous
         return nil if items.blank?
 
-        render :partial => "/refinery/news/items/widgets/news_archive", :locals => { :items => items }
+        render "/refinery/news/items/widgets/news_archive", :items => items
       end
       alias_method :news_archive_list, :news_item_archive_widget
 
@@ -28,23 +28,20 @@ module Refinery
         end
       end
 
-      def news_item_archive_link(item)
-        if item.publish_date >= Time.now.end_of_year.advance(:years => -3)
-          post_date = item.publish_date.strftime('%m/%Y')
-          year = post_date.split('/')[1]
-          month = post_date.split('/')[0]
-          count = News::Item.by_archive(Time.parse(post_date)).size
-          text = t("date.month_names")[month.to_i] + " #{year} (#{count})"
-
-          link_to(text, refinery.news_items_archive_path(:year => year, :month => month))
-        else
-          post_date = post.publish_date.strftime('01/%Y')
-          year = post_date.split('/')[1]
-          count = Refinery::News::Item.by_year(Time.parse(post_date)).size
-          text = "#{year} (#{count})"
-
-          link_to(text, refinery.news_items_archive_path(:year => year))
+      def news_item_archive_links
+        html = ''
+        item_months = ::Refinery::News::Item.archived.group_by {|i| i.publish_date.beginning_of_month}
+        item_months.each do |month, items|
+          if items.present?
+            text = "#{t("date.month_names")[month.month]} #{month.year} (#{items.count})"
+            html += "<li>#{link_to(text, refinery.news_items_archive_path(:year => month.year, :month => month.month))}</li>"
+          end
         end
+        content_tag('ul', raw(html))
+      end
+
+      def archive_date_format(date_for_month)
+        date_for_month ? "%B %Y" : "%Y"
       end
     end
   end

data/app/models/refinery/news/item.rb

@@ -1,3 +1,5 @@
+require 'acts_as_indexed'
+
 module Refinery
   module News
     class Item < Refinery::Core::BaseModel
@@ -6,7 +8,6 @@ module Refinery
       translates :title, :body
 
       attr_accessor :locale # to hold temporarily
-
       attr_accessible :title, :body, :content, :source, :publish_date, :expiration_date
       class Translation
         attr_accessible :locale
@@ -35,11 +36,11 @@ module Refinery
 
       class << self
         def by_archive(archive_date)
-          where(['publish_date between ? and ?', archive_date.beginning_of_month, archive_date.end_of_month])
+          where(:publish_date => archive_date.beginning_of_month..archive_date.end_of_month)
         end
 
         def by_year(archive_year)
-          where(['publish_date between ? and ?', archive_year.beginning_of_year, archive_year.end_of_year])
+          where(:publish_date => archive_year.beginning_of_year..archive_year.end_of_year)
         end
 
         def all_previous
@@ -69,7 +70,11 @@ module Refinery
         end
 
         def live
-          not_expired.where( "publish_date <= ?", Time.now)
+          not_expired.where("publish_date <= ?", Time.now)
+        end
+
+        def archived
+          where("publish_date <= ?", Time.now)
         end
 
         # rejects any page that has not been translated to the current locale.

data/app/views/refinery/news/admin/items/_form.html.erb

@@ -1,14 +1,9 @@
 <%= form_for [refinery, :news, :admin, @item] do |f| %>
-  <%= render :partial => "/refinery/admin/error_messages",
-             :locals => {
-               :object => @item,
-               :include_object_name => true
-             } %>
+  <%= render "/refinery/admin/error_messages",
+             :object => @item,
+             :include_object_name => true %>
 
-  <%= render :partial => "locale_picker",
-             :locals => {
-               :current_locale => Thread.current[:globalize_locale]
-             } if defined?(::Refinery::I18n) %>
+  <%= render '/refinery/admin/locale_picker', :current_locale => Globalize.locale %>
 
   <div class='field'>
     <%= f.label :title %>
@@ -36,12 +31,10 @@
     <%= f.text_field :source, :class => "larger widest" %>
   </div>
 
-  <%= render :partial => "/refinery/admin/form_actions",
-             :locals => {
-               :f => f,
-               :continue_editing => true,
-               :delete_title => t('admin.news.items.item.delete'),
-               :delete_confirmation => t('shared.admin.delete.message', :title => @item.title)
-             } %>
+  <%= render "/refinery/admin/form_actions",
+             :f => f,
+             :continue_editing => true,
+             :delete_title => t('admin.news.items.item.delete'),
+             :delete_confirmation => t('shared.admin.delete.message', :title => @item.title) %>
 
 <% end %>

data/app/views/refinery/news/admin/items/_item.html.erb

@@ -4,11 +4,12 @@
     <span class="preview">
       <%= t('.published') %> <%= l(item.publish_date, :format => :short) %>
     </span>
-    <% if defined?(::Refinery::I18n) and ::Refinery::I18n.frontend_locales.many? and
+    <% if Refinery::I18n.frontend_locales.many? and
           (locales = item.translations.collect{|t| t.locale}).present? %>
       <span class='preview'>
         <% locales.each do |locale| %>
-          <%= refinery_icon_tag "flags/#{locale}.png", :size => '32x32' %>
+          <%= link_to refinery_icon_tag("flags/#{locale}.png", :size => '16x11'), refinery.edit_news_admin_item_path(item, :switch_locale => locale),
+                      :class => "locale" %>
         <% end %>
       </span>
     <% end %>
@@ -23,6 +24,8 @@
                 :class => "cancel confirm-delete",
                 :title => t('.delete'),
                 :method => :delete,
-                :confirm => t('shared.admin.delete.message', :title => item.title) %>
+                :data => {
+                  :confirm => t('refinery.admin.delete.message', :title => item.title)
+                } %>
   </span>
 </li>

data/app/views/refinery/news/admin/items/edit.html.erb

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

data/app/views/refinery/news/admin/items/index.html.erb

@@ -1,7 +1,7 @@
 <div id='actions'>
   <ul>
     <li>
-      <%= render :partial => "/refinery/admin/search", :locals => {:url => refinery.news_admin_items_path} %>
+      <%= render "/refinery/admin/search", :url => refinery.news_admin_items_path %>
     </li>
     <li>
       <%= link_to t('.create'), refinery.new_news_admin_item_path, :class => "add_icon" %>

data/app/views/refinery/news/admin/items/new.html.erb

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

data/app/views/refinery/news/items/archive.html.erb

@@ -1,17 +1,17 @@
-<% content_for :title, "#{t('.news_item_archive_for', :date => @archive_date.strftime('%B %Y'))}" %>
+<% content_for :title, "#{t('.news_item_archive_for', :date => l(@archive_date, :format => archive_date_format(@archive_for_month)))}" %>
 
-<% content_for :body_content_left do %>
-  <h1><%= t('.news_item_archive_for', :date => @archive_date.strftime('%B %Y')) %></h1>
+<% content_for :body do %>
+  <h1><%= t('.news_item_archive_for', :date => l(@archive_date, :format => archive_date_format(@archive_for_month))) %></h1>
   <% if @items.any? %>
     <section id="news_items">
       <%= render :partial => "/refinery/news/shared/item", :collection => @items %>
     </section>
   <% else %>
-    <p><%= t('.no_news_item_articles_posted', :date => @archive_date.strftime('%B %Y')) %></p>
+    <p><%= t('.no_news_item_articles_posted', :date => l(@archive_date, :format => '%B %Y')) %></p>
   <% end %>
 <% end %>
 
-<%= render :partial => '/refinery/news/shared/body_content_right' %>
+<%= render '/refinery/news/shared/body_content_right' %>
 
-<%= render :partial => "/refinery/content_page" %>
+<%= render "/refinery/content_page" %>
 <% content_for :stylesheets, stylesheet_link_tag('refinery/news/frontend') %>

data/app/views/refinery/news/items/index.html.erb

@@ -1,4 +1,4 @@
-<% content_for :body_content_left do %>
+<% content_for :body do %>
   <%=raw @page.content_for(Refinery::Pages.default_parts.first.to_sym) unless params[:page] %>
 
   <% if @items.any? %>
@@ -23,6 +23,6 @@
 <% content_for :body_content_right_prepend do -%>
   <%= raw @page.content_for(::Refinery::Pages.default_parts.second.to_sym) %>
 <% end if ::Refinery::Pages.default_parts.many? -%>
-<%= render :partial => '/refinery/news/shared/body_content_right' %>
+<%= render '/refinery/news/shared/body_content_right' %>
 
-<%= render :partial => "/refinery/content_page" %>
+<%= render "/refinery/content_page" %>

data/app/views/refinery/news/items/show.html.erb

@@ -1,5 +1,5 @@
 <% content_for :body_content_title, @item.title %>
-<% content_for :body_content_left do %>
+<% content_for :body do %>
   <article class="news_item">
     <p>
       <small><%= t('.published') %> <%= l(@item.publish_date, :format => :long) %></small>
@@ -15,6 +15,6 @@
     </p>
   </article>
 <% end %>
-<% content_for :body_content_right, render(:partial => 'recent_posts') %>
+<% content_for :side_body, render(:partial => 'recent_posts') %>
 
-<%= render :partial => "/refinery/content_page" %>
+<%= render "/refinery/content_page" %>

data/app/views/refinery/news/items/widgets/_news_archive.html.erb

@@ -1,10 +1,6 @@
 <section id="news_archive_widget">
   <h2><%= t('archives', :scope => 'refinery.news.shared') %></h2>
   <nav>
-    <ul>
-      <% items.each do |item| %>
-      <li><%= news_item_archive_link(item) %></li>
-      <% end %>
-    </ul>
+    <%= news_item_archive_links %>
   </nav>
 </section> 

data/app/views/refinery/news/shared/_body_content_right.html.erb

@@ -1,4 +1,4 @@
-<% content_for :body_content_right do %>
+<% content_for :side_body do %>
   <%= yield(:body_content_right_prepend) %>
   <%= news_item_archive_widget %>
   <%= yield(:body_content_right_append) %>