attachment_magick 0.3.2 → 0.3.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    attachment_magick (0.3.1)
+    attachment_magick (0.3.3)
       dragonfly (>= 0.9.5)
       jquery-rails (>= 0.2.7)
       marcosinger-auto_html (>= 1.3.6)
@@ -41,8 +41,8 @@ GEM
     activesupport (3.0.10)
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
-    bson (1.4.0)
-    bson_ext (1.4.0)
+    bson (1.4.1)
+    bson_ext (1.4.1)
     builder (2.1.2)
     capybara (1.1.1)
       mime-types (>= 1.16)
@@ -53,8 +53,8 @@ GEM
       xpath (~> 0.1.4)
     childprocess (0.2.2)
       ffi (~> 1.0.6)
-    colorific (1.0.0)
-      minitest (~> 2.3.1)
+    colorific (1.0.1)
+      minitest (~> 2.6.2)
       ruby-progressbar (~> 0.0.10)
     columnize (0.3.4)
     dragonfly (0.9.8)
@@ -64,9 +64,10 @@ GEM
     ffi (1.0.9)
     hpricot (0.8.4)
     i18n (0.5.0)
-    jquery-rails (1.0.14)
+    jquery-rails (1.0.16)
       railties (~> 3.0)
       thor (~> 0.14)
+    json (1.6.1)
     json_pure (1.6.1)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
@@ -82,11 +83,11 @@ GEM
       rinku
       tag_helper
     marcosinger-css_parser (1.3.0)
-    mime-types (1.16)
-    minitest (2.3.1)
-    mongo (1.4.0)
-      bson (= 1.4.0)
-    mongoid (2.2.2)
+    mime-types (1.17.2)
+    minitest (2.6.2)
+    mongo (1.4.1)
+      bson (= 1.4.1)
+    mongoid (2.2.3)
       activemodel (~> 3.0)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
@@ -114,8 +115,9 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (0.9.2)
-    rdoc (3.9.4)
+    rake (0.9.2.2)
+    rdoc (3.11)
+      json (~> 1.4)
     redcarpet (1.17.2)
     rinku (1.2.2)
     ruby-debug-base19 (0.11.25)
@@ -130,12 +132,12 @@ GEM
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
     rubyzip (0.9.4)
-    selenium-webdriver (2.7.0)
+    selenium-webdriver (2.9.1)
       childprocess (>= 0.2.1)
-      ffi (>= 1.0.7)
+      ffi (= 1.0.9)
       json_pure
       rubyzip
-    simplecov (0.5.3)
+    simplecov (0.5.4)
       multi_json (~> 1.0.3)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)

data/app/models/attachment_magick/active_record_image.rb

@@ -1,26 +1,33 @@
 module AttachmentMagick
-  class ActiveRecordImage < ActiveRecord::Base
-    set_table_name "amagick_images"
+  if AttachmentMagick.configuration.orms.include?("ActiveRecord")
+    class ActiveRecordImage < ActiveRecord::Base
+      set_table_name "amagick_images"
 
-    belongs_to      :imageable, :polymorphic => true
-    image_accessor  :photo
+      belongs_to      :imageable, :polymorphic => true
+      image_accessor  :photo
 
-    attr_accessor :file_name #not implemented yet
+      attr_accessor :file_name #not implemented yet
 
-    auto_html_for :source => "_to_html" do
-      youtube(:width => 620, :height => 465)
-      vimeo(:width => 620, :height => 465)
-    end
+      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)
-    end
+      auto_html_for :source => "_to_image" do
+        youtube_image
+        vimeo_image(:size => :large)
+      end
 
-    #not implemented yet
-    def is_flash?
-      false
+      #not implemented yet
+      def is_flash?
+        false
+      end
     end
-
-  end if AttachmentMagick.configuration.orms.include?("ActiveRecord")
-end
+  else
+    #mongoid hack
+    #mongoid v2.3 tries to read all the models =/  
+    class ActiveRecordImage
+    end
+  end
+  
+end

data/lib/attachment_magick/test/attachment_magick_test_helper.rb

@@ -21,7 +21,7 @@ module AttachmentMagickTestHelper
     default_options.merge!(options)
 
     @artist = Artist.create(default_options)
-    @artist.images.create(:photo => exemple_file)
+    @artist.images.create(:photo => example_file)
     return @artist
   end
 
@@ -30,29 +30,29 @@ module AttachmentMagickTestHelper
     default_options.merge!(options)
 
     @place = Place.create(default_options)
-    @place.images.create(:photo => exemple_file)
+    @place.images.create(:photo => example_file)
     return @place
   end
 
   def create_work(artist)
     default_options = {:name => "movie", :local => "Hollywood"}
     artist.works.create(default_options)
-    artist.works.last.images.create(:photo => exemple_file)
+    artist.works.last.images.create(:photo => example_file)
   end
 
