aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Gemfile4
-rw-r--r--app/controllers/refinery/blog/blog_controller.rb2
-rw-r--r--app/controllers/refinery/blog/posts_controller.rb2
-rw-r--r--app/models/refinery/blog/post.rb1
-rw-r--r--app/views/refinery/blog/posts/_comments.html.erb59
-rw-r--r--app/views/refinery/blog/posts/show.html.erb4
-rw-r--r--app/views/refinery/blog/shared/_post.html.erb14
-rw-r--r--app/views/refinery/blog/shared/_rss_feed.html.erb2
-rw-r--r--config/locales/sk.yml2
-rw-r--r--config/routes.rb4
-rw-r--r--lib/generators/refinery/blog/templates/config/initializers/refinery/blog.rb.erb2
-rw-r--r--lib/refinery/blog/configuration.rb3
-rw-r--r--spec/factories/blog_posts.rb1
-rw-r--r--spec/models/refinery/blog/category_spec.rb12
14 files changed, 60 insertions, 52 deletions
diff --git a/Gemfile b/Gemfile
index 4572161..aecadde 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,14 +2,14 @@ source "http://rubygems.org"
gemspec
-gem 'refinerycms', :git => 'git://github.com/resolve/refinerycms.git'
+gem 'refinerycms', :git => 'git://github.com/refinery/refinerycms.git'
gem 'refinerycms-i18n', :git => 'git://github.com/parndt/refinerycms-i18n.git'
gem 'refinerycms-settings', :git => 'git://github.com/parndt/refinerycms-settings.git'
group :development, :test do
require 'rbconfig'
- gem 'refinerycms-testing', :git => 'git://github.com/resolve/refinerycms.git'
+ gem 'refinerycms-testing', :git => 'git://github.com/refinery/refinerycms.git'
gem 'guard-rspec', '~> 1.1.0'
platforms :jruby do
diff --git a/app/controllers/refinery/blog/blog_controller.rb b/app/controllers/refinery/blog/blog_controller.rb
index 54a8b03..6327199 100644
--- a/app/controllers/refinery/blog/blog_controller.rb
+++ b/app/controllers/refinery/blog/blog_controller.rb
@@ -10,7 +10,7 @@ module Refinery
protected
def find_page
- @page = Refinery::Page.find_by_link_url("/blog")
+ @page = Refinery::Page.find_by_link_url(Refinery::Blog.page_url)
end
end
end
diff --git a/app/controllers/refinery/blog/posts_controller.rb b/app/controllers/refinery/blog/posts_controller.rb
index b04000b..6c9049d 100644
--- a/app/controllers/refinery/blog/posts_controller.rb
+++ b/app/controllers/refinery/blog/posts_controller.rb
@@ -71,7 +71,7 @@ module Refinery
def tagged
@tag = ActsAsTaggableOn::Tag.find(params[:tag_id])
@tag_name = @tag.name
- @posts = Post.tagged_with(@tag_name).page(params[:page])
+ @posts = Post.tagged_with(@tag_name).with_globalize.page(params[:page])
end
protected
diff --git a/app/models/refinery/blog/post.rb b/app/models/refinery/blog/post.rb
index 9df7aa3..70c7861 100644
--- a/app/models/refinery/blog/post.rb
+++ b/app/models/refinery/blog/post.rb
@@ -26,6 +26,7 @@ module Refinery
validates :title, :presence => true, :uniqueness => true
validates :body, :presence => true
+ validates :published_at, :author, :presence => true
validates :source_url, :url => { :if => 'Refinery::Blog.validate_source_url',
:update => true,
diff --git a/app/views/refinery/blog/posts/_comments.html.erb b/app/views/refinery/blog/posts/_comments.html.erb
index 8415971..daccd78 100644
--- a/app/views/refinery/blog/posts/_comments.html.erb
+++ b/app/views/refinery/blog/posts/_comments.html.erb
@@ -1,38 +1,37 @@
<aside id="comments">
- <h2><%= t('title', :scope => 'refinery.blog.posts.show.comments') %></h2>
<% if (comments = @post.comments.approved).any? %>
+ <h2><%= t('title', :scope => 'refinery.blog.posts.show.comments') %></h2>
<%= render :partial => "comment", :collection => comments %>
- <% else %>
- <p>
- <%= t('none', :scope => 'refinery.blog.shared.comments') %>.
- </p>
<% end %>
- <% flash.each do |key, value| %>
- <div id='flash' class="flash flash_<%= key %>">
- <%= value %>
- </div>
- <% end %>
+ <% if Refinery::Blog::Post.comments_allowed? %>
+
+ <% flash.each do |key, value| %>
+ <div id='flash' class="flash flash_<%= key %>">
+ <%= value %>
+ </div>
+ <% end %>
- <h2><%= t('add', :scope => 'refinery.blog.posts.show.comments') %></h2>
- <%= form_for [refinery, :blog, @comment] do |f| %>
- <%= render "/refinery/admin/error_messages",
- :object => f.object,
- :include_object_name => true %>
- <div class='field'>
- <%= f.label :name %>
- <%= f.text_field :name %>
- </div>
- <div class='field'>
- <%= f.label :email %>
- <%= f.email_field :email %>
- </div>
- <div class='field message_field'>
- <%= f.label :message %>
- <%= f.text_area :message, :rows => 6 %>
- </div>
- <div class='field form-actions'>
- <%= f.submit t('submit', :scope => 'refinery.blog.posts.show') %>
- </div>
+ <h2><%= t('add', :scope => 'refinery.blog.posts.show.comments') %></h2>
+ <%= form_for [refinery, :blog, @comment] do |f| %>
+ <%= render "/refinery/admin/error_messages",
+ :object => f.object,
+ :include_object_name => true %>
+ <div class='field'>
+ <%= f.label :name %>
+ <%= f.text_field :name %>
+ </div>
+ <div class='field'>
+ <%= f.label :email %>
+ <%= f.email_field :email %>
+ </div>
+ <div class='field message_field'>
+ <%= f.label :message %>
+ <%= f.text_area :message, :rows => 6 %>
+ </div>
+ <div class='field form-actions'>
+ <%= f.submit t('submit', :scope => 'refinery.blog.posts.show') %>
+ </div>
+ <% end %>
<% end %>
</aside>
diff --git a/app/views/refinery/blog/posts/show.html.erb b/app/views/refinery/blog/posts/show.html.erb
index bc9b203..f04ae0b 100644
--- a/app/views/refinery/blog/posts/show.html.erb
+++ b/app/views/refinery/blog/posts/show.html.erb
@@ -3,9 +3,7 @@
<%= render 'post' %>
</div>
- <% if Refinery::Blog::Post.comments_allowed? %>
- <%= render 'comments'%>
- <% end %>
+ <%= render 'comments' %>
<% end %>
<%= render '/refinery/blog/shared/body_content_right' %>
diff --git a/app/views/refinery/blog/shared/_post.html.erb b/app/views/refinery/blog/shared/_post.html.erb
index 40ae70b..532d48f 100644
--- a/app/views/refinery/blog/shared/_post.html.erb
+++ b/app/views/refinery/blog/shared/_post.html.erb
@@ -34,15 +34,11 @@
<%= link_to t('read_more', :scope => 'refinery.blog.shared.posts'), refinery.blog_post_path(post) %>
<% end %>
</p>
- <aside class='comment_count'>
- <% if Refinery::Blog::Post.comments_allowed? %>
- <% if post.comments.any? %>
- (<%= pluralize(post.comments.approved.count, t('singular', :scope => 'refinery.blog.shared.comments')) %>)
- <% else %>
- (<%= t('none', :scope => 'refinery.blog.shared.comments') %>)
- <% end %>
- <% end %>
- </aside>
+ <% if Refinery::Blog::Post.comments_allowed? %>
+ <aside class='comment_count'>
+ <%= link_to "#{t('title', :scope => 'refinery.blog.posts.show.comments')} (#{post.comments.approved.count})", refinery.blog_post_path(post) << '#comments' %>
+ </aside>
+ <% end %>
</footer>
</article>
<% end %>
diff --git a/app/views/refinery/blog/shared/_rss_feed.html.erb b/app/views/refinery/blog/shared/_rss_feed.html.erb
index 27ddf23..20979b4 100644
--- a/app/views/refinery/blog/shared/_rss_feed.html.erb
+++ b/app/views/refinery/blog/shared/_rss_feed.html.erb
@@ -1,2 +1,4 @@
<h2><%= t('.title') %></h2>
<%= link_to t('.subscribe'), refinery.blog_rss_feed_path, :id => "rss_feed_subscribe"%>
+
+<% content_for :meta, auto_discovery_link_tag(:atom, refinery.blog_rss_feed_url, :title => 'RSS Feed') -%>
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index f75087f..b279494 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -124,7 +124,7 @@ sk:
comment: komentár
comments:
by: 'Odoslal %{who}'
- time_ago: '%{time} spáť'
+ time_ago: 'pred %{time}'
thank_you: 'Vďaka za komentár.'
thank_you_moderated: 'Ďakujeme za Váš komentár. Vaša správa čaká na schválenie a čoskoro sa objaví.'
index:
diff --git a/config/routes.rb b/config/routes.rb
index ad8d138..f3467bd 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,5 @@
Refinery::Core::Engine.routes.draw do
- namespace :blog do
+ namespace :blog, :path => Refinery::Blog.page_url do
root :to => "posts#index"
resources :posts, :only => [:show]
@@ -12,7 +12,7 @@ Refinery::Core::Engine.routes.draw do
namespace :blog, :path => '' do
namespace :admin, :path => 'refinery' do
- scope :path => 'blog' do
+ scope :path => Refinery::Blog.page_url do
root :to => "posts#index"
resources :posts do
diff --git a/lib/generators/refinery/blog/templates/config/initializers/refinery/blog.rb.erb b/lib/generators/refinery/blog/templates/config/initializers/refinery/blog.rb.erb
index ac340d7..294c258 100644
--- a/lib/generators/refinery/blog/templates/config/initializers/refinery/blog.rb.erb
+++ b/lib/generators/refinery/blog/templates/config/initializers/refinery/blog.rb.erb
@@ -8,4 +8,6 @@ Refinery::Blog.configure do |config|
# config.post_teaser_length = <%= Refinery::Blog.post_teaser_length.inspect %>
# config.share_this_key = <%= Refinery::Blog.share_this_key.inspect %>
+
+ # config.page_url = <%= Refinery::Blog.page_url.inspect %>
end
diff --git a/lib/refinery/blog/configuration.rb b/lib/refinery/blog/configuration.rb
index 0f00501..b7598e8 100644
--- a/lib/refinery/blog/configuration.rb
+++ b/lib/refinery/blog/configuration.rb
@@ -3,12 +3,13 @@ module Refinery
include ActiveSupport::Configurable
config_accessor :validate_source_url, :comments_per_page, :posts_per_page,
- :post_teaser_length, :share_this_key
+ :post_teaser_length, :share_this_key, :page_url
self.validate_source_url = false
self.comments_per_page = 10
self.posts_per_page = 10
self.post_teaser_length = 250
self.share_this_key = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+ self.page_url = "/blog"
end
end
diff --git a/spec/factories/blog_posts.rb b/spec/factories/blog_posts.rb
index 1ad2bd2..eebad3c 100644
--- a/spec/factories/blog_posts.rb
+++ b/spec/factories/blog_posts.rb
@@ -5,6 +5,7 @@ FactoryGirl.define do
draft false
tag_list "chicago, shopping, fun times"
published_at Time.now
+ author { Factory(:refinery_user) }
factory :blog_post_draft do
draft true
diff --git a/spec/models/refinery/blog/category_spec.rb b/spec/models/refinery/blog/category_spec.rb
index 9c4a7d3..ad83017 100644
--- a/spec/models/refinery/blog/category_spec.rb
+++ b/spec/models/refinery/blog/category_spec.rb
@@ -4,6 +4,7 @@ module Refinery
module Blog
describe Category do
let(:category) { FactoryGirl.create(:blog_category) }
+ let(:refinery_user) { FactoryGirl.create(:refinery_user) }
describe "validations" do
it "requires title" do
@@ -21,8 +22,15 @@ module Refinery
end
it "returns posts by published_at date in descending order" do
- 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 })
+ first_post = category.posts.create!({ :title => "Breaking News: Joe Sak is hot stuff you guys!!",
+ :body => "True story.",
+ :published_at => Time.now.yesterday,
+ :author => refinery_user })
+
+ latest_post = category.posts.create!({ :title => "parndt is p. okay",
+ :body => "For a Kiwi.",
+ :published_at => Time.now,
+ :author => refinery_user })
category.posts.first.should == latest_post
end
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 02:42:20 +0000