tb_media 1.2.1 → 1.3.2

data/lib/spud_media/version.rb

@@ -1,5 +1,5 @@
 module Spud
-	module Media
-		VERSION = "1.2.1"
-	end
+  module Media
+    VERSION = '1.3.2'.freeze
+  end
 end

data/lib/tasks/spud_media_tasks.rake

@@ -5,11 +5,9 @@
 
 namespace :spud_media do
 
-  desc "Validate that all media files have the proper permission settings"
-  task :validate_permissions => :environment do
-    SpudMedia.find_each do |m|
-      m.validate_permissions
-    end
+  desc 'Validate that all media files have the proper permission settings'
+  task validate_permissions: :environment do
+    SpudMedia.find_each(&:validate_permissions)
   end
 
-end
+end

data/spec/controllers/admin/media_controller_spec.rb

@@ -1,44 +1,43 @@
 require 'rails_helper'
 
-describe Admin::MediaController, :type => :controller do
+describe Admin::MediaController, type: :controller do
 
   before :each do
     activate_authlogic
-    u = SpudUser.new(:login => "testuser",:email => "test@testuser.com",:password => "test",:password_confirmation => "test")
+    u = SpudUser.new(login: 'testuser', email: 'test@testuser.com', password: 'test', password_confirmation: 'test')
     u.super_admin = true
     u.save
     @user = SpudUserSession.create(u)
   end
-  
+
   describe 'index' do
-  	it "index page should return all media in descending order by create_at" do
-  	  @media1 = FactoryGirl.create(:spud_media, created_at: 1.hour.ago)
-  	  @media2 = FactoryGirl.create(:spud_media, created_at: 2.hours.ago)
-  	  @media3 = FactoryGirl.create(:spud_media, created_at: 3.hours.ago)
-  	  get :index
-  	  @medias = assigns(:media)
-  	  expect(@medias.count).to eq(3)
-  	  expect((@medias[0].id)).to eq(@media1.id)
-  	  expect((@medias[1].id)).to eq(@media2.id)
-  	  expect((@medias[2].id)).to eq(@media3.id)
+    it 'index page should return all media in descending order by create_at' do
+      @media1 = FactoryBot.create(:spud_media, created_at: 1.hour.ago)
+      @media2 = FactoryBot.create(:spud_media, created_at: 2.hours.ago)
+      @media3 = FactoryBot.create(:spud_media, created_at: 3.hours.ago)
+      get :index
+      @medias = assigns(:media)
+      expect(@medias.count).to eq(3)
+      expect(@medias[0].id).to eq(@media1.id)
+      expect(@medias[1].id).to eq(@media2.id)
+      expect(@medias[2].id).to eq(@media3.id)
     end
   end
 
   describe 'new' do
-  	it "should return a new media object" do
-  	  get :new
-  	  @media = assigns(:media)
-  	  expect(@media).to_not be_blank
+    it 'should return a new media object' do
+      get :new
+      @media = assigns(:media)
+      expect(@media).to_not be_blank
     end
   end
 
   describe 'create' do
-  	it "should create a new media and returned the saved object's edit page" do
-  	  post :create, spud_media: FactoryGirl.attributes_for(:spud_media)
-  	  expect {
-  	  	post :create, spud_media: FactoryGirl.attributes_for(:spud_media)
-  	  }.to change(SpudMedia, :count).by(1)
-  	end
+    it "should create a new media and returned the saved object's edit page" do
+      expect do
+        post :create, params: { spud_media: FactoryBot.attributes_for(:spud_media) }
+      end.to change(SpudMedia, :count).by(1)
+    end
   end
 
-end
+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/config/application.rb

@@ -3,7 +3,7 @@ require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 
 Bundler.require
-require "tb_media"
+require 'tb_media'
 
 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]
@@ -54,4 +54,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/development.rb

