spud_blog 0.8.12 → 0.8.13

data/Rakefile

@@ -20,21 +20,10 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
-
-
 Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
+require 'rake'
 
-task :default => :spec

data/Readme.markdown

@@ -72,4 +72,41 @@ You may find that your blog requires a field that isn't included in the default
 		    	<%= f.text_field :caption %>
 		    </div>
 		  </div>
-		
+		
+## Extending the Post Model
+
+Rails engines allow you to extend or even completely override classes by adding them to your local application. Source files found in your local app's path will take precedence over those found within the Spud Blog gem. Lets say you wanted to extend the SpudPost model.
+
+1. Create a file at `app/models/spud_post.rb`
+2. Add the following code:
+
+		# Use this helper method to pull in the SpudPost source code from the engine
+		Spud::Blog::Engine.require_model('spud_post')
+
+		# Add your own methods to SpudPost
+		class SpudPost
+			attr_accessible :caption
+			def byline
+				return "'#{self.title}' was posted by #{self.author.full_name} on #{self.display_date}"
+			end
+		end
+
+Testing
+-----------------
+
+Spud uses RSpec for testing. Get the tests running with a few short commands:
+
+1. Create and migrate the databases:
+   
+        rake db:create
+        rake db:migrate
+
+2. Load the schema in to the test database:
+
+        rake app:db:test:prepare
+
+3. Run the tests with RSpec
+
+        rspec spec
+
+After the tests have completed the current code coverage stats is available by opening ```/coverage/index.html``` in a browser.

data/app/assets/stylesheets/spud/admin/posts.css

@@ -6,7 +6,6 @@
 #spud_post_categories_form{
 	list-style-type: none;
 	margin: 15px 0 15px 20px;
-	padding: 0 0 0 20px;
 	height: 200px;
 	width: 400px;
 	background: white;
@@ -30,7 +29,7 @@
 	margin: 15px 0 15px 20px;
 	padding: 10px 20px;
 	overflow: hidden;
-	width: 380	px;
+	width: 380px;
 }
 #spud_post_new_category_form h5{
 	margin: 0 0 5px;
@@ -47,4 +46,7 @@
 }
 #spud_post_new_category_form input[type=button]{
 	margin-left: 55px;
+}
+#spud_post_site_options label{
+	padding: 5px 10px 0 0;
 }

data/app/controllers/blog_controller.rb

@@ -23,6 +23,9 @@ class BlogController < ApplicationController
 
   def index
     @posts = SpudPost.public_blog_posts(params[:page], Spud::Blog.config.posts_per_page)
+    if Spud::Core.config.multisite_mode_enabled
+      @posts = @posts.for_spud_site(current_site_id)
+    end 
     respond_with @posts
   end
 
@@ -41,7 +44,11 @@ class BlogController < ApplicationController
 
   def category
     if @post_category = SpudPostCategory.find_by_url_name(params[:category_url_name])
-      @posts = @post_category.posts_with_children.public_blog_posts(params[:page], Spud::Blog.config.posts_per_page).from_archive(params[:archive_date])
+      if Spud::Core.config.multisite_mode_enabled
+        @posts = @post_category.posts_with_children.public_blog_posts(params[:page], Spud::Blog.config.posts_per_page).for_spud_site(current_site_id).from_archive(params[:archive_date])
+      else
+        @posts = @post_category.posts_with_children.public_blog_posts(params[:page], Spud::Blog.config.posts_per_page).from_archive(params[:archive_date])
+      end
     else
       redirect_to blog_path
       return
@@ -52,7 +59,11 @@ class BlogController < ApplicationController
   end
 
   def archive
-    @posts = SpudPost.public_blog_posts(params[:page], Spud::Blog.config.posts_per_page).from_archive(params[:archive_date])
+    if Spud::Core.config.multisite_mode_enabled
+      @posts = SpudPost.public_blog_posts(params[:page], Spud::Blog.config.posts_per_page).for_spud_site(current_site_id).from_archive(params[:archive_date])
+    else
+      @posts = SpudPost.public_blog_posts(params[:page], Spud::Blog.config.posts_per_page).from_archive(params[:archive_date])
+    end
     respond_with @posts do |format|
       format.html { render 'index' }
     end
@@ -74,17 +85,17 @@ class BlogController < ApplicationController
     end
     @comment = @post.comments.new(params[:spud_post_comment])
     @comment.approved = true
