radiant-images-extension 0.4.1 → 0.4.4

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.4

data/app/controllers/admin/images_controller.rb

@@ -4,10 +4,6 @@ class Admin::ImagesController < Admin::ResourceController
   before_filter :edit_assets,           :only => [ :show, :edit ]
   around_filter :rescue_s3_exceptions,  :only => [ :create, :update, :destroy ]
   
-  def index
-    @images = Image.paginate :page => params[:page], :per_page => params[:pp] || 25
-  end
-  
   protected
 
   def index_assets

data/app/models/image.rb

@@ -20,6 +20,7 @@ class Image < ActiveRecord::Base
                       :secret_access_key  => ImagesExtension.s3_credentials['secret_access_key']
                     },
                     :s3_host_alias    => Radiant::Config['s3.host_alias'],
+                    :s3_protocol      => Radiant::Config['s3.protocol'],
                     :bucket           => Radiant::Config['s3.bucket'],
                     :url              => Radiant::Config['images.url'],
                     :path             => Radiant::Config['images.path']

data/images_extension.rb

@@ -1,6 +1,7 @@
 require 'paperclip'
 require 'aws/s3'
 require 'acts_as_list'
+require 'will_paginate'
 
 class ImagesExtension < Radiant::Extension
   version YAML::load_file(File.join(File.dirname(__FILE__), 'VERSION'))
@@ -40,6 +41,7 @@ class ImagesExtension < Radiant::Extension
     #Radiant::Config['s3.host_alias']
     #Radiant::Config['s3.key']
     #Radiant::Config['s3.secret']
+    #Radiant::Config['s3.protocol']
     
     unless Radiant::Config["images.image_magick_path"].nil?
       # Passenger needs this configuration to work with Image magick

data/radiant-images-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-images-extension}
-  s.version = "0.4.1"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dirk Kelly", "Mario Visic"]
-  s.date = %q{2010-11-23}
+  s.date = %q{2010-12-06}
   s.description = %q{Image Radiant Extension management tool, meant only to be useful to pages and extensions that need to require images.}
   s.email = %q{info@squaretalent.com}
   s.extra_rdoc_files = [

data/spec/controllers/admin/images_controller_spec.rb

@@ -37,11 +37,6 @@ describe Admin::ImagesController do
         get :index
         assigns(:images).should == @images
       end
-
-      it 'should use pagination' do
-        get :index
-        assigns(:images).class.should == WillPaginate::Collection
-      end
       
       it 'should include the index stylesheet' do
         mock(controller).index_assets

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-images-extension
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Dirk Kelly
@@ -16,13 +16,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-23 00:00:00 +08:00
+date: 2010-12-06 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: radiant
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -33,12 +33,12 @@ dependencies:
         - 9
         - 1
         version: 0.9.1
-  type: :runtime
-  version_requirements: *id001
+  name: radiant
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: paperclip
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -49,12 +49,12 @@ dependencies:
         - 3
         - 5
         version: 2.3.5
-  type: :runtime
-  version_requirements: *id002
+  name: paperclip
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: aws-s3
+  type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -65,12 +65,12 @@ dependencies:
         - 6
         - 2
         version: 0.6.2
-  type: :runtime
-  version_requirements: *id003
+  name: aws-s3
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: acts_as_list
+  type: :runtime
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -81,12 +81,12 @@ dependencies:
         - 1
         - 2
         version: 0.1.2
-  type: :runtime
-  version_requirements: *id004
+  name: acts_as_list
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  type: :development
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,12 +97,12 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  type: :development
-  version_requirements: *id005
+  name: rspec
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: rr
+  type: :development
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -113,8 +113,8 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  type: :development
-  version_requirements: *id006
+  name: rr
+  requirement: *id006
 description: Image Radiant Extension management tool, meant only to be useful to pages and extensions that need to require images.
 email: info@squaretalent.com
 executables: []