tb_redirects 0.9.0 → 1.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c7b7541613a37b19550d1c27207402092d8cd73
-  data.tar.gz: dbb3adba78aad74beacba8d516fc42cef9e39f52
+  metadata.gz: 256d8418f142449a8cb0c7ac7c02b4122271974d
+  data.tar.gz: b0d94c1d603913c9ff47d3ef5c1a7c7a9aa7959c
 SHA512:
-  metadata.gz: 6269beeeeaf257f53defe0991b494a960c9a2f981550540a6841261049d74061f4722222c479782d5fd901a79e38d10c647110238a1798bb2ad875be59c6fb11
-  data.tar.gz: e8574071c2d3136715a16cbb1f3b71c8a5c44843833a825453683c895a1576fba7ed37fc3a36c7cfa49e3d3d16cd757d7e5531cc5e760ea8f60f9089e6024a3d
+  metadata.gz: d233716c839aa5988d98d6d3b852384b904df2066640803ce0821d080a628fa78fb44be1f08ebaf01ca52a06385723eac6655dce03e61877f7238125cf48116d
+  data.tar.gz: 96b0ef3bc8528530ae026e8da1bf85c81e06e4307f650b010c7137dd707ab4474a84fec5e77e535524fef9d5dbb2e630a48695996543872852ac24e28eae0321

data/README.md

@@ -4,7 +4,7 @@ TB Redirects is an engine for Twice Baked that provides basic redirection capabi
 
 ## Requirements
 
-We require Rails 4.2, tb_core 1.3, and ruby 2.2 or higher.
+We require Rails 5, tb_core 1.4, and ruby 2.3.1 or higher.
 
 ## Installation
 
@@ -30,7 +30,7 @@ What this means for your controllers is that, in order for redirection to work p
 
 You can create a redirect in one of two ways. The first and easiest way is to create it through the Redirects admin module. Simply enter a `source` and `destination` and save it.
 