@@ -22,13 +22,6 @@ Dummy::Application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
-
   # Do not compress assets
   config.assets.compress = false
 

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_files = true
-  config.static_cache_control = "public, max-age=3600"
+  config.serve_static_assets = true
+  config.public_file_server.headers = { '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
@@ -33,6 +33,4 @@ Dummy::Application.configure do
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
-
-  config.active_record.raise_in_transactional_callbacks = true
 end

data/spec/dummy/config/routes.rb

@@ -1,5 +1,5 @@
 Rails.application.routes.draw do
 
-  #mount SpudMedia::Engine => "/spud_media"
-  
+  # mount SpudMedia::Engine => "/spud_media"
+
 end

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

@@ -2,21 +2,21 @@
 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
+      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/20130904141443_add_time_zone_to_spud_user.tb_core.rb

@@ -2,6 +2,5 @@
 class AddTimeZoneToSpudUser < ActiveRecord::Migration
   def change
     add_column :spud_users, :time_zone, :string
-
   end
 end

data/spec/dummy/db/migrate/20130904141444_add_scope_to_spud_admin_permissions.tb_core.rb

@@ -2,6 +2,5 @@
 class AddScopeToSpudAdminPermissions < ActiveRecord::Migration
   def change
     add_column :spud_admin_permissions, :scope, :string
-
   end
 end

data/spec/dummy/db/migrate/20130904141446_create_spud_media.tb_media.rb

@@ -9,4 +9,4 @@ class CreateSpudMedia < ActiveRecord::Migration
       t.timestamps
     end
   end
-end
+end

data/spec/dummy/db/migrate/20130904141447_add_protected_to_spud_media.tb_media.rb

@@ -1,7 +1,7 @@
 # This migration comes from tb_media (originally 20120501203325)
 class AddProtectedToSpudMedia < ActiveRecord::Migration
   def change
-    add_column :spud_media, :is_protected, :boolean, :default => false
+    add_column :spud_media, :is_protected, :boolean, default: false
     add_column :spud_media, :attachment_updated_at, :datetime
   end
 end

data/spec/dummy/db/migrate/20130904141448_add_cropping_to_spud_media.tb_media.rb

@@ -1,10 +1,10 @@
 # This migration comes from tb_media (originally 20120508132153)
 class AddCroppingToSpudMedia < ActiveRecord::Migration
   def change
-    add_column :spud_media, :crop_x, :int, :default => 0
-    add_column :spud_media, :crop_y, :int, :default => 0
+    add_column :spud_media, :crop_x, :int, default: 0
+    add_column :spud_media, :crop_y, :int, default: 0
     add_column :spud_media, :crop_w, :int
     add_column :spud_media, :crop_h, :int
-    add_column :spud_media, :crop_s, :int, :default => 100
+    add_column :spud_media, :crop_s, :int, default: 100
   end
 end

data/spec/dummy/db/migrate/20151012194531_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/20151012194532_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/20151012194534_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/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,83 +10,80 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20151012194534) do
+ActiveRecord::Schema.define(version: 20_151_012_194_534) do
 
-  create_table "spud_media", force: :cascade do |t|
-    t.string   "attachment_content_type", limit: 255
-    t.integer  "attachment_file_size",    limit: 4
-    t.string   "attachment_file_name",    limit: 255
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.boolean  "is_protected",            limit: 1,   default: false
-    t.datetime "attachment_updated_at"
-    t.integer  "crop_x",                  limit: 4,   default: 0
-    t.integer  "crop_y",                  limit: 4,   default: 0
-    t.integer  "crop_w",                  limit: 4
-    t.integer  "crop_h",                  limit: 4
-    t.integer  "crop_s",                  limit: 4,   default: 100
+  create_table 'spud_media', force: :cascade, options: 'ENGINE=InnoDB DEFAULT CHARSET=utf8' do |t|
+    t.string   'attachment_content_type'
+    t.integer  'attachment_file_size'
+    t.string   'attachment_file_name'
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
+    t.boolean  'is_protected', default: false
+    t.datetime 'attachment_updated_at'
+    t.integer  'crop_x',                  default: 0
+    t.integer  'crop_y',                  default: 0
+    t.integer  'crop_w'
+    t.integer  'crop_h'
+    t.integer  'crop_s', default: 100
   end
 
-  create_table "spud_permissions", force: :cascade do |t|
-    t.string   "name",       limit: 255, null: false
-    t.string   "tag",        limit: 255, null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+  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
   end
 
-  add_index "spud_permissions", ["tag"], name: "index_spud_permissions_on_tag", unique: true, using: :btree
-
-  create_table "spud_role_permissions", force: :cascade do |t|
-    t.integer  "spud_role_id",        limit: 4,   null: false
-    t.string   "spud_permission_tag", limit: 255, null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+  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
   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: :cascade do |t|
-    t.string   "name",       limit: 255
-    t.datetime "created_at"
-    t.datetime "updated_at"
+  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'
   end
 
-  create_table "spud_user_settings", force: :cascade do |t|
-    t.integer  "spud_user_id", limit: 4
-    t.string   "key",          limit: 255
-    t.string   "value",        limit: 255
-    t.datetime "created_at"
-    t.datetime "updated_at"
+  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 do |t|
-    t.string   "first_name",               limit: 255
-    t.string   "last_name",                limit: 255
-    t.boolean  "super_admin",              limit: 1
-    t.string   "login",                    limit: 255,                 null: false
-    t.string   "email",                    limit: 255,                 null: false
-    t.string   "crypted_password",         limit: 255,                 null: false
-    t.string   "password_salt",            limit: 255,                 null: false
-    t.string   "persistence_token",        limit: 255,                 null: false
-    t.string   "single_access_token",      limit: 255,                 null: false
-    t.string   "perishable_token",         limit: 255,                 null: false
-    t.integer  "login_count",              limit: 4,   default: 0,     null: false
-    t.integer  "failed_login_count",       limit: 4,   default: 0,     null: false
-    t.datetime "last_request_at"
-    t.datetime "current_login_at"
-    t.datetime "last_login_at"
-    t.string   "current_login_ip",         limit: 255
-    t.string   "last_login_ip",            limit: 255
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "time_zone",                limit: 255
-    t.integer  "spud_role_id",             limit: 4
-    t.boolean  "requires_password_change", limit: 1,   default: false
+  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
   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