radiant-clipped-extension 1.0.12 → 1.0.13

data/README.md

@@ -28,7 +28,7 @@ At the moment I think uploads probably don't work in IE7. See github for more is
 
 ## Requirements
 
-The `paperclip`, `uuidtools` and `acts_as_list` gems are required. For S3 storage you need the `aws-s3` gem.
+The `paperclip`, `uuidtools` and `acts_as_list` gems are required. For cloud storage you need the `fog` gem.
 
 Paperclip's post-processors require ImageMagick. PDF-thumbnailing also requires ghostscript, which is usually 
 installed with ImageMagick anyway, and if you want to generate thumbnails from video clips then you also need FFmpeg. 

data/app/models/asset.rb

@@ -39,15 +39,17 @@ class Asset < ActiveRecord::Base
                       asset.paperclip_processors
                     },
                     :whiny => false,
-                    :storage => Radiant.config["paperclip.storage"] == "s3" ? :s3 : :filesystem,
-                    :s3_credentials => {
-                      :access_key_id     => Radiant.config["paperclip.s3.key"],
-                      :secret_access_key => Radiant.config["paperclip.s3.secret"]
-                    },
-                    :s3_host_alias => Radiant.config["paperclip.s3.host_alias"] || Radiant.config["paperclip.s3.bucket"],
-                    :bucket => Radiant.config["paperclip.s3.bucket"],
-                    :url => Radiant.config["paperclip.url"],
-                    :path => Radiant.config["paperclip.path"]
+                    :storage => RadiantClippedExtension::Cloud.storage ||
+                                :filesystem,
+                    :path => Radiant.config["paperclip.path"],
+                    :fog_credentials  => RadiantClippedExtension::Cloud.credentials,
+                    :fog_directory    => Radiant.config["paperclip.fog.directory"] ||
+                                         Radiant.config["paperclip.s3.bucket"],
+                    :fog_public       => Radiant.config["paperclip.fog.public?"]   ||
+                                         true,
+                    :fog_host         => Radiant.config["paperclip.fog.host"]      ||
+                                         "http://#{Radiant.config['paperclip.s3.host_alias']}" ||
+                                         "http://#{Radiant.config['paperclip.url']}"
 
   before_save :assign_title
   before_save :assign_uuid

data/clipped_extension.rb

@@ -1,6 +1,7 @@
 require 'radiant-clipped-extension'
 require 'acts_as_list'
 require 'uuidtools'
+require 'cloud'
 
 class ClippedExtension < Radiant::Extension
   version RadiantClippedExtension::VERSION

data/config/initializers/radiant_config.rb

@@ -3,16 +3,49 @@ Radiant.config do |config|
     pc.define 'url',                      :default => '/:class/:id/:basename:no_original_style.:extension'
     pc.define 'path',                     :default => ':rails_root/public/:class/:id/:basename:no_original_style.:extension', :allow_change => true
     pc.define 'skip_filetype_validation', :default => true, :type => :boolean
-    pc.define 'storage', :default      => 'filesystem',
-                         :select_from  => {'File System' => 'filesystem', 'Amazon S3' => 's3'},
-                         :allow_blank  => false,
+    pc.define 'storage', :default       => 'filesystem',
+                         :select_from   => {
+                           'File System'            => 'filesystem',
+                           'Amazon S3'              => 'fog',
+                           'Google Storage'         => 'fog',
+                           'Rackspace Cloud Files'  => 'fog'
+                         },
+                         :allow_blank   => false,
                          :allow_display => false
-                         
+
+    pc.namespace 'fog' do |fog|
+      fog.define 'provider', :select_from => {
+                               'Amazon S3'              => 'AWS',
+                               'Google Storage'         => 'Google',
+                               'Rackspace Cloud Files'  => 'Rackspace'
+                             }
+      fog.define 'directory'
+      fog.define 'public?', :default => true
+      fog.define 'host'
+    end
+
+    pc.namespace 'google_storage' do |gs|
+      gs.define 'access_key_id'
+      gs.define 'secret_access_key'
+    end
+
+    pc.namespace 'rackspace' do |rs|
+      rs.define 'username'
+      rs.define 'api_key'
+    end
+
     pc.namespace 's3' do |s3|
       s3.define 'bucket'
       s3.define 'key'
       s3.define 'secret'
       s3.define 'host_alias'
+      s3.define 'region', :select_from => {
+                            'Asia North East' => 'ap-northeast-1',
+                            'Asia South East' => 'ap-southeast-1',
+                            'EU West' => 'eu-west-1',
+                            'US East' => 'us-east-1',
+                            'US West' => 'us-west-1'
+                          }
     end
   end
 

data/lib/cloud.rb

@@ -0,0 +1,39 @@
+module RadiantClippedExtension
+
+  module Cloud
+
+    def self.credentials
+      case Radiant.config["paperclip.fog.provider"]
+      when "AWS"
+        return {
+          :provider => "AWS",
+          :aws_access_key_id => Radiant.config["paperclip.s3.key"],
+          :aws_secret_access_key => Radiant.config["paperclip.s3.secret"],
+          :region => Radiant.config["paperclip.s3.region"],
+        }
+      when "Google"
+        return {
+          :provider => "Google",
+          :rackspace_username => Radiant.config["paperclip.google_storage.access_key_id"],
+          :rackspace_api_key  => Radiant.config["paperclip.google_storage.secret_access_key"]
+        }
+      when "Rackspace"
+        return {
+          :provider => "Rackspace",
+          :rackspace_username => Radiant.config["paperclip.rackspace.username"],
+          :rackspace_api_key  => Radiant.config["paperclip.rackspace.api_key"]
+        }
+      end
+    end
+
+    def self.storage
+      if Radiant.config["paperclip.storage"] == "s3"
+        :fog
+      else
+        Radiant.config["paperclip.storage"]
+      end
+    end
+
+  end
+
+end

data/lib/radiant-clipped-extension.rb

@@ -1,8 +1,8 @@
 module RadiantClippedExtension
-  VERSION     = "1.0.12"
+  VERSION     = "1.0.13"
   SUMMARY     = %q{Assets for Radiant CMS}
   DESCRIPTION = %q{Asset-management derived from Keith Bingman's Paperclipped extension.}
   URL         = "http://radiantcms.org"
-  AUTHORS     = ["Keith Bingman", "Benny Degezelle", "William Ross", "John W. Long"]
+  AUTHORS     = ["Keith Bingman", "Benny Degezelle", "William Ross", "John W. Long", "John Muhl"]
   EMAIL       = ["radiant@radiantcms.org"]
 end

metadata

@@ -1,24 +1,26 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-clipped-extension
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 1
   - 0
-  - 12
-  version: 1.0.12
+  - 13
+  version: 1.0.13
 platform: ruby
 authors: 
 - Keith Bingman
 - Benny Degezelle
 - William Ross
 - John W. Long
+- John Muhl
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-10-30 00:00:00 Z
+date: 2011-11-08 00:00:00 +00:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: acts_as_list
@@ -131,6 +133,7 @@ files:
 - features/support/paths.rb
 - lib/asset_tags.rb
 - lib/clipped_admin_ui.rb
+- lib/cloud.rb
 - lib/page_asset_associations.rb
 - lib/paperclip/frame_grab.rb
 - lib/paperclip/geometry_transformation.rb
@@ -200,6 +203,7 @@ files:
 - wireframes/edit-page-assets.png
 - wireframes/edit-page.bmml
 - wireframes/edit-page.png
+has_rdoc: true
 homepage: http://radiantcms.org
 licenses: []
 
@@ -229,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Assets for Radiant CMS