tb_banners 1.3.beta1 → 1.3.1

data/db/migrate/20140721142719_add_start_and_end_dates_to_spud_banners.rb

@@ -1,4 +1,4 @@
-class AddStartAndEndDatesToSpudBanners < ActiveRecord::Migration
+class AddStartAndEndDatesToSpudBanners < ActiveRecord::Migration[4.2]
   def change
     add_column :spud_banners, :start_date, :date
     add_column :spud_banners, :end_date, :date

data/lib/spud_banners/configuration.rb

@@ -3,7 +3,7 @@ module Spud
     include ActiveSupport::Configurable
     config_accessor :paperclip_storage, :s3_credentials, :storage_path, :storage_url, :s3_protocol
     self.paperclip_storage = :filesystem
-    self.s3_credentials = "#{Rails.root}/config/s3.yml"
+    self.s3_credentials = './config/s3.yml'
     self.s3_protocol = 'https'
     self.storage_path = ':rails_root/public/system/spud_banners/:id/:style/:basename.:extension'
     self.storage_url = '/system/spud_banners/:id/:style/:basename.:extension'

data/lib/spud_banners/engine.rb

@@ -1,6 +1,5 @@
 require 'tb_core'
 require 'paperclip'
-require 'tb_liquid'
 
 module Spud
   module Banners
@@ -8,7 +7,7 @@ module Spud
       engine_name :tb_banners
 
       initializer :admin do
-        Spud::Core.config.admin_applications += [{
+        TbCore.config.admin_applications += [{
           name: 'Banner Sets',
           thumbnail: 'admin/banners/banners.png',
           retina: true,
@@ -17,13 +16,9 @@ module Spud
         }]
       end
 
-      initializer :liquid do
-        Liquid::Template.register_tag('spud_banner_set', Spud::Banners::BannerSetTag) if defined?(Liquid::Template)
-      end
-
       initializer 'tb_banners.assets' do
-        Spud::Core.append_admin_stylesheets('admin/banners/application')
-        Spud::Core.append_admin_javascripts('admin/banners/application')
+        TbCore.append_admin_stylesheets('admin/banners/application')
+        TbCore.append_admin_javascripts('admin/banners/application')
         Rails.application.config.assets.precompile += ['admin/banners/banners.png']
       end
 

data/lib/spud_banners/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Banners
-    VERSION = '1.3.beta1'.freeze
+    VERSION = '1.3.1'.freeze
   end
 end

data/lib/tb_banners.rb

@@ -1,7 +1,6 @@
 module Spud
   module Banners
     require 'spud_banners/configuration'
-    require 'spud_banners/liquid_tags'
     require 'spud_banners/engine' if defined?(Rails)
   end
 end

data/spec/controllers/admin/banner_sets_controller_spec.rb

@@ -13,7 +13,7 @@ describe Admin::BannerSetsController, type: 'controller' do
   describe 'index' do
     it 'should return an array of banner sets' do
       5.times do |_x|
-        banner_set = FactoryGirl.create(:spud_banner_set)
+        FactoryBot.create(:spud_banner_set)
       end
       get :index
       expect(assigns(:banner_sets).count).to be > 1
@@ -22,16 +22,16 @@ describe Admin::BannerSetsController, type: 'controller' do
 
   describe 'show' do
     it 'should respond with a banner set' do
-      banner_set = FactoryGirl.create(:spud_banner_set)
+      banner_set = FactoryBot.create(:spud_banner_set)
       get :show, params: { id: banner_set.id }
       expect(assigns(:banner_set)).to eq(banner_set)
       expect(response).to be_success
     end
 
-    it 'should redirect if banner set is not found' do
+    it 'should return a 404 if banner set is not found' do
       get :show, params: { id: -1 }
       expect(assigns(:banner_set)).to be_blank
-      expect(response).to redirect_to admin_banner_sets_path
+      expect(response.status).to eq(404)
     end
   end
 
@@ -45,7 +45,7 @@ describe Admin::BannerSetsController, type: 'controller' do
   describe 'create' do
     it 'should respond with a banner set' do
       expect do
-        post :create, params: { spud_banner_set: FactoryGirl.attributes_for(:spud_banner_set) }
+        post :create, params: { spud_banner_set: FactoryBot.attributes_for(:spud_banner_set) }
       end.to change(SpudBannerSet, :count).by(1)
       expect(response).to be_success
     end
@@ -60,7 +60,7 @@ describe Admin::BannerSetsController, type: 'controller' do
 
   describe 'edit' do
     it 'should respond with a banner set' do
-      banner_set = FactoryGirl.create(:spud_banner_set)
+      banner_set = FactoryBot.create(:spud_banner_set)
       get :edit, params: { id: banner_set.id }
       expect(assigns(:banner_set)).to eq(banner_set)
       expect(response).to be_success
@@ -69,7 +69,7 @@ describe Admin::BannerSetsController, type: 'controller' do
 
   describe 'update' do
     it 'should update the banner set' do
-      banner_set = FactoryGirl.create(:spud_banner_set)
+      banner_set = FactoryBot.create(:spud_banner_set)
       new_name = 'Updated Set Name'
       expect do
         put :update, params: { id: banner_set.id, spud_banner_set: { name: new_name } }
@@ -78,7 +78,7 @@ describe Admin::BannerSetsController, type: 'controller' do
     end
 
     it 'should respond unsuccessfully if the updated banner set is invalid' do
-      banner_set = FactoryGirl.create(:spud_banner_set)
+      banner_set = FactoryBot.create(:spud_banner_set)
       expect do
         put :update, params: { id: banner_set.id, spud_banner_set: { name: '', width: 'lorem', height: 'ipsum' } }
       end.to_not change(SpudBannerSet, :count)
@@ -88,7 +88,7 @@ describe Admin::BannerSetsController, type: 'controller' do
 
   describe 'destroy' do
     it 'should destroy the banner set and respond successfully' do
-      banner_set = FactoryGirl.create(:spud_banner_set)
+      banner_set = FactoryBot.create(:spud_banner_set)
       expect do
         delete :destroy, params: { id: banner_set.id }
       end.to change(SpudBannerSet, :count).by(-1)

data/spec/dummy/config/initializers/secret_token.rb

@@ -4,5 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = 'dacbd8a483ea9645b13e97018089cbc9da8bf98f99a0be873cdb565d8f64c066974f37cbe7e8b4fedaadd057bce78d1d9326b0768120d2a693de8165df286693'
 Dummy::Application.config.secret_key_base = 'b43711419c807b9c9efe9365dd79f87ebe31e9f72e1aa6744c1ecac68aace664c0a3a4f791d92bd2fa324fce1d6d09701a54b88453f131b7c460eeb9c530bd72'

data/spec/dummy/db/migrate/20121127192246_create_spud_admin_permissions.spud_core.rb

@@ -1,5 +1,5 @@
 # This migration comes from spud_core (originally 20111214161011)
-class CreateSpudAdminPermissions < ActiveRecord::Migration
+class CreateSpudAdminPermissions < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_admin_permissions do |t|
       t.integer :user_id

data/spec/dummy/db/migrate/20121127192247_create_spud_users.spud_core.rb

@@ -1,5 +1,5 @@
 # This migration comes from spud_core (originally 20111214161146)
-class CreateSpudUsers < ActiveRecord::Migration
+class CreateSpudUsers < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_users do |t|
 

data/spec/dummy/db/migrate/20121127192248_add_time_zone_to_spud_user.spud_core.rb

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

data/spec/dummy/db/migrate/20121127192249_add_scope_to_spud_admin_permissions.spud_core.rb

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

data/spec/dummy/db/migrate/20121127192250_create_spud_user_settings.spud_core.rb

@@ -1,5 +1,5 @@
 # This migration comes from spud_core (originally 20120329174000)
-class CreateSpudUserSettings < ActiveRecord::Migration
+class CreateSpudUserSettings < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_user_settings do |t|
       t.integer :spud_user_id

data/spec/dummy/db/migrate/20130920154442_create_spud_roles.tb_core.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_core (originally 20130620143010)
-class CreateSpudRoles < ActiveRecord::Migration
+class CreateSpudRoles < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_roles do |t|
       t.string :name

data/spec/dummy/db/migrate/20130920154443_create_spud_permissions.tb_core.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_core (originally 20130620143941)
-class CreateSpudPermissions < ActiveRecord::Migration
+class CreateSpudPermissions < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_permissions do |t|
       t.string :name, null: false

data/spec/dummy/db/migrate/20130920154444_create_spud_role_permissions.tb_core.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_core (originally 20130620151132)
-class CreateSpudRolePermissions < ActiveRecord::Migration
+class CreateSpudRolePermissions < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_role_permissions do |t|
       t.integer :spud_role_id, null: false

data/spec/dummy/db/migrate/20130920154445_drop_spud_admin_permissions.tb_core.rb

@@ -1,5 +1,5 @@
 # This migration comes from tb_core (originally 20130620163144)
-class DropSpudAdminPermissions < ActiveRecord::Migration
+class DropSpudAdminPermissions < ActiveRecord::Migration[4.2]
   def up
     drop_table :spud_admin_permissions
   end

data/spec/dummy/db/migrate/20160310164644_add_requires_password_change_to_spud_users.tb_core.rb

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

data/spec/dummy/db/schema.rb

@@ -10,105 +10,95 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20_160_310_164_644) do
+ActiveRecord::Schema.define(version: 20160310164644) do
 
-  create_table 'spud_banner_sets', force: :cascade, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8' do |t|
-    t.string   'name',                          null: false
-    t.integer  'width',                         null: false
-    t.integer  'height',                        null: false
-    t.boolean  'cropped', default: true
-    t.datetime 'created_at'
-    t.datetime 'updated_at'
-    t.boolean  'has_rich_text', default: false
-    t.index ['name'], name: 'index_spud_banner_sets_on_name', unique: true, using: :btree
+  create_table "spud_banner_sets", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+    t.string "name", null: false
+    t.integer "width", null: false
+    t.integer "height", null: false
+    t.boolean "cropped", default: true
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean "has_rich_text", default: false
+    t.index ["name"], name: "index_spud_banner_sets_on_name", unique: true
   end
 
-  create_table 'spud_banners', force: :cascade, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8' do |t|
-    t.integer  'spud_banner_set_id',                                  null: false
-    t.string   'link_to'
-    t.string   'link_target', default: '_self'
-    t.string   'title'
-    t.string   'alt'
-    t.integer  'sort_order', default: 0
-    t.string   'banner_file_name'
-    t.string   'banner_content_type'
-    t.integer  'banner_file_size'
-    t.datetime 'banner_updated_at'
-    t.datetime 'created_at'
-    t.datetime 'updated_at'
-    t.text     'rich_text', limit: 65_535
-    t.date     'start_date'
-    t.date     'end_date'
-    t.index ['spud_banner_set_id'], name: 'index_spud_banners_on_spud_banner_set_id', using: :btree
+  create_table "spud_banners", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+    t.integer "spud_banner_set_id", null: false
+    t.string "link_to"
+    t.string "link_target", default: "_self"
+    t.string "title"
+    t.string "alt"
+    t.integer "sort_order", default: 0
+    t.string "banner_file_name"
+    t.string "banner_content_type"
+    t.integer "banner_file_size"
+    t.datetime "banner_updated_at"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.text "rich_text"
+    t.date "start_date"
+    t.date "end_date"
+    t.index ["spud_banner_set_id"], name: "index_spud_banners_on_spud_banner_set_id"
   end
 
-  create_table 'spud_liquid_tags', force: :cascade, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8' do |t|
-    t.integer  'attachment_id'
-    t.string   'attachment_type'
-    t.string   'tag_name'
-    t.string   'value'
-    t.datetime 'created_at'
-    t.datetime 'updated_at'
-    t.index ['tag_name', 'value'], name: 'index_spud_liquid_tags_on_tag_name_and_value', using: :btree
+  create_table "spud_permissions", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+    t.string "name", null: false
+    t.string "tag", null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.index ["tag"], name: "index_spud_permissions_on_tag", unique: true
   end
 
-  create_table 'spud_permissions', force: :cascade, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8' do |t|
-    t.string   'name',       null: false
-    t.string   'tag',        null: false
-    t.datetime 'created_at'
-    t.datetime 'updated_at'
-    t.index ['tag'], name: 'index_spud_permissions_on_tag', unique: true, using: :btree
+  create_table "spud_role_permissions", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+    t.integer "spud_role_id", null: false
+    t.string "spud_permission_tag", null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.index ["spud_permission_tag"], name: "index_spud_role_permissions_on_spud_permission_tag"
+    t.index ["spud_role_id"], name: "index_spud_role_permissions_on_spud_role_id"
   end
 
-  create_table 'spud_role_permissions', force: :cascade, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8' do |t|
-    t.integer  'spud_role_id',        null: false
-    t.string   'spud_permission_tag', null: false
-    t.datetime 'created_at'
-    t.datetime 'updated_at'
-    t.index ['spud_permission_tag'], name: 'index_spud_role_permissions_on_spud_permission_tag', using: :btree
-    t.index ['spud_role_id'], name: 'index_spud_role_permissions_on_spud_role_id', using: :btree
+  create_table "spud_roles", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+    t.string "name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table 'spud_roles', force: :cascade, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8' do |t|
-    t.string   'name'
-    t.datetime 'created_at'
-    t.datetime 'updated_at'
+  create_table "spud_user_settings", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+    t.integer "spud_user_id"
+    t.string "key"
+    t.string "value"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table 'spud_user_settings', force: :cascade, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8' do |t|
-    t.integer  'spud_user_id'
-    t.string   'key'
-    t.string   'value'
-    t.datetime 'created_at'
-    t.datetime 'updated_at'
-  end
-
-  create_table 'spud_users', force: :cascade, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8' do |t|
-    t.string   'first_name'
-    t.string   'last_name'
-    t.boolean  'super_admin'
-    t.string   'login',                                    null: false
-    t.string   'email',                                    null: false
-    t.string   'crypted_password',                         null: false
-    t.string   'password_salt',                            null: false
-    t.string   'persistence_token',                        null: false
-    t.string   'single_access_token',                      null: false
-    t.string   'perishable_token',                         null: false
-    t.integer  'login_count',              default: 0,     null: false
-    t.integer  'failed_login_count',       default: 0,     null: false
-    t.datetime 'last_request_at'
-    t.datetime 'current_login_at'
-    t.datetime 'last_login_at'
-    t.string   'current_login_ip'
-    t.string   'last_login_ip'
-    t.datetime 'created_at'
-    t.datetime 'updated_at'
-    t.string   'time_zone'
-    t.integer  'spud_role_id'
-    t.boolean  'requires_password_change', default: false
-    t.index ['email'], name: 'index_spud_users_on_email', using: :btree
-    t.index ['login'], name: 'index_spud_users_on_login', using: :btree
-    t.index ['spud_role_id'], name: 'index_spud_users_on_spud_role_id', using: :btree
+  create_table "spud_users", id: :integer, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+    t.string "first_name"
+    t.string "last_name"
+    t.boolean "super_admin"
+    t.string "login", null: false
+    t.string "email", null: false
+    t.string "crypted_password", null: false
+    t.string "password_salt", null: false
+    t.string "persistence_token", null: false
+    t.string "single_access_token", null: false
+    t.string "perishable_token", null: false
+    t.integer "login_count", default: 0, null: false
+    t.integer "failed_login_count", default: 0, null: false
+    t.datetime "last_request_at"
+    t.datetime "current_login_at"
+    t.datetime "last_login_at"
+    t.string "current_login_ip"
+    t.string "last_login_ip"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string "time_zone"
+    t.integer "spud_role_id"
+    t.boolean "requires_password_change", default: false
+    t.index ["email"], name: "index_spud_users_on_email"
+    t.index ["login"], name: "index_spud_users_on_login"
+    t.index ["spud_role_id"], name: "index_spud_users_on_spud_role_id"
   end
 
 end

data/spec/factories/spud_banner_sets.rb

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :spud_banner_set do
+    sequence :name do |i|
+      "Test #{i}"
+    end
+    width 800
+    height 200
+  end
+end

data/spec/factories/spud_banners.rb

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :spud_banner do
+    banner_file_name 'test.jpg'
+    banner_content_type 'image/jpeg'
+    banner_file_size 1
+  end
+end

data/spec/models/spud_banner_spec.rb

@@ -0,0 +1,27 @@
+require 'rails_helper'
+
+describe SpudBanner, type: 'model' do
+
+  let(:set) { create(:spud_banner_set) }
+
+  describe 'active' do
+    it 'returns active banners' do
+      banner = create(:spud_banner,
+        spud_banner_set_id: set.id,
+        start_date: Date.yesterday, end_date: Date.tomorrow)
+
+      result = SpudBanner.active
+      expect(result).to eq([banner])
+    end
+
+    it 'does not return inactive banners' do
+      create(:spud_banner,
+        spud_banner_set_id: set.id,
+        start_date: nil, end_date: Date.yesterday)
+
+      result = SpudBanner.active
+      expect(result).to eq([])
+    end
+  end
+
+end