tb_banners 1.2.0.beta1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 77d69497d933e4e7d8b92513aef1b785d67fdee0
-  data.tar.gz: 379864ece8c927552575a6bda6b161172492a805
+SHA256:
+  metadata.gz: c6523446637e03b2e8bbf0817e9a3f932a914ec2eb4e9b15564a5e41d5e1f4b8
+  data.tar.gz: 96800f6ab2b718017ec48b39d4f403a59682b7cca43c45e7b271972d35582335
 SHA512:
-  metadata.gz: d4c75394cc35e6c9e43816f31fe477a9ed2047cc20f77193d47fbf8ed7cf0189939e72199cc6a09f35a79221ee6929f155d04d8beb8b3eee0adc5ff112d273cc
-  data.tar.gz: 123e7574293cf224312fa1b5e080b73a0f18fe1914ad1991e1b57c3556f9e5509d9c78b4901df271278fc81111b4a73f0324b496031dd94db216cd9f5cd31b4d
+  metadata.gz: 9a832b4f51efcbb3904b77b2b29be04a89d4e07ad4c242e46de3427d81abd268f538d5a588ff3bba4a1402072a06d71936074177f7da3b7cca171329f4c1e1a2
+  data.tar.gz: ae6b66441337ca85a0e91b998f77871b72ce6c47c2ff16d1f5215ae487c55559316dbf29e17e0b723951c2e28dd44258ae476f951a7725f6f6f12e716a9852f1

data/README.markdown

@@ -24,6 +24,7 @@ TB Banners accepts the following configuration options:
 Spud::Banners.configure do |config|
 	config.paperclip_storage = :filesystem #use :s3 to use s3 storage (aws gem required)
 	config.s3_credentials = "#{Rails.root}/config/s3.yml"
+	config.s3_protocol = 'https'
 	config.storage_path = ":rails_root/public/system/spud_banners/:id/:style/:basename.:extension"
 	config.storage_url = "/system/spud_banners/:id/:style/:basename.:extension"
 end
@@ -48,7 +49,12 @@ A number of view helpers are provided for displaying banners in your templates.
 
 `spud_banners_for_set(set_or_identifier, options)`
 
-Accepts the banner set name as a String or Symbol and returns an html template. Options hash accepts a `:limit` parameter for limiting the number of banners returned. This helper also accepts a block argument for rendering custom html.
+Accepts the banner set name as a String or Symbol and returns an html template. This helper also accepts a block argument for rendering custom html.
+
+**Options:**
+
+- `limit`: Limit how many banners you wish to render
+- `background_image`: Pass `true` in order to render the banners as divs with css background images instead of image tags. Defaults to `false`. **This is required when rendering banners with rich text.**
 
 ```ruby
 spud_banner_tag(banner)
@@ -97,21 +103,11 @@ Displaying banners using the helper, with a block for even more custom html.
 	</ul>
 ```
 
-## Liquid
-
-TB Banners comes with its own custom [Liquid][liquid] tag. For now the liquid tag only supports rendering the standard html as generated by the `spud_banners_for_set`. Will provide support more advanced options in the future.
-
-Usage:
-
-```erb
-	<%= raw Liquid::Template.parse("{% spud_banner_set Promotions %}").render %>
-```
-
 ## Rich Text
 
-Banner Sets contain a configuration for rich text. Turning this feature on will enable a rich text editor on individual banners. The default setting for this option is off. 
+Banner Sets contain a configuration for rich text. Turning this feature on will enable a rich text editor on individual banners. The default setting for this option is off.
 
