radiant-clipped-extension 1.0.2 → 1.0.3

data/app/models/asset.rb

@@ -45,7 +45,7 @@ class Asset < ActiveRecord::Base
                       :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["assets.s3.bucket"],
+                    :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"]

data/app/views/admin/page_attachments/_attachment.html.haml

@@ -7,7 +7,7 @@
 - css_class += ' unsaved' if attachment.new_record?
 
 %li{:class => css_class, :id => "attachment_#{asset.uuid}"}
-  - fields_for @page do |f|
+  - fields_for :page, @page do |f|
     - f.fields_for :page_attachments, attachment, :child_index => asset.uuid do |paf|
       - if attachment.new_record?
         = paf.hidden_field :asset_id, :class => 'attacher'

data/clipped_extension.rb

@@ -1,5 +1,7 @@
 require_dependency 'application_controller'
+
 require 'radiant-clipped-extension'
+require 'acts_as_list'
 require 'uuidtools'
 
 class ClippedExtension < Radiant::Extension
@@ -8,13 +10,13 @@ class ClippedExtension < Radiant::Extension
   url RadiantClippedExtension::URL
 
   extension_config do |config|
-    config.gem "uuidtools", :version => "~> 2.1.2"
-    config.gem 'paperclip', :version => "~> 2.3.11"
-    config.gem 'acts_as_list', :version => "~> 0.1.2"
+    config.gem "acts_as_list", :version => "~> 0.1.2"
+    config.gem "paperclip",    :version => "~> 2.3.11"
+    config.gem "uuidtools",    :version => "~> 2.1.2"
   end
-  
+
   migrate_from 'Paperclipped', 20100327111216
-  
+
   def activate
     require 'paperclip/geometry_transformation'
     if Asset.table_exists?
@@ -23,7 +25,7 @@ class ClippedExtension < Radiant::Extension
       Admin::PagesController.send :helper, Admin::AssetsHelper                           # currently only provides a description of asset sizes
       Page.send :include, AssetTags                                                      # radius tags for selecting sets of assets and presenting each one
       UserActionObserver.instance.send :add_observer!, Asset                             # the usual creator- and updater-stamping
-    
+
       AssetType.new :image, :icon => 'image', :default_radius_tag => 'image', :processors => [:thumbnail], :styles => {:icon => ['42x42#', :png], :thumbnail => ['100x100#', :png]}, :extensions => %w[jpg jpeg png gif], :mime_types => %w[image/png image/x-png image/jpeg image/pjpeg image/jpg image/gif]
       AssetType.new :video, :icon => 'video', :processors => [:frame_grab], :styles => {:native => ['', :jpg], :icon => ['42x42#', :png], :thumbnail => ['100x100#', :png]}, :mime_types => %w[application/x-mp4 video/mpeg video/quicktime video/x-la-asf video/x-ms-asf video/x-msvideo video/x-sgi-movie video/x-flv flv-application/octet-stream video/3gpp video/3gpp2 video/3gpp-tt video/BMPEG video/BT656 video/CelB video/DV video/H261 video/H263 video/H263-1998 video/H263-2000 video/H264 video/JPEG video/MJ2 video/MP1S video/MP2P video/MP2T video/mp4 video/MP4V-ES video/MPV video/mpeg4 video/mpeg4-generic video/nv video/parityfec video/pointer video/raw video/rtx video/ogg video/webm]
       AssetType.new :audio, :icon => 'audio', :mime_types => %w[audio/mpeg audio/mpg audio/ogg application/ogg audio/x-ms-wma audio/vnd.rn-realaudio audio/x-wav]
@@ -32,35 +34,35 @@ class ClippedExtension < Radiant::Extension
       AssetType.new :pdf, :icon => 'pdf', :processors => [:thumbnail], :extensions => %w{pdf}, :mime_types => %w[application/pdf application/x-pdf], :styles => {:icon => ['42x42#', :png], :thumbnail => ['100x100#', :png]}
       AssetType.new :document, :icon => 'document', :mime_types => %w[application/msword application/rtf application/vnd.ms-excel application/vnd.ms-powerpoint application/vnd.ms-project application/vnd.ms-works text/plain text/html]
       AssetType.new :other, :icon => 'unknown'