-  def exemple_file
+  def example_file
     Tempfile.new('little_girl.jpg')
   end
 
-  def exemple_youtube
+  def example_youtube
     'http://www.youtube.com/watch?v=FUe83k3t_0s'
   end
 
-  def exemple_vimeo
+  def example_vimeo
     'http://vimeo.com/14051767'
   end
 
-  def exemple_partial
+  def example_partial
     "layouts/custom_images_list"
   end
 end

data/lib/attachment_magick/version.rb

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

data/test/attachment_magick/controllers/images_controller_test.rb

@@ -9,37 +9,37 @@ class AttachmentMagick::ImagesControllerTest < ActionController::TestCase
   end
 
   test "should create artist image" do
-    post :create, artist_hash.merge({ :Filedata => exemple_file })
+    post :create, artist_hash.merge({ :Filedata => example_file })
     assert_response :success
     assert  assert_element_in(response.body, "img")
   end
 
   test "should create artist vimeo video" do
-    post :create, artist_hash.merge({ :source => exemple_vimeo })
+    post :create, artist_hash.merge({ :source => example_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 })
+    post :create, artist_hash.merge({ :source => example_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 })
+    post :create, work_hash.merge({ :Filedata => example_file })
     assert_response :success
     assert  assert_element_in(response.body, "img")
   end
 
   test "should create place image" do
-    post :create, place_hash.merge({ :Filedata => exemple_file })
+    post :create, place_hash.merge({ :Filedata => example_file })
     assert_response :success
     assert  assert_element_in(response.body, "img")
   end
 
   test "should update priority order" do
-    4.times{ @artist.images.create(:photo => exemple_file) }
+    4.times{ @artist.images.create(:photo => example_file) }
     @artist.save
     @artist.reload
 
@@ -70,7 +70,7 @@ class AttachmentMagick::ImagesControllerTest < ActionController::TestCase
   end
 
   def work_hash
-    {:data_attachment => "#{@artist.class.name}_#{@artist.id}_works_#{@artist.works.last.id}", :data_partial => exemple_partial}
+    {:data_attachment => "#{@artist.class.name}_#{@artist.id}_works_#{@artist.works.last.id}", :data_partial => example_partial}
   end
 
   def place_hash

data/test/attachment_magick/helpers/attachment_magick_test.rb

@@ -32,7 +32,7 @@ class AttachmentMagick::AttachmentMagickHelperTest < ActionView::TestCase
     assert assert_element_in(html, "a[@class='remove_image']")
     assert assert_element_in(html, "input[@id='image_id']")
 
-    html = attachment_for_view(@artist, exemple_partial)
+    html = attachment_for_view(@artist, example_partial)
     assert assert_element_in(html, "div[@class='image_caption']")
     assert assert_element_in(html, "div[@class='image_thumb']")
     assert assert_element_in(html, "img")
@@ -41,7 +41,7 @@ class AttachmentMagick::AttachmentMagickHelperTest < ActionView::TestCase
     assert assert_element_in(html, "a[@class='remove_image']")
     assert assert_element_in(html, "input[@id='image_id']")
 
-    html = attachment_for_view(@place, exemple_partial)
+    html = attachment_for_view(@place, example_partial)
     assert assert_element_in(html, "div[@class='image_caption']")
     assert assert_element_in(html, "div[@class='image_thumb']")
     assert assert_element_in(html, "img")
@@ -55,7 +55,7 @@ class AttachmentMagick::AttachmentMagickHelperTest < ActionView::TestCase
   end
 
   def test_attachment_for_flash
-    @artist.images.create(:photo => exemple_file)
+    @artist.images.create(:photo => example_file)
 
     html = attachment_for_flash(@artist.images.first.photo.url)
     assert assert_element_in(html, "object")

data/test/attachment_magick/units/artist_test.rb

@@ -12,8 +12,8 @@ class ArtistTest < ActiveSupport::TestCase
 
   def test_image_cover
     @artist = Artist.create(:name => "Busk")
-    @image = @artist.images.create(:photo => exemple_file, :priority => 0)
-    @artist.images.create(:photo => exemple_file, :priority => 1)
+    @image = @artist.images.create(:photo => example_file, :priority => 0)
+    @artist.images.create(:photo => example_file, :priority => 1)
 
     assert_equal @artist.image_cover, @image
   end

data/test/attachment_magick/units/place_test.rb

@@ -8,8 +8,8 @@ class PlaceTest < ActiveSupport::TestCase
 
   def test_image_cover
     @place = Place.create(:name => "Busk")
-    @image = @place.images.create(:photo => exemple_file, :priority => 0)
-    @place.images.create(:photo => exemple_file, :priority => 1)
+    @image = @place.images.create(:photo => example_file, :priority => 0)
+    @place.images.create(:photo => example_file, :priority => 1)
 
     assert_equal @place.image_cover, @image
   end

metadata

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