-The second way is through code. You can create a redirect using the `create_smart` method. 
+The second way is through code. You can create a redirect using the `create_smart` method.
 
     TbRedirect.create_smart({
       :source => '/my/path',

data/Rakefile

@@ -14,14 +14,11 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
 load 'rails/tasks/engine.rake'
 
-
 load 'rails/tasks/statistics.rake'
 
-
-
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
@@ -33,5 +30,4 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-
 task default: :test

data/app/controllers/admin/tb_redirects_controller.rb

@@ -1,14 +1,12 @@
 class Admin::TbRedirectsController < Admin::ApplicationController
 
   belongs_to_app :tb_redirects
-  add_breadcrumb "Redirects", :admin_tb_redirects_path
-  before_action :load_tb_redirect, :only => [:show, :edit, :update, :destroy]
+  add_breadcrumb 'Redirects', :admin_tb_redirects_path
+  before_action :load_tb_redirect, only: [:show, :edit, :update, :destroy]
 
   def index
-    @tb_redirects = TbRedirect.ordered.paginate(:page => params[:page])
-    if params[:search]
-      @tb_redirects = @tb_redirects.search(params[:search])
-    end
+    @tb_redirects = TbRedirect.ordered.paginate(page: params[:page])
+    @tb_redirects = @tb_redirects.search(params[:search]) if params[:search]
     respond_with @tb_redirects
   end
 
@@ -22,10 +20,9 @@ class Admin::TbRedirectsController < Admin::ApplicationController
   end
 
   def create
-    if @tb_redirect = TbRedirect.create_smart(tb_redirect_params.merge(:created_by => 'user'))
-      flash[:notice] = 'Redirect created successfully'
-    end
-    respond_with @tb_redirect, :location => admin_tb_redirects_path
+    @tb_redirect = TbRedirect.create_smart(tb_redirect_params.merge(created_by: 'user'))
+    flash[:notice] = 'Redirect created successfully' if @tb_redirect.errors.none?
+    respond_with @tb_redirect, location: admin_tb_redirects_path
   end
 
   def edit
@@ -36,18 +33,18 @@ class Admin::TbRedirectsController < Admin::ApplicationController
     if @tb_redirect.update_attributes(tb_redirect_params)
       flash[:notice] = 'Redirect updated successfully'
     end
-    respond_with @tb_redirect, :location => admin_tb_redirects_path
+    respond_with @tb_redirect, location: admin_tb_redirects_path
   end
 
   def destroy
     flash[:notice] = 'Redirect deleted successfully' if @tb_redirect.destroy
-    respond_with @tb_redirect, :location => admin_tb_redirects_path
+    respond_with @tb_redirect, location: admin_tb_redirects_path
   end
 
-private
+  private
 
   def load_tb_redirect
-    @tb_redirect = TbRedirect.find_by!(:id => params[:id])
+    @tb_redirect = TbRedirect.find_by!(id: params[:id])
   end
 
   def tb_redirect_params

data/app/controllers/concerns/tb_redirects/handle_redirects.rb

@@ -2,15 +2,14 @@ module TbRedirects::HandleRedirects
   extend ActiveSupport::Concern
 
   included do
-    rescue_from Spud::NotFoundError, :with => :check_for_applicable_redirect
+    rescue_from Spud::NotFoundError, with: :check_for_applicable_redirect
   end
 
   def check_for_applicable_redirect(error)
-    if redirect = TbRedirect.find_by_uri(request.original_url)
-      redirect_to redirect.destination, :status => :moved_permanently
+    if redirect = TbRedirect.find_with_uri(request.original_url)
+      redirect_to redirect.destination, status: :moved_permanently
     else
       handle_request_error(error)
     end
   end
-
 end

data/app/helpers/admin/tb_redirects_helper.rb

@@ -1,11 +1,9 @@
 module Admin::TbRedirectsHelper
-
   def created_by_for_tb_redirect(created_by)
     if created_by == 'user'
-      content_tag :span, created_by.titleize, :class => 'label label-info'
+      content_tag :span, created_by.titleize, class: 'label label-info'
     else
-      content_tag :span, created_by.titleize, :class => 'label label-default'
+      content_tag :span, created_by.titleize, class: 'label label-default'
     end
   end
-
 end

data/app/jobs/tb_redirects/detect_redirect_loop_job.rb

@@ -10,11 +10,11 @@ class TbRedirects::DetectRedirectLoopJob < ActiveJob::Base
   end
 
   def perform(redirect)
-    parents = TbRedirect.where(:destination => redirect.source)
-    parents.each{ |p| search_parent(p, redirect.destination) }
+    parents = TbRedirect.where(destination: redirect.source)
+    parents.each { |p| search_parent(p, redirect.destination) }
   end
 
-private
+  private
 
   class AttemptsExceeded < StandardError
   end
@@ -26,8 +26,8 @@ private
     if parent.source == destination_to_check
       parent.destroy
     else
-      parents = TbRedirect.where(:destination => parent.source)
-      parents.each{ |p| search_parent(p, destination_to_check) }
+      parents = TbRedirect.where(destination: parent.source)
+      parents.each { |p| search_parent(p, destination_to_check) }
     end
   end
 

data/app/models/concerns/tb_redirects/has_redirects.rb

@@ -2,7 +2,6 @@ module TbRedirects::HasRedirects
   extend ActiveSupport::Concern
 
   included do
-    has_many :tb_redirects, :dependent => :destroy, :as => :owner
+    has_many :tb_redirects, dependent: :destroy, as: :owner
   end
-
 end

data/app/models/tb_redirect.rb

@@ -1,17 +1,17 @@
 class TbRedirect < ActiveRecord::Base
-  scope :ordered, ->{ order('source desc') }
-  scope :search, ->(term){ where('source LIKE ?', "%#{term}%") }
+  scope :ordered, -> { order('source desc') }
+  scope :search, ->(term) { where('source LIKE ?', "%#{term}%") }
 
-  belongs_to :owner, :polymorphic => true, :inverse_of => :tb_redirects
+  belongs_to :owner, polymorphic: true, inverse_of: :tb_redirects
 
-  validates :source, :destination, :created_by, :presence => true
-  validates :source, :uniqueness => true
+  validates :source, :destination, :created_by, presence: true
+  validates :source, uniqueness: true
 
   validate :source_not_equals_destination
   after_save :destroy_opposite_redirect
   after_save :schedule_loop_detection
 
-  def self.find_by_uri(uri)
+  def self.find_with_uri(uri)
     path = URI(uri).path
     uri_without_params = uri.split('?').first
     find_by(
@@ -24,32 +24,30 @@ class TbRedirect < ActiveRecord::Base
   end
 
   def self.create_smart(params)
-    redirect = find_or_initialize_by(:source => params.delete(:source))
+    redirect = find_or_initialize_by(source: params.delete(:source))
     redirect.assign_attributes(params)
     redirect.save()
     return redirect
   end
 
-private
+  private
 
   def source_not_equals_destination
-    if self.source == self.destination
+    if source == destination
       errors.add(:destination, 'cannot be the same as the source')
     end
     return true
   end
 
   def destroy_opposite_redirect
-    opposite = TbRedirect.find_by({
-      :source => self.destination,
-      :destination => self.source
-    })
+    opposite = TbRedirect.find_by(source: destination,
+                                  destination: source)
     opposite.destroy if opposite.present?
     return true
   end
 
   def schedule_loop_detection
-    if TbRedirect.where(:destination => source).count > 0
+    if TbRedirect.where(destination: source).count > 0
       TbRedirects::DetectRedirectLoopJob.perform_later(self)
     end
     return true

data/lib/tb_redirects/engine.rb

@@ -6,19 +6,19 @@ module TbRedirects
     config.autoload_paths += Dir["#{config.root}/lib/**/"]
 
     config.generators do |g|
-      g.test_framework :rspec, :fixture => false
-      g.fixture_replacement :factory_girl, :dir => 'spec/factories'
+      g.test_framework :rspec, fixture: false
+      g.fixture_replacement :factory_girl, dir: 'spec/factories'
       g.assets false
       g.helper true
     end
 
-    initializer 'tb_redirects.admin', :before => 'tb_core.admin' do |config|
+    initializer 'tb_redirects.admin', before: 'tb_core.admin' do |_config|
       Spud::Core.admin_applications += [
-        {:name => 'Redirects', :key => :tb_redirects, :thumbnail => "admin/module_icon.png", :url => '/admin/redirects'},
+        { name: 'Redirects', key: :tb_redirects, thumbnail: 'admin/module_icon.png', url: '/admin/redirects' }
       ]
     end
 
-    initializer 'tb_redirects.controllers' do |config|
+    initializer 'tb_redirects.controllers' do |_config|
       ActiveSupport.on_load(:action_controller) do
         Spud::ApplicationController.send :include, TbRedirects::HandleRedirects
       end

data/lib/tb_redirects/version.rb

@@ -1,3 +1,3 @@
 module TbRedirects
-  VERSION = "0.9.0"
+  VERSION = '1.0.beta1'.freeze
 end

data/lib/tb_redirects.rb

@@ -1,4 +1,4 @@
-require "tb_redirects/engine"
+require 'tb_redirects/engine'
 
 module TbRedirects
 end

data/spec/concerns/tb_redirects/has_redirects_spec.rb

@@ -1,22 +1,20 @@
 require 'rails_helper'
 
 RSpec.describe TbRedirects::HasRedirects do
-
   describe 'included' do
     it 'should add a has_many relationship' do
-      widget = Widget.create(:name => 'Test')
-      redirect = widget.tb_redirects.create(:source => 'a', :destination => 'b')
+      widget = Widget.create(name: 'Test')
+      redirect = widget.tb_redirects.create(source: 'a', destination: 'b')
       expect(widget.tb_redirects).to eq([redirect])
     end
 
     it 'should delete the related redirects' do
-      widget = Widget.create(:name => 'Test')
-      redirect = widget.tb_redirects.create(:source => 'a', :destination => 'b')
+      widget = Widget.create(name: 'Test')
+      redirect = widget.tb_redirects.create(source: 'a', destination: 'b')
       widget.destroy
-      expect{
+      expect do
         TbRedirect.find(redirect.id)
-      }.to raise_error(ActiveRecord::RecordNotFound)
+      end.to raise_error(ActiveRecord::RecordNotFound)
     end
   end
-
 end

data/spec/controllers/admin/tb_redirects_controller_spec.rb

@@ -1,7 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Admin::TbRedirectsController, :type => :controller do
-
+RSpec.describe Admin::TbRedirectsController, type: :controller do
   before(:each) do
     activate_session(admin: true)
   end
@@ -17,13 +16,13 @@ RSpec.describe Admin::TbRedirectsController, :type => :controller do
   describe 'show' do
     it 'should render the show page' do
       tb_redirect = FactoryGirl.create(:tb_redirect)
-      get :show, :id => tb_redirect.id
+      get :show, params: { id: tb_redirect.id }
       expect(response).to have_http_status :success
       expect(response).to render_template :show
     end
 
     it 'should return a 404 error' do
-      get :show, :id => 1
+      get :show, params: { id: 1 }
       expect(response).to have_http_status :not_found
     end
   end
@@ -39,7 +38,7 @@ RSpec.describe Admin::TbRedirectsController, :type => :controller do
   describe 'edit' do
     it 'should render the edit page' do
       tb_redirect = FactoryGirl.create(:tb_redirect)
-      get :edit, :id => tb_redirect.id
+      get :edit, params: { id: tb_redirect.id }
       expect(response).to have_http_status :success
       expect(response).to render_template :edit
     end
@@ -47,9 +46,9 @@ RSpec.describe Admin::TbRedirectsController, :type => :controller do
 
   describe 'create' do
     it 'should create the record' do
-      expect{
-        post :create, :tb_redirect => FactoryGirl.attributes_for(:tb_redirect)  
-      }.to change(TbRedirect, :count).by(1)
+      expect do
+        post :create, params: { tb_redirect: FactoryGirl.attributes_for(:tb_redirect) }
+      end.to change(TbRedirect, :count).by(1)
     end
   end
 
@@ -58,20 +57,19 @@ RSpec.describe Admin::TbRedirectsController, :type => :controller do
       tb_redirect = FactoryGirl.create(:tb_redirect)
       current_value = tb_redirect.source
       new_value = current_value + '-Updated'
-      expect{
-        patch :update, :id => tb_redirect.id, :tb_redirect => {:source => new_value}
+      expect do
+        patch :update, params: { id: tb_redirect.id, tb_redirect: { source: new_value } }
         tb_redirect.reload
-      }.to change(tb_redirect, :source).to(new_value)
+      end.to change(tb_redirect, :source).to(new_value)
     end
   end
 
   describe 'destroy' do
     it 'should destroy the record' do
       tb_redirect = FactoryGirl.create(:tb_redirect)
-      expect{
-        delete :destroy, :id => tb_redirect.id
-      }.to change(TbRedirect, :count).by(-1)
+      expect do
+        delete :destroy, params: { id: tb_redirect.id }
+      end.to change(TbRedirect, :count).by(-1)
     end
   end
-
 end

data/spec/controllers/application_controller_spec.rb

@@ -1,25 +1,23 @@
 require 'rails_helper'
 
 RSpec.describe ApplicationController, type: :controller do
-
   controller do
     def index
-      raise Spud::NotFoundError.new
+      raise Spud::NotFoundError
     end
   end
 
   describe '#check_for_applicable_redirect' do
     it 'should redirect' do
-      FactoryGirl.create(:tb_redirect, :source => '/anonymous', :destination => '/redirected')
+      FactoryGirl.create(:tb_redirect, source: '/anonymous', destination: '/redirected')
       get :index
       expect(response).to redirect_to('/redirected')
     end
 
     it 'should not redirect' do
-      FactoryGirl.create(:tb_redirect, :source => '/other', :destination => '/redirected')
+      FactoryGirl.create(:tb_redirect, source: '/other', destination: '/redirected')
       get :index
       expect(response).to_not redirect_to('/redirected')
     end
   end
-
 end

data/spec/dummy/bin/setup

@@ -2,15 +2,15 @@
 require 'pathname'
 
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
 
 Dir.chdir APP_ROOT do
   # This script is a starting point to setup your application.
   # Add necessary setup steps to this file:
 
-  puts "== Installing dependencies =="
-  system "gem install bundler --conservative"
-  system "bundle check || bundle install"
+  puts '== Installing dependencies =='
+  system 'gem install bundler --conservative'
+  system 'bundle check || bundle install'
 
   # puts "\n== Copying sample files =="
   # unless File.exist?("config/database.yml")
@@ -18,12 +18,12 @@ Dir.chdir APP_ROOT do
   # end
 
   puts "\n== Preparing database =="
-  system "bin/rake db:setup"
+  system 'bin/rake db:setup'
 
   puts "\n== Removing old logs and tempfiles =="
-  system "rm -f log/*"
-  system "rm -rf tmp/cache"
+  system 'rm -f log/*'
+  system 'rm -rf tmp/cache'
 
   puts "\n== Restarting application server =="
-  system "touch tmp/restart.txt"
+  system 'touch tmp/restart.txt'
 end

data/spec/dummy/config/application.rb

@@ -3,13 +3,13 @@ require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 
 Bundler.require(*Rails.groups)
-require "tb_redirects"
+require 'tb_redirects'
 
 module Dummy
   class Application < Rails::Application
     Spud::Core.configure do |config|
-      config.site_name = "Dummy"
-      config.from_address = "no-reply@dummy.com"
+      config.site_name = 'Dummy'
+      config.from_address = 'no-reply@dummy.com'
     end
 
     # Settings in config/environments/* take precedence over those specified here.
@@ -23,9 +23,5 @@ module Dummy
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
-
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
   end
 end
-

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

@@ -22,7 +22,7 @@ Rails.application.configure do
 
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
-  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
+  config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier

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

@@ -13,8 +13,8 @@ Rails.application.configure do
   config.eager_load = false
 
   # Configure static file server for tests with Cache-Control for performance.
-  config.serve_static_files   = 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' }
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true

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

@@ -2,21 +2,20 @@
 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

data/spec/dummy/db/migrate/20160211160616_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/20160211160617_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/20160211160620_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/20160211160621_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/20160211160623_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/20160212211331_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