-    flash[:notice] = 'Your comment has been posted, however it will not appear until it is approved.' if @comment.save
+    flash[:notice] = 'Your comment has been posted.' if @comment.save
     respond_with @comment do |format|
     	format.html { redirect_to blog_post_path(@post.url_name, :anchor => 'spud_post_comment_form') }
     end
   end 
 
-  private 
+  private
 
   def find_post
   	@post = SpudPost.find_by_url_name(params[:id])
-		if @post.blank? || @post.is_private?
+		if @post.blank? || @post.is_private? || (Spud::Core.config.multisite_mode_enabled && !@post.spud_site_ids.include?(current_site_id))
 			flash[:error] = "Post not found!"
 			redirect_to blog_path and return false
 		end

data/app/controllers/news_controller.rb

@@ -21,6 +21,9 @@ class NewsController < ApplicationController
 
   def index
     @posts = SpudPost.public_news_posts(params[:page], Spud::Blog.config.posts_per_page)
+    if Spud::Core.config.multisite_mode_enabled
+      @posts = @posts.for_spud_site(current_site_id)
+    end 
     respond_with @posts
   end
 
@@ -39,7 +42,11 @@ class NewsController < ApplicationController
 
   def category
     if @post_category = SpudPostCategory.find_by_url_name(params[:category_url_name])
-      @posts = @post_category.posts_with_children.public_news_posts(params[:page], Spud::Blog.config.posts_per_page).from_archive(params[:archive_date])
+      if Spud::Core.config.multisite_mode_enabled
+        @posts = @post_category.posts_with_children.public_news_posts(params[:page], Spud::Blog.config.posts_per_page).for_spud_site(current_site_id).from_archive(params[:archive_date])
+      else
+        @posts = @post_category.posts_with_children.public_news_posts(params[:page], Spud::Blog.config.posts_per_page).from_archive(params[:archive_date])
+      end
     else
       redirect_to news_path
       return
@@ -50,7 +57,11 @@ class NewsController < ApplicationController
   end
 
   def archive
-    @posts = SpudPost.public_news_posts(params[:page], Spud::Blog.config.posts_per_page).from_archive(params[:archive_date])
+    if Spud::Core.config.multisite_mode_enabled
+      @posts = SpudPost.public_news_posts(params[:page], Spud::Blog.config.posts_per_page).for_spud_site(current_site_id).from_archive(params[:archive_date])
+    else
+      @posts = SpudPost.public_news_posts(params[:page], Spud::Blog.config.posts_per_page).from_archive(params[:archive_date])
+    end
     respond_with @posts do |format|
       format.html { render 'index' }
     end
@@ -58,7 +69,7 @@ class NewsController < ApplicationController
 
   def show
   	@post = SpudPost.find_by_url_name(params[:id])
-		if @post.blank? || @post.is_private?
+		if @post.blank? || @post.is_private? || (Spud::Core.config.multisite_mode_enabled && !@post.spud_site_ids.include?(current_site_id))
 			flash[:error] = "Post not found!"
 			redirect_to news_path and return false
 		else

data/app/controllers/spud/admin/news_posts_controller.rb

@@ -19,24 +19,26 @@ class Spud::Admin::NewsPostsController < Spud::Admin::ApplicationController
 
 	def update
 		@categories = SpudPostCategory.grouped
+		params[:spud_post][:spud_site_ids] ||= []
 		if @post.update_attributes(params[:spud_post])
 	    flash[:notice] = 'News Post was successfully updated.'
-	  end
+		end
     respond_with @post, :location => spud_admin_news_posts_path
 	end
 
 	def new
 		@categories = SpudPostCategory.grouped
-		@post = SpudPost.new(:published_at => Time.zone.now, :spud_user_id => current_user.id, :is_news => true, :comments_enabled => false)
+		@post = SpudPost.new(:published_at => Time.zone.now, :spud_user_id => current_user.id, :is_news => true, :comments_enabled => false, :spud_site_ids => [current_site_id])
 		respond_with @post
 	end
 
 	def create
 		@categories = SpudPostCategory.grouped
+		params[:spud_post][:spud_site_ids] ||= []
 		@post = SpudPost.new(params[:spud_post])
 		if @post.save
     	flash[:notice] = 'News Post was successfully created.'
-	  end
+		end
     respond_with @post, :location => spud_admin_news_posts_path
 	end
 

data/app/controllers/spud/admin/posts_controller.rb

@@ -19,6 +19,7 @@ class Spud::Admin::PostsController < Spud::Admin::ApplicationController
 
 	def update
 		@categories = SpudPostCategory.grouped
+		params[:spud_post][:spud_site_ids] ||= []
 		if @post.update_attributes(params[:spud_post])
 			flash[:notice] = 'Post was successfully updated.'
 		end
@@ -27,12 +28,13 @@ class Spud::Admin::PostsController < Spud::Admin::ApplicationController
 
 	def new
 		@categories = SpudPostCategory.grouped
-		@post = SpudPost.new(:published_at => Time.zone.now, :spud_user_id => current_user.id)
+		@post = SpudPost.new(:published_at => Time.zone.now, :spud_user_id => current_user.id, :spud_site_ids => [current_site_id])
 		respond_with @post
 	end
 
 	def create
 		@categories = SpudPostCategory.grouped
+		params[:spud_post][:spud_site_ids] ||= []
 		@post = SpudPost.new(params[:spud_post])
 		if @post.save
 	    flash[:notice] = 'Post was successfully created.'
@@ -43,7 +45,7 @@ class Spud::Admin::PostsController < Spud::Admin::ApplicationController
 	def destroy
 		if @post.destroy
 	    flash[:notice] = 'Post was successfully deleted.' 
-   	end
+		end
     respond_with @post, :location => spud_admin_posts_path
 	end
 

data/app/helpers/spud/admin/posts_helper.rb

@@ -9,7 +9,14 @@ module Spud::Admin::PostsHelper
 		else
 			return []
 		end
+	end
+
+	def spud_post_site_check_box_tag(site, post)
+		return check_box_tag 'spud_post[spud_site_ids][]', site[:site_id], post.spud_site_ids.include?(site[:site_id]), :id => "spud_post_site_id_#{site[:site_id]}"
+	end
 
+	def spud_post_site_label_tag(site)
+		return label_tag "spud_post_site_id_#{site[:site_id]}", site[:site_name], :class => 'checkbox inline'
 	end
 
 end

data/app/models/spud_post.rb

@@ -8,14 +8,22 @@ class SpudPost < ActiveRecord::Base
 	belongs_to :author, :class_name => 'SpudUser', :foreign_key => 'spud_user_id'
 	has_many :comments, :class_name => 'SpudPostComment'
 	has_many :spud_permalinks,:as => :attachment
+	has_many :spud_post_sites, :dependent => :destroy
 
 	scope :publicly, where('visible = true AND published_at <= ?', Time.now.utc).order('published_at desc')
 	scope :future_posts, where('visible = true AND published_at > ?', Time.now.utc)
 	validates_presence_of :title, :content, :published_at, :spud_user_id, :url_name
 	validates_uniqueness_of :url_name
 	before_validation :set_url_name
+	
+	after_save :set_spud_site_ids
 
-	attr_accessible :is_news,:published_at,:title,:content,:spud_user_id,:url_name,:visible,:comments_enabled,:meta_keywords,:meta_description,:category_ids
+	attr_accessible :is_news,:published_at,:title,:content,:spud_user_id,:url_name,:visible,:comments_enabled,:meta_keywords,:meta_description,:category_ids, :spud_site_ids
+	attr_accessor :spud_site_ids
+
+	def self.for_spud_site(spud_site_id)
+		return joins(:spud_post_sites).where(:spud_post_sites => {:spud_site_id => spud_site_id})
+	end
 
 	def self.public_posts(page, per_page)
 		return where('visible = ? AND published_at <= ?', true,Time.now.utc).order('published_at desc').includes(:categories).paginate(:page => page, :per_page => per_page)
@@ -100,9 +108,36 @@ class SpudPost < ActiveRecord::Base
 		return !is_public?
 	end
 
+	# Spud site ids getter
+	def spud_site_ids
+		if @spud_site_ids.nil?
+			@spud_site_ids = spud_post_sites.collect{ |site| site.spud_site_id }
+		end
+		return @spud_site_ids
+	end
+
+	# Spud site ids setter
+	def spud_site_ids=(site_ids)
+		if site_ids.is_a?(Array)
+			@spud_site_ids = site_ids.collect{ |id| id.to_i }
+		else
+			raise 'Site ids must be an Array'
+		end
+	end
+
 	private
 
 	def set_url_name
 		self.url_name = "#{self.published_at.strftime('%Y-%m-%d')}-#{self.title.parameterize}"
 	end
