refinerycms-resources 0.9.9.18 → 0.9.9.19

data/app/controllers/admin/resources_controller.rb

@@ -33,9 +33,11 @@ module Admin
         if @resources.all?(&:valid?)
           @resource_id = @resources.detect(&:persisted?).id
           @resource = nil
-        end
 
-        insert
+          redirect_to :action => 'insert', :modal => from_dialog?, :wymeditor => from_dialog?, :dialog => from_dialog?
+        else
+          self.insert
+        end
       end
     end
 
@@ -75,10 +77,10 @@ module Admin
     end
 
     def paginate_resources(conditions={})
-      @resources = Resource.paginate   :page => (@paginate_page_number ||= params[:page]),
-                                       :conditions => conditions,
-                                       :order => 'created_at DESC',
-                                       :per_page => Resource.per_page(from_dialog?)
+      @resources = Resource.paginate :page => (@paginate_page_number ||= params[:page]),
+                                     :conditions => conditions,
+                                     :order => 'created_at DESC',
+                                     :per_page => Resource.per_page(from_dialog?)
     end
 
   end

data/refinerycms-resources.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-resources}
-  s.version           = %q{0.9.9.18}
+  s.version           = %q{0.9.9.19}
   s.summary           = %q{Resources engine for Refinery CMS}
   s.description       = %q{Handles all file 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}
@@ -87,7 +87,7 @@ Gem::Specification.new do |s|
     'spec/uploads/refinery_is_awesome.txt'
   ]
 
-  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/resource_spec.rb

@@ -2,58 +2,40 @@ require 'spec_helper'
 
 describe Resource do
 
-  def reset_resource(options = {})
-    @valid_attributes = {
-      :id => 1,
-      :file => File.new(File.expand_path('../../uploads/refinery_is_awesome.txt', __FILE__))
-    }.merge(options)
-
-    @resource.destroy if @resource
-    @resource = Resource.create!(@valid_attributes)
-  end
-
-  def resource_can_be_destroyed
-    @resource.destroy.should == true
-  end
-
-  before(:each) do
-    reset_resource
-  end
-
-  # clean up after ourselves.
-  after(:each) do
-    Resource.destroy_all
+  let(:resource) do
+    Resource.create!(:id => 1,
+                     :file => File.new(File.expand_path('../../uploads/refinery_is_awesome.txt', __FILE__)))
   end
 
   context "with valid attributes" do
     it "should create successfully" do
-      @resource.errors.empty?
+      resource.errors.should be_empty
     end
   end
 
   context "resource url" do
     it "should respond to .url" do
-      @resource.respond_to?(:url).should == true
+      resource.should respond_to(:url)
     end
 
     it "should not support thumbnailing like images do" do
-      @resource.respond_to?(:thumbnail).should == false
+      resource.should_not respond_to(:thumbnail)
     end
 
     it "should contain its filename at the end" do
-      @resource.url.split('/').last.should == @resource.file_name
+      resource.url.split('/').last.should == resource.file_name
     end
   end
 
   describe "#type_of_content" do
     it "returns formated mime type" do
-      @resource.type_of_content.should == "text plain"
+      resource.type_of_content.should == "text plain"
     end
   end
 
   describe "#title" do
     it "returns a titleized version of the filename" do
-      @resource.title.should == "Refinery Is Awesome"
+      resource.title.should == "Refinery Is Awesome"
     end
   end
 
@@ -87,8 +69,8 @@ describe Resource do
     end
 
     specify "each returned array item should be an instance of resource" do
-      Resource.create_resources(:file => [file, file, file]).each do |resource|
-        resource.should be_an_instance_of(Resource)
+      Resource.create_resources(:file => [file, file, file]).each do |r|
+        r.should be_an_instance_of(Resource)
       end
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-resources
 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