refinerycms-images 0.9.9.18 → 0.9.9.19

data/app/controllers/admin/images_controller.rb

@@ -66,11 +66,16 @@ module Admin
           render :action => 'new'
         end
       else
+        # if all uploaded images are ok redirect page back to dialog, else show current page with error
         if @images.all?{|i| i.valid?}
           @image_id = @image.id if @image.persisted?
           @image = nil
+
+          # please please please
+          redirect_to :action => 'insert', :modal => from_dialog?, :wymeditor => from_dialog?, :dialog => from_dialog?
+        else
+          self.insert
         end
-        self.insert
       end
     end
 

data/refinerycms-images.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-images}
-  s.version           = %q{0.9.9.18}
+  s.version           = %q{0.9.9.19}
   s.summary           = %q{Images engine for Refinery CMS}
   s.description       = %q{Handles all image upload and processing functionality in Refinery CMS.}
-  s.date              = %q{2011-04-16}
+  s.date              = %q{2011-04-22}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
@@ -94,7 +94,7 @@ Gem::Specification.new do |s|
     'spec/uploads/beach.jpeg'
   ]
 
-  s.add_dependency 'refinerycms-core', '= 0.9.9.18'
+  s.add_dependency 'refinerycms-core', '= 0.9.9.19'
   s.add_dependency 'dragonfly',        '~> 0.8.2'
   s.add_dependency 'rack-cache',       '>= 0.5.3'
 end

data/spec/models/image_spec.rb

@@ -1,63 +1,43 @@
 require 'spec_helper'
 
 describe Image do
-
-  def reset_image(options = {})
-    @valid_attributes = {
-      :id => 1,
-      :image => File.new(File.expand_path('../../uploads/beach.jpeg', __FILE__))
-    }.merge(options)
-
-    @image.destroy if @image
-    @image = Image.create!(@valid_attributes)
-  end
-
-  def image_can_be_destroyed
-    @image.destroy.should == true
-  end
-
-  before(:each) do
-    reset_image
-  end
-
-  # clean up after ourselves.
-  after(:each) do
-    Image.destroy_all
+  let(:image) do
+    Image.create!(:id => 1,
+                  :image => File.new(File.expand_path('../../uploads/beach.jpeg', __FILE__)))
   end
 
   context "with valid attributes" do
     it "should create successfully" do
-      @image.errors.empty?
+      image.errors.should be_empty
     end
   end
 
   context "image url" do
     it "should respond to .thumbnail" do
-      @image.respond_to?(:thumbnail).should == true
+      image.should respond_to(:thumbnail)
     end
 
     it "should contain its filename at the end" do
-      @image.thumbnail(nil).url.split('/').last.should == @image.image_name
+      image.thumbnail(nil).url.split('/').last.should == image.image_name
     end
 
     it "should be different when supplying geometry" do
-      @image.thumbnail(nil).url.should_not == @image.thumbnail('200x200').url
+      image.thumbnail(nil).url.should_not == image.thumbnail('200x200').url
     end
 
     it "should have different urls for each geometry string" do
-      @image.thumbnail('200x200').url.should_not == @image.thumbnail('200x201').url
+      image.thumbnail('200x200').url.should_not == image.thumbnail('200x201').url
     end
 
     it "should use right geometry when given a thumbnail name" do
       name, geometry = Image.user_image_sizes.first
-      @image.thumbnail(name).url.should == @image.thumbnail(geometry).url
+      image.thumbnail(name).url.should == image.thumbnail(geometry).url
     end
-
   end
 
   describe "#title" do
     it "returns a titleized version of the filename" do
-      @image.title.should == "Beach"
+      image.title.should == "Beach"
     end
   end
 

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-images
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.9.18
+  version: 0.9.9.19
 platform: ruby
 authors: 
 - Resolve Digital
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-16 00:00:00 Z
+date: 2011-04-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: refinerycms-core
@@ -23,7 +23,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.9.18
+        version: 0.9.9.19
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency