refinerycms-blog 1.1 → 1.2

data/config/locales/pt-BR.yml

@@ -0,0 +1,125 @@
+pt-BR:
+  plugins:
+    refinerycms_blog:
+      title: Blog
+  admin:
+    blog:
+      categories:
+        category:
+          edit: Editar esta categoria
+          delete: Apagar esta categoria para sempre
+        index:
+          no_items_yet: 'Não há categorias ainda. Clique em "%{create}" para adicionar a primeira categoria.'
+      comments:
+        approved: 'O comentário de "%{author}" foi aprovado.'
+        comment:
+          view_live_html: Ver este comentário <br/><em>(será aberto em outra janela)</em>
+          read: Ler este comentário
+          reject: Rejeitar este comentário
+          approve: Aprovar este comentário
+        rejected: 'O comentário de "%{author}" foi rejeitado.'
+        index:
+          no_items_yet: 'Não há %{type} comentários.'
+        show:
+          comment: Comentário
+          blog_post: Post
+          from: Postado por
+          date: Postado em
+          message: Comentário
+          details: Detalhes
+          age: Idade
+          actions: Ações
+          back: Voltar para todos os comentários
+          reject: Rejeitar este comentário
+          approve: Aprovar este comentário
+      posts:
+        form:
+          advanced_options: Opções avançadas
+          toggle_advanced_options: Clique aqui para acessar as configurações de meta tag e menu
+          save_as_draft: Salvar como rascunho
+          published_at: Data de publicação
+        index:
+          no_items_yet: 'Ainda não há Posts no Blog. Clique em "%{create}" para adicionar o primeiro post.'
+        post:
+          view_live_html: Ver este comentário <br/><em>(será aberto em outra janela)</em>
+          edit: Editar este post
+          delete: Remover esse post para sempre
+      settings:
+        notification_recipients:
+          value: Enviar notificações para
+          explanation: 'Cada vez que alguém comenta em um post no blog, é enviado um e-mail para informar que há um novo comentário.'
+          hint: 'Quando um novo comentário é adicionado, será enviado uma notificação por e-mail para você.'
+          example: "Entre com o(s) seu(s) endereço(s) de email, como: jack@work.com, jill@office.com"
+          updated: 'As notificações foram enviadas para "%{recipients}"'
+      submenu:
+        categories:
+          title: Categorias
+          manage: Gerenciar
+          new: Criar nova categoria
+        comments:
+          title: Comentários
+          title_with_count: 'Comentários (%{new_count} novos)'
+          new: Novo
+          unmoderated: Novo
+          approved: Aprovado
+          rejected: Rejeitado
+        posts:
+          title: Posts
+          manage: Gerenciar posts
+          new: Criar novo post
+        settings:
+          title: Configurações
+          moderation: Moderação
+          update_notified: Quem receberá a notificação?
+          comments: Comentários
+  blog:
+    comment_mailer:
+      notification:
+        greeting: Olá
+        you_recieved_new_comment: Você acaba de receber um novo comentário em seu site.
+        comment_starts: --- Início do comentário ---
+        comment_ends: --- Fim do comentário ---
+        from: De
+        email: Email
+        message: Mensagem
+        closing_line: Atenciosamente
+        ps: P.S. Lembre-se que você pode ver todos os comentários em "Comentários" dentro da seção "Blog".
+    shared:
+      categories:
+        title: Categorias
+      rss_feed:
+        title: Feed RSS
+        subscribe: Assinar
+      posts:
+        other: Últimos posts
+        created_at: 'Postado em %{when}'
+        read_more: Continue lendo...
+      comments:
+        singular: comentário
+        none: não há comentários
+      archives: Arquivos
+    categories:
+      show:
+        no_posts: Não há posts aqui ainda.
+    posts:
+      comment: commentário
+      comments:
+        by: 'Postado por %{who}'
+        time_ago: '%{time} atrás'
+        thank_you: 'Obrigado por comentar.'
+        thank_you_moderated: 'Obrigado por comentar. Sua mensagem foi colocada na fila de moderação e será exibida em breve.'
+      index:
+        no_blog_articles_yet: Ainda não há artigos postados no blog.
+      show:
+        blog_home: Blog Home
+        comments:
+          title: Comentários
+          add: Fazer um comentário
+        other: Outros posts
+        filed_in: Arquivado em
+        submit: Enviar comentário
+      archive:
+        blog_archive_for: Arquivo do blog em %{date}
+        no_blog_articles_posted: Não há arquivos do blog em %{date}.
+      post: 
+        filed_in: Arquivado em