+
+	def set_spud_site_ids
+		if Spud::Core.multisite_mode_enabled
+			_spud_post_sites = []
+			self.spud_site_ids.each do |site_id|
+				_spud_post_sites << SpudPostSite.new(:spud_post_id => id, :spud_site_id => site_id)
+			end
+			self.spud_post_sites = _spud_post_sites
+		end
+	end
 end

data/app/models/spud_post_site.rb

@@ -0,0 +1,9 @@
+class SpudPostSite < ActiveRecord::Base
+  attr_accessible :spud_post_id, :spud_site_id
+  belongs_to :spud_post
+
+  def spud_site
+    return Spud::Core.site_config_for_id(spud_site_id)
+  end
+  
+end

data/app/views/spud/admin/posts/_form.html.erb

@@ -7,80 +7,96 @@
   </div>
 </fieldset>
 
-	<div>
-		<%= f.text_area :content,:style => "width:100%;", :class => 'tinymce full-width' %>
-	</div>
+<div>
+	<%= f.text_area :content,:style => "width:100%;", :class => 'tinymce full-width' %>
+</div>
 
-	<fieldset>
-		<legend>Categories</legend>
-		<input type="hidden" name="spud_post[category_ids][]" value="" />
-		<ul id="spud_post_categories_form">
-			<%= render :partial => '/spud/admin/posts/category', :collection => @categories[0] %>
-		</ul>
-	</fieldset>
+<fieldset>
+	<legend>Categories</legend>
+	<input type="hidden" name="spud_post[category_ids][]" value="" />
+	<ul id="spud_post_categories_form">
+		<%= render :partial => '/spud/admin/posts/category', :collection => @categories[0] %>
+	</ul>
+</fieldset>
 
-	<% if Spud::Blog.config.has_custom_fields %>
-	<fieldset>
-		<legend>Custom Fields</legend>		
-		<%= render :partial => '/spud/admin/posts/custom_fields', :locals => {:f => f} %>
-	</fieldset>
-	<% end %>
+<% if Spud::Blog.config.has_custom_fields %>
+<fieldset>
+	<legend>Custom Fields</legend>		
+	<%= render :partial => '/spud/admin/posts/custom_fields', :locals => {:f => f} %>
+</fieldset>
+<% end %>
 
-	<fieldset>
-		<legend>Advanced</legend>
-		
-			<div class="control-group">
-				<%= f.label :published_at, 'Publish Date', :class=>"control-label" %>
-				<div class="controls">
-					<%= f.text_field :published_at,:value => f.object.published_at.strftime("%Y-%m-%d %H:%M") , :class => 'spud_form_date_picker' %>
-				</div>
+<% if Spud::Core.config.multisite_mode_enabled %>
+<fieldset id="spud_post_site_options">
+	<legend>Sites</legend>
+	<div class="control-group">
+		<div class="controls">
+			<span class="help-block"><b>Choose which websites you would like to publish to:</b></span>
+			<%= spud_post_site_check_box_tag(Spud::Core.default_site_config, @post) %>
+			<%= spud_post_site_label_tag(Spud::Core.default_site_config) %>
+			<% Spud::Core.config.multisite_config.each do |site| %>
+				<%= spud_post_site_check_box_tag(site, @post) %>
+				<%= spud_post_site_label_tag(site) %>
+			<% end %>
+		</div>
+	</div>
+</fieldset>
+<% end %>
+
+<fieldset>
+	<legend>Advanced</legend>
+	
+		<div class="control-group">
+			<%= f.label :published_at, 'Publish Date', :class=>"control-label" %>
+			<div class="controls">
+				<%= f.text_field :published_at,:value => f.object.published_at.strftime("%Y-%m-%d %H:%M") , :class => 'spud_form_date_picker' %>
 			</div>
-			<%if @current_user.super_admin%>
-				<div class="control-group">
-					<%= f.label :spud_user_id, 'Author', :class=>"control-label" %>
-					<div class="controls">
-						<%=f.select :spud_user_id,options_for_select(SpudUser.order(:first_name,:last_name,:login).all.collect{|user| [user.full_name,user.id]},f.object.spud_user_id)%>
-					</div>
-				</div>
-			<%else%>
-				<%= f.hidden_field :spud_user_id %>
-			<%end%>
+		</div>
+		<%if @current_user.super_admin%>
 			<div class="control-group">
-				<%= f.label :visible, :class=>"control-label" %>
+				<%= f.label :spud_user_id, 'Author', :class=>"control-label" %>
 				<div class="controls">
-					<%= f.check_box :visible %>
+					<%=f.select :spud_user_id,options_for_select(SpudUser.order(:first_name,:last_name,:login).all.collect{|user| [user.full_name,user.id]},f.object.spud_user_id)%>
 				</div>
 			</div>
-			<div class="control-group">
-				<%= f.label :meta_keywords, 'Keywords', :class=>"control-label" %>
-				<div class="controls">
-					<%= f.text_field :meta_keywords ,:style=>"width:600px;" %>
-			        <span class="help-block">A Comma seperated list of keywords for search engines. Keep it short (no more than 10 keywords)</span>
-				</div>
+		<%else%>
+			<%= f.hidden_field :spud_user_id %>
+		<%end%>
+		<div class="control-group">
+			<%= f.label :visible, :class=>"control-label" %>
+			<div class="controls">
+				<%= f.check_box :visible %>
 			</div>
-			<div class="control-group">
-				<%= f.label :meta_description, 'Description', :class=>"control-label" %>
-				<div class="controls">
-					<%= f.text_area :meta_description, :style =>"width:600px;height:40px;"%>
-			        <span class="help-block">A short description of the article. This is what appears on a search engines search result page.</span>
-				</div>
+		</div>
+		<div class="control-group">
+			<%= f.label :meta_keywords, 'Keywords', :class=>"control-label" %>
+			<div class="controls">
+				<%= f.text_field :meta_keywords ,:style=>"width:600px;" %>
+		        <span class="help-block">A Comma seperated list of keywords for search engines. Keep it short (no more than 10 keywords)</span>
 			</div>
-			<% unless @post.is_news %>
-			<div class="control-group">
-				<%= f.label :comments_enabled,"Comments Enabled", :class=>"control-label" %>
-				<div class="controls">
-					<%= f.check_box :comments_enabled %>
-				</div>
+		</div>
+		<div class="control-group">
+			<%= f.label :meta_description, 'Description', :class=>"control-label" %>
+			<div class="controls">
+				<%= f.text_area :meta_description, :style =>"width:600px;height:40px;"%>
+		        <span class="help-block">A short description of the article. This is what appears on a search engines search result page.</span>
 			</div>
-			<% end %>
-		</ol>
-	</fieldset>
-	<%= f.hidden_field :is_news %>
-	
-	<div class="form-actions">
-		<%=f.submit "Save Post", :class=>"btn btn-primary form-btn","data-loading-text"=>"Saving..."%> or <%=link_to "cancel",request.referer, :class => "btn"%>
-	</div>
+		</div>
+		<% unless @post.is_news %>
+		<div class="control-group">
+			<%= f.label :comments_enabled,"Comments Enabled", :class=>"control-label" %>
+			<div class="controls">
+				<%= f.check_box :comments_enabled %>
+			</div>
+		</div>
+		<% end %>
+	</ol>
+</fieldset>
+<%= f.hidden_field :is_news %>
 
+<div class="form-actions">
+	<%=f.submit "Save Post", :class=>"btn btn-primary form-btn","data-loading-text"=>"Saving..."%> or <%=link_to "cancel",request.referer, :class => "btn"%>
+</div>
 
 <script type="text/javascript">
 	$(document).ready(Spud.Admin.Posts.edit);

data/db/migrate/20120713150446_create_spud_post_sites.rb

@@ -0,0 +1,11 @@
+class CreateSpudPostSites < ActiveRecord::Migration
+  def change
+    create_table :spud_post_sites do |t|
+      t.integer :spud_post_id, :null => false
+      t.integer :spud_site_id, :null => false
+      t.timestamps
+    end
+    add_index :spud_post_sites, :spud_post_id
+    add_index :spud_post_sites, :spud_site_id  
+  end
+end

data/lib/spud_blog/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Blog
-	  VERSION = "0.8.12"
+	  VERSION = "0.8.13"
 	end
 end

data/test/fixtures/spud_post_sites.yml

@@ -0,0 +1,9 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+one:
+  spud_post_id: 1
+  spud_site_id: 1
+
+two:
+  spud_post_id: 1
+  spud_site_id: 1

data/test/unit/spud_post_site_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class SpudPostSiteTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end