tb_banners 1.2.0.beta1 → 1.3.2

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/config/application.rb

@@ -3,7 +3,7 @@ require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 
 Bundler.require
-require "tb_banners"
+require 'tb_banners'
 
 module Dummy
   class Application < Rails::Application
@@ -31,7 +31,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]
@@ -51,4 +51,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/environments/production.rb

@@ -9,7 +9,7 @@ Dummy::Application.configure do
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
+  config.public_file_server.enabled = false
 
   # Compress JavaScripts and CSS
   config.assets.compress = true

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

@@ -8,8 +8,8 @@ Dummy::Application.configure do
   config.cache_classes = true
 
   # 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.public_file_server.enabled = true
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
 
   # Deprecated
   # Log error messages when you accidentally call methods on nil
@@ -20,7 +20,6 @@ Dummy::Application.configure do
   # preloads Rails for running tests, you may have to set it to true.
   config.eager_load = false
 
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
@@ -29,7 +28,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/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,22 +1,22 @@
 # 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|
-      
+
       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
+      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.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
@@ -24,7 +24,7 @@ class CreateSpudUsers < ActiveRecord::Migration
       t.string    :last_login_ip                                      # optional, see Authlogic::Session::MagicColumns
       t.timestamps
     end
-    add_index :spud_users,:login
-    add_index :spud_users,:email
+    add_index :spud_users, :login
+    add_index :spud_users, :email
   end
 end

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

@@ -1,7 +1,6 @@
 # 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
 end

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

@@ -1,7 +1,6 @@
 # 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
 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,11 +1,11 @@
 # 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
-      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/20130920154444_create_spud_role_permissions.tb_core.rb

@@ -1,9 +1,9 @@
 # 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
-      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/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

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

data/spec/dummy/db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -11,108 +10,95 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140120174546) do
+ActiveRecord::Schema.define(version: 20160310164644) do
 
-  create_table "spud_banner_sets", force: true 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",                    null: false
-    t.datetime "updated_at",                    null: false
-    t.boolean  "has_rich_text", default: false
+  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
 
-  add_index "spud_banner_sets", ["name"], name: "index_spud_banner_sets_on_name", unique: true, using: :btree
-
-  create_table "spud_banners", force: true 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"
+  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",                            null: false
-    t.datetime "updated_at",                            null: false
-    t.text     "rich_text"
-  end
-
-  add_index "spud_banners", ["spud_banner_set_id"], name: "index_spud_banners_on_spud_banner_set_id", using: :btree
-
-  create_table "spud_liquid_tags", force: true 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.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
 
-  add_index "spud_liquid_tags", ["tag_name", "value"], name: "index_spud_liquid_tags_on_tag_name_and_value", using: :btree
-
-  create_table "spud_permissions", force: true do |t|
-    t.string   "name",       null: false
-    t.string   "tag",        null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+  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
 
-  add_index "spud_permissions", ["tag"], name: "index_spud_permissions_on_tag", unique: true, using: :btree
-
-  create_table "spud_role_permissions", force: true do |t|
-    t.integer  "spud_role_id",        null: false
-    t.string   "spud_permission_tag", null: false
-    t.datetime "created_at",          null: false
-    t.datetime "updated_at",          null: false
+  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
 
-  add_index "spud_role_permissions", ["spud_permission_tag"], name: "index_spud_role_permissions_on_spud_permission_tag", using: :btree
-  add_index "spud_role_permissions", ["spud_role_id"], name: "index_spud_role_permissions_on_spud_role_id", using: :btree
-
-  create_table "spud_roles", force: true do |t|
-    t.string   "name"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+  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_user_settings", force: true do |t|
-    t.integer  "spud_user_id"
-    t.string   "key"
-    t.string   "value"
-    t.datetime "created_at",   null: false
-    t.datetime "updated_at",   null: false
+  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_users", force: true 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
+  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",                      null: false
-    t.datetime "updated_at",                      null: false
-    t.string   "time_zone"
-    t.integer  "spud_role_id"
+    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
 
-  add_index "spud_users", ["email"], name: "index_spud_users_on_email", using: :btree
-  add_index "spud_users", ["login"], name: "index_spud_users_on_login", using: :btree
-  add_index "spud_users", ["spud_role_id"], name: "index_spud_users_on_spud_role_id", using: :btree
-
 end

data/spec/dummy/script/rails

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require File.expand_path('../../config/boot', __FILE__)
 require 'rails/commands'

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