data/config/locales/ru.yml

@@ -0,0 +1,125 @@
+ru:
+  plugins:
+    refinerycms_blog:
+      title: Блог
+  admin:
+    blog:
+      categories:
+        category:
+          edit: Редактировать эту категорию
+          delete: Удалить эту категорию навсегда
+        index:
+          no_items_yet: 'Категории пока не созданы. Нажмите "%{create}", чтобы добавить вашу первую категорию.'
+      comments:
+        approved: 'Комментарий от "%{author}" был опубликован.'
+        comment:
+          view_live_html: Посмотреть комментарий на сайте <br/><em>(откроется в новом окне)</em>
+          read: Прочитать комментарий
+          reject: Отклонить комментарий
+          approve: Принять комментарий
+        rejected: 'Комментарий от "%{author}" был отклонен.'
+        index:
+          no_items_yet: '%{type} комментарии: отсутствуют.'
+        show:
+          comment: Комментарий
+          blog_post: Запись в блоге
+          from: Опубликовал
+          date: Опубликовано
+          message: Комментарий
+          details: Детали
+          age: Возраст
+          actions: Действия
+          back: Вернуться к списку комментариев
+          reject: Отклонить этот комментарий
+          approve: Принять этот комментарий
+      posts:
+        form:
+          advanced_options: Дополнительные настройки
+          toggle_advanced_options: 'Нажмите, чтобы получить доступ к настройкам мета-тегов и меню'
+          save_as_draft: Сохранить как черновик
+          published_at: Дата публикации
+        index:
+          no_items_yet: 'Записи в блоге отстутствуют. Нажмите "%{create}", чтобы добавить первую запись.'
+        post:
+          view_live_html: Посмотреть запись на сайте <br/><em>(откроется в новом окне)</em>
+          edit: Редактировать запись
+          delete: Удалить запись
+      settings:
+        notification_recipients:
+          value: Отправлять уведомления
+          explanation: 'При появлении новых комментариев Refinery пришлет уведомление на email.'
+          hint: 'При появлении новых комментариев Refinery пришлет уведомление на email.'
+          example: "Введите адреса эл. почты, например: jack@work.com, jill@office.com"
+          updated: 'Получателем уведомлений является "%{recipients}"'
+      submenu:
+        categories:
+          title: Категории
+          manage: Редактировать категории
+          new: Создать новую категорию
+        comments:
+          title: Комментарии
+          title_with_count: 'Комментарии (%{new_count} новых)'
+          new: Новые
+          unmoderated: Новые
+          approved: Принятые
+          rejected: Отклоненные
+        posts:
+          title: Записи
+          manage: Редактировать записи
+          new: Создать новую запись
+        settings:
+          title: Настройки
+          moderation: Модерирование
+          update_notified: Настроить уведомления
+          comments: Комментарии
+  blog:
+    comment_mailer:
+      notification:
+        greeting: Здравствуйте
+        you_recieved_new_comment: Новый комментарий опубликован на вашем сайте.
+        comment_starts: --- начало комментария ---
+        comment_ends: --- конец комментария ---
+        from: От
+        email: Эл. почта
+        message: Сообщение
+        closing_line: С уважением
+        ps: P.S. Все комментарии находятся в разделе "Блог" Refinery CMS в подменю "Комментарии".
+    shared:
+      categories:
+        title: Категории
+      rss_feed:
+        title: RSS-лента
+        subscribe: Подписаться
+      posts:
+        other: Другие записи
+        created_at: 'Опубликовано %{when}'
+        read_more: Читать дальше
+      comments:
+        singular: комментарий
+        none: нет комментариев
+      archives: Архивы
+    categories:
+      show:
+        no_posts: Записей пока нет.
+    posts:
+      post:
+        filed_in: Категория
+      comment: комментарий
+      comments:
+        by: 'Опубликовал %{who}'
+        time_ago: '%{time} назад'
+        thank_you: 'Спасибо за комментарий.'
+        thank_you_moderated: 'Спасибо за комментарий. Ваше сообщение модерируется и скоро появится на сайте.'
+      index:
+        no_blog_articles_yet: Пока ни одной записи не опубликовано. Следите за новостями.
+      show:
+        blog_home: Вернуться к списку записей
+        comments:
+          title: Комментарии
+          add: Написать комментарий
+        other: Другие записи
+        filed_in: Категория
+        submit: Отправить комментарий
+      archive:
+        blog_archive_for: 'Архив %{date}'
+        no_blog_articles_posted: 'Ни одной записи за %{date} не опубликовано. Следите за новостями.'

data/config/routes.rb

@@ -5,13 +5,15 @@ Refinery::Application.routes.draw do
     match ':id', :to => 'posts#show', :as => 'blog_post'
     match 'categories/:id', :to => 'categories#show', :as => 'blog_category'
     match ':id/comments', :to => 'posts#comment', :as => 'blog_post_blog_comments'
-    get 'archive/:year/:month', :to => 'posts#archive', :as => 'archive_blog_posts'
+    get 'archive/:year(/:month)', :to => 'posts#archive', :as => 'archive_blog_posts'
   end
 
   scope(:path => 'refinery', :as => 'admin', :module => 'admin') do
     scope(:path => 'blog', :as => 'blog', :module => 'blog') do
       root :to => 'posts#index'
-      resources :posts
+      resources :posts do
+        get 'uncategorized', :on => :collection
+      end
 
       resources :categories
 
@@ -32,6 +34,7 @@ Refinery::Application.routes.draw do
           post :notification_recipients
 
           get :moderation
+          get :comments
         end
       end
     end

data/features/authors.feature

@@ -0,0 +1,15 @@
+@blog
+Feature: Blog Post Authors
+  Blog posts can be assigned authors through the given user model
+  current_user is assumed through admin screens
+  
+  Scenario: Saving a blog post in blog_posts#new associates the current_user as the author
+    Given I am a logged in refinery user
+    
+    When I am on the new blog post form
+    And I fill in "Title" with "This is my blog post"
+    And I fill in "Body" with "And I love it"
+    And I press "Save"
+    
+    Then there should be 1 blog post
+    And the blog post should belong to me

data/features/support/factories/blog_categories.rb

@@ -1,4 +1,4 @@
 Factory.define(:blog_category) do |f|
-  f.title "Shopping"
+  f.sequence(:title) { |n| "Shopping #{n}" }
   f.posts {|p| [p.association(:post)]}
 end

data/features/support/factories/blog_posts.rb

@@ -1,4 +1,6 @@
 Factory.define(:post, :class => BlogPost) do |f|
-  f.title "Top Ten Shopping Centers in Chicago"
+  f.sequence(:title) { |n| "Top #{n} Shopping Centers in Chicago" }
   f.body "These are the top ten shopping centers in Chicago. You're going to read a long blog post about them. Come to peace with it."
+  f.draft false
+  f.published_at Time.now
 end

data/features/support/step_definitions/authors_steps.rb

@@ -0,0 +1,7 @@
+Then /^there should be (\d+) blog posts?$/ do |num|
+  BlogPost.all.size == num
+end
+
+Then /^the blog post should belong to me$/ do
+  BlogPost.first.author.login == User.last.login
+end

data/lib/gemspec.rb

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   s.homepage          = %q{http://refinerycms.com}
   s.authors           = %w(Resolve\\ Digital Neoteric\\ Design)
   s.require_paths     = %w(lib)
+
   s.add_dependency    'refinerycms',  '>= 0.9.8'
   s.add_dependency    'filters_spam', '~> 0.2'
 

data/lib/generators/refinerycms_blog/templates/db/migrate/migration_number_add_user_id_to_blog_posts.rb

@@ -0,0 +1,11 @@
+class AddUserIdToBlogPosts < ActiveRecord::Migration
+  
+  def self.up
+    add_column :blog_posts, :user_id, :integer
+  end
+  
+  def self.down
+    remove_column :blog_posts, :user_id
+  end
+  
+end

data/lib/generators/refinerycms_blog_generator.rb

@@ -41,14 +41,21 @@ class RefinerycmsBlogGenerator < Rails::Generators::NamedBase
          Rails::Generators::GeneratedAttribute.new('blog_post_id', 'integer')
        ], :id => false
      }]
