tb_banners 1.3.beta1 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4c5570408f1fd6f89b4ded74aaf55fbe28485c35
-  data.tar.gz: c747224366ee66af3f347a8c569d8d66bdb51956
+SHA256:
+  metadata.gz: e3a78e90e1242e80c10dfebdf922550e8883dc7f24c783a42b8b85c48cc67263
+  data.tar.gz: aa49eb68f74b9c070a83ba2be68110f00e904c5f10e7e9d02dc1c787ef9ed3e3
 SHA512:
-  metadata.gz: 3f55b7a276d17e9215bb54c109fdda5d0fe1515bb41c01da8197f98daff23f192fc31dc9c47f5c9d633a3ccb11654fe818ce8cbb4a3b977283404fa7f617f824
-  data.tar.gz: 10bef6d2c769966df3dd61b1543e2371a78c0a8e7ec2b541d8680109ce2614c5ef7fdd675f5e997d6c4f36b1f20531575cb836bdbf37d5bfdba863a4dffb99ed
+  metadata.gz: 36e529fa4ced38e9f632173d9bced428144a32e092836f09246f89e52d549da34a733569511175137665d0a5e0aea20b930543123dc47152959f9b413df07633
+  data.tar.gz: 1d2ab1f911dcaedc5ac572b216464f7d492c1354855d3bd3848d4c38aef7626be600b6cf972fb5ec92fb9721ee6aad0a85a37048e078e7a22bc3f468eb627328

data/README.markdown

@@ -156,4 +156,3 @@ Below is an example of integration with [SlidesJs][slidesjs], a jQuery plugin.
 
 [tb]:https://bitbucket.org/westlakedesign/tb_core
 [slidesjs]:http://www.slidesjs.com
-[liquid]:https://github.com/Shopify/liquid

data/Rakefile

@@ -20,7 +20,7 @@ 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', __dir__)
 load 'rails/tasks/engine.rake'
 
 Bundler::GemHelper.install_tasks

data/app/assets/javascripts/admin/banners/banner_sets.js

@@ -46,6 +46,9 @@ var clickedEditBannerSet = function(e){
 
 var clickedDeleteBannerSet = function(e){
   e.preventDefault();
+  $.ajaxSetup({
+    headers: { 'X-CSRF-TOKEN': Rails.csrfToken() }
+  });
   if(window.confirm('Are you sure?')){
     var el = $(this);
     $.ajax({

data/app/assets/javascripts/admin/banners/banners.js

@@ -14,21 +14,14 @@ spud.admin.banners = {
     $('.admin-banner-set-items-container').on('click', '.admin-banner-set-item-edit', clickedEditBanner);
     $('.admin-banner-set-items-container').on('click', '.admin-banner-set-item-delete', clickedDeleteBanner);
     $('.modal-body').on('submit', '.admin-banner-form', submittedBannerForm);
-    $('.admin-banner-set-items-container').sortable({
-      stop: sortedBanners,
-      helper: fixHelper
+    Sortable.create(document.querySelector('.admin-banner-set-items-container'), {
+      onUpdate: sortedBanners,
+      dragClass: 'banner-dragging',
+      handle: '.glyphicon-sort'
     });
   }
 };
 
-// http://www.foliotek.com/devblog/make-table-rows-sortable-using-jquery-ui-sortable/
-var fixHelper = function(e, ui) {
-  ui.children().each(function() {
-    $(this).width($(this).width());
-  });
-  return ui;
-};
-
 var clickedAddNewBanner = function(e){
     e.preventDefault();
     bannerEditId = false;
@@ -65,6 +58,9 @@ var clickedEditBanner = function(e){
 
 var clickedDeleteBanner = function(e){
   e.preventDefault();
+  $.ajaxSetup({
+    headers: { 'X-CSRF-TOKEN': Rails.csrfToken() }
+  });
   var el = $(this);
   $.ajax({
     url: el.attr('href'),
@@ -172,9 +168,10 @@ var sortedBanners = function(e, ui){
     ids.push($(this).attr('data-id'));
   });
   $.ajax({
+    headers: { 'X-CSRF-TOKEN': Rails.csrfToken() },
     url: '/admin/banners/sort',
     type: 'post',
-    data: {spud_banner_ids:ids, _method:'put'}
+    data: { spud_banner_ids: ids, _method: 'put' }
   });
 };
 

data/app/assets/stylesheets/admin/banners/banners.css.scss

@@ -2,7 +2,7 @@
 .admin-banner-set-items-container{
 
 }
-.admin-banner-set-item{
+.admin-banner-set-item .glyphicon-sort{
   cursor: move;
 }
 .admin-banner-set-item.ui-sortable-helper{
@@ -12,6 +12,11 @@
 .admin-banner-set-item img{
   display: block;
 }
+tr.banner-dragging {
+  display: block;
+  width: 300px;
+  height: 100px;
+}
 
 // Banner Form
 .admin-banner-upload-progress{

data/app/controllers/admin/banner_sets_controller.rb

@@ -1,6 +1,6 @@
 class Admin::BannerSetsController < Admin::ApplicationController
 
-  before_action :get_record, only: [:show, :edit, :update, :destroy]
+  before_action :load_record, only: [:show, :edit, :update, :destroy]
   respond_to :html
   belongs_to_app :banner_sets
   add_breadcrumb 'Banner Sets', :admin_banner_sets_path
@@ -23,10 +23,10 @@ class Admin::BannerSetsController < Admin::ApplicationController
   def create
     @banner_set = SpudBannerSet.new(banner_set_params)
     if @banner_set.save
-      flash.now[:notice] = 'BannerSet created successfully'
+      flash.now[:notice] = 'Banner Set created successfully'
       render 'create'
     else
-      render 'new', status: 422
+      render 'new', status: :unprocessable_entity
     end
   end
 
@@ -35,27 +35,23 @@ class Admin::BannerSetsController < Admin::ApplicationController
   end
 
   def update
-    if @banner_set.update_attributes(banner_set_params)
-      flash.now[:notice] = 'BannerSet updated successfully'
+    if @banner_set.update(banner_set_params)
+      flash.now[:notice] = 'Banner Set updated successfully'
       render 'create'
     else
-      render 'edit', status: 422
+      render 'edit', status: :unprocessable_entity
     end
   end
 
   def destroy
-    flash.now[:notice] = 'BannerSet deleted successfully' if @banner_set.destroy
+    flash.now[:notice] = 'Banner Set deleted successfully' if @banner_set.destroy
     head :ok
   end
 
   private
 
-  def get_record
-    @banner_set = SpudBannerSet.find(params[:id])
-  rescue ActiveRecord::RecordNotFound => e
-    flash.now[:error] = 'Could not find the requested BannerSet'
-    redirect_to admin_banner_sets_path
-    return false
+  def load_record
+    @banner_set = SpudBannerSet.find_by!(id: params[:id])
   end
 
   def banner_set_params

data/app/controllers/admin/banners_controller.rb

@@ -1,12 +1,12 @@
 class Admin::BannersController < Admin::ApplicationController
 
-  before_action :get_set, only: [:new, :create]
-  before_action :get_record, only: [:edit, :update, :destroy]
+  before_action :load_set, only: [:new, :create]
+  before_action :load_record, only: [:edit, :update, :destroy]
   respond_to :html
   layout false
 
   def new
-    @banner = @banner_set.banners.new(start_date: Date.today)
+    @banner = @banner_set.banners.new(start_date: Time.zone.today)
     respond_with @banner
   end
 
@@ -14,14 +14,16 @@ class Admin::BannersController < Admin::ApplicationController
     @banner = @banner_set.banners.build
     @banner.attributes = banner_params
 
-    last_banner = SpudBanner.select('sort_order').where(spud_banner_set_id: @banner_set.id).order('sort_order desc').first
+    last_banner = SpudBanner.select(:sort_order)
+                            .where(spud_banner_set_id: @banner_set.id)
+                            .order(sort_order: :desc).first
     @banner.sort_order = last_banner.sort_order + 1 if last_banner
 
     if @banner.save
-      flash.now[:notice] = 'SpudBanner created successfully'
+      flash.now[:notice] = 'Banner created successfully'
       render 'show'
     else
-      render 'new', status: 422
+      render 'new', status: :unprocessable_entity
     end
   end
 
@@ -30,24 +32,20 @@ class Admin::BannersController < Admin::ApplicationController
   end
 
   def update
-    if @banner.update_attributes(banner_params)
-      flash.now[:notice] = 'SpudBanner created successfully'
+    if @banner.update(banner_params)
+      flash.now[:notice] = 'Banner created successfully'
       render 'show'
     else
-      render 'edit', status: 422
+      render 'edit', status: :unprocessable_entity
     end
   end
 
   def destroy
-    if @banner.destroy
-      flash.now[:notice] = 'SpudBanner deleted successfully'
-      status = 200
-    else
-      status = 422
-    end
-    render blank: true, status: status
+    @banner.destroy
+    head :ok
   end
 
+  # rubocop:disable Rails/SkipsModelValidations
   def sort
     banner_ids = params[:spud_banner_ids]
     banners = SpudBanner.where(id: banner_ids).to_a
@@ -56,31 +54,26 @@ class Admin::BannersController < Admin::ApplicationController
         banner = banners.select { |b| b.id == id.to_i }.first
         banner.update_column(:sort_order, index)
       end
-      banners.last.owner.touch()
+      banners.last.owner.touch
     end
     head :ok
   end
+  # rubocop:enable Rails/SkipsModelValidations
 
   private
 
-  def get_set
-    @banner_set = SpudBannerSet.find(params[:banner_set_id])
-  rescue ActiveRecord::RecordNotFound => e
-    flash.now[:error] = 'Could not find the requested SpudBannerSet'
-    render blank: true, status: 404
-    return false
+  def load_set
+    @banner_set = SpudBannerSet.find_by!(id: params[:banner_set_id])
   end
 
-  def get_record
-    @banner = SpudBanner.find(params[:id])
-  rescue ActiveRecord::RecordNotFound => e
-    flash.now[:error] = 'Could not find the requested SpudBanner'
-    redirect_to admin_banner_sets_path
-    return false
+  def load_record
+    @banner = SpudBanner.find_by!(id: params[:id])
   end
 
   def banner_params
-    params.require(:spud_banner).permit(:banner, :link_to, :link_target, :title, :alt, :sort_order, :rich_text, :start_date, :end_date)
+    params.require(:spud_banner).permit(
+      :banner, :link_to, :link_target, :title, :alt, :sort_order, :rich_text, :start_date, :end_date
+    )
   end
 
 end

data/app/helpers/spud_banners_helper.rb

@@ -1,9 +1,10 @@
 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
@@ -14,10 +15,10 @@ module SpudBannersHelper
                  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)}');") do
-              if banner.rich_text
-                content_tag :div, raw(banner.rich_text), class: 'spud-banner-rich-text'
-              end
-            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
@@ -71,4 +75,5 @@ module SpudBannersHelper
     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,8 +1,20 @@
 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,
@@ -38,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,12 +1,11 @@
 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 :name, presence: true
   validates :name, uniqueness: true
   validates :width, :height, numericality: true
 
-  acts_as_tb_liquid_tag :spud_banner_set, :name
-
   after_update :check_for_dimension_change
 
   def self.find_with_identifier(identifier)
@@ -33,7 +32,7 @@ class SpudBannerSet < ActiveRecord::Base
   private
 
   def check_for_dimension_change
-    reprocess_banners! if height_changed? || width_changed? || cropped_changed?
+    reprocess_banners! if saved_change_to_height? || saved_change_to_width? || saved_change_to_cropped?
   end
 
 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>

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

@@ -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>

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