tb_blog 1.3.3 → 1.3.4

data/spec/controllers/admin/posts_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe Admin::PostsController, :type => :controller do
+describe Admin::PostsController, type: :controller do
 
   before(:each) do
     activate_session(admin: true)
@@ -12,16 +12,37 @@ describe Admin::PostsController, :type => :controller do
     end
 
     it 'should create a redirect' do
-      expect{
-        put :update, :id => @post.id, :spud_post => {:url_name => 'new-url'}, :blog_key => 'blog'
-      }.to change(@post.tb_redirects, :count).by(1)
+      expect do
+        put :update, id: @post.id, spud_post: { url_name: 'new-url' }, blog_key: 'blog'
+      end.to change(@post.tb_redirects, :count).by(1)
     end
 
     it 'should not create a redirect' do
-      expect{
-        put :update, :id => @post.id, :spud_post => {:title => 'Hello World'}, :blog_key => 'blog'
-      }.to_not change(@post.tb_redirects, :count)
+      expect do
+        put :update, id: @post.id, spud_post: { title: 'Hello World' }, blog_key: 'blog'
+      end.to_not change(@post.tb_redirects, :count)
     end
   end
 
+  describe '#preview' do
+    context 'with a new post' do
+      it 'should set the attributes without saving' do
+        expect do
+          post :preview, blog_key: 'blog', post_id: nil, spud_post: { title: 'Hello World' }
+        end.to_not change(SpudPost, :count)
+      end
+    end
+    context 'with an existing post' do
+      it 'should set the attributes without saving' do
+        @post = FactoryGirl.create(:spud_post)
+        expect do
+          post :preview,
+            blog_key: @post.blog_key,
+            post_id: @post.id,
+            spud_post: { title: 'Hello World' }
+          @post.reload
+        end.to_not change(@post, :title)
+      end
+    end
+  end
 end

data/spec/controllers/posts_controller_spec.rb

@@ -1,27 +1,27 @@
 require 'rails_helper'
 
-describe PostsController, :type => :controller do
+describe PostsController, type: :controller do
 
   before(:each) do
     activate_authlogic
   end
 
   describe 'index' do
-    it "should display a list of posts" do
-      2.times { |i| FactoryGirl.create(:spud_post) }
-      get :index, {:blog_key => 'blog'}
+    it 'should display a list of posts' do
+      2.times { |_i| FactoryGirl.create(:spud_post) }
+      get :index, blog_key: 'blog'
       expect(assigns(:posts).count).to be > 1
     end
 
-    it "should not display any posts" do
-      Spud::Blog.config.query_for_user = ->(user){
+    it 'should not display any posts' do
+      Spud::Blog.config.query_for_user = ->(user) {
         if user.blank?
           '1=0'
         else
           {}
         end
       }
-      get :index, {:blog_key => 'blog'}
+      get :index, blog_key: 'blog'
       expect(assigns(:posts).count).to be 0
       Spud::Blog.config.query_for_user = nil
     end

data/spec/dummy/config/application.rb

@@ -3,7 +3,7 @@ require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 
 Bundler.require
-require "tb_blog"
+require 'tb_blog'
 
 module Dummy
   class Application < Rails::Application
@@ -36,7 +36,7 @@ module Dummy
     config.i18n.enforce_available_locales = true
 
     # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
+    config.encoding = 'utf-8'
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
@@ -64,4 +64,3 @@ module Dummy
     config.assets.version = '1.0'
   end
 end
-

data/spec/dummy/config/boot.rb

@@ -7,4 +7,4 @@ if File.exist?(gemfile)
   Bundler.setup
 end
 
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy/config/environment.rb

@@ -2,8 +2,8 @@
 require File.expand_path('../application', __FILE__)
 
 Spud::Blog.configure do |config|
-	config.news_enabled = true
-	config.news_layout = 'application'
+  config.news_enabled = true
+  config.news_layout = 'application'
 end
 
 # Initialize the rails application

data/spec/dummy/config/environments/test.rb

@@ -1,4 +1,4 @@
-Dummy::Application.configure do  
+Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # The test environment is used exclusively to run your application's
@@ -9,7 +9,7 @@ Dummy::Application.configure do
 
   # Configure static asset server for tests with Cache-Control for performance
   config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
+  config.static_cache_control = 'public, max-age=3600'
 
   # Do not eager load code on boot. This avoids loading your whole application
   # just for the purpose of running a single test. If you are using a tool that
@@ -24,7 +24,7 @@ Dummy::Application.configure do
   config.action_dispatch.show_exceptions = false
 
   # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the

data/spec/dummy/config/routes.rb

@@ -1,4 +1,4 @@
 Rails.application.routes.draw do
 
-	root :to => "pages#show", :id => "home"
+  root to: 'pages#show', id: 'home'
 end

data/spec/dummy/config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)
 run Dummy::Application

data/spec/dummy/db/migrate/{20120610130206_create_spud_admin_permissions.spud_core.rb → 20161020155425_create_spud_admin_permissions.tb_core.rb}

@@ -1,4 +1,4 @@
-# This migration comes from spud_core (originally 20111214161011)
+# This migration comes from tb_core (originally 20111214161011)
 class CreateSpudAdminPermissions < ActiveRecord::Migration
   def change
     create_table :spud_admin_permissions do |t|

data/spec/dummy/db/migrate/20161020155426_create_spud_users.tb_core.rb

@@ -0,0 +1,30 @@
+# This migration comes from tb_core (originally 20111214161146)
+class CreateSpudUsers < ActiveRecord::Migration
+  def change
+    create_table :spud_users do |t|
+
+      t.string :first_name
+      t.string :last_name
+      t.boolean :super_admin
+      t.string    :login,               null: false                # optional, you can use email instead, or both
+      t.string    :email,               null: false                # optional, you can use login instead, or both
+      t.string    :crypted_password,    null: false                # optional, see below
+      t.string    :password_salt,       null: false                # optional, but highly recommended
+      t.string    :persistence_token,   null: false                # required
+      t.string    :single_access_token, null: false                # optional, see Authlogic::Session::Params
+      t.string    :perishable_token,    null: false                # optional, see Authlogic::Session::Perishability
+
+      # Magic columns, just like ActiveRecord's created_at and updated_at. These are automatically maintained by Authlogic if they are present.
+      t.integer   :login_count,         null: false, default: 0 # optional, see Authlogic::Session::MagicColumns
+      t.integer   :failed_login_count,  null: false, default: 0 # optional, see Authlogic::Session::MagicColumns
+      t.datetime  :last_request_at                                    # optional, see Authlogic::Session::MagicColumns
+      t.datetime  :current_login_at                                   # optional, see Authlogic::Session::MagicColumns
+      t.datetime  :last_login_at                                      # optional, see Authlogic::Session::MagicColumns
+      t.string    :current_login_ip                                   # optional, see Authlogic::Session::MagicColumns
+      t.string    :last_login_ip                                      # optional, see Authlogic::Session::MagicColumns
+      t.timestamps
+    end
+    add_index :spud_users, :login
+    add_index :spud_users, :email
+  end
+end

data/spec/dummy/db/migrate/{20120610130208_add_time_zone_to_spud_user.spud_core.rb → 20161020155427_add_time_zone_to_spud_user.tb_core.rb}

@@ -1,7 +1,6 @@
-# This migration comes from spud_core (originally 20120327124229)
+# This migration comes from tb_core (originally 20120327124229)
 class AddTimeZoneToSpudUser < ActiveRecord::Migration
   def change
     add_column :spud_users, :time_zone, :string
-
   end
 end

data/spec/dummy/db/migrate/{20120610130209_add_scope_to_spud_admin_permissions.spud_core.rb → 20161020155428_add_scope_to_spud_admin_permissions.tb_core.rb}

@@ -1,7 +1,6 @@
-# This migration comes from spud_core (originally 20120328235431)
+# This migration comes from tb_core (originally 20120328235431)
 class AddScopeToSpudAdminPermissions < ActiveRecord::Migration
   def change
     add_column :spud_admin_permissions, :scope, :string
-
   end
 end

data/spec/dummy/db/migrate/{20120610130210_create_spud_user_settings.spud_core.rb → 20161020155429_create_spud_user_settings.tb_core.rb}

@@ -1,4 +1,4 @@
-# This migration comes from spud_core (originally 20120329174000)
+# This migration comes from tb_core (originally 20120329174000)
 class CreateSpudUserSettings < ActiveRecord::Migration
   def change
     create_table :spud_user_settings do |t|

data/spec/dummy/db/migrate/{20140110180412_create_spud_permissions.tb_core.rb → 20161020155431_create_spud_permissions.tb_core.rb}

@@ -2,10 +2,10 @@
 class CreateSpudPermissions < ActiveRecord::Migration
   def change
     create_table :spud_permissions do |t|
-      t.string :name, :null => false
-      t.string :tag, :null => false
+      t.string :name, null: false
+      t.string :tag, null: false
       t.timestamps
     end
-    add_index :spud_permissions, :tag, :unique => true
+    add_index :spud_permissions, :tag, unique: true
   end
 end

data/spec/dummy/db/migrate/{20140110180413_create_spud_role_permissions.tb_core.rb → 20161020155432_create_spud_role_permissions.tb_core.rb}

@@ -2,8 +2,8 @@
 class CreateSpudRolePermissions < ActiveRecord::Migration
   def change
     create_table :spud_role_permissions do |t|
-      t.integer :spud_role_id, :null => false
-      t.string :spud_permission_tag, :null => false
+      t.integer :spud_role_id, null: false
+      t.string :spud_permission_tag, null: false
       t.timestamps
     end
     add_index :spud_role_permissions, :spud_role_id

data/spec/dummy/db/migrate/{20160215174632_add_requires_password_change_to_spud_users.tb_core.rb → 20161020155434_add_requires_password_change_to_spud_users.tb_core.rb}

@@ -1,6 +1,6 @@
 # This migration comes from tb_core (originally 20150610143438)
 class AddRequiresPasswordChangeToSpudUsers < ActiveRecord::Migration
   def change
-    add_column :spud_users, :requires_password_change, :boolean, :default => false
+    add_column :spud_users, :requires_password_change, :boolean, default: false
   end
 end

data/spec/dummy/db/migrate/{20160215174633_create_tb_redirects.tb_redirects.rb → 20161020155435_create_tb_redirects.tb_redirects.rb}

@@ -4,12 +4,12 @@ class CreateTbRedirects < ActiveRecord::Migration
     create_table :tb_redirects do |t|
       t.string :owner_type
       t.integer :owner_id
-      t.string :source, :null => false
-      t.string :destination, :null => false
+      t.string :source, null: false
+      t.string :destination, null: false
       t.string :created_by
       t.timestamps null: false
     end
     add_index :tb_redirects, [:owner_type, :owner_id]
-    add_index :tb_redirects, :source, :unique => true
+    add_index :tb_redirects, :source, unique: true
   end
 end

data/spec/dummy/db/migrate/{20140110180418_create_spud_posts.tb_blog.rb → 20161020155437_create_spud_posts.tb_blog.rb}

@@ -5,12 +5,12 @@ class CreateSpudPosts < ActiveRecord::Migration
       t.integer :spud_user_id
       t.string :title
       t.text :content
-      t.boolean :comments_enabled, :default => false
-      t.boolean :visible, :default => true
+      t.boolean :comments_enabled, default: false
+      t.boolean :visible, default: true
       t.datetime :published_at
       t.timestamps
     end
     add_index :spud_posts, :spud_user_id
     add_index :spud_posts, :visible
   end
-end
+end

data/spec/dummy/db/migrate/{20140110180419_create_spud_post_categories.tb_blog.rb → 20161020155438_create_spud_post_categories.tb_blog.rb}

@@ -5,10 +5,10 @@ class CreateSpudPostCategories < ActiveRecord::Migration
       t.string :name
       t.timestamps
     end
-    create_table :spud_post_categories_posts, :id => false do |t|
-    	t.integer :spud_post_id
-    	t.integer :spud_post_category_id
+    create_table :spud_post_categories_posts, id: false do |t|
+      t.integer :spud_post_id
+      t.integer :spud_post_category_id
     end
     add_index :spud_post_categories_posts, :spud_post_category_id
   end
-end
+end

data/spec/dummy/db/migrate/{20140110180421_add_url_to_spud_posts.tb_blog.rb → 20161020155439_add_url_to_spud_posts.tb_blog.rb}

@@ -1,7 +1,7 @@
 # This migration comes from tb_blog (originally 20120127143054)
 class AddUrlToSpudPosts < ActiveRecord::Migration
   def change
-  	add_column :spud_posts, :url_name, :string
-  	add_index :spud_posts, :url_name
+    add_column :spud_posts, :url_name, :string
+    add_index :spud_posts, :url_name
   end
 end

data/spec/dummy/db/migrate/20161020155440_add_url_to_spud_post_categories.tb_blog.rb

@@ -0,0 +1,9 @@
+# This migration comes from tb_blog (originally 20120127144942)
+class AddUrlToSpudPostCategories < ActiveRecord::Migration
+  def change
+    add_column :spud_post_categories, :parent_id, :integer, default: 0
+    add_column :spud_post_categories, :url_name, :string
+    add_index :spud_post_categories, :parent_id
+    add_index :spud_post_categories, :url_name
+  end
+end

