radiant-assets-extension 0.0.1 → 0.0.2

data/README

@@ -1,5 +1,19 @@
-= Images
+= Assets
 
-Radiant is so freaking awesome, but I made it better through this extension.
+Provides simple image handling, incl. on-the-fly resizing. Intended as a
+replacement for paperclipped in the long run, but very barebones right now.
 
-Created by Your Name. 
+== Radius Tags
+
+<r:images size="300x" />
+
+Proportionally resizes an image to 300px width. Supports imagemagick geometry
+strings to do advanced resizing straight in Radius tags. Resized images are
+cached in Radiant's built-in cache so they don't have to be re-created on every
+request.
+
+== Todo
+
+- Handling of non-image uploads
+- Attaching Assets to Pages
+- Easy/Automatic migration from paperclipped

data/app/models/image.rb

@@ -1,3 +1,4 @@
 class Image < ActiveRecord::Base
   image_accessor :upload
+  validates_presence_of :upload
 end

data/assets_extension.rb

@@ -1,20 +1,24 @@
 # Uncomment this if you reference any of your controllers in activate
 # require_dependency 'application_controller'
 require 'radiant-assets-extension/version'
-require 'dragonfly'
+require 'radiant-assets-extension/s3_store'
 
 class AssetsExtension < Radiant::Extension
   version RadiantAssetsExtension::VERSION
-  description "Simple asset management (images and other uploads) for Radiant."
-  url "http://github"
+  description 'Simple asset management (images and other uploads) for Radiant.'
+  url 'http://ext.radiantcms.org/extensions/269-assets'
   
   extension_config do |config|
     path = '/assets'
     dragonfly = Dragonfly[:assets]
     dragonfly.configure_with(:imagemagick)
     dragonfly.configure_with(:rails)
-    dragonfly.url_path_prefix = path
     dragonfly.define_macro(ActiveRecord::Base, :image_accessor)    
+    dragonfly.url_path_prefix = path
+    if RadiantAssetsExtension::S3Store.enabled?
+      dragonfly.datastore = RadiantAssetsExtension::S3Store.new
+    end
+    
     config.middleware.insert_after 'Rack::Lock', 'Dragonfly::Middleware', :assets, path
   end
   

data/lib/radiant-assets-extension/s3_store.rb

@@ -0,0 +1,41 @@
+require 'dragonfly'
+
+module RadiantAssetsExtension
+  # Subclass that allows connecting to S3 regions other than US-Standard
+  class S3Store < Dragonfly::DataStorage::S3DataStore
+    def self.enabled?
+      Radiant::Config['assets.storage'] && Radiant::Config['assets.storage'] == 's3'
+    end
+
+    def self.region_hosts
+      {
+        'us-east-1' => 	's3.amazonaws.com',
+        'us-west-1' => 's3-us-west-1.amazonaws.com',
+        'eu-west-1' => 's3-eu-west-1.amazonaws.com',
+        'ap-southeast-1' => 's3-ap-southeast-1.amazonaws.com'
+      }
+    end
+    
+    DEFAULT_BUCKET_NAME = 'radiant-assets-extension'
+    
+    def initialize(opts={})
+      # HACK: AWS::S3 doesn't support S3 international regions properly
+      # https://github.com/marcel/aws-s3/issues#issue/4/comment/411302
+      # we monkey-patch the default host
+      AWS::S3::DEFAULT_HOST.replace Radiant::Config['s3.host'] || self.class.s3_region_hosts['us-east-1']
+      super({
+        :bucket_name => Radiant::Config['s3.bucket'] || DEFAULT_BUCKET_NAME,
+        :access_key_id => Radiant::Config['s3.key'],
+        :secret_access_key => Radiant::Config['s3.secret']
+      }.merge(opts))
+    end
+    
+    def connect!
+      AWS::S3::Base.establish_connection!(
+        :server => "#{bucket_name}.s3.amazonaws.com",
+        :access_key_id => access_key_id,
+        :secret_access_key => secret_access_key
+      )
+    end
+  end
+end

