aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Sak <joe@joesak.com>2011-02-24 21:32:37 -0600
committerJoe Sak <joe@joesak.com>2011-02-24 21:32:37 -0600
commit6a3cf5d6a695e9394a73bd429dbeae3787a3963e (patch)
treeed6a5405871d0d4788d5ade500a613a4616b9c02
parentc75cf8a00e916e795a0299a55e933c8b3cad17ac (diff)
downloadrefinerycms-blog-6a3cf5d6a695e9394a73bd429dbeae3787a3963e.tar.gz
refinerycms-blog-6a3cf5d6a695e9394a73bd429dbeae3787a3963e.tar.bz2
refinerycms-blog-6a3cf5d6a695e9394a73bd429dbeae3787a3963e.zip
WIP: trying to test user association as author
-rw-r--r--app/controllers/admin/blog/posts_controller.rb46
-rw-r--r--app/views/blog/posts/_post.html.erb2
-rw-r--r--features/authors.feature15
-rw-r--r--features/support/step_definitions/authors_steps.rb11
4 files changed, 73 insertions, 1 deletions
diff --git a/app/controllers/admin/blog/posts_controller.rb b/app/controllers/admin/blog/posts_controller.rb
index 1b6efc3..e8ffed2 100644
--- a/app/controllers/admin/blog/posts_controller.rb
+++ b/app/controllers/admin/blog/posts_controller.rb
@@ -10,6 +10,52 @@ class Admin::Blog::PostsController < Admin::BaseController
:per_page => BlogPost.per_page
})
end
+
+ def create
+ # if the position field exists, set this object as last object, given the conditions of this class.
+ if BlogPost.column_names.include?("position")
+ params[:blog_post].merge!({
+ :position => ((BlogPost.maximum(:position, :conditions => "")||-1) + 1)
+ })
+ end
+
+ if BlogPost.column_names.include?("user_id")
+ params[:blog_post].merge!({
+ :user_id => current_user.id
+ })
+ end
+
+ if (@blog_post = BlogPost.create(params[:blog_post])).valid?
+ (request.xhr? ? flash.now : flash).notice = t(
+ 'refinery.crudify.created',
+ :what => "'#{@blog_post.title}'"
+ )
+
+ unless from_dialog?
+ unless params[:continue_editing] =~ /true|on|1/
+ redirect_back_or_default(admin_blog_posts_url)
+ else
+ unless request.xhr?
+ redirect_to :back
+ else
+ render :partial => "/shared/message"
+ end
+ end
+ else
+ render :text => "<script>parent.window.location = '#{admin_blog_posts_url}';</script>"
+ end
+ else
+ unless request.xhr?
+ render :action => 'new'
+ else
+ render :partial => "/shared/admin/error_messages",
+ :locals => {
+ :object => @blog_post,
+ :include_object_name => true
+ }
+ end
+ end
+ end
before_filter :find_all_categories,
:only => [:new, :edit, :create, :update]
diff --git a/app/views/blog/posts/_post.html.erb b/app/views/blog/posts/_post.html.erb
index 6a16631..7600d26 100644
--- a/app/views/blog/posts/_post.html.erb
+++ b/app/views/blog/posts/_post.html.erb
@@ -9,7 +9,7 @@
<details>
<time datetime="<%=l @blog_post.published_at.to_date, :format => :default %>" class='posted_at'>
<%= t('blog.shared.posts.created_at', :when => l(@blog_post.published_at.to_date, :format => :short)) %>.
- </time>
+ </time> by <%= @blog_post.author.try :login %>
<% if (categories = @blog_post.categories).any? %>
<aside class='filed_in'>
<%= t('blog.posts.show.filed_in') %>
diff --git a/features/authors.feature b/features/authors.feature
new file mode 100644
index 0000000..5bb5cea
--- /dev/null
+++ b/features/authors.feature
@@ -0,0 +1,15 @@
+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 there is a user named "hubble"
+ And I am logged in as "hubble"
+
+ 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 am hubble"
+ And I press "Save"
+
+ Then there should be 1 blog post
+ And the blog post should belong to "hubble" \ No newline at end of file
diff --git a/features/support/step_definitions/authors_steps.rb b/features/support/step_definitions/authors_steps.rb
new file mode 100644
index 0000000..6f695ca
--- /dev/null
+++ b/features/support/step_definitions/authors_steps.rb
@@ -0,0 +1,11 @@
+Given /^there is a user named "([^\"]*)"$/ do |login|
+ @user = Factory.create(:user, :login => login, :password => "#{login}-123", :password_confirmation => "#{login}-123")
+end
+
+Then /^there should be (\d+) blog posts?$/ do |num|
+ BlogPost.all.size == num
+end
+
+Then /^the blog post should belong to "([^\"]*)"$/ do |login|
+ BlogPost.last.author.login == login
+end \ No newline at end of file