data/spec/dummy/db/migrate/{20140110180423_add_is_news_to_spud_posts.tb_blog.rb → 20161020155441_add_is_news_to_spud_posts.tb_blog.rb}

@@ -1,7 +1,7 @@
 # This migration comes from tb_blog (originally 20120210165540)
 class AddIsNewsToSpudPosts < ActiveRecord::Migration
   def change
-  	add_column :spud_posts, :is_news, :boolean, :default => false
-  	add_index :spud_posts, :is_news
+    add_column :spud_posts, :is_news, :boolean, default: false
+    add_index :spud_posts, :is_news
   end
 end

data/spec/dummy/db/migrate/{20140110180426_create_spud_post_sites.tb_blog.rb → 20161020155443_create_spud_post_sites.tb_blog.rb}

@@ -2,11 +2,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.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  
+    add_index :spud_post_sites, :spud_site_id
   end
 end

data/spec/dummy/db/migrate/{20140110180429_add_nested_set_to_post_categories.tb_blog.rb → 20161020155444_add_nested_set_to_post_categories.tb_blog.rb}

@@ -6,15 +6,11 @@ class AddNestedSetToPostCategories < ActiveRecord::Migration
       t.integer :rgt
       t.integer :depth
     end
-
-    # Populates lft, rgt, and depth values for nested set
-    #SpudPostCategory.where(:parent_id => 0).update_all({:parent_id => nil})
-    #SpudPostCategory.rebuild!
   end
 
   def down
     change_table :spud_post_categories do |t|
-      t.remove :ltf
+      t.remove :lft
       t.remove :rgt
       t.remove :depth
     end

data/spec/dummy/db/migrate/{20140110180430_add_content_format_to_spud_posts.tb_blog.rb → 20161020155445_add_content_format_to_spud_posts.tb_blog.rb}

@@ -1,6 +1,6 @@
 # This migration comes from tb_blog (originally 20130120151857)
 class AddContentFormatToSpudPosts < ActiveRecord::Migration
   def change
-    add_column :spud_posts, :content_format, :string, :default => "HTML"
+    add_column :spud_posts, :content_format, :string, default: 'HTML'
   end
 end

data/spec/dummy/db/migrate/{20140730131550_remove_awesome_nested_set_columns_from_spud_post_categories.tb_blog.rb → 20161020155448_remove_awesome_nested_set_columns_from_spud_post_categories.tb_blog.rb}

@@ -5,12 +5,13 @@ class RemoveAwesomeNestedSetColumnsFromSpudPostCategories < ActiveRecord::Migrat
       t.remove :lft, :rgt, :depth, :parent_id
     end
   end
+
   def down
     change_table :spud_post_categories do |t|
       t.integer :lft
       t.integer :rgt
       t.integer :depth
-      t.inreger :parent_id
+      t.integer :parent_id
     end
   end
 end

data/spec/dummy/db/migrate/{20150116195007_drop_spud_post_sites.tb_blog.rb → 20161020155450_drop_spud_post_sites.tb_blog.rb}

@@ -3,13 +3,14 @@ class DropSpudPostSites < ActiveRecord::Migration
   def up
     drop_table :spud_post_sites
   end
+
   def down
     create_table :spud_post_sites do |t|
-      t.integer :spud_post_id, :null => false
-      t.integer :spud_site_id, :null => false
+      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  
+    add_index :spud_post_sites, :spud_site_id
   end
 end

data/spec/dummy/db/migrate/{20151015154040_add_custom_author_to_post.tb_blog.rb → 20161020155451_add_custom_author_to_post.tb_blog.rb}

@@ -1,6 +1,6 @@
 # This migration comes from tb_blog (originally 20151015151133)
 class AddCustomAuthorToPost < ActiveRecord::Migration
   def change
-  	add_column :spud_posts, :custom_author, :string
+    add_column :spud_posts, :custom_author, :string
   end
 end

data/spec/dummy/db/migrate/{20160216150847_add_identifier_to_spud_posts.tb_blog.rb → 20161020155452_add_identifier_to_spud_posts.tb_blog.rb}

@@ -2,6 +2,6 @@
 class AddIdentifierToSpudPosts < ActiveRecord::Migration
   def change
     add_column :spud_posts, :identifier, :string
-    add_index :spud_posts, :identifier, :unique => true
+    add_index :spud_posts, :identifier, unique: true
   end
 end