-Rich text is intended to be more of an edge case feature, and should be used only if your banner needs to include an editable HTML block. The built-in helpers described earlier will not automatically include your rich text; If you want to use this feature, you should supply a block to the helper and render the rich text yourself. 
+Rich text is intended to be more of an edge case feature, and should be used only if your banner needs to include an editable HTML block. The built-in helpers described earlier will not automatically include your rich text; If you want to use this feature, you should supply a block to the helper and render the rich text yourself.
 
 ```erb
 	<ul id="slides">
@@ -160,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,11 +20,9 @@ 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
 
 require 'rake/testtask'
@@ -36,5 +34,4 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-
-task :default => :test
+task default: :test

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

@@ -5,7 +5,7 @@
 
 var bannerSetEditId = false;
 
-spud.admin.banner_sets = {
+tb.banner_sets = {
   init: function(){
     $('.spud_banner_sets_add_new').on('click', clickedAddNewBannerSet);
     $('.admin-banner-sets-list').on('click', '.admin-banner-set-edit', clickedEditBannerSet);
@@ -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

@@ -3,39 +3,29 @@
 
 (function(){
 
-var html5upload = false;
 var bannerEditId = false;
 
-spud.admin.banners = {
+tb.banners = {
 
   // Index Page
   /////////////
   init: function(){
-    if(typeof(FormData) != 'undefined'){
-      html5upload = true;
-    }
     $('.admin-banner-set-item-add').on('click', clickedAddNewBanner);
     $('.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;
+    spud.admin.editor.unload();
     $.ajax({
       url: $(this).attr('href'),
       dataType: 'html',
@@ -51,8 +41,8 @@ var clickedAddNewBanner = function(e){
 
 var clickedEditBanner = function(e){
   e.preventDefault();
-  spud.admin.editor.unload();
   bannerEditId = parseInt($(this).parents('.admin-banner-set-item').attr('data-id'), 10);
+  spud.admin.editor.unload();
   $.ajax({
     url: $(this).attr('href'),
     dataType: 'html',
@@ -68,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'),
@@ -86,43 +79,41 @@ var clickedDeleteBanner = function(e){
 };
 
 var submittedBannerForm = function(e){
-  if(html5upload){
-    e.preventDefault();
+  e.preventDefault();
 
-    var form = $(this);
-    var fd = new FormData();
-    
-    $('input[type=text], input[type=hidden], select').each(function(index, element){
-      var input = $(element);
-      var name = input.attr('name');
-      var value = input.val();
-      fd.append(name, value);
-    });
+  var form = $(this);
+  var fd = new FormData();
 
-    var richText = form.find('.admin-banner-rich-text');
-    if(richText.length > 0){
-      fd.append('spud_banner[rich_text]', richText.val());
-    }
-    else{
-      fd.append('spud_banner[rich_text]', '');
-    }
+  $('input[type=text], input[type=hidden], select').each(function(index, element){
+    var input = $(element);
+    var name = input.attr('name');
+    var value = input.val();
+    fd.append(name, value);
+  });
 
-    var file = form.find('#spud_banner_banner')[0].files[0];
-    if(file){
-      fd.append('spud_banner[banner]', file);
-      $('.admin-banner-upload-progress').show();
-    }
+  var editor = tinymce.get('admin-banner-rich-text');
+  if(editor){
+    fd.append('spud_banner[rich_text]', editor.getContent());
+  }
+  else{
+    fd.append('spud_banner[rich_text]', '');
+  }
 
-    var xhr = new XMLHttpRequest();
-    xhr.upload.addEventListener('progress', onFileUploadProgress);
-    xhr.addEventListener('load', onFileUploadComplete);
-    xhr.addEventListener('error', onFileUploadError);
-    xhr.addEventListener('abort', onFileUploadAbort);
-    xhr.open('POST', form.attr('action'));
-    xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
-    xhr.send(fd);
-    return false;
+  var file = form.find('#spud_banner_banner')[0].files[0];
+  if(file){
+    fd.append('spud_banner[banner]', file);
+    $('.admin-banner-upload-progress').show();
   }
+
+  var xhr = new XMLHttpRequest();
+  xhr.upload.addEventListener('progress', onFileUploadProgress);
+  xhr.addEventListener('load', onFileUploadComplete);
+  xhr.addEventListener('error', onFileUploadError);
+  xhr.addEventListener('abort', onFileUploadAbort);
+  xhr.open('POST', form.attr('action'));
+  xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+  xhr.send(fd);
+  return false;
 };
 
 var onFileUploadProgress = function(e){
@@ -137,10 +128,10 @@ var onFileUploadProgress = function(e){
 var onFileUploadComplete = function(e){
   switch(this.status){
     case 200:
-      spud.admin.banners.onLegacyUploadComplete(e.target.response);
+      onUploadComplete(e.target.response);
       break;
     case 422:
-      spud.admin.banners.onLegacyUploadError(e.target.response);
+      onUploadError(e.target.response);
       break;
     default:
       window.alert("Whoops! Something has gone wrong.");
@@ -155,8 +146,7 @@ var onFileUploadAbort = function(e){
 
 };
 
-// Non-html5 upload
-spud.admin.banners.onLegacyUploadComplete = function(html){
+var onUploadComplete = function(html){
   if(bannerEditId){
     var item = $('.admin-banner-set-item[data-id="'+bannerEditId+'"]');
     item.replaceWith(html);
@@ -167,7 +157,7 @@ spud.admin.banners.onLegacyUploadComplete = function(html){
   spud.admin.modal.hide();
 };
 
-spud.admin.banners.onLegacyUploadError = function(html){
+var onUploadError = function(html){
   $('.admin-banner-form').replaceWith(html);
   initForm();
 };
@@ -178,16 +168,19 @@ 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' }
   });
 };
 
 var initForm = function(){
   var richText = $('#admin-banner-rich-text');
   if(richText){
-    tinymce.EditorManager.execCommand('mceRemoveEditor', true, 'admin-banner-rich-text');
+    if(typeof tinymce != "undefined"){
+      tinymce.EditorManager.execCommand('mceRemoveEditor', true, 'admin-banner-rich-text');
+    }
     spud.admin.editor.init({
       selector: '#admin-banner-rich-text',
       buttons: ['bold','italic','underline','formatselect','|','bullist','numlist','|','link','unlink','anchor', '|', 'code'],

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,18 +1,18 @@
 class Admin::BannerSetsController < Admin::ApplicationController
 
-  before_filter :get_record, :only => [:show, :edit, :update, :destroy]
+  before_action :load_record, only: [:show, :edit, :update, :destroy]
   respond_to :html
-  belongs_to_spud_app :banner_sets
+  belongs_to_app :banner_sets
   add_breadcrumb 'Banner Sets', :admin_banner_sets_path
   layout false
 
   def index
     @banner_sets = SpudBannerSet.all
-    respond_with @banner_sets, :layout => 'admin/detail'
+    respond_with @banner_sets, layout: 'admin/detail'
   end
 
   def show
-    respond_with @banner_set, :layout => 'admin/detail'
+    respond_with @banner_set, layout: 'admin/detail'
   end
 
   def new
@@ -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,35 +35,27 @@ 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
-    if @banner_set.destroy
-      flash.now[:notice] = 'BannerSet deleted successfully' 
-    end
-    render :nothing => true
+    flash.now[:notice] = 'Banner Set deleted successfully' if @banner_set.destroy
+    head :ok
   end
 
-private
+  private
 
-  def get_record
-    begin
-      @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
-    end
+  def load_record
+    @banner_set = SpudBannerSet.find_by!(id: params[:id])
   end
 
   def banner_set_params
     params.require(:spud_banner_set).permit(:cropped, :height, :name, :short_name, :width, :has_rich_text)
   end
 
-end
+end

data/app/controllers/admin/banners_controller.rb

@@ -1,14 +1,12 @@
 class Admin::BannersController < Admin::ApplicationController
 
-  include RespondsToParent
-
-  before_filter :get_set, :only => [:new, :create]
-  before_filter :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
 
@@ -16,23 +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
-    if last_banner
-     @banner.sort_order = last_banner.sort_order + 1
-    end
+    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 request.xhr?
-      if @banner.save
-        flash.now[:notice] = 'SpudBanner created successfully' 
-        render 'show'
-      else
-        render 'new', :status => 422
-      end
+    if @banner.save
+      flash.now[:notice] = 'Banner created successfully'
+      render 'show'
     else
-      @banner.save
-      respond_to_parent do
-        render 'legacy', :formats => [:js]
-      end
+      render 'new', status: :unprocessable_entity
     end
   end
 
@@ -41,68 +32,48 @@ class Admin::BannersController < Admin::ApplicationController
   end
 
   def update
-    if request.xhr?
-      if @banner.update_attributes(banner_params)
-        flash.now[:notice] = 'SpudBanner created successfully' 
-        render 'show'
-      else
-        render 'edit', :status => 422
-      end
+    if @banner.update(banner_params)
+      flash.now[:notice] = 'Banner created successfully'
+      render 'show'
     else
-      @banner.update_attributes(banner_params)
-      respond_to_parent do
-        render 'legacy', :formats => [:js]
-      end
+      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 :nothing => 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
+    banners = SpudBanner.where(id: banner_ids).to_a
     SpudBanner.transaction do
       banner_ids.each_with_index do |id, index|
-        banner = banners.select{ |b| b.id == id.to_i }.first
+        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
-    render :nothing => true, :status => 200
+    head :ok
   end
+  # rubocop:enable Rails/SkipsModelValidations
 
-private
+  private
 
-  def get_set
-    begin
-      @banner_set = SpudBannerSet.find(params[:banner_set_id])
-    rescue ActiveRecord::RecordNotFound => e
-      flash.now[:error] = "Could not find the requested SpudBannerSet"
-      render :nothing => true, :status => 404
-      return false
-    end
+  def load_set
+    @banner_set = SpudBannerSet.find_by!(id: params[:banner_set_id])
   end
 
-  def get_record
-    begin
-      @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
-    end
+  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
+end