attachment_magick 0.1.0 → 0.2.0

data/.gitignore

@@ -10,3 +10,4 @@ tmp/
 coverage/
 ._*
 *.gem
+.rvmrc

data/Gemfile

@@ -11,5 +11,6 @@ gem 'hpricot'
 gem 'colorific'
 gem 'ruby-debug19'
 gem 'simplecov'
+gem 'mime-types', '>=1.16'
 # Specify your gem's dependencies in attachment_magick.gemspec
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    attachment_magick (0.0.1)
+    attachment_magick (0.1.0)
       dragonfly (>= 0.8.1)
       jquery-rails (>= 0.2.7)
       marcosinger-auto_html (>= 1.3.4)
@@ -151,6 +151,7 @@ DEPENDENCIES
   capybara (>= 0.4.0)
   colorific
   hpricot
+  mime-types (>= 1.16)
   mongoid (>= 2.0.0.rc.6)
   nokogiri
   rails (= 3.0.3)

data/README.rdoc

@@ -1,47 +1,43 @@
 == AttachmentMagick
 
 Attachment Magick is a gem to upload images and videos(vimeo) using swfupload.
-Supports Mongoid, coming soon support to activerecord.
+Supports Mongoid and ActiveRecord.
 
 == Installation
 
-This gem is not released yet, some dependencies are still necessary
 Add to Gemfile
 
-  #AttachmentMagick requires
-  gem 'attachment_magick', :git => 'git://github.com/marcosinger/attachment_magick.git'
-  gem 'auto_html', :git => 'git://github.com/marcosinger/auto_html.git'
-  gem 'hpricot'
-  gem 'haml'
+  gem 'attachment_magick'
 
-Then run
-
-  bundle install
 
 After the gem installation, run the generator
 
-  attachment_magick:install
+  rails g attachment_magick:install
 
 The generator will install swfupload (js and css files) and will create some routes.
 
+And if you using ActiveRecord, run this too
+
+  rails g attachment_magick:migration
+
 Create a initializer like this (config/initializers/attachment_magick_setup.rb)
 
   AttachmentMagick.setup do |config|
-    config.default_add_partial = '/layouts/attachment_magick/images/add_image'
+    #config.default_add_partial = '/attachment_magick/add_image'  # default
     config.columns_amount = 16
-    config.columns_width = 52
-    config.gutter = 8
+    config.columns_width  = 52
+    config.gutter         = 8
 
     config.custom_styles do
       publisher "52x"
-      custom_style "50x50"
+      my_custom_style "50x50"
     end
   end
 
 * Attachment Magick is based in 960 Grid System (http://960.gs/)
 
 Add to application.rb
-  
+
   config.middleware.insert_after 'Rack::Lock', 'Dragonfly::Middleware', :images, '/media'
   config.middleware.insert_before 'Dragonfly::Middleware', 'Rack::Cache', {
     :verbose     => true,
@@ -58,17 +54,21 @@ Include the js files to your application layout or page
 Include AttachmentMagick Module to your model
 
   class Post
-    include Mongoid::Document
     include AttachmentMagick
 
-    field :title
+    ...
   end
 
 Call this helpers in form views
 
   attachment_progress_container @post
   attachment_for_view @post
-  attachment_for_video
+  attachment_for_video @post
+  attachment_for_flash @image.photo.url
+
+For customize your list for images
+  attachment_for_view @post, 'path/my_partial'
+
 
 == Customizing views
 
@@ -86,13 +86,9 @@ Call this helpers in form views
 == Customizing sizes
 
   class Post
-    include Mongoid::Document
     include AttachmentMagick
 
-    field :title
-
     attachment_magick do
       grid_1 "100x100"
     end
-  end
-
+  end

data/app/controllers/attachment_magick/images_controller.rb

@@ -4,7 +4,7 @@ class AttachmentMagick::ImagesController < ActionController::Base
   before_filter :load_klass
 
   def create
-    @image = @klass.images.create(:photo => params[:Filedata], :source => params[:source], :image_type => params[:data_type])
+    @image = @klass.images.create(:photo => params[:Filedata], :source => params[:source], :file_name => params[:source] ? "" : params[:Filedata].original_filename)
     @klass.save
 
     if params[:data_partial].present?

data/app/helpers/attachment_magick/attachment_magick_helper.rb

@@ -50,8 +50,45 @@ module AttachmentMagick::AttachmentMagickHelper
       "#{html_partial}<div id='#{key}' class='#{'attachmentSortable' if use_sortable}'>#{html}</div><div></div>".html_safe
     end
   end
-  
-  def attachment_for_video
-    %{<label>vídeo</label><ol class='form-block'>#{render :partial => "layouts/attachment_magick/images/video_upload"}</ol>}.html_safe
+
+  def attachment_for_video(object)
+    %{<label>vídeo</label><ol class='form-block'>#{render :partial => "/attachment_magick/video_upload"}</ol>}.html_safe unless object.new_record?
+  end
+
+  #FIXME - verify this html
+  def attachment_for_flash(url, width=100, height=60)
+    "<object classid='clsid:d27cdb6e-ae6d-11cf-96b8-444553540000' width='#{width}' height='#{height}' id='#{url}' align='middle'>
+      <param name='movie' value='#{url}' />
+      <param name='quality' value='high' />
+      <param name='bgcolor' value='#FFF' />
+      <param name='play' value='true' />
+      <param name='loop' value='true' />
+      <param name='wmode' value='window' />
+      <param name='scale' value='showall' />
+      <param name='menu' value='true' />
+      <param name='devicefont' value='false' />
+      <param name='salign' value='' />
+      <param name='allowScriptAccess' value='sameDomain' />
+      <!--[if !IE]>-->
+      <object type='application/x-shockwave-flash' data='#{url}' width='#{width}' height='#{height}'>
+        <param name='movie' value='#{url}' />
+        <param name='quality' value='high' />
+        <param name='bgcolor' value='#FFF' />
+        <param name='play' value='true' />
+        <param name='loop' value='true' />
+        <param name='wmode' value='window' />
+        <param name='scale' value='showall' />
+        <param name='menu' value='true' />
+        <param name='devicefont' value='false' />
+        <param name='salign' value='' />
+        <param name='allowScriptAccess' value='sameDomain' />
+      <!--<![endif]-->
+        <a href='http://www.adobe.com/go/getflash'>
+          <img src='http://www.adobe.com/images/shared/download_buttons/get_flash_player.gif' alt='Get Adobe Flash player' />
+        </a>
+      <!--[if !IE]>-->
+      </object>
+      <!--<![endif]-->
+    </object>".html_safe
   end
 end

data/app/models/attachment_magick/active_record_image.rb

@@ -1,10 +1,12 @@
 module AttachmentMagick
   class ActiveRecordImage < ActiveRecord::Base
     set_table_name "amagick_images"
-        
+
     belongs_to      :imageable, :polymorphic => true
     image_accessor  :photo
 
+    attr_accessor :file_name #not implemented yet
+
     auto_html_for :source => "_to_html" do
       youtube(:width => 620, :height => 465)
       vimeo(:width => 620, :height => 465)
@@ -14,5 +16,11 @@ module AttachmentMagick
       youtube_image
       vimeo_image(:size => :large)
     end
+
+    #not implemented yet
+    def is_flash?
+      false
+    end
+
   end if defined? ActiveRecord::Persistence
 end

data/app/models/attachment_magick/mongoid_image.rb

@@ -1,14 +1,20 @@
+require "mime/types"
+
 module AttachmentMagick
   class MongoidImage
     include Mongoid::Document
     include AutoHtml
     include AutoHtmlFor
 
+    before_create :set_content_type
+
+    attr_accessor :file_name
+
     field           :photo_uid
     field           :caption
     field           :priority
     field           :source
-    field           :image_type
+    field           :content_type
     image_accessor  :photo
     embedded_in     :imageable, :inverse_of => :image
 
@@ -25,5 +31,15 @@ module AttachmentMagick
     def imageable
       self._parent
     end
+
+    #FIXME - find a better way to compare
+    def is_flash?
+      self.content_type =~ /flash/ ? true : false
+    end
+
+    private
+    def set_content_type
+      self.content_type = MIME::Types.type_for(self.file_name.to_s).to_s
+    end
   end
 end

data/app/views/{layouts/attachment_magick/images → attachment_magick}/_add_image.html.erb

@@ -1,6 +1,10 @@
 <div class="grid_5 attachment_magick_image">
   <div class="grid_3 alpha">
-    <%= image_tag image.source.nil? ? image.photo.thumb(image.imageable.class.style_publisher).url : image.source_to_image%>
+    <% if image.is_flash? %>
+      <%= attachment_for_flash(image.photo.url) %>
+    <% else %>
+      <%= image_tag((image.source.nil? ? image.photo.thumb(image.imageable.class.style_publisher).url : image.source_to_image), :alt => "") %>
+    <% end %>
     <input type="hidden" value="<%= image.id%>" id="image_id">
   </div>
   <div class="grid_2 omega">

data/lib/attachment_magick/configuration/configuration.rb

@@ -13,7 +13,7 @@ module AttachmentMagick
       @columns_width          = 54
       @gutter                 = 3
       @custom_styles          = []
-      @default_add_partial    = "layouts/attachment_magick/images/add_image"
+      @default_add_partial    = "/attachment_magick/add_image"
     end
 
     def custom_styles(&block)

data/lib/attachment_magick/test/attachment_magick_test_helper.rb

@@ -1,3 +1,10 @@
+class Tempfile
+  def original_filename
+    "little_girl.jpg"
+  end
+end
+
+
 module AttachmentMagickTestHelper
   def assert_element_in(target, match)
     target = Nokogiri::HTML(target)
@@ -34,7 +41,15 @@ module AttachmentMagickTestHelper
   end
 
   def exemple_file
-    File.expand_path('../dummy/public/images/little_girl.jpg', __FILE__)
+    Tempfile.new('little_girl.jpg')
+  end
+
+  def exemple_youtube
+    'http://www.youtube.com/watch?v=FUe83k3t_0s'
+  end
+
+  def exemple_vimeo
+    'http://vimeo.com/14051767'
   end
 
   def exemple_partial

data/lib/attachment_magick/version.rb

@@ -1,3 +1,3 @@
 module AttachmentMagick
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/generators/attachment_magick/templates/public/javascripts/swfupload/handlers.js

@@ -48,7 +48,7 @@ var attachmentMagick = {
           post_params :                 { 'data_attachment' : data_attachment, 'data_partial' : data_partial },
 
           file_size_limit:              '20 MB',
-          file_types:                   '*.jpg; *.png; *.gif; *.jpeg',
+          file_types:                   '*.jpg; *.png; *.gif; *.jpeg; *.swf',
           file_types_description:       'Images Files',
           file_upload_limit :           0,
 

data/test/attachment_magick/controllers/images_controller_test.rb

@@ -14,6 +14,18 @@ class AttachmentMagick::ImagesControllerTest < ActionController::TestCase
     assert  assert_element_in(response.body, "img")
   end
 
+  test "should create artist vimeo video" do
+    post :create, artist_hash.merge({ :source => exemple_vimeo })
+    assert_response :success
+    assert  assert_element_in(response.body, "img")
+  end
+
+  test "should create artist youtube video" do
+    post :create, artist_hash.merge({ :source => exemple_youtube })
+    assert_response :success
+    assert  assert_element_in(response.body, "img")
+  end
+
   test "should create work image" do
     post :create, work_hash.merge({ :Filedata => exemple_file })
     assert_response :success

data/test/attachment_magick/helpers/attachment_magick_test.rb

@@ -46,11 +46,19 @@ class AttachmentMagick::AttachmentMagickHelperTest < ActionView::TestCase
     assert assert_element_in(html, "div[@class='image_thumb']")
     assert assert_element_in(html, "img")
   end
-  
+
   def test_attachment_for_video
-    html = attachment_for_video
-    
+    html = attachment_for_video(@artist)
+
     assert assert_element_in(html, "input")
     assert assert_element_in(html, "a[@class='video_upload']")
   end
+
+  def test_attachment_for_flash
+    @artist.images.create(:photo => exemple_file)
+
+    html = attachment_for_flash(@artist.images.first.photo.url)
+    assert assert_element_in(html, "object")
+    assert assert_element_in(html, "object[@width='100'][@height='60']")
+  end
 end

data/test/dummy/app/views/artists/_form.html.erb

@@ -9,21 +9,20 @@
         <%=link_to work.name, edit_artist_work_path(@artist, work)%>
       <% end %>
   </div>
-  
+<% end %>
   <div class="grid_13 tpush_2">
     <%=form_for @artist, :html => {:multipart => true} do |form|%>
       <%=form.label :name%>
       <%=form.text_field :name%>
-  
+
       <%=form.label :lastname%>
       <%=form.text_field :lastname%>
       <%=form.submit%>
       <br />
       <br />
-  
+
       <%= attachment_progress_container @artist%>
       <%= attachment_for_view @artist%>
-      <%= attachment_for_video%>
+      <%= attachment_for_video @artist%>
     <% end %>
   </div>
-<% end %>

data/test/dummy/app/views/layouts/application.html.erb

@@ -21,7 +21,7 @@
           <li><%= link_to "Novo Lugar", new_place_path%></li>
         </ul>
       </div>
-      <%= yield%>
+      <%= yield %>
     </div>
   </body>
 </html>

data/test/dummy/config/application.rb

@@ -14,6 +14,8 @@ module Dummy
     config.encoding           = "utf-8"
     config.filter_parameters  += [:password]
 
+    config.action_view.javascript_expansions[:defaults] = %w(jquery.min rails application)
+
     config.middleware.insert_after 'Rack::Lock', 'Dragonfly::Middleware', :images, '/media'
     config.middleware.insert_before 'Dragonfly::Middleware', 'Rack::Cache', {
       :verbose     => true,

data/test/dummy/config/initializers/attachment_magick_setup.rb

@@ -1,5 +1,4 @@
 AttachmentMagick.setup do |config|
-  config.default_add_partial  = "layouts/attachment_magick/images/add_image"
   config.columns_amount       = 19
   config.columns_width        = 54
   config.gutter               = 3

data/test/dummy/public/javascripts/swfupload/handlers.js

@@ -48,7 +48,7 @@ var attachmentMagick = {
           post_params :                 { 'data_attachment' : data_attachment, 'data_partial' : data_partial },
 
           file_size_limit:              '20 MB',
-          file_types:                   '*.jpg; *.png; *.gif; *.jpeg',
+          file_types:                   '*.jpg; *.png; *.gif; *.jpeg; *.swf',
           file_types_description:       'Images Files',
           file_upload_limit :           0,
 

metadata

@@ -2,7 +2,7 @@
 name: attachment_magick
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - "Marco Ant\xC3\xB4nio Singer"
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-07 00:00:00 -03:00
+date: 2011-04-08 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,8 +79,8 @@ files:
 - app/helpers/attachment_magick/attachment_magick_helper.rb
 - app/models/attachment_magick/active_record_image.rb
 - app/models/attachment_magick/mongoid_image.rb
-- app/views/layouts/attachment_magick/images/_add_image.html.erb
-- app/views/layouts/attachment_magick/images/_video_upload.html.erb
+- app/views/attachment_magick/_add_image.html.erb
+- app/views/attachment_magick/_video_upload.html.erb
 - attachment_magick.gemspec
 - lib/attachment_magick.rb
 - lib/attachment_magick/configuration/configuration.rb
@@ -156,7 +156,6 @@ files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
-- test/dummy/public/images/little_girl.jpg
 - test/dummy/public/images/swfupload/cancelbutton.gif
 - test/dummy/public/javascripts/application.js
 - test/dummy/public/javascripts/jquery-ui.js
@@ -199,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: attachment_magick
-rubygems_version: 1.6.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: little more magick when you upload image files (with SwfUpload and Dragonfly)
@@ -262,7 +261,6 @@ test_files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
-- test/dummy/public/images/little_girl.jpg
 - test/dummy/public/images/swfupload/cancelbutton.gif
 - test/dummy/public/javascripts/application.js
 - test/dummy/public/javascripts/jquery-ui.js