spree_banner 1.0.2 → 1.0.3

data/README.md

@@ -9,7 +9,7 @@ Basic Installation
 
 1. Add the following to your Gemfile
 <pre>
-  gem 'spree_banner', :git => 'git://github.com/damianogiacomello/spree_banner'
+  gem 'spree_banner', '~> 1.0.3'
 </pre>
 2. Run `bundle install`
 3. To copy and apply migrations run:
@@ -41,6 +41,6 @@ set banner class (default banner)
 <pre>
 	<%= insert_banner(:style => "your_container") %>
 </pre>
-set banner container (default list[ul/li])
+set banner container (default list [possibile: div, p, ...])
 
 Copyright (c) 2012 [Damiano Giacomello], released under the New BSD License

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

@@ -3,10 +3,26 @@ module Spree
     class BannersController < ResourceController
       before_filter :load_data
       
+      def update_positions
+        params[:positions].each do |id, index|
+          Spree::Banner.update_all(['position=?', index], ['id=?', id])
+        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
+        admin_banners_url(@banner)
+      end
+      
     end
   end
 end

data/app/models/spree/banner.rb

@@ -12,18 +12,49 @@ module Spree
                 :convert_options => {
                       :thumbnail => "-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'], :message => "deve essere JPG, JPEG o PNG"
     #process_in_background :image UTILE MA OCCORRE ATTIVARE ANCHE LA GEMMA DELAYED-PAPERCLIP
     scope :enable, lambda { |category| {:conditions => {:enabled => true, :category => category}} }
-
+    
+    # Load S3 settings
+    if (Rails.root.join('config', 's3.yml'))
+      S3_OPTIONS = {
+              :storage => 's3',
+              :s3_credentials => Rails.root.join('config', 's3.yml')
+            }
+    elsif (ENV['S3_KEY'] && ENV['S3_SECRET'] && ENV['S3_BUCKET'])
+      S3_OPTIONS = {
+              :storage => 's3',
+              :s3_credentials => {
+                :access_key_id     => ENV['S3_KEY'],
+                :secret_access_key => ENV['S3_SECRET']
+              },
+              :bucket => ENV['S3_BUCKET']
+            }
+    else
+      S3_OPTIONS = { :storage => 'filesystem' }
+    end
+    
+    attachment_definitions[:attachment] = (attachment_definitions[:attachment] || {}).merge(S3_OPTIONS)
+    
     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
 end

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

@@ -9,7 +9,7 @@
 
 <h1><%= t("banner.many") %></h1>
 
-<table class="index">
+<table class="index sortable" data-hook data-sortable-link="<%= update_positions_admin_banners_url %>">
 	<tr>
 		<th><%= t("banner.category") %></th>
 		<th><%= t("banner.position") %></th>
@@ -19,7 +19,10 @@
 	<tbody>
 		<% @banners.each do |banner| %>
 		<tr class="<%= cycle('even', 'odd') %>" id="<%= dom_id banner %>">
-			<td><%= banner.category %></td>
+			<td>
+				<span class="handle"></span>
+				<%= banner.category %>
+			</td>
 			<td><%= banner.position %></td>
 			<td><%= icon('tick') if banner.enabled %></td>
 			<td>

data/config/routes.rb

@@ -1,5 +1,9 @@
 Spree::Core::Engine.routes.prepend do
   namespace :admin do
-    resources :banners
+    resources :banners do
+      collection do
+        post :update_positions
+      end
+    end
   end
 end

data/db/migrate/20120116204313_create_banners.rb

@@ -1,6 +1,6 @@
 class CreateBanners < ActiveRecord::Migration
   def change
-    create_table :spree_banners do |t|
+    create_table :banners do |t|
       t.string :title, :url
       t.string :category
       t.integer :position

data/db/migrate/20120323174800_banner_namespace.rb

@@ -0,0 +1,5 @@
+class BannerNamespace < ActiveRecord::Migration
+  def change
+    rename_table :banners, :spree_banners
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_banner
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Damiano Giacomello
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-22 00:00:00 Z
+date: 2012-04-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: spree_core
@@ -116,6 +116,7 @@ files:
 - app/views/spree/admin/banners/index.html.erb
 - app/views/spree/admin/banners/new.html.erb
 - db/migrate/20120116204313_create_banners.rb
+- db/migrate/20120323174800_banner_namespace.rb
 - config/locales/en.yml
 - config/locales/it.yml
 - config/routes.rb
@@ -150,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Extension to manage banner for you Spree Shop