spree_banner 0.70.6 → 1.0.0

data/README.md

@@ -1,4 +1,4 @@
-SpreeMultiSlideshow
+SpreeBanner
 ===================
 
 Add banner for Spree Commerce Shop
@@ -9,7 +9,7 @@ Basic Installation
 
 1. Add the following to your Gemfile
 <pre>
-  gem 'spree_banner', '~> 0.70.6'
+  gem 'spree_banner', :git => 'git://github.com/damianogiacomello/spree_banner'
 </pre>
 2. Run `bundle install`
 3. To copy and apply migrations run:
@@ -34,5 +34,13 @@ displays banner for which the category column, dafault is ""
 	<%= insert_banner(:max => 10) %>
 </pre>
 limits the number of banner shown to 10 (default 1)
+<pre>
+	<%= insert_banner(:class => "your_class") %>
+</pre>
+set banner class (default banner)
+<pre>
+	<%= insert_banner(:style => "your_container") %>
+</pre>
+set banner container (default list[ul/li])
 
 Copyright (c) 2012 [Damiano Giacomello], released under the New BSD License

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

@@ -1,17 +1,3 @@
 /*
  *= require admin/spree_core
- *= require formtastic
 */
-
-.formtastic input, .formtastic textarea, .formtastic select {
-	font-size: 100%;
-	padding: 5px;
-}
-
-.formtastic button {
-	margin: 0;
-	padding: 0 20px 0 0;
-}
-.formtastic button:hover {
-	text-shadow: #FFFFFF -1px -1px 0px;
-}

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

@@ -0,0 +1,12 @@
+module Spree
+  module Admin
+    class BannersController < ResourceController
+      before_filter :load_data
+      
+      
+      def load_data
+        @banners = Spree::Banner.all
+      end
+    end
+  end
+end

data/app/helpers/spree/banners_helper.rb

@@ -0,0 +1,27 @@
+module Spree
+  module BannersHelper
+
+    def insert_banner(params={})
+      # max items show for list
+      max = params[:max] || 1
+      # category items show
+      category = params[:category] || ""
+      # class items show
+      cl = params[:class] || "banner"
+      # style items show
+      style = params[:style] || "list"
+      banner = Banner.enable(category).limit(max)
+      if !banner.blank?
+        banner = banner.sort_by { |ban| ban.position }
+        
+        if (style == "list")
+          content_tag(:ul, raw(banner.map do |ban| content_tag(:li, link_to(image_tag(ban.attachment.url(:custom)), ban.url), :class => cl) end.join) )
+        else
+          raw(banner.map do |ban| content_tag(style.to_sym, link_to(image_tag(ban.attachment.url(:custom)), ban.url), :class => cl) end.join)
+        end
+        
+      end
+    end
+
+  end
+end

data/app/models/spree/banner.rb

@@ -0,0 +1,26 @@
+module Spree
+  class Banner < ActiveRecord::Base
+  
+    has_attached_file :attachment,
+                :url  => "/spree/banner/:id/:style_:basename.:extension",
+                :path => ":rails_root/public/spree/banner/:id/:style_:basename.:extension",
+                #:default_url => "/missing/:style.jpg",
+                :styles => {
+                      :thumbnail => "80x80#",
+                      :custom => Proc.new { |instance| "#{instance.attachment_width}x#{instance.attachment_height}#" }
+                },
+                :convert_options => {
+                      :thumbnail => "-gravity center"
+                }
+    
+    #process_in_background :image UTILE MA OCCORRE ATTIVARE ANCHE LA GEMMA DELAYED-PAPERCLIP
+    scope :enable, lambda { |category| {:conditions => {:enabled => true, :category => category}} }
+
+    def initialize(*args)
+      super(*args)
+      last_banner = Banner.last
+      self.position = last_banner ? last_banner.position + 1 : 0
+    end
+    
+  end
+end

data/app/overrides/banner_admin_tab.rb

@@ -1,4 +1,5 @@
-Deface::Override.new(:virtual_path => "layouts/admin",
+Deface::Override.new(:virtual_path => "spree/layouts/admin",
                       :name => "banner_admin_tab",
-                      :insert_bottom => "[data-hook='admin_tabs']",
-                      :text => "<%= tab(:banners) %>")
+                      :insert_bottom => "[data-hook='admin_tabs'], #admin_tabs[data-hook]",
+                      :text => "<%= tab(:banners, :url => spree.admin_banners_path) %>",
+                      :disabled => false)

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

@@ -0,0 +1,7 @@
+<h1><%= t(:editing_banner) %></h1>
+<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @banner } %>
+
+<%= semantic_form_for([:admin, @banner]) do |f| %>
+<%= render :partial => "form", :locals => { :f => f } %>
+<%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+<% end %>

data/app/views/{admin → spree/admin}/banners/index.html.erb

@@ -1,24 +1,26 @@
 <div class='toolbar'>
-	<ul class='actions'>
-		<li id="new_product_link">
-			<%= button_link_to t("banner.new_page"), new_admin_banner_url, {:icon => 'add'} %>
-		</li>
-	</ul>
-	<br class='clear' />
+  <ul class='actions'>
+    <li>
+      <%= button_link_to t(:new_banner), spree.new_admin_banner_path, :icon => 'add' %>
+    </li>
+  </ul>
+  <br class="clear" />
 </div>
 
-<h1><%= t("banner.many") %></h1>
+<h1><%= t(:banner) %></h1>
 
 <table class="index">
 	<tr>
-		<th><%= t("banner.category") %></th>
-		<th><%= t("banner.enable") %></th>
-		<th><%= t("action") %></th>
+		<th><%= t(:category) %></th>
+		<th><%= t(:position) %></th>
+		<th><%= t(:enable) %></th>
+		<th><%= t(:action) %></th>
 	</tr>
 	<tbody>
 		<% @banners.each do |banner| %>
 		<tr class="<%= cycle('even', 'odd') %>" id="<%= dom_id banner %>">
 			<td><%= banner.category %></td>
+			<td><%= banner.position %></td>
 			<td><%= icon('tick') if banner.enabled %></td>
 			<td>
 				<%= link_to_edit banner %> &nbsp;

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

@@ -0,0 +1,7 @@
+<h1><%= t(: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 %>

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

@@ -1,18 +1,8 @@
 module SpreeBanner
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      
-      def add_formtastic
-        res = ask "Would you like to run the formtastic install now? [Y/n]"
-        if res == "" || res.downcase == "y"
-          run 'rails generate formtastic:install'
-        else
-          puts "Skiping rails generate formtastic:install, don't forget to run it!"
-        end
-      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
 

data/lib/spree_banner.rb

@@ -1,3 +1,2 @@
 require 'spree_core'
-require 'formtastic'
 require 'spree_banner/engine'

metadata

@@ -1,86 +1,103 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: spree_banner
-version: !ruby/object:Gem::Version
-  version: 0.70.6
+version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
-authors:
+authors: 
 - Damiano Giacomello
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-22 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-03-15 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: spree_core
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: spree_auth
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: formtastic
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: formtastic
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: paperclip
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.5.0
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: paperclip
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 5
+        - 0
         version: 2.5.0
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: *id004
+- !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
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: 
 email: damiano.giacomello@diginess.it
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - README.md
 - LICENSE
 - lib/generators/spree_banner/install/install_generator.rb
@@ -90,41 +107,48 @@ files:
 - app/assets/javascripts/store/spree_banner.js
 - app/assets/stylesheets/admin/spree_banner.css
 - app/assets/stylesheets/store/spree_banner.css
-- app/controllers/admin/banners_controller.rb
-- app/helpers/banners_helper.rb
-- app/models/banner.rb
+- app/controllers/spree/admin/banners_controller.rb
+- app/helpers/spree/banners_helper.rb
+- app/models/spree/banner.rb
 - app/overrides/banner_admin_tab.rb
-- app/views/admin/banners/_form.html.erb
-- app/views/admin/banners/edit.html.erb
-- app/views/admin/banners/index.html.erb
-- app/views/admin/banners/new.html.erb
-- db/migrate/20120116204313_create_banners.rb
-- config/locales/en.yml
-- config/locales/it.yml
-- config/routes.rb
+- 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
 homepage: 
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-requirements:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+requirements: 
 - none
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Extension to manage banner for you Spree Shop
 test_files: []
+

data/app/controllers/admin/banners_controller.rb

@@ -1,2 +0,0 @@
-class Admin::BannersController < Admin::ResourceController
-end

data/app/helpers/banners_helper.rb

@@ -1,14 +0,0 @@
-module BannersHelper
-  
-  def insert_banner(params={})
-    max = params[:max] || 1
-    category = params[:category] || ""
-    banner = Banner.enable(category).limit(max)
-    if !banner.blank?
-      banner = banner.sort_by { |ban| ban.position }
-
-      content_tag(:div, content_tag(:ul, raw(banner.map do |ban| content_tag(:li, link_to(image_tag(ban.attachment.url(:custom)), ban.url) ) end.join) ), :class => "banner")
-    end
-  end
-  
-end

data/app/models/banner.rb

@@ -1,40 +0,0 @@
-class Banner < ActiveRecord::Base
-  
-  attr_accessible :category, :url, :position, :attachment_width, :attachment_height, :enabled, :attachment
-  
-  has_attached_file :attachment,
-            :url  => "/spree/banner/:id/:style_:basename.:extension",
-            :path => ":rails_root/public/spree/banner/:id/:style_:basename.:extension",
-            #:default_url => "/missing/:style.jpg",
-            :styles => {
-                  :thumbnail => "80x80#",
-                  :custom => Proc.new { |instance| "#{instance.attachment_width}x#{instance.attachment_height}#" }
-            },
-            :convert_options => {
-                  :thumbnail => "-gravity center",
-                  :custom => "-gravity center"
-            }
-  
-  
-  after_post_process :find_dimensions
-  validates_presence_of :category, :attachment_width, :attachment_height
-  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"
-  
-  scope :enable, lambda { |category| {:conditions => {:enabled => true, :category => category}} }
-  
-  def initialize(*args)
-    super(*args)
-    last_banner = Banner.last
-    self.position = last_banner ? last_banner.position + 1 : 0
-  end
-  
-  def find_dimensions
-    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/views/admin/banners/edit.html.erb

@@ -1,10 +0,0 @@
-<h1><%= t("banner.editing_page") %></h1>
-<%= render "shared/error_messages", :target => @banner %>
-
-<%= semantic_form_for([:admin, @banner]) do |f| %>
-<%= render :partial => "form", :locals => { :f => f } %>
-<p class="form-buttons">
-	<%= button t("actions.create"), nil, 'submit' %>
-	<%= t("or") %> <%= link_to t("actions.cancel"), admin_banners_path %>
-</p>
-<% end %>

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

@@ -1,10 +0,0 @@
-<h1><%= t("banner.new_page") %></h1>
-<%= render "shared/error_messages", :target => @banner %>
-
-<%= semantic_form_for([:admin, @banner], :html => { :enctype => "multipart/form-data" }) do |f| %>
-  <%= render :partial => "form", :locals => { :f => f } %>
-  <p class="form-buttons">
-    <%= button t("actions.create"), nil, 'submit' %>
-    <%= t("or") %> <%= link_to t("actions.cancel"), admin_banners_path %>
-  </p>
-<% end %>

data/config/locales/en.yml

@@ -1,30 +0,0 @@
----
-it:
-  activerecord:
-    attributes:
-      banner:
-        category: Category
-        enabled: Enable?
-        url: Link to product or taxonomy or to external website
-        attachment_width: Width
-        attachment_height: Height
-        attachment: Image
-        position: Position (if there are other banners with the same category)
-    models:
-      banner:
-        one: Banner
-        many: Banners
-
-  banner:
-    one: Banner
-    many: Banners
-    enable: Enable?
-    category: Category
-    no_image: No Image Yet
-    image:
-      one: Image
-      many: Images
-    banner_desc: Manage banner.
-    new_page: New banner
-    editing_page: Edit banner
-    confirm_delete: Are you sure?

data/config/locales/it.yml

@@ -1,30 +0,0 @@
----
-it:
-  activerecord:
-    attributes:
-      banner:
-        category: Categoria
-        enabled: Attivo?
-        url: Link a prodotto o tassonomia o a sito esterno
-        attachment_width: Larghezza
-        attachment_height: Altezza
-        attachment: Immagine
-        position: Posizione (se esistono altri banner con la stessa categoria)
-    models:
-      banner:
-        one: Banner
-        many: Banners
-
-  banner:
-    one: Banner
-    many: Banners
-    enable: Attivo?
-    category: Categoria
-    no_image: Nessuna immagine caricata
-    image:
-      one: Immagine
-      many: Immagini
-    banner_desc: Gestione banner.
-    new_page: Nuovo banner
-    editing_page: Modifica banner
-    confirm_delete: Sei sicuro?

data/config/routes.rb

@@ -1,7 +0,0 @@
-Rails.application.routes.draw do
-  
-  namespace :admin do
-    resources :banners
-  end
-  
-end

data/db/migrate/20120116204313_create_banners.rb

@@ -1,18 +0,0 @@
-class CreateBanners < ActiveRecord::Migration
-  def change
-    create_table :banners do |t|
-      t.string :title, :url
-      t.string :category
-      t.integer :position
-      t.boolean :enabled
-      
-      t.string   :attachment_content_type, :attachment_file_name, :attachment_content_type
-      t.datetime :attachment_updated_at
-      t.integer  :attachment_width, :attachment_height, :default => 100
-      t.integer  :attachment_size, :position
-      t.string   :type, :limit => 75
-      
-      t.timestamps
-    end
-  end
-end