spree_banner 1.1.3 → 1.1.4

data/README.md

@@ -9,7 +9,7 @@ Basic Installation
 
 1. Add the following to your Gemfile
 <pre>
-  gem 'spree_banner', '~> 1.1.3'
+  gem 'spree_banner', '~> 1.1.4'
 </pre>
 2. Run `bundle install`
 3. To copy and apply migrations run:

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

@@ -0,0 +1,31 @@
+$(document).ready(function() {
+
+  $('.destroy_banner_style').on("click", function() {
+   $(this).parent().remove();
+  });
+
+  // Handle adding new styles
+  var styles_hash_index = 1;
+  $('.add_banner_style').click(function() {
+    $('#styles_list').append(generate_html_for_hash("new_banner_styles", styles_hash_index));
+  });
+
+  // Generates html for new paperclip styles form fields
+  generate_html_for_hash = function(hash_name, index) {
+    var html = '<li>';
+    html += '<label for="' + hash_name + '_' + index + '_name">';
+    html += 'Name</label>';
+    html += '<input id="' + hash_name + '_' + index + '_name" name="' + hash_name + '[' + index + '][name]" type="text">';
+    html += '<label for="' + hash_name + '_' + index + '_value">';
+    html += 'Value</label>';
+    html += '<input id="' + hash_name + '_' + index + '_value" name="' + hash_name + '[' + index + '][value]" type="text">';
+    html += '<a href="#" alt="Destroy" class="destroy_banner_style">&nbsp;x</a>';
+    html += '</li>';
+
+    index += 1;
+    return html;
+  };
+
+
+
+});

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

@@ -1 +1 @@
-//= require admin/spree_core
+//= require admin/banner_settings

data/app/assets/stylesheets/store/spree_banner.css

@@ -1,7 +1,3 @@
-/*
- *= require store/spree_core
-*/
-
 .banner {
 	background: none;
 }

data/app/controllers/spree/admin/banner_settings_controller.rb

@@ -0,0 +1,49 @@
+module Spree
+  module Admin
+    class BannerSettingsController < Spree::Admin::BaseController
+      def show
+        styles = ActiveSupport::JSON.decode(Spree::Config[:banner_styles])
+        @styles_list = styles.collect { |k, v| k }.join(", ")
+      end
+
+      def edit
+        @styles = ActiveSupport::JSON.decode(Spree::Config[:banner_styles])
+      end
+
+      def update
+        update_styles(params)
+
+        Spree::Config.set(params[:preferences])
+        update_paperclip_settings
+
+        respond_to do |format|
+          format.html {
+            flash[:notice] = t(:banner_settings_updated)
+            redirect_to admin_banner_settings_path
+          }
+        end
+      end
+
+
+      private
+
+      def update_styles(params)
+        params[:new_banner_styles].each do |index, style|
+          params[:banner_styles][style[:name]] = style[:value] unless style[:value].empty?
+        end if params[:new_banner_styles].present?
+
+        styles = params[:banner_styles]
+
+        Spree::Config[:banner_styles] = ActiveSupport::JSON.encode(styles) unless styles.nil?
+      end
+
+      def update_paperclip_settings
+        Spree::Banner.attachment_definitions[:attachment][:styles] = ActiveSupport::JSON.decode(Spree::Config[:banner_styles])
+        Spree::Banner.attachment_definitions[:attachment][:path] = Spree::Config[:banner_path]
+        Spree::Banner.attachment_definitions[:attachment][:default_url] = Spree::Config[:banner_default_url]
+        Spree::Banner.attachment_definitions[:attachment][:default_style] = Spree::Config[:banner_default_style]
+      end
+    end
+  end
+end
+

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

@@ -1,23 +1,21 @@
 module Spree
   module Admin
     class BannersController < ResourceController
-      before_filter :load_data
+            
+      def show
+        redirect_to(:action => :edit)
+      end
       
       def update_positions
         params[:positions].each do |id, index|
-          Spree::Banner.update_all(['position=?', index], ['id=?', id])
+          Spree::Banner.where(:id => id).update_all(:position => index)
         end
 
         respond_to do |format|
-          format.html { redirect_to admin_banners_url() }
           format.js  { render :text => 'Ok' }
         end
       end
       
