radiant-images-extension 0.4.0 → 0.4.1

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/app/models/image.rb

@@ -16,8 +16,8 @@ class Image < ActiveRecord::Base
                     :default_url      => '/images/extensions/images/missing_:style.png',
                     :storage          => Radiant::Config['images.storage'] == 's3' ? :s3 : :filesystem, 
                     :s3_credentials   => {
-                      :access_key_id      => Radiant::Config['s3.key'],
-                      :secret_access_key  => Radiant::Config['s3.secret']
+                      :access_key_id      => ImagesExtension.s3_credentials['access_key_id'],
+                      :secret_access_key  => ImagesExtension.s3_credentials['secret_access_key']
                     },
                     :s3_host_alias    => Radiant::Config['s3.host_alias'],
                     :bucket           => Radiant::Config['s3.bucket'],

data/images_extension.rb

@@ -1,23 +1,16 @@
-# Uncomment this if you reference any of your controllers in activate
-# require_dependency 'application_controller'
-
 require 'paperclip'
 require 'aws/s3'
+require 'acts_as_list'
 
 class ImagesExtension < Radiant::Extension
-  version "0.1"
+  version YAML::load_file(File.join(File.dirname(__FILE__), 'VERSION'))
   description "Images stores images on s3"
   url "http://github.com/squaretalent/radiant-images-extension"
     
   extension_config do |config|
-    config.gem 'paperclip', :version => '~> 2.3.5'
-    config.gem 'aws-s3', :version => '>= 0.6.2', :lib => 'aws/s3'
-    config.gem 'acts_as_list', :version => '>= 0.1.2'
-    
-    if RAILS_ENV == :test
-      config.gem 'rr', :version => '>= 1.0.0'
-    end
-    
+    config.gem 'paperclip',    :lib => 'paperclip'
+    config.gem 'aws-s3',       :lib => 'aws/s3'
+    config.gem 'acts_as_list', :lib => 'acts_as_list'
   end
   
   def activate
@@ -43,12 +36,11 @@ class ImagesExtension < Radiant::Extension
     Radiant::Config['images.styles']  ||= "icon=45x45#,preview=200x200#,normal=640x640#"
     Radiant::Config['images.url']     ||= "/:class/:basename-:style.:extension"
     
-    Radiant::Config['s3.bucket']      ||= "set"
-    Radiant::Config['s3.host_alias']  ||= "set"
-    Radiant::Config['s3.key']         ||= "set"
-    Radiant::Config['s3.secret']      ||= "set"
+    #Radiant::Config['s3.bucket']
+    #Radiant::Config['s3.host_alias']
+    #Radiant::Config['s3.key']
+    #Radiant::Config['s3.secret']
     
-
     unless Radiant::Config["images.image_magick_path"].nil?
       # Passenger needs this configuration to work with Image magick
       # Radiant::Config["assets.image_magick_path"] = '/usr/local/bin/' # OS X Homebrew
@@ -56,4 +48,16 @@ class ImagesExtension < Radiant::Extension
     end
     
   end
+  
+  def self.s3_credentials
+    result = {}
+    if File.exists?(File.join(Rails.root, 'config', 'amazon_s3.yml'))
+      result.merge!(YAML.load_file(File.join(Rails.root, 'config', 'amazon_s3.yml'))[RAILS_ENV])
+    else
+      result['access_key_id']     = Radiant::Config['s3.key']
+      result['secret_access_key'] = Radiant::Config['s3.secret']
+    end
+    result
+  end
+  
 end

data/lib/radiant-images-extension.rb

@@ -0,0 +1 @@
+# Nothing to see here

data/radiant-images-extension.gemspec

@@ -1,77 +1,78 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-images-extension}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   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-02}
+  s.date = %q{2010-11-23}
   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 = [
     "LICENSE",
-     "README.md"
+    "README.md"
   ]
   s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "app/controllers/admin/images_controller.rb",