data/lib/radiant-assets-extension/version.rb

@@ -1,5 +1,3 @@
 module RadiantAssetsExtension
-  VERSION = '0.0.1'
-  
-  
-end
+  VERSION = '0.0.2'
+end

data/lib/tasks/{images_extension_tasks.rake → assets_extension_tasks.rake}

@@ -1,15 +1,15 @@
 namespace :radiant do
   namespace :extensions do
-    namespace :images do
+    namespace :assets do
       
       desc "Runs the migration of the Images extension"
       task :migrate => :environment do
         require 'radiant/extension_migrator'
         if ENV["VERSION"]
-          ImagesExtension.migrator.migrate(ENV["VERSION"].to_i)
+          AssetsExtension.migrator.migrate(ENV["VERSION"].to_i)
           Rake::Task['db:schema:dump'].invoke
         else
-          ImagesExtension.migrator.migrate
+          AssetsExtension.migrator.migrate
           Rake::Task['db:schema:dump'].invoke
         end
       end
@@ -18,17 +18,17 @@ namespace :radiant do
       task :update => :environment do
         is_svn_or_dir = proc {|path| path =~ /\.svn/ || File.directory?(path) }
         puts "Copying assets from ImagesExtension"
-        Dir[ImagesExtension.root + "/public/**/*"].reject(&is_svn_or_dir).each do |file|
-          path = file.sub(ImagesExtension.root, '')
+        Dir[AssetsExtension.root + "/public/**/*"].reject(&is_svn_or_dir).each do |file|
+          path = file.sub(AssetsExtension.root, '')
           directory = File.dirname(path)
           mkdir_p RAILS_ROOT + directory, :verbose => false
           cp file, RAILS_ROOT + path, :verbose => false
         end
-        unless ImagesExtension.root.starts_with? RAILS_ROOT # don't need to copy vendored tasks
+        unless AssetsExtension.root.starts_with? RAILS_ROOT # don't need to copy vendored tasks  
           puts "Copying rake tasks from ImagesExtension"
           local_tasks_path = File.join(RAILS_ROOT, %w(lib tasks))
           mkdir_p local_tasks_path, :verbose => false
-          Dir[File.join ImagesExtension.root, %w(lib tasks *.rake)].each do |file|
+          Dir[File.join AssetsExtension.root, %w(lib tasks *.rake)].each do |file|
             cp file, local_tasks_path, :verbose => false
           end
         end
@@ -37,7 +37,7 @@ namespace :radiant do
       desc "Syncs all available translations for this ext to the English ext master"
       task :sync => :environment do
         # The main translation root, basically where English is kept
-        language_root = ImagesExtension.root + "/config/locales"
+        language_root = AssetsExtension.root + "/config/locales"
         words = TranslationSupport.get_translation_keys(language_root)
         
         Dir["#{language_root}/*.yml"].each do |filename|
@@ -52,4 +52,4 @@ namespace :radiant do
       end
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-assets-extension
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Gerrit Kaiser
@@ -81,8 +81,9 @@ files:
 - features/support/env.rb
 - features/support/paths.rb
 - lib/radiant-assets-extension.rb
+- lib/radiant-assets-extension/s3_store.rb
 - lib/radiant-assets-extension/version.rb
-- lib/tasks/images_extension_tasks.rake
+- lib/tasks/assets_extension_tasks.rake
 - public/stylesheets/admin/extensions/assets/assets.css
 - radiant-assets-extension.gemspec
 - spec/spec.opts
@@ -91,7 +92,7 @@ has_rdoc: true
 homepage: http://ext.radiantcms.org/extensions/269-assets
 licenses: []
 
-post_install_message: "\n  Add this to your radiant project with:\n    config.gem 'radiant-assets-extension', :version => '0.0.1'\n  "
+post_install_message: "\n  Add this to your radiant project with:\n    config.gem 'radiant-assets-extension', :version => '0.0.2'\n  "
 rdoc_options: []
 
 require_paths: