tb_banners 1.2.0.beta1 → 1.3.2

data/app/helpers/spud_banners_helper.rb

@@ -1,23 +1,24 @@
 module SpudBannersHelper
+  # rubocop:disable  Metrics/MethodLength, Metrics/AbcSize
 
   # Returns banner html for a given identifier
-  # Generated HTML will be cached if your application uses fragment caching
   #
-  # * set_or_identifier: A reference to a SpudBannerSet, or the name of a known banner set passed as a symbol (ie, :home)
+  # * set_or_identifier: A reference to a SpudBannerSet,
+  #   or the name of a known banner set passed as a symbol (ie, :home)
   # * options:
   #   - limit: Max number of banners to return
   #   - background_image: Pass true to return the banners as CSS background-image properties rather than <img/> tags
   #
   def spud_banners_for_set(set_or_identifier, options = {})
-    if set_or_identifier.is_a?(SpudBannerSet)
-      banner_set = set_or_identifier
-    else
-      banner_set = SpudBannerSet.find_by_identifier(set_or_identifier)
-    end
+    banner_set = if set_or_identifier.is_a?(SpudBannerSet)
+                   set_or_identifier
+                 else
+                   SpudBannerSet.find_with_identifier(set_or_identifier)
+                 end
+
     return '' if banner_set.blank?
-    cache(banner_set) do
-      concat spud_banners_set_tag(banner_set, options)
-    end
+
+    spud_banners_set_tag(banner_set, options)
   end
 
   # Returns banner html for a given banner_set
@@ -39,13 +40,16 @@ module SpudBannersHelper
       content_tag(:div, :class => "spud-banner-set #{options[:wrapper_class]}", 'data-id' => banner_set.id) do
         banners_query.map do |banner|
           if background_image
-            concat(content_tag(:div, :class => "spud-banner #{options[:banner_class]}", 'data-id' => banner.id, :style => "background-image:url('#{banner.banner.url(:banner)}');"){
-              if banner.rich_text
-                content_tag :div, raw(banner.rich_text), :class => 'spud-banner-rich-text'
-              end
-            })
+            concat(content_tag(:div,
+              class: "spud-banner #{options[:banner_class]}",
+              style: "background-image:url('#{banner.banner.url(:banner)}');",
+              'data-id' => banner.id) do
+                content_tag :div, raw(banner.rich_text), class: 'spud-banner-rich-text' if banner.rich_text
+              end)
           else
-            concat(content_tag(:div, :class => "spud-banner #{options[:banner_class]}", 'data-id' => banner.id){ spud_banner_tag(banner, options) })
+            concat(content_tag(:div, :class => "spud-banner #{options[:banner_class]}", 'data-id' => banner.id) do
+              spud_banner_tag(banner, options)
+            end)
           end
         end
       end
@@ -55,11 +59,11 @@ module SpudBannersHelper
   # Returns an HTML tag for a single banner
   # May return either an <img/> or an <a/> depending on the banner
   #
-  def spud_banner_tag(banner, options={})
+  def spud_banner_tag(banner, _options = {})
     if banner.link_to.blank?
       spud_banner_image_tag(banner)
     else
-      link_to(banner.link_to, :target => banner.link_target) do
+      link_to(banner.link_to, target: banner.link_target) do
         spud_banner_image_tag(banner)
       end
     end
@@ -68,7 +72,8 @@ module SpudBannersHelper
   # Returns an HTML <img/> tag for a single banner
   #
   def spud_banner_image_tag(banner)
-    image_tag(banner.banner.url(:banner), :alt => banner.alt, :title => banner.title)
+    image_tag(banner.banner.url(:banner), alt: banner.alt, title: banner.title)
   end
 
+  # rubocop:enable  Metrics/MethodLength, Metrics/AbcSize
 end

data/app/models/spud_banner.rb

@@ -1,33 +1,46 @@
 class SpudBanner < ActiveRecord::Base
-  belongs_to :owner, :class_name => 'SpudBannerSet', :foreign_key => 'spud_banner_set_id', :inverse_of => :banners, :touch => true
+  belongs_to :owner,
+    class_name: SpudBannerSet.to_s,
+    foreign_key: :spud_banner_set_id,
+    inverse_of: :banners,
+    touch: true
 
-  scope :active, ->{
-    where('(start_date IS NULL OR start_date <= ?) AND (end_date IS NULL OR end_date >= ?)', Date.today, Date.today)
+  scope :active, lambda {
+    t = Time.zone.today
+    start_date = arel_table[:start_date]
+    end_date = arel_table[:end_date]
+
+    where(
+      start_date.eq(nil).or(start_date.lteq(t)).and(
+        end_date.eq(nil).or(end_date.gteq(t))
+      )
+    )
   }
 
-  has_attached_file :banner, 
-    :styles => lambda { |attachment| attachment.instance.dynamic_styles },
-    :convert_options => {
-      :tiny => '-strip -density 72x72',
-      :banner => '-strip -density 72x72'
+  has_attached_file :banner,
+    styles: ->(attachment) { attachment.instance.dynamic_styles },
+    convert_options: {
+      tiny: '-strip -density 72x72',
+      banner: '-strip -density 72x72'
     },
-    :storage => Spud::Banners.paperclip_storage,
-    :s3_credentials => Spud::Banners.s3_credentials,
-    :url => Spud::Banners.storage_url,
-    :path => Spud::Banners.storage_path
+    storage: Spud::Banners.paperclip_storage,
+    s3_credentials: Spud::Banners.s3_credentials,
+    s3_protocol: Spud::Banners.s3_protocol,
+    url: Spud::Banners.storage_url,
+    path: Spud::Banners.storage_path
 
   validates_attachment :banner,
-    :presence => true,
-    :content_type => {:content_type => ['image/jpg', 'image/jpeg', 'image/png']}
+    presence: true,
+    content_type: { content_type: ['image/jpg', 'image/jpeg', 'image/png'] }
 
   def dynamic_styles
     styles = {
-      :tiny => '150x150'
+      tiny: '150x150'
     }
     owner_style = nil
-    if self.owner
-      owner_style = "#{self.owner.width}x#{self.owner.height}"
-      owner_style += '#' if self.owner.cropped
+    if owner
+      owner_style = "#{owner.width}x#{owner.height}"
+      owner_style += '#' if owner.cropped
       styles[:banner] = owner_style
     end
     return styles
@@ -37,8 +50,8 @@ class SpudBanner < ActiveRecord::Base
     return owner.name
   end
 
-  def is_expired?
-    return end_date.present? && end_date < Date.today
+  def expired?
+    return end_date.present? && end_date < Time.zone.today
   end
 
 end

data/app/models/spud_banner_set.rb

@@ -1,27 +1,26 @@
 class SpudBannerSet < ActiveRecord::Base
-  has_many :banners, ->{ order('sort_order asc') }, :class_name => 'SpudBanner', :dependent => :destroy, :inverse_of => :owner
+  has_many :banners, -> { order(sort_order: :asc) },
+    class_name: SpudBanner.to_s, dependent: :destroy, inverse_of: :owner
 
-  validates_presence_of :name
-  validates_uniqueness_of :name
-  validates_numericality_of :width, :height
-
-  acts_as_spud_liquid_tag :spud_banner_set, :name
+  validates :name, presence: true
+  validates :name, uniqueness: true
+  validates :width, :height, numericality: true
 
   after_update :check_for_dimension_change
 
-  def self.find_by_identifier(identifier)
-    if identifier.class == String
-      banner_set = SpudBannerSet.find_by_name(identifier)
-    elsif identifier.class == Symbol
-      banner_set = SpudBannerSet.find_by_name(identifier.to_s.titleize)
-    else
-      banner_set = SpudBannerSet.find(identifier)
-    end
+  def self.find_with_identifier(identifier)
+    banner_set = if identifier.class == String
+                   SpudBannerSet.find_by(name: identifier.strip)
+                 elsif identifier.class == Symbol
+                   SpudBannerSet.find_by(name: identifier.to_s.titleize)
+                 else
+                   SpudBannerSet.find(identifier)
+                 end
     return banner_set
   end
 
   def reprocess_banners!
-    self.banners.each do |banner|
+    banners.each do |banner|
       banner.banner.reprocess!
     end
   end
@@ -30,12 +29,10 @@ class SpudBannerSet < ActiveRecord::Base
     return name
   end
 
-private
+  private
 
   def check_for_dimension_change
-    if self.height_changed? || self.width_changed? || self.cropped_changed?
-      self.reprocess_banners!
-    end
+    reprocess_banners! if saved_change_to_height? || saved_change_to_width? || saved_change_to_cropped?
   end
 
 end

data/app/views/admin/banner_sets/index.html.erb

@@ -9,6 +9,6 @@
     </table>
   </div>
   <script>
-    $(document).ready(spud.admin.banner_sets.init);
+    $(document).ready(tb.banner_sets.init);
   </script>
 <% end %>

data/app/views/admin/banner_sets/show.html.erb

@@ -6,6 +6,7 @@
   <table class="table table-striped table-hover">
     <thead>
       <tr>
+        <th>&nbsp</th>
         <th>Banner</th>
         <th>Start Date</th>
         <th>End Date</th>
@@ -22,5 +23,5 @@
 </div>
 
 <script>
-  $(document).ready(spud.admin.banners.init);
+  $(document).ready(tb.banners.init);
 </script>

data/app/views/admin/banners/_banner.html.erb

@@ -1,4 +1,7 @@
 <%= content_tag :tr, 'data-id' => banner.id, :class => 'admin-banner-set-item' do %>
+  <td>
+    <span class="glyphicon glyphicon-sort" aria-hidden="true"></span>
+  </td>
   <td width="200">
     <%= link_to banner.banner.url(:banner), :target => :blank do %>
       <%= image_tag banner.banner.url(:tiny) %>
@@ -7,7 +10,7 @@
   <td><%= banner.start_date.try(:strftime, '%m/%d/%Y') %></td>
   <td class="table-actions">
     <%= banner.end_date.try(:strftime, '%m/%d/%Y') %>
-    <% if banner.is_expired? %>
+    <% if banner.expired? %>
       <span class="label">Expired</span>
     <% end %>
   </td>

data/app/views/admin/banners/_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_for @banner, :url => path, :builder => TbCore::FormBuilder, :html => {:class => 'admin-banner-form', :target => 'admin-banner-upload-target'} do |f| %>
+<%= form_for @banner, :url => path, :builder => TbCore::FormBuilder, :html => { :class => 'admin-banner-form' } do |f| %>
 
   <%= tb_form_errors(f.object) %>
 
@@ -47,13 +47,13 @@
     <div class="form-group">
       <%= f.label :start_date, 'Start Date', :class => 'control-label' %>
       <div class="controls controls-banner-date-selects">
-        <%= f.date_select :start_date, :start_year => Date.today.year %>
+        <%= f.date_select :start_date, :start_year => Time.zone.today.year %>
       </div>
     </div>
     <div class="form-group">
       <%= f.label :end_date, 'End Date', :class => 'control-label' %>
       <div class="controls controls-banner-date-selects">
-        <%= f.date_select :end_date, :include_blank => true, :start_year => Date.today.year %>
+        <%= f.date_select :end_date, :include_blank => true, :start_year => Time.zone.today.year %>
         <span class="help-block">Leave blank to never expire</span>
       </div>
     </div>
@@ -63,5 +63,3 @@
   </div>
 
 <% end %>
-
-<iframe id="admin-banner-upload-target" name="admin-banner-upload-target" style="display:none;"></iframe>

data/db/migrate/20121116195139_create_spud_banners.rb

@@ -1,4 +1,4 @@
-class CreateSpudBanners < ActiveRecord::Migration
+class CreateSpudBanners < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_banners do |t|
       t.integer :spud_banner_set_id, :null => false

data/db/migrate/20121116195312_create_spud_banner_sets.rb

@@ -1,4 +1,4 @@
-class CreateSpudBannerSets < ActiveRecord::Migration
+class CreateSpudBannerSets < ActiveRecord::Migration[4.2]
   def change
     create_table :spud_banner_sets do |t|
       t.string :name, :null => false

data/db/migrate/20130614132846_add_rich_text_to_spud_banners.rb

@@ -1,4 +1,4 @@
-class AddRichTextToSpudBanners < ActiveRecord::Migration
+class AddRichTextToSpudBanners < ActiveRecord::Migration[4.2]
   def change
     add_column :spud_banner_sets, :has_rich_text, :boolean, :default => false
     add_column :spud_banners, :rich_text, :text

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

@@ -1,10 +1,11 @@
 module Spud
   module Banners
     include ActiveSupport::Configurable
-    config_accessor :paperclip_storage, :s3_credentials, :storage_path, :storage_url
+    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.storage_path = ":rails_root/public/system/spud_banners/:id/:style/:basename.:extension"
-    self.storage_url = "/system/spud_banners/:id/:style/:basename.:extension"
+    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'
   end
-end
+end

data/lib/spud_banners/engine.rb

@@ -1,25 +1,27 @@
 require 'tb_core'
 require 'paperclip'
-require 'tb_liquid'
 
 module Spud
   module Banners
     class Engine < Rails::Engine
       engine_name :tb_banners
-      Spud::Core.append_admin_stylesheets('admin/banners/application')
-      Spud::Core.append_admin_javascripts('admin/banners/application')
+
       initializer :admin do
-        Spud::Core.config.admin_applications += [{
-          :name => 'Banner Sets',
-          :thumbnail => 'admin/banners/banners.png',
-          :retina => true,
-          :url => '/admin/banner_sets',
-          :order => 120  
+        TbCore.config.admin_applications += [{
+          name: 'Banner Sets',
+          thumbnail: 'admin/banners/banners.png',
+          retina: true,
+          url: '/admin/banner_sets',
+          order: 120
         }]
       end
-      initializer :liquid do
-        Liquid::Template.register_tag('spud_banner_set', Spud::Banners::BannerSetTag) if defined?(Liquid::Template)
+
+      initializer 'tb_banners.assets' do
+        TbCore.append_admin_stylesheets('admin/banners/application')
+        TbCore.append_admin_javascripts('admin/banners/application')
+        Rails.application.config.assets.precompile += ['admin/banners/banners.png']
       end
+
     end
   end
 end

data/lib/spud_banners/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Banners
-    VERSION = "1.2.0.beta1"
+    VERSION = '1.3.2'.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)
+    require 'spud_banners/engine' if defined?(Rails)
   end
 end

data/spec/controllers/admin/banner_sets_controller_spec.rb

@@ -1,100 +1,99 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Admin::BannerSetsController do
+describe Admin::BannerSetsController, 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 "should return an array of banner sets" do
-      5.times do |x| 
-        banner_set = FactoryGirl.create(:spud_banner_set)
+  describe 'index' do
+    it 'should return an array of banner sets' do
+      5.times do |_x|
+        FactoryBot.create(:spud_banner_set)
       end
       get :index
-      assigns(:banner_sets).count.should be > 1
+      expect(assigns(:banner_sets).count).to be > 1
     end
   end
 
-  describe :show do
-    it "should respond with a banner set" do
-      banner_set = FactoryGirl.create(:spud_banner_set)
-      get :show, :id => banner_set.id
-      assigns(:banner_set).should == banner_set
-      response.should be_success
+  describe 'show' do
+    it 'should respond with a banner set' do
+      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
-      get :show, :id => -1
-      assigns(:banner_set).should be_blank
-      response.should redirect_to admin_banner_sets_path
+    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.status).to eq(404)
     end
   end
 
-  describe :new do
-    it "should respond with a banner set" do
+  describe 'new' do
+    it 'should respond with a banner set' do
       get :new
-      assigns(:banner_set).should_not be_blank
-      response.should be_success
+      expect(response).to be_success
     end
   end
 
-  describe :create do
-    it "should respond with a banner set" do
-      lambda {
-        post :create, :spud_banner_set => FactoryGirl.attributes_for(:spud_banner_set)
-      }.should change(SpudBannerSet, :count).by(1)
-      response.should be_success
+  describe 'create' do
+    it 'should respond with a banner set' do
+      expect do
+        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
 
-    it "should respond unsuccessfully if the banner set is invalid" do
-      lambda {
-        post :create, :spud_banner_set => {:name => '', :width => 'lorem', :height => 'ipsum'}
-      }.should_not change(SpudBannerSet, :count)
+    it 'should respond unsuccessfully if the banner set is invalid' do
+      expect do
+        post :create, params: { spud_banner_set: { name: '', width: 'lorem', height: 'ipsum' } }
+      end.to_not change(SpudBannerSet, :count)
       assert_response 422
     end
   end
 
-  describe :edit do
-    it "should respond with a banner set" do
-      banner_set = FactoryGirl.create(:spud_banner_set)
-      get :edit, :id => banner_set.id
-      assigns(:banner_set).should == banner_set
-      response.should be_success
+  describe 'edit' do
+    it 'should respond with a banner set' do
+      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
     end
   end
 
-  describe :update do
-    it "should update the banner set" do
-      banner_set = FactoryGirl.create(:spud_banner_set)
-      new_name = "Updated Set Name"
-      lambda {
-        put :update, :id => banner_set.id, :spud_banner_set => {:name => new_name}
+  describe 'update' do
+    it 'should update the banner set' do
+      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 } }
         banner_set.reload
-      }.should change(banner_set, :name).to(new_name)
+      end.to change(banner_set, :name).to(new_name)
     end
 
-    it "should respond unsuccessfully if the updated banner set is invalid" do
-      banner_set = FactoryGirl.create(:spud_banner_set)
-      lambda {
-        put :update, :id => banner_set.id, :spud_banner_set => {:name => '', :width => 'lorem', :height => 'ipsum'}
-      }.should_not change(SpudBannerSet, :count)
+    it 'should respond unsuccessfully if the updated banner set is invalid' do
+      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)
       assert_response 422
     end
   end
 
-  describe :destroy do
-    it "should destroy the banner set and respond successfully" do
-      banner_set = FactoryGirl.create(:spud_banner_set)
-      lambda {
-        delete :destroy, :id => banner_set.id
-      }.should change(SpudBannerSet, :count).by(-1)
-      response.should be_success
+  describe 'destroy' do
+    it 'should destroy the banner set and respond successfully' do
+      banner_set = FactoryBot.create(:spud_banner_set)
+      expect do
+        delete :destroy, params: { id: banner_set.id }
+      end.to change(SpudBannerSet, :count).by(-1)
+      expect(response).to be_success
     end
   end
 
-end
+end