-    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"))
+    unless Pathname.glob(Rails.root.join('db', 'migrate', "*_create_#{singular_name}.rb")).any?
+      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"))
+    end
+    unless Pathname.glob(Rails.root.join('db', 'migrate', "*_add_user_id_to_blog_posts.rb")).any?
+      next_migration_number = ActiveRecord::Generators::Base.next_migration_number(File.dirname(__FILE__))
+      template('db/migrate/migration_number_add_user_id_to_blog_posts.rb',
+               Rails.root.join('db', 'migrate', "#{next_migration_number}_add_user_id_to_blog_posts.rb"))
+    end
 
-     puts "------------------------"
-     puts "Now run:"
-     puts "rake db:migrate"
-     puts "------------------------"
+    puts "------------------------"
+    puts "Now run:"
+    puts "rake db:migrate"
+    puts "------------------------"
   end
 end
 

data/lib/refinerycms-blog.rb

@@ -1,8 +1,4 @@
-if defined?(Bundler) and !defined?(FiltersSpam)
-  # this will tell the user what to do
-  load(File.expand_path('../../Gemfile', __FILE__))
-  require 'filters_spam'
-end
+require 'filters_spam'
 
 module Refinery
   module Blog
@@ -42,7 +38,7 @@ module Refinery
 
     class << self
       def version
-        %q{1.1}
+        %q{1.2}
       end
     end
   end

data/public/javascripts/refinery/refinerycms-blog.js

@@ -1,5 +1,5 @@
 $(document).ready(function(){
-  $('nav#actions.multilist > ul:not(.search_list) li a[href$=' + window.location.pathname + ']')
+  $('nav#actions.multilist > ul:not(.search_list) li a[href$="' + window.location.pathname + '"]')
     .parent().addClass('selected');
   if($('nav#actions.multilist > ul:not(.search_list) li.selected').length == 0) {
     $('nav#actions.multilist > ul:not(.search_list) li a:nth(1)').parent().addClass('selected');
@@ -15,9 +15,9 @@ $(document).ready(function(){
 
   $('ul.collapsible_menu').each(function(i, ul) {
     (first_li = $(this).children('li:first')).after(div=$("<div></div>"));
-    
+
     $("<span class='arrow'>&nbsp;</span>").appendTo(first_li)
-    
+
     if (($(this).children('li.selected')).length == 0) {
       div.hide();
       first_li.addClass("closed");

data/spec/models/blog_categories_spec.rb

@@ -2,20 +2,40 @@ require 'spec_helper'
 Dir[File.expand_path('../../../features/support/factories/*.rb', __FILE__)].each{|factory| require factory}
 
 describe BlogCategory do
-  context "wiring up" do
+  before(:each) do
+    @attr = { :title => "RefineryCMS" }
+  end
 
-    before(:each) do
-      @category = Factory(:blog_category)
+  describe "validations" do
+    it "requires title" do
+      BlogCategory.new(@attr.merge(:title => "")).should_not be_valid
     end
 
-    it "saves" do
-      @category.should_not be_nil
+    it "won't allow duplicate titles" do
+      BlogCategory.create!(@attr)
+      BlogCategory.new(@attr).should_not be_valid
     end
+  end
 
-    it "has a blog post" do
-      BlogPost.last.categories.should include(@category)
+  describe "blog posts association" do
+    it "has a posts attribute" do
+      BlogCategory.new.should respond_to(:posts)
     end
-
+    
+    it "returns posts by published_at date in descending order" do
+      @category = BlogCategory.create!(@attr)
+      @first_post = @category.posts.create!({ :title => "Breaking News: Joe Sak is hot stuff you guys!!", :body => "True story.", :published_at => Time.now.yesterday })
+      @latest_post = @category.posts.create!({ :title => "parndt is p. okay", :body => "For a kiwi.", :published_at => Time.now })
+      @category.posts.first.should == @latest_post
+    end
+      
   end
 
+  describe "#post_count" do
+    it "returns post count in category" do
+      Factory(:post, :categories => [Factory(:blog_category)])
+      Factory(:post, :categories => [Factory(:blog_category)])
+      BlogCategory.first.post_count.should == 2
+    end
+  end
 end