-     "app/models/image.rb",
-     "app/views/admin/images/_bottom.haml",
-     "app/views/admin/images/_fields.haml",
-     "app/views/admin/images/_fields_bottom.haml",
-     "app/views/admin/images/_fields_top.haml",
-     "app/views/admin/images/_image.haml",
-     "app/views/admin/images/edit.haml",
-     "app/views/admin/images/index.haml",
-     "app/views/admin/images/new.haml",
-     "app/views/admin/images/remove.haml",
-     "config/locales/en.yml",
-     "config/routes.rb",
-     "cucumber.yml",
-     "db/migrate/20100601042237_create_images.rb",
-     "db/migrate/20100602044124_add_position_to_images.rb",
-     "db/migrate/20100929150930_change_images_to_created_by_id.rb",
-     "features/support/env.rb",
-     "features/support/paths.rb",
-     "images_extension.rb",
-     "lib/images/interface/admin/images.rb",
-     "lib/images/tags/core.rb",
-     "lib/images/tags/helpers.rb",
-     "lib/tasks/images_extension_tasks.rake",
-     "public/images/admin/extensions/images/sort.png",
-     "public/images/extensions/images/missing_icon.png",
-     "public/images/extensions/images/missing_normal.png",
-     "public/images/extensions/images/missing_preview.png",
-     "public/stylesheets/sass/admin/extensions/images/edit.sass",
-     "public/stylesheets/sass/admin/extensions/images/index.sass",
-     "radiant-images-extension.gemspec",
-     "spec/controllers/admin/images_controller_spec.rb",
-     "spec/datasets/images.rb",
-     "spec/datasets/squaretalent.png",
-     "spec/lib/images/tags/core_spec.rb",
-     "spec/models/image_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+    "LICENSE",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "app/controllers/admin/images_controller.rb",
+    "app/models/image.rb",
+    "app/views/admin/images/_bottom.haml",
+    "app/views/admin/images/_fields.haml",
+    "app/views/admin/images/_fields_bottom.haml",
+    "app/views/admin/images/_fields_top.haml",
+    "app/views/admin/images/_image.haml",
+    "app/views/admin/images/edit.haml",
+    "app/views/admin/images/index.haml",
+    "app/views/admin/images/new.haml",
+    "app/views/admin/images/remove.haml",
+    "config/locales/en.yml",
+    "config/routes.rb",
+    "cucumber.yml",
+    "db/migrate/20100601042237_create_images.rb",
+    "db/migrate/20100602044124_add_position_to_images.rb",
+    "db/migrate/20100929150930_change_images_to_created_by_id.rb",
+    "features/support/env.rb",
+    "features/support/paths.rb",
+    "images_extension.rb",
+    "lib/images/interface/admin/images.rb",
+    "lib/images/tags/core.rb",
+    "lib/images/tags/helpers.rb",
+    "lib/radiant-images-extension.rb",
+    "lib/tasks/images_extension_tasks.rake",
+    "public/images/admin/extensions/images/sort.png",
+    "public/images/extensions/images/missing_icon.png",
+    "public/images/extensions/images/missing_normal.png",
+    "public/images/extensions/images/missing_preview.png",
+    "public/stylesheets/sass/admin/extensions/images/edit.sass",
+    "public/stylesheets/sass/admin/extensions/images/index.sass",
+    "radiant-images-extension.gemspec",
+    "spec/controllers/admin/images_controller_spec.rb",
+    "spec/datasets/images.rb",
+    "spec/datasets/squaretalent.png",
+    "spec/lib/images/tags/core_spec.rb",
+    "spec/lib/images_extension_spec.rb",
+    "spec/models/image_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/squaretalent/radiant-images-extension}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Images Extension for Radiant CMS}
   s.test_files = [
     "spec/controllers/admin/images_controller_spec.rb",
-     "spec/datasets/images.rb",
-     "spec/lib/images/tags/core_spec.rb",
-     "spec/models/image_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/datasets/images.rb",
+    "spec/lib/images/tags/core_spec.rb",
+    "spec/lib/images_extension_spec.rb",
+    "spec/models/image_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/spec/controllers/admin/images_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.dirname(__FILE__) + "/../../spec_helper"
 
 describe Admin::ImagesController do
   
@@ -106,7 +106,7 @@ describe Admin::ImagesController do
       controller.send :rescue_s3_exceptions do
         raise AWS::S3::ResponseError.new('some error' ,'')
       end
-      (controller.send :flash)[:error].should == 'some error'
+      flash.now[:error].should == 'some error'
       
     end
     

data/spec/lib/images/tags/core_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.dirname(__FILE__) + "/../../../spec_helper"
 
 describe Images::Tags::Core do
   
@@ -7,6 +7,11 @@ describe Images::Tags::Core do
   before(:all) do
     @images = [ images(:first), images(:second), images(:third),
                 images(:fourth), images(:fifth), images(:sixth) ]
+    Radiant::Config['images.default'] = "original"
+    Radiant::Config['images.path']    = ":rails_root/public/:class/:basename-:style.:extension"
+    Radiant::Config['images.storage'] = "local"
+    Radiant::Config['images.styles']  = "icon=45x45#,preview=200x200#,normal=640x640#"
+    Radiant::Config['images.url']     = "/:class/:basename-:style.:extension"
   end
   
   before(:each) do

data/spec/lib/images_extension_spec.rb

@@ -0,0 +1,64 @@
+require File.dirname(__FILE__) + "/../spec_helper"
+
+describe ImagesExtension do
+  
+  describe 's3_credentials' do
+    
+    context 'load through yaml' do
+      
+      before :each do
+        
+        if File.exists?(File.join(Rails.root,'config','amazon_s3.yml'))
+          FileUtils.mv(File.join(Rails.root,'config','amazon_s3.yml'),File.join(Rails.root,'config','amazon_s3-back.yml'))
+        end
+        
+        f = File.new(File.join(Rails.root,'config','amazon_s3.yml'), 'w')
+        f << "#{RAILS_ENV}:\n"
+        f << "  access_key_id: FILE KEY\n"
+        f << "  secret_access_key: FILE SECRET"
+        f.close
+        
+      end
+      
+      it 'should return the file config strings' do
+        ImagesExtension.s3_credentials.should == { 'access_key_id' => 'FILE KEY', 'secret_access_key' => 'FILE SECRET' }
+      end
+      
+      after :each do
+        File.delete(File.join(Rails.root,'config','amazon_s3.yml'))
+          
+        if File.exists?(File.join(Rails.root,'config','amazon_s3-back.yml'))
+          FileUtils.mv(File.join(Rails.root,'config','amazon_s3-back.yml'),File.join(Rails.root,'config','amazon_s3.yml'))
+        end
+      end
+      
+    end
+    
+    context 'load through Radiant::Config' do
+      
+      before :each do
+        
+        Radiant::Config['s3.key']    = 'DB KEY'
+        Radiant::Config['s3.secret'] = 'DB SECRET'
+        
+        if File.exists?(File.join(Rails.root,'config','amazon_s3.yml'))
+          FileUtils.mv(File.join(Rails.root,'config','amazon_s3.yml'),File.join(Rails.root,'config','amazon_s3-back.yml'))
+        end
+        
+      end
+      
+      it 'should return the radiant config strings' do
+        ImagesExtension.s3_credentials.should == { 'access_key_id' => 'DB KEY', 'secret_access_key' => 'DB SECRET' }
+      end
+      
+      after :each do
+        if File.exists?(File.join(Rails.root,'config','amazon_s3-back.yml'))
+          FileUtils.mv(File.join(Rails.root,'config','amazon_s3-back.yml'),File.join(Rails.root,'config','amazon_s3.yml'))
+        end
+      end
+      
+    end
+    
+  end
+  
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-images-extension
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Dirk Kelly
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-02 00:00:00 +08:00
+date: 2010-11-23 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -125,7 +125,6 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files: 
-- .gitignore
 - LICENSE
 - README.md
 - Rakefile
@@ -153,6 +152,7 @@ files:
 - lib/images/interface/admin/images.rb
 - lib/images/tags/core.rb
 - lib/images/tags/helpers.rb
+- lib/radiant-images-extension.rb
 - lib/tasks/images_extension_tasks.rake
 - public/images/admin/extensions/images/sort.png
 - public/images/extensions/images/missing_icon.png
@@ -165,6 +165,7 @@ files:
 - spec/datasets/images.rb
 - spec/datasets/squaretalent.png
 - spec/lib/images/tags/core_spec.rb
+- spec/lib/images_extension_spec.rb
 - spec/models/image_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -173,8 +174,8 @@ homepage: http://github.com/squaretalent/radiant-images-extension
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -206,5 +207,6 @@ test_files:
 - spec/controllers/admin/images_controller_spec.rb
 - spec/datasets/images.rb
 - spec/lib/images/tags/core_spec.rb
+- spec/lib/images_extension_spec.rb
 - spec/models/image_spec.rb
 - spec/spec_helper.rb

data/.gitignore

@@ -1,2 +0,0 @@
-.DS_Store
-*.gem