attachment_magick 0.3.1 → 0.3.2

data/Gemfile

@@ -4,13 +4,15 @@ gem "rails", "3.0.10"
 gem "capybara", ">= 1.0.1"
 gem "sqlite3-ruby", :require => "sqlite3"
 
-gem "mongoid", "~> 2.0"
-gem "bson_ext", "~> 1.3"
+gem "mongoid", "~> 2.2"
+gem "bson_ext", "~> 1.4"
 gem "nokogiri"
 gem "hpricot"
 gem "colorific"
 gem "ruby-debug19"
-gem "simplecov"
+gem "simplecov", :require => false
 gem "mime-types", ">=1.16"
-# Specify your gem"s dependencies in attachment_magick.gemspec
+
+
+# Specify your gem's dependencies in attachment_magick.gemspec
 gemspec

data/Gemfile.lock

@@ -4,13 +4,14 @@ PATH
     attachment_magick (0.3.1)
       dragonfly (>= 0.9.5)
       jquery-rails (>= 0.2.7)
-      marcosinger-auto_html (>= 1.3.4)
+      marcosinger-auto_html (>= 1.3.6)
       marcosinger-css_parser (>= 1.3.0)
       rack-cache (>= 1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    RedCloth (4.2.8)
     abstract (1.0.0)
     actionmailer (3.0.10)
       actionpack (= 3.0.10)
@@ -40,10 +41,10 @@ GEM
     activesupport (3.0.10)
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
-    bson (1.3.0)
-    bson_ext (1.3.0)
+    bson (1.4.0)
+    bson_ext (1.4.0)
     builder (2.1.2)
-    capybara (1.0.1)
+    capybara (1.1.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -52,22 +53,21 @@ GEM
       xpath (~> 0.1.4)
     childprocess (0.2.2)
       ffi (~> 1.0.6)
-    colorific (0.0.2)
-      minitest (~> 2.0)
-      ruby-progressbar (>= 0.0.9)
-    columnize (0.3.2)
-    dragonfly (0.9.5)
+    colorific (1.0.0)
+      minitest (~> 2.3.1)
+      ruby-progressbar (~> 0.0.10)
+    columnize (0.3.4)
+    dragonfly (0.9.8)
       rack
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    ffi (1.0.7)
-      rake (>= 0.8.7)
+    ffi (1.0.9)
     hpricot (0.8.4)
     i18n (0.5.0)
-    jquery-rails (1.0.13)
+    jquery-rails (1.0.14)
       railties (~> 3.0)
       thor (~> 0.14)
-    json_pure (1.5.1)
+    json_pure (1.6.1)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
     mail (2.2.19)
@@ -75,22 +75,26 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    marcosinger-auto_html (1.3.5)
+    marcosinger-auto_html (1.3.6)
+      RedCloth
       hpricot (>= 0.8.4)
+      redcarpet
+      rinku
+      tag_helper
     marcosinger-css_parser (1.3.0)
     mime-types (1.16)
-    minitest (2.1.0)
-    mongo (1.3.0)
-      bson (>= 1.3.0)
-    mongoid (2.0.1)
+    minitest (2.3.1)
+    mongo (1.4.0)
+      bson (= 1.4.0)
+    mongoid (2.2.2)
       activemodel (~> 3.0)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
-      will_paginate (~> 3.0.pre)
-    nokogiri (1.4.4)
+    multi_json (1.0.3)
+    nokogiri (1.5.0)
     polyglot (0.3.2)
-    rack (1.2.3)
-    rack-cache (1.0.3)
+    rack (1.2.4)
+    rack-cache (1.1)
       rack (>= 0.4)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
@@ -112,6 +116,8 @@ GEM
       thor (~> 0.14.4)
     rake (0.9.2)
     rdoc (3.9.4)
+    redcarpet (1.17.2)
+    rinku (1.2.2)
     ruby-debug-base19 (0.11.25)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
@@ -124,23 +130,24 @@ GEM
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
     rubyzip (0.9.4)
-    selenium-webdriver (2.5.0)
+    selenium-webdriver (2.7.0)
       childprocess (>= 0.2.1)
       ffi (>= 1.0.7)
       json_pure
       rubyzip
-    simplecov (0.4.2)
-      simplecov-html (~> 0.4.4)
-    simplecov-html (0.4.4)
-    sqlite3 (1.3.3)
+    simplecov (0.5.3)
+      multi_json (~> 1.0.3)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
+    sqlite3 (1.3.4)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
+    tag_helper (0.0.3)
     thor (0.14.6)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.29)
-    will_paginate (3.0.pre2)
+    tzinfo (0.3.30)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -149,12 +156,12 @@ PLATFORMS
 
 DEPENDENCIES
   attachment_magick!
-  bson_ext (~> 1.3)
+  bson_ext (~> 1.4)
   capybara (>= 1.0.1)
   colorific
   hpricot
   mime-types (>= 1.16)
-  mongoid (~> 2.0)
+  mongoid (~> 2.2)
   nokogiri
   rails (= 3.0.10)
   ruby-debug19

data/app/models/attachment_magick/mongoid_image.rb

@@ -3,7 +3,7 @@ require "mime/types"
 module AttachmentMagick
   class MongoidImage
     include Mongoid::Document
-    include AutoHtml
+    # include AutoHtml
     include AutoHtmlFor
 
     before_create :set_content_type
@@ -16,13 +16,14 @@ module AttachmentMagick
     field           :source
     field           :content_type
     image_accessor  :photo
-    embedded_in     :imageable, :inverse_of => :image
+    
+    embedded_in     :imageable, :polymorphic => true
 
     auto_html_for :source => "_to_html" do
       youtube(:width => 620, :height => 465)
       vimeo(:width => 620, :height => 465)
     end
-
+    
     auto_html_for :source => "_to_image" do
       youtube_image
       vimeo_image(:size => :large)

data/attachment_magick.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |s|
   s.add_dependency "dragonfly",  ">= 0.9.5"
   s.add_dependency "rack-cache", ">= 1.0"
   s.add_dependency "jquery-rails", ">= 0.2.7"
-  s.add_dependency "marcosinger-auto_html", ">= 1.3.4"
+  s.add_dependency "marcosinger-auto_html", ">= 1.3.6"
   s.add_dependency "marcosinger-css_parser", ">= 1.3.0"
 end

data/lib/attachment_magick.rb

@@ -19,8 +19,8 @@ module AttachmentMagick
   included do
     cattr_accessor :attachment_magick_default_options
     
-    if AttachmentMagick.configuration.orms.include?("Mongoid")
-      embeds_many :images, :class_name => "AttachmentMagick::MongoidImage", :polymorphic => true  if self.include?(Mongoid::Document)
+    if AttachmentMagick.configuration.orms.include?("Mongoid")      
+      embeds_many :images, :as => :imageable, :class_name => "AttachmentMagick::MongoidImage" if self.include?(Mongoid::Document)
     end
     
     if AttachmentMagick.configuration.orms.include?("ActiveRecord")

data/lib/attachment_magick/version.rb

@@ -1,3 +1,3 @@
 module AttachmentMagick
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

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

@@ -26,12 +26,16 @@
   </div>
   <div class="grid_19 tpush_2">
     <%artist.images.each do |image|%>
-      <%= image_tag image.photo.thumb(Artist.style_thumb).url,    :class => "attachment-thumb hide"%>
-      <%= image_tag image.photo.thumb(Artist.style_grid_1).url,   :class => "attachment-grid_1 hide"%>
-      <%= image_tag image.photo.thumb(Artist.style_grid_10).url,  :class => "attachment-grid_10"%>
-      <%= image_tag image.photo.thumb(Artist.style_grid_15).url,  :class => "attachment-grid_15 hide"%>
-      <%= image_tag image.photo.thumb(Artist.style_grid_16).url,  :class => "attachment-grid_16 hide"%>
-      <%= image_tag image.photo.thumb(Artist.style_publisher).url,  :class => "attachment-publisher hide"%>
+      <% if image.source.nil? %>
+        <%= image_tag image.photo.thumb(Artist.style_thumb).url,    :class => "attachment-thumb hide"%>
+        <%= image_tag image.photo.thumb(Artist.style_grid_1).url,   :class => "attachment-grid_1 hide"%>
+        <%= image_tag image.photo.thumb(Artist.style_grid_10).url,  :class => "attachment-grid_10"%>
+        <%= image_tag image.photo.thumb(Artist.style_grid_15).url,  :class => "attachment-grid_15 hide"%>
+        <%= image_tag image.photo.thumb(Artist.style_grid_16).url,  :class => "attachment-grid_16 hide"%>
+        <%= image_tag image.photo.thumb(Artist.style_publisher).url,  :class => "attachment-publisher hide"%>
+      <% else %>
+        <%= image_tag image.source_to_image %>
+      <% end %>
     <% end %>
   </div>
 <% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attachment_magick
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,12 +11,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-31 00:00:00.000000000 -03:00
+date: 2011-10-04 00:00:00.000000000 -03:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
-  requirement: &2155959540 !ruby/object:Gem::Requirement
+  requirement: &2168762480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 0.9.5
   type: :runtime
   prerelease: false
-  version_requirements: *2155959540
+  version_requirements: *2168762480
 - !ruby/object:Gem::Dependency
   name: rack-cache
-  requirement: &2155958400 !ruby/object:Gem::Requirement
+  requirement: &2168761860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155958400
+  version_requirements: *2168761860
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2155957120 !ruby/object:Gem::Requirement
+  requirement: &2168761300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,21 +46,21 @@ dependencies:
         version: 0.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *2155957120
+  version_requirements: *2168761300
 - !ruby/object:Gem::Dependency
   name: marcosinger-auto_html
-  requirement: &2155955560 !ruby/object:Gem::Requirement
+  requirement: &2168760800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 1.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *2155955560
+  version_requirements: *2168760800
 - !ruby/object:Gem::Dependency
   name: marcosinger-css_parser
-  requirement: &2155954640 !ruby/object:Gem::Requirement
+  requirement: &2168759340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,7 +68,7 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2155954640
+  version_requirements: *2168759340
 description: 
 email:
 - markaum@gmail.com