-      def load_data
-        @banners = Spree::Banner.all
-      end
-      
       private
       def location_after_save
         edit_admin_banner_url(@banner)

data/app/models/spree/app_configuration_decorator.rb

@@ -0,0 +1,8 @@
+Spree::AppConfiguration.class_eval do
+  # Preferences related to banner settings
+  preference :banner_default_url, :string, :default => '/spree/banners/:id/:style/:basename.:extension'
+  preference :banner_path, :string, :default => ':rails_root/public/spree/banners/:id/:style/:basename.:extension'
+  preference :banner_url, :string, :default => '/spree/banners/:id/:style/:basename.:extension'
+  preference :banner_styles, :string, :default => "{\"mini\":\"80x80#\",\"small\":\"120x120#\"}"
+  preference :banner_default_style, :string, :default => 'small'
+end

data/app/models/spree/banner.rb

@@ -1,22 +1,24 @@
 module Spree
   class Banner < ActiveRecord::Base
-    attr_accessible :title, :url, :category, :position, :enabled, :attachment, :attachment_width, :attachment_height
+    attr_accessible :title, :url, :category, :position, :enabled, :attachment
     
     has_attached_file :attachment,
-                :url  => "/spree/banner/:id/:style_:basename.:extension",
-                :path => ":rails_root/public/spree/banner/:id/:style_:basename.:extension",
+                :url  => "/spree/banners/:id/:style_:basename.:extension",
+                :path => ":rails_root/public/spree/banners/:id/:style_:basename.:extension",
                 :styles => lambda {|a| {
-                  :thumbnail => "80x80#",
+                  :mini => "80x80#",
+                  :small => "120x120#",
                   :custom => "#{a.instance.attachment_width}x#{a.instance.attachment_height}#"
                 }},
                 :convert_options => {
-                  :thumbnail => "-gravity center",
+                  :mini => "-gravity center",
+                  :small => "-gravity center",
                   :custom => "-gravity center"
                 }
     
     after_post_process :find_dimensions
     
-    validates_presence_of :category, :attachment_width, :attachment_height
+    validates_presence_of :category
     validates_attachment_presence :attachment
     validates_attachment_content_type :attachment, :content_type => ['image/jpeg', 'image/png', 'image/gif', 'image/jpg', 'image/x-png', 'image/pjpeg'], :message => "deve essere JPG, JPEG, PNG o GIF"
     
@@ -31,6 +33,12 @@ module Spree
       Spree::Banner.attachment_definitions[:attachment][:bucket] = Spree::Config[:s3_bucket]
       Spree::Banner.attachment_definitions[:attachment][:s3_protocol] = Spree::Config[:s3_protocol] unless Spree::Config[:s3_protocol].blank?
     end
+    
+    Spree::Banner.attachment_definitions[:attachment][:styles] = ActiveSupport::JSON.decode(Spree::Config[:banner_styles])
+    Spree::Banner.attachment_definitions[:attachment][:path] = Spree::Config[:banner_path]
+    Spree::Banner.attachment_definitions[:attachment][:url] = Spree::Config[:banner_url]
+    Spree::Banner.attachment_definitions[:attachment][:default_url] = Spree::Config[:banner_default_url]
+    Spree::Banner.attachment_definitions[:attachment][:default_style] = Spree::Config[:banner_default_style]
         
     def initialize(*args)
       super(*args)
@@ -39,14 +47,12 @@ module Spree
     end
     
     def find_dimensions
-      if self.attachment_width.blank? && self.attachment_height.blank?
-        temporary = attachment.queued_for_write[:original]
-        filename = temporary.path unless temporary.nil?
-        filename = attachment.path if filename.blank?
-        geometry = Paperclip::Geometry.from_file(filename)
-        self.attachment_width  = geometry.width
-        self.attachment_height = geometry.height
-      end
+      temporary = attachment.queued_for_write[:original]
+      filename = temporary.path unless temporary.nil?
+      filename = attachment.path if filename.blank?
+      geometry = Paperclip::Geometry.from_file(filename)
+      self.attachment_width = geometry.width
+      self.attachment_height = geometry.height
     end
     
   end

data/app/overrides/banner_admin_tab.rb

@@ -2,4 +2,9 @@ Deface::Override.new(:virtual_path => "spree/layouts/admin",
                       :name => "banner_admin_tab",
                       :insert_bottom => "[data-hook='admin_tabs'], #admin_tabs[data-hook]",
                       :text => "<%= tab(:banners, :url => spree.admin_banners_path) %>",
-                      :disabled => false)
+                      :disabled => false)
+
+Deface::Override.new(:virtual_path => "spree/admin/configurations/index",
+                      :name => "add_banner_setting_to_configuration_menu",
+                      :insert_bottom => "[data-hook='admin_configurations_menu']",
+                      :partial => "spree/admin/shared/banner_setting_configurations_menu")

data/app/views/spree/admin/banner_settings/edit.html.erb

@@ -0,0 +1,48 @@
+<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+
+<h1><%= t(:banner_settings) %></h1>
+
+<p><span class="warning"><%= t(:banner_settings_warning) %></span></p>
+
+<%= form_tag admin_banner_settings_path, :method => :put do %>
+
+  <p data-hook="banner_path">
+    <label>
+      <%= label_tag 'preferences[banner_path]', t(:banner_path) %>
+      <%= preference_field_tag 'preferences[banner_path]', Spree::Config[:banner_path], :type => :string %>
+    </label>
+  </p>
+
+  <p data-hook="banner_default_url">
+    <label>
+      <%= label_tag 'preferences[banner_default_url]', t(:banner_default_url) %>
+      <%= preference_field_tag 'preferences[banner_default_url]', Spree::Config[:banner_default_url], :type => :string %>
+    </label>
+  </p>
+
+  <p data-hook="banner_default_style">
+    <label>
+      <%= label_tag 'preferences[banner_default_style]', t(:banner_default_style) %>
+      <%= collection_select 'preferences', 'banner_default_style', @styles, :first, :first, {:selected => Spree::Config[:banner_default_style] } %> 
+    </label>
+  </p>
+
+  <div id="banner_styles" data-hook="banner_styles">
+    <h2><%= t(:banner_styles) %></h2>
+    <ul id="styles_list">
+      <% @styles.each do |style_name, style_value| %>
+        <li>
+          <%= label_tag "banner_styles[#{style_name}]", style_name %>
+          <%= text_field_tag "banner_styles[#{style_name}]", style_value %>
+          <a href="#" alt="Destroy" class="destroy_banner_style">x</a>
+        </li>
+      <% end %>
+    </ul>
+    <p><a href="#" alt="Add Style" class="add_banner_style"><%= t(:add_new_style) %></a></p>
+  </div>
+
+  <p class="form-buttons" data-hook="buttons">
+    <%= button t(:update) %>
+  </p>
+
+<% end %>

data/app/views/spree/admin/banner_settings/show.html.erb

@@ -0,0 +1,10 @@
+<%= render :partial => 'spree/admin/shared/configuration_menu' %>
+
+<h1><%= t(:banner_settings) %></h1>
+
+<h4><%= t(:banner_path) %>: <%= Spree::Config[:banner_path] %></h4>
+<h4><%= t(:banner_default_url) %>: <%= Spree::Config[:banner_default_url] %></h4>
+<h4><%= t(:banner_default_style) %>: <%= Spree::Config[:banner_default_style] %></h4>
+<h4><%= t(:defined_paperclip_styles) %>: <%= @styles_list %></h4>
+
+<%= link_to_with_icon 'edit', t(:edit), edit_admin_banner_settings_path, :id => 'admin_banner_settings_link' %>

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

@@ -1,6 +1,6 @@
-<div data-hook="admin_slideshow_form_fields">
+<div data-hook="admin_banner_form_fields">
 	<div class="clearfix">
-		<div class="left" data-hook="admin_product_form_left">
+		<div class="left" data-hook="admin_banner_form_left">
 			<%= f.field_container :category do %>
 				<%= f.label :category, t(:category) %> <span class="required">*</span><br />
 				<%= f.text_field :category, :class => 'fullwidth title' %>
@@ -19,7 +19,7 @@
 				<%= f.error_message_on :attachment %>
 			<% end %>
 		</div>
-		<div class="right" data-hook="admin_product_form_right">
+		<div class="right" data-hook="admin_banner_form_right">
 			<%= f.field_container :attachment_width do %>
 				<%= f.label :attachment_width, t(:attachment_width) %> <span class="required">*</span><br />
 				<%= f.text_field :attachment_width, :class => 'fullwidth title' %>

data/app/views/spree/admin/banners/new.html.erb

@@ -1,16 +1,8 @@
-<h1><%= t("banner.new_banner") %></h1>
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @banner } %>
-
-<%= semantic_form_for([:admin, @banner], :html => { :enctype => "multipart/form-data" }) do |f| %>
-  <%= render :partial => "form", :locals => { :f => f } %>
-  <%= render :partial => 'spree/admin/shared/new_resource_links' %>
-<% end %>
-
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @banner } %>
 
 <%= form_for [:admin, @banner], :html => { :multipart => true } do |f| %>
-<fieldset data-hook="new_slideshow_type">
-	<div class="clearfix" data-hook="new_product_attrs">
+<fieldset data-hook="new_banner">
+	<div class="clearfix" data-hook="new_banner_attrs">
 		<div class="left">
 			<%= f.field_container :category do %>
 				<%= f.label :category, t(:category) %> <span class="required">*</span><br />

data/app/views/spree/admin/shared/_banner_setting_configurations_menu.html.erb

@@ -0,0 +1,4 @@
+<tr>
+  <td><%= link_to t(:banner_settings), admin_banner_settings_path %></td>
+  <td><%= t(:banner_settings_description) %></td>
+</tr>

data/config/routes.rb

@@ -5,5 +5,6 @@ Spree::Core::Engine.routes.prepend do
         post :update_positions
       end
     end
+    resource :banner_settings
   end
 end

data/db/migrate/20120116204313_create_banners.rb

@@ -8,7 +8,7 @@ class CreateBanners < ActiveRecord::Migration
       
       t.string   :attachment_content_type, :attachment_file_name
       t.datetime :attachment_updated_at
-      t.integer  :attachment_width, :attachment_height, :default => 100
+      t.integer  :attachment_width, :attachment_height
       t.integer  :attachment_size
       
       t.timestamps

data/lib/generators/spree_banner/install/install_generator.rb

@@ -2,8 +2,11 @@ module SpreeBanner
   module Generators
     class InstallGenerator < Rails::Generators::Base
       
+      def add_javascripts
+        append_file "app/assets/javascripts/admin/all.js", "//= require admin/spree_banner\n"
+      end
+      
       def add_stylesheets
-        inject_into_file "app/assets/stylesheets/admin/all.css", " *= require admin/spree_banner\n", :before => /\*\//, :verbose => true
         inject_into_file "app/assets/stylesheets/store/all.css", " *= require store/spree_banner\n", :before => /\*\//, :verbose => true
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_banner
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-22 00:00:00.000000000 Z
+date: 2013-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -59,22 +59,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email: damiano.giacomello@diginess.it
 executables: []
@@ -86,19 +70,25 @@ files:
 - lib/generators/spree_banner/install/install_generator.rb
 - lib/spree_banner/engine.rb
 - lib/spree_banner.rb
+- app/assets/javascripts/admin/banner_settings.js
 - app/assets/javascripts/admin/spree_banner.js
 - app/assets/javascripts/store/spree_banner.js
 - app/assets/stylesheets/admin/spree_banner.css
 - app/assets/stylesheets/store/spree_banner.css
+- app/controllers/spree/admin/banner_settings_controller.rb
 - app/controllers/spree/admin/banners_controller.rb
 - app/helpers/spree/banners_helper.rb
+- app/models/spree/app_configuration_decorator.rb
 - app/models/spree/banner.rb
 - app/overrides/banner_admin_tab.rb
+- app/views/spree/admin/banner_settings/edit.html.erb
+- app/views/spree/admin/banner_settings/show.html.erb
 - app/views/spree/admin/banners/_form.html.erb
 - app/views/spree/admin/banners/edit.html.erb
 - app/views/spree/admin/banners/index.html.erb
 - app/views/spree/admin/banners/new.html.erb
 - app/views/spree/admin/banners/new.js.erb
+- app/views/spree/admin/shared/_banner_setting_configurations_menu.html.erb
 - db/migrate/20120116204313_create_banners.rb
 - db/migrate/20120323174800_banner_namespace.rb
 - config/locales/en.yml