-    
+
       admin.asset ||= Radiant::AdminUI.load_default_asset_regions                        # loads the shards defined in AssetsAdminUI
       admin.page.edit.add :form, 'assets', :after => :edit_page_parts                    # adds the asset-attachment picker to the page edit view
       admin.page.edit.add :main, 'asset_popups', :after => :edit_popups                  # adds the asset-attachment picker to the page edit view
       admin.page.edit.asset_popups.concat %w{upload_asset attach_asset}
-      admin.configuration.show.add :config, 'admin/configuration/show', :after => 'defaults'
-      admin.configuration.edit.add :form,   'admin/configuration/edit', :after => 'edit_defaults'
+      admin.configuration.show.add :config, 'admin/configuration/clipped_show', :after => 'defaults'
+      admin.configuration.edit.add :form,   'admin/configuration/clipped_edit', :after => 'edit_defaults'
     
       if Radiant::Config.table_exists? && Radiant::config["paperclip.command_path"]    # This is needed for testing if you are using mod_rails
         Paperclip.options[:command_path] = Radiant::config["paperclip.command_path"]
       end
-    
+
       tab "Assets", :after => "Content" do
         add_item "All", "/admin/assets/"
       end
-    
+
       if RAILS_ENV == 'development'
         update_sass_each_request
         update_javascript_each_request
       end
     end
   end
-  
+
   def deactivate
-    
+
   end
-  
+
   private
-  
+
     def update_sass_each_request
       ApplicationController.class_eval do
         prepend_before_filter :update_assets_sass
@@ -74,7 +76,7 @@ class ClippedExtension < Radiant::Extension
         end
       end
     end
-    
+
     def update_javascript_each_request
       ApplicationController.class_eval do
         prepend_before_filter :update_assets_javascript
@@ -88,5 +90,5 @@ class ClippedExtension < Radiant::Extension
         end
       end
     end
-  
+
 end

data/config/locales/en.yml

@@ -9,6 +9,7 @@ en:
     others: 'Others'
     audios: 'Audio'
     flashes: 'Flash'
+    fonts: 'Fonts'
     videos: 'Video'
     pdfs: 'PDFs'
     swfs: 'Flash'

data/config/locales/nl.yml

@@ -9,6 +9,7 @@ nl:
     others: 'Andere'
     audios: 'Audio'
     flashes: 'Flash'
+    fonts: 'Fonts'
     videos: 'Video'
     pdfs: 'PDFs'
     swfs: 'Flash'

data/lib/asset_tags.rb

@@ -38,7 +38,6 @@ module AssetTags
   end
   tag 'assets:each' do |tag|
     options = tag.attr.dup
-    result = []
     tag.locals.assets = tag.locals.page.assets.scoped(assets_find_options(tag))
     tag.render('asset_list', tag.attr.dup, &tag.block)
   end

data/lib/radiant-clipped-extension.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-clipped-extension
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Keith Bingman
@@ -18,7 +18,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-05 00:00:00 Z
+date: 2011-08-11 00:00:00 +01:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: acts_as_list
@@ -97,8 +98,8 @@ files:
 - app/views/admin/assets/new.html.haml
 - app/views/admin/assets/refresh.html.haml
 - app/views/admin/assets/remove.html.haml
-- app/views/admin/configuration/_edit.html.haml
-- app/views/admin/configuration/_show.html.haml
+- app/views/admin/configuration/_clipped_edit.html.haml
+- app/views/admin/configuration/_clipped_show.html.haml
 - app/views/admin/page_attachments/_attachment.html.haml
 - app/views/admin/page_parts/_page_part.html.haml
 - app/views/admin/pages/_asset_popups.html.haml
@@ -201,10 +202,11 @@ files:
 - wireframes/edit-page-assets.png
 - wireframes/edit-page.bmml
 - wireframes/edit-page.png
+has_rdoc: true
 homepage: http://radiantcms.org
 licenses: []
 
-post_install_message: "\n  Add this to your radiant project with:\n    config.gem 'radiant-clipped-extension', :version => '~>1.0.2'\n  "
+post_install_message: "\n  Add this to your radiant project with:\n    config.gem 'radiant-clipped-extension', :version => '~>1.0.3'\n  "
 rdoc_options: []
 
 require_paths: 
@@ -230,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Assets for Radiant CMS