spud_banners 0.9.3 → 1.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36ad057b77352b362b1e0891a641083127eb7051
-  data.tar.gz: 58f8e4768d7e813a1c50cd173ccccdec5ce6be21
+  metadata.gz: d127bb48ca96fcbcb024d22188e63e8988b74192
+  data.tar.gz: 617fd24717a2bb1b052257172e247ee8008548a2
 SHA512:
-  metadata.gz: 97e38d84de662556348eb7ccc85a7160c6fa2ad71b97193a55276f87cc9bc2bac52a8af5df054da91fd04889b33e599eb442d8d4f8a6d32b23e9ee8f266935b7
-  data.tar.gz: 29bc18ba4bc6891a17d6599d1c31845629156f59e481174f52bf42f393ef2dade2ba2128300a3cde651fe7243abbccb74ec6e2e2c883d49395b4d3319e18ff49
+  metadata.gz: 12e2edaf15ad49fb75f969b84f5d3fc942593861fd843a2e216edbfbef7f9467d137f236a84c0f22ae938018aedc5c53035498eac39dbe1e418a0eb3324e32e3
+  data.tar.gz: 9b4dab04dffc026d37f41bd30a6acdc69840c9be6743dd0015e44e676882e7663dce367affd912693731f9007f74d586a3d298a9675b7326a1247f6e0a843788

data/app/controllers/spud/admin/banner_sets_controller.rb

@@ -1,6 +1,4 @@
 class Spud::Admin::BannerSetsController < Spud::Admin::ApplicationController
-
-  cache_sweeper :spud_banner_sweeper, :only => [:create, :update, :destroy]
   before_filter :get_record, :only => [:show, :edit, :update, :destroy]
   respond_to :html
   belongs_to_spud_app :banner_sets
@@ -22,9 +20,9 @@ class Spud::Admin::BannerSetsController < Spud::Admin::ApplicationController
   end
 
   def create
-    @banner_set = SpudBannerSet.new(params[:spud_banner_set])
+    @banner_set = SpudBannerSet.new(banner_set_params)
     if @banner_set.save
-      flash.now[:notice] = 'BannerSet created successfully' 
+      flash.now[:notice] = 'BannerSet created successfully'
       render 'create'
     else
       render 'new', :status => 422
@@ -36,7 +34,7 @@ class Spud::Admin::BannerSetsController < Spud::Admin::ApplicationController
   end
 
   def update
-    if @banner_set.update_attributes(params[:spud_banner_set])
+    if @banner_set.update_attributes(banner_set_params)
       flash.now[:notice] = 'BannerSet updated successfully'
       @banner_set.reprocess_banners!
       render 'create'
@@ -47,7 +45,7 @@ class Spud::Admin::BannerSetsController < Spud::Admin::ApplicationController
 
   def destroy
     if @banner_set.destroy
-      flash.now[:notice] = 'BannerSet deleted successfully' 
+      flash.now[:notice] = 'BannerSet deleted successfully'
     end
     render :nothing => true
   end
@@ -65,4 +63,8 @@ private
     end
   end
 
-end
+  def banner_set_params
+    params.require(:spud_banner_set).permit(:cropped, :height, :name, :short_name, :width)
+  end
+
+end

data/app/controllers/spud/admin/banners_controller.rb

@@ -1,8 +1,6 @@
 class Spud::Admin::BannersController < Spud::Admin::ApplicationController
 
   include RespondsToParent
-
-  cache_sweeper :spud_banner_sweeper, :only => [:create, :update, :destroy]
   before_filter :get_set, :only => [:new, :create]
   before_filter :get_record, :only => [:edit, :update, :destroy]
   respond_to :html
@@ -15,7 +13,7 @@ class Spud::Admin::BannersController < Spud::Admin::ApplicationController
 
   def create
     @banner = @banner_set.banners.build
-    @banner.attributes = params[:spud_banner]
+    @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
@@ -24,7 +22,7 @@ class Spud::Admin::BannersController < Spud::Admin::ApplicationController
 
     if request.xhr?
       if @banner.save
-        flash.now[:notice] = 'SpudBanner created successfully' 
+        flash.now[:notice] = 'SpudBanner created successfully'
         render 'show'
       else
         render 'new', :status => 422
@@ -43,14 +41,14 @@ class Spud::Admin::BannersController < Spud::Admin::ApplicationController
 
   def update
     if request.xhr?
-      if @banner.update_attributes(params[:spud_banner])
-        flash.now[:notice] = 'SpudBanner created successfully' 
+      if @banner.update_attributes(banner_params)
+        flash.now[:notice] = 'SpudBanner created successfully'
         render 'show'
       else
         render 'edit', :status => 422
       end
     else
-      @banner.update_attributes(params[:spud_banner])
+      @banner.update_attributes(banner_params)
       respond_to_parent do
         render 'legacy', :formats => [:js]
       end
@@ -59,7 +57,7 @@ class Spud::Admin::BannersController < Spud::Admin::ApplicationController
 
   def destroy
     if @banner.destroy
-      flash.now[:notice] = 'SpudBanner deleted successfully' 
+      flash.now[:notice] = 'SpudBanner deleted successfully'
       status = 200
     else
       status = 422
@@ -101,4 +99,8 @@ private
     end
   end
 
-end
+  def banner_params
+    params.require(:spud_banner).permit(:banner, :link_to, :link_target, :title, :alt, :sort_order)
+  end
+
+end

data/app/models/spud_banner.rb

@@ -1,8 +1,7 @@
 class SpudBanner < ActiveRecord::Base
-  attr_accessible :banner, :link_to, :link_target, :title, :alt, :sort_order
-  belongs_to :owner, :class_name => 'SpudBannerSet', :foreign_key => 'spud_banner_set_id', :inverse_of => :banners
+  belongs_to :owner, :class_name => 'SpudBannerSet', :foreign_key => 'spud_banner_set_id', :inverse_of => :banners, :touch => true
 
-  has_attached_file :banner, 
+  has_attached_file :banner,
     :styles => lambda { |attachment| attachment.instance.dynamic_styles },
     :convert_options => {
       :admin_small => '-strip -density 72x72',

data/app/models/spud_banner_set.rb

@@ -1,10 +1,13 @@
 class SpudBannerSet < ActiveRecord::Base
-  attr_accessible :cropped, :height, :name, :short_name, :width
-  has_many :banners, :class_name => 'SpudBanner', :order => 'sort_order asc', :dependent => :destroy, :inverse_of => :owner
+  has_many :banners, -> { order :sort_order }, :class_name => 'SpudBanner', :dependent => :destroy, :inverse_of => :owner
 
-  validates_presence_of :name
-  validates_uniqueness_of :name
-  validates_numericality_of :width, :height
+  validates :name, :presence => true, :uniqueness => true
+  validates :width, :numericality => true
+  validates :height, :numericality => true
+
+  after_destroy :expire_cache
+  after_save    :expire_cache
+  after_touch    :expire_cache
 
   def self.find_by_identifier(identifier)
     if identifier.class == String
@@ -27,4 +30,15 @@ class SpudBannerSet < ActiveRecord::Base
     return name
   end
 
+  def expire_cache
+    if defined?(Spud::Cms)
+      old_name = self.name_was
+      values = [self.name]
+      values << old_name if !old_name.blank?
+      SpudPageLiquidTag.where(:tag_name => ["spud_banner_set","banner_set"], :value => values).includes(:attachment).each do |tag|
+        partial = tag.touch
+      end
+    end
+  end
+
 end

data/lib/spud_banners/engine.rb

@@ -14,11 +14,12 @@ module Spud
           :thumbnail => 'spud/admin/banners/banners.png',
           :retina => true,
           :url => '/spud/admin/banner_sets',
-          :order => 120  
+          :order => 120
         }]
       end
       initializer :liquid do
         Liquid::Template.register_tag('spud_banner_set', Spud::Banners::BannerSetTag) if defined?(Liquid::Template)
+        Liquid::Template.register_tag('banner_set', Spud::Banners::BannerSetTag) if defined?(Liquid::Template)
       end
     end
   end

data/lib/spud_banners/liquid_tags.rb

@@ -5,8 +5,8 @@ module Spud
   module Banners
     class BannerSetTag < Liquid::Tag
 
-      include Sprockets::Helpers::RailsHelper
-      include Sprockets::Helpers::IsolatedHelper
+      include Sprockets::Rails::Helper
+      # include Sprockets::Rails::Helpers::IsolatedHelper
       include ActionView::Helpers
       include ActionView::Context
       include SpudBannersHelper
@@ -29,4 +29,4 @@ module Spud
 
     end
   end
-end
+end

data/lib/spud_banners/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Banners
-    VERSION = "0.9.3"
+    VERSION = "1.0.0.rc1"
   end
 end

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

@@ -6,8 +6,9 @@ Dummy::Application.configure do
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+
+
+  config.eager_load = false
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
@@ -22,8 +23,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)

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

@@ -11,8 +11,9 @@ Dummy::Application.configure do
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
+
+  config.eager_load = false
+
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
@@ -29,8 +30,6 @@ Dummy::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr