radiant-clipped-extension 1.0.14 → 1.0.15

data/README.md

@@ -1,132 +1,106 @@
-Radiant Clipped Extension
-------------------------
+# Radiant Clipped Extension
 
-This is a new core extension intended for use with Radiant version 1.0 or higher. 
-It is based on Keith Bingman's excellent Paperclipped extension, for which it is a drop-in replacement. 
-It should also be an easy upgrade from `page_attachments`, but I haven't tested that yet.
+Asset management for Radiant CMS.
 
-## Changes
+The Clipped extension comes bundled with the Radiant gem but may be updated separately. Only Radiant versions 1.0 or newer are supported.
 
-* video files frame-grabbed (automatically disabled if FFmpeg is not found)
-* pdfs thumbnailed
-* new asset-retrieval and page-attachment interface (by John Long)
-* new inline upload mechanism that allows several concurrent uploads and attachment to new pages
-* easily extended with new asset types and processors
-* helpful insert buttons that do the right thing.
+Please file bugs and feature requests on [Github][issues]. If you have questions regarding usage ask on the [mailing list][mailing-list].
 
-## Still to do
+[issues]: https://github.com/radiant/radiant-clipped-extension/issues
+[mailing-list]: https://groups.google.com/forum/?hl=en#!forum/radiantcms
 
-* progress bars on uploading assets
-* warning if you try and save a page while assets are still uploading
-* html5 video and audio tags in radius (with sensible flash fallbacks)
+## Features
 
-Video transcoding support will be in an optional extension with `delayed_job` support.
+* Concurrent uploads
+* Automatic thumbnail generation
+  * requiers ImageMagick for images
+  * requiers FFmpeg for videos
+  * requiers Ghostscript for PDFs
+* In-page and dedicated management interfaces
+* Easily to extended with new asset types and processors
 
-# Known bugs
-
-At the moment I think uploads probably don't work in IE7. See github for more issues.
-
-## Requirements
-
-The `paperclip`, `uuidtools` and `acts_as_list` gems are required. For cloud storage you need the `fog` gem.
+## Installation
 
-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. 
+If you installed the Radiant gem then you already have Clipped installed. You can upgrade to a newer version using `bundle update radiant-clipped-extension`.
 
-On unixy systems there should be packages available to satisfy all these requirements. You don't need to 
-install development libraries, but you will get a lot of little file-type utilities if you don't have them already.
+Installation of the optional post-processors varies by system but are likely available through your package manager.
 
-On OS X, with macports:
+### Mac OSX
 
+    brew install ghostscript imagemagick ffmpeg
+    # or
     port install ghostscript imagemagick ffmpeg
 
-On debian-like systems:
+### Debian
 
     apt-get install ghostscript imagemagick ffmpeg
 
-And I expect it's very similar with yum.
-
-On Windows, you can get binary installers of all the required pieces and apparently these days they're simple 
-to install and connect:
-
-* ImageMagick: http://www.imagemagick.org/script/binary-releases.php
-* Ghostscript: http://sourceforge.net/projects/ghostscript/
-* FFMpeg: http://ffmpeg.zeranoe.com/builds/
-
-If your paths are strange, or you're running under passenger, you may need to set `Paperclip.options[:command_path]` 
-to the location of these binaries for each of your environments. On OS X that's usually `/opt/local/bin`.
-
-## Installation
+### Windows
 
-This extension is not currently compatible with versions of radiant earlier than 1.0rc. The incompatibilities 
-are fairly minor and it may be backported, but for now if you're running a version of radiant which with the assets 
-extension will work, you will find it is already installed. If you don't have it in your radiant distribution, it 
-probably wouldn't work anyway.
+[Ghostscript][ghostscript], [ImageMagick][imagemagick] and [FFmpeg][ffmpeg] all
+offer Windows installers that you can install in the usual way.
 
-## Upgrading from paperclipped
+[ghostscript]: http://sourceforge.net/projects/ghostscript/
+[imagemagick]: http://www.imagemagick.org/script/binary-releases.php
+[ffmpeg]: http://ffmpeg.zeranoe.com/builds/
 
-No special steps are required. Paperclipped migrations are respected. The /images/assets directory is no longer needed. 
-and can be deleted. See below for some radius tag changes that won't affect you yet but should be borne in mind.
+If the post-processors are not in your `PATH` or you're running Passenger you might need to set `Paperclip.options[:command_path]` to the location where the binaries are installed.
 
-## Upgrading from page_attachments
+## Configuration
 
-This is supposed to be straightforward too. In theory once the clipped extension has been migrated all you need is:
+The clipped extension is configured in the usual way, but only its minor settings are exposed in the admin interface. The more architectural settings shouldn't be changed at runtime and some of them will require a lot of sorting out if they're changed at all, so those are only accessible through the console or by editing the database. Eventually they will be made part of the initial radiant installation process.
 
-    rake radiant:extensions:clipped:migrate_from_page_attachments
+### Structural settings
 
-But I haven't tested that theory recently.
+* `paperclip.url` sets the url scheme for attached files. Paperclip interpolations are applied. You probably don't want to change this.
+* `paperclip.path` sets the path scheme for attached files. Paperclip interpolations are applied. You might conceivably want to change this.
+* `paperclip.additional_thumbnails` is a string of comma-separated style definitions that is passed to paperclip for any asset type that has a post-processor (that is, currently, images, pdfs and video clips). The definitions are in the format name=geometry and when assembled the string will look something like `preview=640x640>,square=#260x260`. Thumbnail and icon styles are already defined and don't need to be configured this way.
+* `paperclip.storage` can be 'filesystem' (the default) or 'fog' for cloud storage (such as s3).
+* `paperclip.skip_filetype_validation` is true by default and allows uploads of any mime type.
 
-## Radius tag changes
+### Cloud Storage
 
-The full radius tag set of paperclipped is still supported, so your pages should just work. If they worked before. 
+Set `paperclip.storage` to 'fog' and add the following line to your `Gemfile`
 
-The preferred syntax is slightly different, though. Where paperlipped used the `r:assets` namespace for everything, the 
-assets extension has adopted a readable system of singular and plural tags that will be familiar from other bits of radiant:
+`gem "fog", "~> 1.0"`
 
-    <r:assets:each>
-      <a href="<r:asset:url size="download" />">
-        <r:asset:image size="thumbnail" />
-      </a>
-      <span class="caption"><r:asset:caption /></span>
-    </r:assets:each>
+You also have to provide the following settings:
 
-Anything to do with the collection of assets is plural. Anything to do with a particular asset is singular. The old plural 
-forms still work but they are deprecated and (as the log messages will keep telling you) likely to removed in version 2.
+* `paperclip.fog.provider` # set to one of "AWS", "Google" or "Rackspace"
 
-## Configuration
+If set to AWS, provide the following:
 
-The clipped extension is configured in the usual way, but only its minor settings are exposed in the admin interface. The
-more architectural settings shouldn't be changed at runtime and some of them will require a lot of sorting out if they're 
-changed at all, so those are only accessible through the console or by editing the database. Eventually they will be made 
-part of the initial radiant installation process.
+* `paperclip.s3.bucket`
+* `paperclip.s3.key`
+* `paperclip.s3.secret`
+* `paperclip.s3.region`
 
-### Structural settings
+If set to "Google", provide the following:
 
-* `clipped.url` sets the url scheme for attached files. Paperclip interpolations are applied. You probably don't want to change this.
-* `clipped.path` sets the path scheme for attached files. Paperclip interpolations are applied. You might conceivably want to change this.
-* `clipped.additional_thumbnails` is a string of comma-separated style definitions that is passed to paperclip for any asset type that has a post-processor (that is, currently, images, pdfs and video clips). The definitions are in the format name=geometry and when assembled the string will look something like `preview=640x640>,square=#260x260`. Thumbnail and icon styles are already defined and don't need to be configured this way.
-* `clipped.storage` can be 'filesystem' (the default) or 's3' for amazon's cloud service.
-* `clipped.skip_filetype_validation` is true by default and allows uploads of any mime type.
+* `paperclip.fog.directory`
+* `paperclip.google_storage.access_key_id`
+* `paperclip.google_storage.secret_access_key`
 
-If the storage option is set to 's3' then these settings are also required:
+If set to "Rackspace", provide the following:
 
-* `clipped.s3.bucket`
-* `clipped.s3.key`
-* `clipped.s3.secret`
+* `paperclip.fog.directory`
+* `paperclip.rackspace.username`
+* `paperclip.rackspace.api_key`
 
 And optionally:
 
-* `clipped.s3.host_alias`
+* `paperclip.fog.host`
+* `paperclip.fog.public?`
 
 ### Configurable settings
 
 If you want to disable a whole category of post-processing, set one of these options to false:
 
-* `clipped.create_image_thumbnails?`
-* `clipped.create_video_thumbnails?`
-* `clipped.create_pdf_thumbnails?`
+* `assets.create_image_thumbnails?`
+* `assets.create_video_thumbnails?`
+* `assets.create_pdf_thumbnails?`
 
-If we can't find ffmpeg on initialization, video thumbnailing will be disabled automatically by setting `clipped.create_video_thumbnails?` to false.
+If we can't find ffmpeg on initialization, video thumbnailing will be disabled automatically by setting `assets.create_video_thumbnails?` to false.
 
 To set a threshold for the size of uploads permitted:
 
@@ -139,30 +113,24 @@ And you can set some defaults:
 
 ## Usage
 
-For most purposes you will probably work with assets while you're working on pages. Click on one of the 'assets' links and a panel will pop up allowing you to find, insert and attach existing assets or upload new ones. 
+For most purposes you will probably work with assets while you're working on pages. Click on one of the 'assets' links and a panel will pop up allowing you to find, insert and attach existing assets or upload new ones.
 
 For tidying up, replacing files and other admin, click on the 'assets' tab to get a larger version of the same list. Here again you can search for assets and filter the results by type, but the options are 'edit' and 'remove' and on editing you can change name, file and caption while keeping page associations intact.
 
 ## Radius Tags
 
-The asset manager has its own family of radius tags. The basic tag is <code><r:asset /></code>, 
-which can be used either alone or as a double tag. This tag requires a `name` or `id` attribute, 
-which references the asset. The <code><r:asset /></code> tag can be combined with other tags for a
-variety of uses:
+The asset manager has its own family of radius tags. The basic tag is `<r:asset/>`, which can be used either alone or as a double tag. This tag requires a `name` or `id` attribute, which references the asset. The `<r:asset/>` tag can be combined with other tags for a variety of uses:
 
-    <r:asset:image name="image.png" />  #=>  <img src="/path/to/image.png" />
-    <r:asset:link name="image.png" />   #=>  <a href="/path/to/image.png">image.png</a>
+    <r:asset:image name="image.png"/>  #=>  <img src="/path/to/image.png" />
+    <r:asset:link name="image.png"/>   #=>  <a href="/path/to/image.png">image.png</a>
 
-You could also use: 
+You could also use:
 
     <r:asset:link name="bar.pdf">Download PDF</r:asset:link>
 
-Asset links are also available, such as content_type, file_size, and url. 
+Asset links are also available, such as content_type, file_size, and url.
 
-Another important tag is the <code><r:assets:each>...</r:assets:each></code>.
-(Note the plural namespace tag "assets".) If a page has attached assets, the
-assets:each tag will cycle through each asset. You can then use an image,
-link or url tag to display and connect your assets. Usage:
+Another important tag is the `<r:assets:each>...</r:assets:each>` (note the plural namespace tag "assets"). If a page has attached assets, the `<r:assets:each>` tag will cycle through each asset. You can then use an image, `link` or `url` tag to display and connect your assets. Usage:
 
     <r:assets:each [limit=0] [offset=0] [order="asc|desc"] [by="position|title|..."]>
       ...
@@ -173,53 +141,37 @@ This tag uses the following parameters:
 * `limit` and `offset` let you specify a range of assets
 * `order` and `by` lets you control sorting
 
-The conditional tags <code><r:if_assets [min_count="0"]></code> and
-<code><r:unless_assets [min_count="0"]></code> allow you to optionally render
-content based on the existence of tags. They accept the same options as
-`<r:assets:each>`.
+The conditional tags `<r:if_assets [min_count="0"]>` and `<r:unless_assets [min_count="0"]>` allow you to optionally render content based on the existence of tags. They accept the same options as `<r:assets:each>`.
 
-Thumbnails are automatically generated for images when the images are
-uploaded. By default, two sizes are made for use within the extension itself.
-These are "icon" 42px by 42px and "thumbnail" which is 100px square.
+Thumbnails are automatically generated for images when the images are uploaded. By default, two sizes are made for use within the extension itself. These are "icon" 42px by 42px and "thumbnail" which is 100px square.
 
-You can access sizes of image assets for various versions with tags like
-`<r:asset:width [size="original"]/>` and <code><r:asset:height
-[size="original"]/></code>.
+You can access sizes of image assets for various versions with tags like `<r:asset:width [size="original"]/>` and `<r:asset:height [size="original"]/>`.
 
-Also, for vertical centering of images, you have the handy
-`<r:asset:top_padding container="<container height>" [size="icon"]/>` tag.
-Working example:
+Also, for vertical centering of images, you have the handy `<r:asset:top_padding container="<container height>" [size="icon"]/>` tag. Working example:
 
     <ul>
       <r:assets:each>
         <li style="height:140px">
-          <img style="padding-top:<r:top_padding size='category' container='140' />px" 
-               src="<r:url />" alt="<r:title />" />
+          <img style="padding-top:<r:top_padding size='category' container='140'/>px" src="<r:url/>" alt="<r:caption/>">
         </li>
       </r:assets:each>
     </ul>
 
 ## Contributions
 
-This extension is a work in progress. If you would like to
-contribute, please fork the project and submit a pull request:
-
-<https://github.com/radiant/radiant-clipped-extension>
-
-Pull requests with working tests are preferred and have a greater chance of
-being merged.
-
-## Support
+If you would like to contribute, please [fork the project][fork] and submit a [pull request][pull-request].
 
-If you have questions about this extension please post a message to the
-Radiant-Dev mailing list:
+[fork]: http://help.github.com/fork-a-repo/
+[pull-request]: http://help.github.com/send-pull-requests/
 
-<http://groups.google.com/group/radiantcms-dev>
+Pull requests with working tests are preferred and have a greater chance of being merged.
 
-If you would like to file a bug report or feature request, please create a
-GitHub issue here:
+## TODO
 
-<https://github.com/radiant/radiant-clipped-extension/issues>
+* Progress bars while uploading assets
+* Warning if you try and save a page while assets are still uploading
+* Radius tags for the HTML video and audio elements
+* Auxiliary extension to add video transcoding support
 
 ## Authors
 
@@ -227,4 +179,4 @@ GitHub issue here:
 * John Long
 * William Ross
 
-Copyright 2011 the radiant team. Released under the same terms as radiant.
+Copyright 2011 the Radiant team. Released under the same terms as Radiant.

data/app/helpers/admin/page_attachments_helper.rb

@@ -0,0 +1,2 @@
+module Admin::PageAttachmentsHelper
+end

data/app/models/asset.rb

@@ -39,18 +39,13 @@ class Asset < ActiveRecord::Base
                       asset.paperclip_processors
                     },
                     :whiny => false,
-                    :storage => RadiantClippedExtension::Cloud.storage ||
-                                :filesystem,
+                    :storage => Radiant.config["paperclip.storage"],
                     :path => Radiant.config["paperclip.path"],
-                    :url  => Radiant.config["paperclip.url"],
-                    :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']}"
+                    :url => Radiant.config["paperclip.url"],
+                    :fog_credentials => RadiantClippedExtension::Cloud.credentials,
+                    :fog_directory => Radiant.config["paperclip.fog.directory"],
+                    :fog_public => Radiant.config["paperclip.fog.public?"] || true,
+                    :fog_host => RadiantClippedExtension::Cloud.host
 
   before_save :assign_title
   before_save :assign_uuid

data/app/models/asset_type.rb

@@ -145,9 +145,9 @@ class AssetType
   #
   def configured_styles
     @configured_styles ||= if style_definitions = Radiant.config["assets.thumbnails.#{name}"]
-      style_definitions.gsub(/\s/,'').split('|').each_with_object({}) do |definition, styles|
+      style_definitions.split('|').each_with_object({}) do |definition, styles|
         name, rule = definition.split(':')
-        styles[name.to_sym] = rule
+        styles[name.strip.to_sym] = rule.strip
       end
     else
       {}

data/config/initializers/radiant_config.rb

@@ -35,10 +35,8 @@ Radiant.config do |config|
     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',

data/config/locales/de.yml

@@ -0,0 +1,109 @@
+---
+de:
+  assets: 'Assets'
+  asset_types:
+    all: 'Alle'
+    documents: 'Dokumente'
+    fonts: 'Schriftarten'
+    images: 'Bilder'
+    others: 'Andere'
+    audios: 'Audio'
+    flashes: 'Flash'
+    videos: 'Video'
+    pdfs: 'PDF'
+    swfs: 'Flash'
+  
+  activerecord:
+    errors:
+      models:
+        asset:
+          attributes:
+            asset:
+              blank: 'Sie müssen eine Datei zum hochladen auswählen!'
+
+  clipped_extension:
+    actions: Aktionen
+    all: 'Alle'
+    all_thumbnails_refreshed: 'Alle Voransichten wurden aktualisiert.'
+    alt_text_or_title: 'Bildbeschreibung oder Titel <span class="hint">(optional)</span>'
+    asset: 'Asset'
+    asset_edit_title: Asset bearbeiten
+    asset_errors: 'Ein Fehler ist aufgetreten. {{errors}}'
+    asset_page_attachment_note: 'Angehangene Assets. Diese können per drag&drop eingefügt oder mit dem <code>&lt;r:assets:each /&gt;</code> tag angezeigt werden.'
+    asset_note: 'Angehangene assets. '
+    assets: 'Assets'
+    assets_explanation: 'Assets und Bilder können hochgeladen und dann an Seiten angehangen oder eingefügt werden. Klicken sie auf den Namen, um das Asset zu bearbeiten, oder <code>Löschen</code> um es zu entfernen.'
+    assets_title: 'Assets'
+    asset_page_upload_note: 'Hier hochgeladene Assets werden automatisch mit dieser Seite verknüpft sein.'
+    asset_upload_note: 'Wählen sie ein Assets aus, um es hochzuladen. Wenn der <code>Titel</code> leer ist, wird statt dessen der Dateiname ohne Endung verwendet. Mit <code>Mehr</code> können Sie auch einen Untertitel angeben.'
+    attached_assets: 'Angehangene Assets'
+    attach: Anhängen
+    attach_asset: 'Asset anhängen'
+    attach_assets: 'Assets anhängen'
+    attach_existing: Bestehendes anhängen
+    attach_to_page: 'Mit Seite verknüpfen'
+    audio: 'Audio'
+    cancel_attachment: 'Anhang lösen'
+    copy: 'kopieren'
+    copy_alt: 'Radius Tag in die Zwischenablage'
+    choose_file: Datei auswählen
+    documents: 'Dokumente'
+    caption: Untertitel
+    confirm_refresh_assets: 'Sind sie sicher, alle Voransichten aktualisieren zu wollen? Dies wird voraussichtlich eine lange Zeit und erhebliche Serverressourcen in Anspruch nehmen. <strong class="warning">Die Leistung der Webseite wird währenddessen beeinflusst sein</strong> und ihr Browser könnte die Verbindung schließen, bevor der Vorgang abgeschlossen ist. Wir empfehlen dies nur, wenn der Umfang der Asset-Bibliothek klein ist.'
+    confirm_remove_asset: 'Sind sie sicher, dieses Asset <strong class="warning">dauerhaft entfernen</strong> zu wollen?'
+    confirm_remove_from_page: 'Sind sie sicher, dieses Assets von der Seite entfernen zu wollen?'
+    delete_asset: 'Asset löschen'
+    detach: 'Verknüpfung lösen'
+    edit: Bearbeiten
+    edit_asset: 'Bearbeite {{asset}}'
+    filename: Dateiname
+    find_assets: Assets finden
+    images: 'Bilder'
+    images_automatically_created: 'Bilder werden automatisch angelegt'
+    insert: Einsetzen
+    modify: 'Bearbeiten'
+    movies: 'Filme'
+    need_to_upload: 'Möchten Sie etwas hochladen?'
+    new_asset: Neues Asset anlegen
+    no_assets_found: 'Es wurden keine Assets gefunden.'
+    no_assets: 'Keine Assets'
+    no_attached_assets: Keine Assets angehangen
+    others: 'Andere'
+    refresh_assets: Alle Assets aktualisieren
+    regenerate: Neu anlegen
+    regenerate_thumbnails: Vorschau neu anlegen
+    remove_asset: 'Asset entfernen'
+    remove_from_page: 'Von der Seite entfernen'
+    reorder: 'Anordnen'
+    remove: Löschen
+    refresh_assets_rake_task: 'Es ist empfehlenswert, sich auf dem Server anzumelden und das Kommando <code>rake paperclip:refresh class=Asset</code> auszuführen.'
+    replace_file: Datei ersetzen
+    save_and_upload: 'Speichern und hochladen'
+    search_assets: 'Assets suchen'
+    search: 'Suchen'
+    select: 'Auswählen'
+    thumbnails_refreshed: Voransichten wurden neu angelegt
+    title: Titel
+    type: 'Typ'
+    types_to_find: 'Zu suchender Typ'
+    upload: Hochladen
+    upload_asset: Asset hochladen
+
+  config:
+    assets:
+      additional_thumbnails: 'Weitere Voransichten'
+      content_types: 'Inhaltstypen'
+      create_image_thumbnails?: 'Bilder zeigen'
+      create_pdf_thumbnails?: 'PDF zeigen'
+      create_video_thumbnails?: 'Video zeigen'
+      display_size: 'Anzeigegröße'
+      insertion_size: 'Einfügegröße'
+      max_asset_size: 'Max Assetgröße'
+      path: 'Pfad'
+      s3:
+        bucket: 'Bucket'
+        key: 'Schlüssel'
+        secret: 'Secret'
+      skip_filetype_validation: 'Typerkennung überspringen?'
+      storage: 'Speicherung'
+      url: 'Url'

data/db/migrate/20110606111250_update_configuration.rb

@@ -4,7 +4,13 @@ class UpdateConfiguration < ActiveRecord::Migration
 
       puts "Importing paperclip configuration"
       %w{url path skip_filetype_validation storage}.select{|k| !!Radiant.config["assets.#{k}"] }.each do |k|
-        Radiant.config["paperclip.#{k}"] = Radiant.config["assets.#{k}"]
+        begin
+          Radiant.config["paperclip.#{k}"] = Radiant.config["assets.#{k}"]
+        rescue ActiveRecord::RecordInvalid => e
+          print "Oops! There was trouble setting #{k} to '#{Radiant.config["assets.#{k}"]}'"
+          print "\nSetting it to 'fog'. Please see the clipped extension README for more details."
+          Radiant.config["paperclip.#{k}"] = 'fog'
+        end
       end
 
       puts "Importing s3 storage configuration"

data/lib/cloud.rb

@@ -5,20 +5,20 @@ module RadiantClippedExtension
     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"]
@@ -26,11 +26,13 @@ module RadiantClippedExtension
       end
     end
 
-    def self.storage
-      if Radiant.config["paperclip.storage"] == "s3"
-        :fog
+    def self.host
+      return Radiant.config["paperclip.fog.host"] if Radiant.config["paperclip.fog.host"]
+      case Radiant.config["paperclip.fog.provider"]
+      when "AWS"
+        "http://#{Radiant.config['paperclip.fog.directory']}.s3.amazonaws.com"
       else
-        Radiant.config["paperclip.storage"]
+        nil
       end
     end
 

data/lib/generators/templates/clipped_config.rb

@@ -0,0 +1,53 @@
+Radiant.config do |config|
+
+  # Uncomment and change the settings below to customize the Clipped extension
+
+  # The default settings
+  # config["paperclip.url"] = "/system/:attachment/:id/:style/:basename:no_original_style.:extension"
+  # config["paperclip.path"] = ":rails_root/public/system/:attachment/:id/:style/:basename:no_original_style.:extension"
+  # config["paperclip.storage"] = "filesystem"
+  # config["paperclip.skip_filetype_validation"] = true
+  # config["assets.max_asset_size"] = 5 # megabytes
+  # config["assets.display_size"] = "normal"
+  # config["assets.insertion_size"] = "normal"
+  # config["assets.create_image_thumbnails?"] = true
+  # config["assets.create_video_thumbnails?"] = true
+  # config["assets.create_pdf_thumbnails?"] = true
+  # Check http://www.imagemagick.org/script/command-line-processing.php#geometry
+  # for more details on ImageMagick settings for thumbnail generation
+  # config["assets.thumbnails.image"] = "normal:size=640x640>|small:size=320x320>"
+  # config["assets.thumbnails.video"] = "normal:size=640x640>,format=jpg|small:size=320x320>,format=jpg"
+  # config["assets.thumbnails.pdf"] = "normal:size=640x640>,format=jpg|small:size=320x320>,format=jpg"
+
+  # An example of using Amazon S3
+  # add `gem "fog", "~> 1.0"` to your Gemfile and run `bundle install`
+  # config["paperclip.storage"] = "fog"
+  # config["paperclip.path"] = ":attachment/:id/:style/:basename:no_original_style.:extension"
+  # config["paperclip.fog.provider"] = "AWS"
+  # config["paperclip.fog.directory"] = "bucket-name"
+  # config["paperclip.s3.key"] = "S3_KEY"
+  # config["paperclip.s3.secret"] = "S3_SECRET"
+  # optionally use a custom domain name; requires a CNAME DNS record
+  # config["paperclip.fog.host"] = "http://assets.example.com"
+  # optionally set the S3 region of your bucket; defaults to US East
+  # 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
+  # config["paperclip.s3.region"] = "us-east-1"
+
+  # An example of using Rackspace Cloud Files
+  # add `gem "fog", "~> 1.0"` to your Gemfile and run `bundle install`
+  # config["paperclip.storage"] = "fog"
+  # config["paperclip.path"] = ":attachment/:id/:style/:basename:no_original_style.:extension"
+  # config["paperclip.fog.provider"] = "Rackspace"
+  # config["paperclip.fog.directory"] = "container-name"
+  # config["paperclip.rackspace.username"] = "RACKSPACE_USERNAME"
+  # config["paperclip.rackspace.api_key"] = "RACKSPACE_API_KEY"
+  # paperclip.fog.host is your Cloud Files CDN URL
+  # config["paperclip.fog.host"] = "http://a.b.c.rackcdn.com"
+  # optionally use a custom domain name; requires a CNAME DNS record
+  # config["paperclip.fog.host"] = "http://assets.example.com"
+
+end

data/lib/radiant-clipped-extension.rb

@@ -1,5 +1,5 @@
 module RadiantClippedExtension
-  VERSION     = "1.0.14"
+  VERSION     = "1.0.15"
   SUMMARY     = %q{Assets for Radiant CMS}
   DESCRIPTION = %q{Asset-management derived from Keith Bingman's Paperclipped extension.}
   URL         = "http://radiantcms.org"

data/lib/tasks/clipped_extension_tasks.rake

@@ -20,7 +20,7 @@ namespace :radiant do
       end
       
       desc "Copies public assets of the Clipped extension to the instance public/ directory."
-      task :update => :environment do
+      task :update => [:environment, :initialize] do
         is_svn_or_dir = proc {|path| path =~ /\.svn/ || File.directory?(path) }
         puts "Copying assets from ClippedExtension"
         Dir[ClippedExtension.root + "/public/**/*"].reject(&is_svn_or_dir).each do |file|
@@ -112,6 +112,13 @@ If you would like to use this mode type \"yes\", type \"no\" or just hit enter t
         ClippedExtension.migrator.new(:up, ClippedExtension.migrations_path).send(:assume_migrated_upto_version, 3)
         ClippedExtension.migrator.migrate
       end
+
+      desc "Generate an example initializer"
+      task :initialize do
+        puts "Copying initializer from ClippedExtension"
+        cp ClippedExtension.root + "/lib/generators/templates/clipped_config.rb", RAILS_ROOT + "/config/initializers/", :verbose => false
+      end
+
     end
   end
 end

data/public/javascripts/admin/assets.js

@@ -168,7 +168,7 @@ Asset.MakeSortable = function (element) {
   var sorter = Sortable.create(element, {
     overlap: 'horizontal',
     constraint: false,
-    handle: 'title',
+    handle: 'back',
     onChange: function (e) { 
       Asset.SetPositions();
       Asset.Notify('Assets reordered. Save page to commit changes.'); 

data/public/stylesheets/sass/admin/assets.sass

@@ -171,10 +171,8 @@ p.asset
         color: #d99
   ul.sortable
     li.asset
-      div.title
+      div.back
         cursor: move
-        &:hover
-          font-weight: bold
 
 #assets_table.assets
   position: relative

data/spec/models/asset_type_spec.rb

@@ -42,13 +42,14 @@ describe AssetType do
   context 'with configured thumbnail sizes' do
     before { 
       Radiant.config["assets.create_configured_thumbnails?"] = true 
-      Radiant.config["assets.thumbnails.configured"] = "special:size=800x800>,format=jpg|tiny:size=10x10#,format=png"
+      Radiant.config["assets.thumbnails.configured"] = "special:size=800x800>,format=jpg|tiny:size=10x10#,format=png|custom:size=1x1,convert_options=-quality 33 -interlace Plane"
     }
     subject{ AssetType.find(:configured) }
     its(:paperclip_processors) { should == [:dummy] }
     its(:paperclip_styles) { should == {
       :special => {:geometry => "800x800>", :format => 'jpg'},
-      :tiny => {:geometry => "10x10#", :format => 'png'}
+      :tiny => {:geometry => "10x10#", :format => 'png'},
+      :custom => {:geometry => "1x1", :convert_options='-quality 33 -interlace Plane'}
     }}
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-clipped-extension
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 1
   - 0
-  - 14
-  version: 1.0.14
+  - 15
+  version: 1.0.15
 platform: ruby
 authors: 
 - Keith Bingman
@@ -19,7 +19,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-11 00:00:00 Z
+date: 2012-01-05 00:00:00 -06:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: acts_as_list
@@ -82,6 +83,7 @@ files:
 - app/controllers/admin/assets_controller.rb
 - app/controllers/admin/page_attachments_controller.rb
 - app/helpers/admin/assets_helper.rb
+- app/helpers/admin/page_attachments_helper.rb
 - app/models/asset.rb
 - app/models/asset_type.rb
 - app/models/old_page_attachment.rb
@@ -116,6 +118,7 @@ files:
 - config/initializers/interpolation.rb
 - config/initializers/processors.rb
 - config/initializers/radiant_config.rb
+- config/locales/de.yml
 - config/locales/en.yml
 - config/locales/nl.yml
 - config/routes.rb
@@ -133,6 +136,7 @@ files:
 - lib/asset_tags.rb
 - lib/clipped_admin_ui.rb
 - lib/cloud.rb
+- lib/generators/templates/clipped_config.rb
 - lib/page_asset_associations.rb
 - lib/paperclip/frame_grab.rb
 - lib/paperclip/geometry_transformation.rb
@@ -202,6 +206,7 @@ files:
 - wireframes/edit-page-assets.png
 - wireframes/edit-page.bmml
 - wireframes/edit-page.png
+has_rdoc: true
 homepage: http://radiantcms.org
 licenses: []
 
@@ -231,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.3.9.3
 signing_key: 
 specification_version: 3
 summary: Assets for Radiant CMS