comfy_carousel 0.0.1 → 0.0.2

data/README.md

@@ -22,6 +22,8 @@ This gem comes bundled with [slides.jquery.js](http://slidesjs.com/) that you ca
     
 ## Usage
 
+You'll notice that carousels have `dimensions` field. You can force-resize uploaded images via ImageMagic values. For example: `300x200#` will resize any image to be 300px wide and 200px in height. Also it will crop image if necessary. 
+
 There's nothing on the front-end really. You have access to `Carousel::Carousel` objects that in turn can be used to access their slides. Like so:
 
     @carousel = Carousel::Carousel.find_by_identifier('my_carousel')

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/app/controllers/admin/carousel/slides_controller.rb

@@ -50,7 +50,8 @@ class Admin::Carousel::SlidesController < Admin::Carousel::BaseController
 protected
 
   def build_slide
-    @slide = @carousel.slides.new(params[:slide])
+    # Yes, this is terrible. Thank paperclip for that.
+    @slide = Carousel::Slide.new({:carousel => @carousel}.merge(params[:slide] || {}))
   end
 
   def load_slide

data/app/models/carousel/slide.rb

@@ -1,8 +1,20 @@
 class Carousel::Slide < ActiveRecord::Base
   
+  IMAGE_MIMETYPES = %w(gif jpeg pjpeg png svg+xml tiff).collect{|subtype| "image/#{subtype}"}
+  
   self.table_name = :carousel_slides
   
-  has_attached_file :file
+  upload_options = (ComfyCarousel.config.upload_options || {}).merge(
+    :styles => lambda { |slide|
+      if c = slide.instance.carousel && dimentions = c.try(:dimentions)
+        { :original => dimentions }
+      else
+        { }
+      end
+    }
+  )
+  has_attached_file :file, upload_options
+  before_post_process :is_image?
   
   # -- Relationships --------------------------------------------------------
   belongs_to :carousel
@@ -17,6 +29,11 @@ class Carousel::Slide < ActiveRecord::Base
   # -- Scopes ---------------------------------------------------------------
   default_scope order('carousel_slides.position')
   
+  # -- Instance Methods -----------------------------------------------------
+  def is_image?
+    IMAGE_MIMETYPES.include?(file_content_type)
+  end
+  
 protected
   
   def assign_position

data/app/views/admin/carousel/carousels/_form.html.erb

@@ -1,4 +1,5 @@
 <%= form.text_field :label, :id => (@carousel.new_record?? 'slugify' : nil) %>
 <%= form.text_field :identifier, :id => 'slug' %>
+<%= form.text_field :dimensions %>
 
-<%= form.submit (@carousel.new_record? ? 'Create Carousel' : 'Update Carousel') %>
+<%= form.submit @carousel.new_record?? 'Create Carousel' : 'Update Carousel' %>

data/app/views/admin/carousel/slides/_form.html.erb

@@ -1,6 +1,12 @@
 <%= form.text_field :label %>
 <%= form.text_area :content %>
 <%= form.text_field :url %>
+
+<% if @slide.file? && !@slide.new_record? %>
+  <%= form.simple_field 'Current Image' do %>
+    <%= image_tag @slide.file.url %>
+  <% end %>
+<% end %>
 <%= form.file_field :file %>
 
 <% if defined?(ComfortableMexicanSofa) %>
@@ -10,4 +16,4 @@
   <%= cms_hook :carousel_slide, :locals => { :form => form } %>
 <% end %>
 
-<%= form.submit (@slide.new_record? ? 'Create Slide' : 'Update Slide') %>
+<%= form.submit @slide.new_record?? 'Create Slide' : 'Update Slide' %>

data/comfy_carousel.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "comfy_carousel"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc."]

data/db/migrate/01_create_comfy_carousel.rb

@@ -4,6 +4,7 @@ class CreateComfyCarousel < ActiveRecord::Migration
     create_table :carousel_carousels do |t|
       t.string :label,      :null => false
       t.string :identifier, :null => false
+      t.string :dimensions
       t.timestamps
     end
     add_index :carousel_carousels, :identifier

data/db/schema.rb

@@ -16,6 +16,7 @@ ActiveRecord::Schema.define(:version => 1) do
   create_table "carousel_carousels", :force => true do |t|
     t.string   "label",      :null => false
     t.string   "identifier", :null => false
+    t.string   "dimensions"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
   end

data/lib/comfy_carousel/configuration.rb

@@ -11,11 +11,15 @@ module ComfyCarousel
     # Form builder
     attr_accessor :form_builder
     
+    # Paperclip upload settings for photos
+    attr_accessor :upload_options
+    
     # Configuration defaults
     def initialize
-      @admin_route_prefix     = 'admin'
-      @admin_controller       = 'ApplicationController'
-      @form_builder           = 'ComfyCarousel::FormBuilder'
+      @admin_route_prefix = 'admin'
+      @admin_controller   = 'ApplicationController'
+      @form_builder       = 'ComfyCarousel::FormBuilder'
+      @upload_options     = { }
     end
     
   end

data/lib/comfy_carousel/engine.rb

@@ -10,6 +10,7 @@ module ComfyCarousel
           conf.admin_route_prefix = ComfortableMexicanSofa.config.admin_route_prefix
           conf.admin_controller   = 'CmsAdmin::BaseController'
           conf.form_builder       = 'ComfortableMexicanSofa::FormBuilder'
+          conf.upload_options     = ComfortableMexicanSofa.config.upload_file_options
         end
         # Adding view hooks
         ComfortableMexicanSofa::ViewHooks.add(:navigation, '/admin/carousel/navigation')

data/test/fixtures/carousel/carousels.yml

@@ -1,3 +1,4 @@
 default:
   label: Default
-  identifier: default
+  identifier: default
+  dimensions:

data/test/test_helper.rb

@@ -15,9 +15,10 @@ class ActiveSupport::TestCase
   # resetting default configuration
   def reset_config
     ComfyCarousel.configure do |config|
-      config.admin_route_prefix     = 'admin'
-      config.admin_controller       = 'ApplicationController'
-      config.form_builder           = 'ComfyCarousel::FormBuilder'
+      config.admin_route_prefix = 'admin'
+      config.admin_controller   = 'ApplicationController'
+      config.form_builder       = 'ComfyCarousel::FormBuilder'
+      config.upload_options     = { }
     end
   end
 

data/test/unit/configuration_test.rb

@@ -4,9 +4,10 @@ class ConfigurationTest < ActiveSupport::TestCase
   
   def test_configuration
     assert config = ComfyCarousel.configuration
-    assert_equal 'admin',                   config.admin_route_prefix
-    assert_equal 'ApplicationController',   config.admin_controller
+    assert_equal 'admin',                       config.admin_route_prefix
+    assert_equal 'ApplicationController',       config.admin_controller
     assert_equal 'ComfyCarousel::FormBuilder',  config.form_builder
+    assert_equal ({}),                          config.upload_options
   end
   
   def test_initialization_overrides

data/test/unit/slide_test.rb

@@ -15,15 +15,25 @@ class SlideTest < ActiveSupport::TestCase
   end
   
   def test_creation
+    carousel = carousel_carousels(:default)
     assert_difference 'Carousel::Slide.count' do
-      slide = carousel_carousels(:default).slides.create(
+      slide = carousel.slides.create(
         :label    => 'Test',
         :content  => 'Test Content',
         :url      => 'http://google.com',
         :file     => fixture_file_upload('files/image.jpg', 'image/jpeg')
       )
       assert_equal 1, slide.position
+      assert_equal carousel, slide.carousel
     end
   end
   
+  def test_is_image?
+    slide = carousel_slides(:default)
+    assert slide.is_image?
+    
+    slide.update_attribute(:file_content_type, 'application/pdf')
+    assert !slide.is_image?
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfy_carousel
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-02-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70348692094640 !ruby/object:Gem::Requirement
+  requirement: &70281782162840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70348692094640
+  version_requirements: *70281782162840
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70348692091400 !ruby/object:Gem::Requirement
+  requirement: &70281782162080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70348692091400
+  version_requirements: *70281782162080
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70348692083860 !ruby/object:Gem::Requirement
+  requirement: &70281782161380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70348692083860
+  version_requirements: *70281782161380
 description: ''
 email: oleg@twg.ca
 executables: []
@@ -135,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1820114394021651927
+      hash: -4170429523828767881
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: