radiant-clipped-extension 1.0.1 → 1.0.2

data/app/models/page_attachment.rb

@@ -14,7 +14,6 @@ class PageAttachment < ActiveRecord::Base
   # a small change to the method in acts_as_list so that we don't override 
   # the position value if it has already been set (as it usually is for new attachments)
   def add_to_list_bottom
-    p "add_to_list_bottom: current value is #{self[position_column]}"
     self[position_column] ||= bottom_position_in_list.to_i + 1
   end
   

data/clipped_extension.rb

@@ -1,17 +1,19 @@
 require_dependency 'application_controller'
-require 'radiant-clipped-extension/version'
+require 'radiant-clipped-extension'
+require 'uuidtools'
+
 class ClippedExtension < Radiant::Extension
   version RadiantClippedExtension::VERSION
-  description "Assets extension based Keith Bingman's original Paperclipped extension."
-  url "http://github.com/radiant/radiant-clipped-extension"
+  description RadiantClippedExtension::DESCRIPTION
+  url RadiantClippedExtension::URL
 
   extension_config do |config|
-    config.gem "uuidtools"
-    config.gem 'paperclip', :version => '~> 2.3'
-    config.gem 'acts_as_list'
+    config.gem "uuidtools", :version => "~> 2.1.2"
+    config.gem 'paperclip', :version => "~> 2.3.11"
+    config.gem 'acts_as_list', :version => "~> 0.1.2"
   end
   
-  migrate_from 'Paperclip', 20100327111216
+  migrate_from 'Paperclipped', 20100327111216
   
   def activate
     require 'paperclip/geometry_transformation'

data/config/locales/en.yml

@@ -4,6 +4,7 @@ en:
   asset_types:
     all: 'All'
     documents: 'Documents'
+    fonts: 'Fonts'
     images: 'Images'
     others: 'Others'
     audios: 'Audio'

data/config/locales/nl.yml

@@ -4,6 +4,7 @@ nl:
   asset_types:
     all: 'Alle'
     documents: 'Documenten'
+    fonts: 'Fonts'
     images: 'Afbeeldingen'
     others: 'Andere'
     audios: 'Audio'

data/{app/models → lib}/asset_tags.rb

@@ -319,14 +319,12 @@ private
   end
   
   def find_asset(tag, options)
-    return tag.locals.asset if tag.locals.asset
-    if title = options.delete('name') || options.delete('title')
+    tag.locals.asset ||= if title = (options.delete('name') || options.delete('title'))
       Asset.find_by_title(title)
     elsif id = options.delete('id')
       Asset.find_by_id(id)
-    else
-      raise TagError, "'name' or 'id' attribute required for unenclosed r:asset tag" unless tag.locals.asset
     end
+    tag.locals.asset || raise(TagError, "Asset not found.")
   end
   
   def assets_find_options(tag)

data/lib/radiant-clipped-extension.rb

@@ -1,2 +1,8 @@
 module RadiantClippedExtension
+  VERSION = '1.0.2'
+  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"]
+  EMAIL = ["radiant@radiantcms.org"]
 end

data/radiant-clipped-extension.gemspec

@@ -1,16 +1,20 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "radiant-clipped-extension/version"
+require "radiant-clipped-extension"
 
 Gem::Specification.new do |s|
   s.name        = "radiant-clipped-extension"
   s.version     = RadiantClippedExtension::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Keith Bingman", "Benny Degezelle", "William Ross", "John W. Long"]
-  s.email       = ["radiant@radiantcms.org"]
-  s.homepage    = "http://radiantcms.org"
-  s.summary     = %q{Assets for Radiant CMS}
-  s.description = %q{Assets extension on based Keith Bingman's excellent Paperclipped extension.}
+  s.authors     = RadiantClippedExtension::AUTHORS
+  s.email       = RadiantClippedExtension::EMAIL
+  s.homepage    = RadiantClippedExtension::URL
+  s.summary     = RadiantClippedExtension::SUMMARY
+  s.description = RadiantClippedExtension::DESCRIPTION
+
+  s.add_dependency 'acts_as_list', "~> 0.1.2"
+  s.add_dependency 'paperclip', "~> 2.3.11"
+  s.add_dependency 'uuidtools', "~> 2.1.2"
 
   ignores = if File.exist?('.gitignore')
     File.read('.gitignore').split("\n").inject([]) {|a,p| a + Dir[p] }
@@ -26,8 +30,4 @@ Gem::Specification.new do |s|
   Add this to your radiant project with:
     config.gem 'radiant-clipped-extension', :version => '~>#{RadiantClippedExtension::VERSION}'
   }
-
-  s.add_dependency 'acts_as_list', "~> 0.1.2"
-  s.add_dependency 'paperclip', "~> 2.3.11"
-  s.add_dependency 'uuidtools', "~> 2.1.2"
 end

data/spec/datasets/assets_dataset.rb

@@ -13,7 +13,6 @@ class AssetsDataset < Dataset::Base
   
   helpers do
     def create_asset(name, attributes={})
-      attributes = 
       create_record :asset, name.symbolize, {
         :title => name,
         :asset_file_name =>  'asset.jpg',

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-clipped-extension
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Keith Bingman
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-22 00:00:00 Z
+date: 2011-07-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: acts_as_list
@@ -68,7 +68,7 @@ dependencies:
         version: 2.1.2
   type: :runtime
   version_requirements: *id003
-description: Assets extension on based Keith Bingman's excellent Paperclipped extension.
+description: Asset-management derived from Keith Bingman's Paperclipped extension.
 email: 
 - radiant@radiantcms.org
 executables: []
@@ -82,7 +82,6 @@ files:
 - app/controllers/admin/page_attachments_controller.rb
 - app/helpers/admin/assets_helper.rb
 - app/models/asset.rb
-- app/models/asset_tags.rb
 - app/models/asset_type.rb
 - app/models/old_page_attachment.rb
 - app/models/page_attachment.rb
@@ -131,11 +130,11 @@ files:
 - db/migrate/20110609101438_dimensions.rb
 - features/support/env.rb
 - features/support/paths.rb
+- lib/asset_tags.rb
 - lib/clipped_admin_ui.rb
 - lib/page_asset_associations.rb
 - lib/paperclip/frame_grab.rb
 - lib/paperclip/geometry_transformation.rb
-- lib/radiant-clipped-extension/version.rb
 - lib/radiant-clipped-extension.rb
 - lib/tasks/clipped_extension_tasks.rake
 - lib/tasks/paperclip_tasks.rake
@@ -178,7 +177,6 @@ files:
 - public/images/admin/assets/zip_icon.png
 - public/javascripts/admin/assets.js
 - public/stylesheets/sass/admin/assets.sass
-- radiant-clipped-extension-1.0.0.gem
 - radiant-clipped-extension.gemspec
 - Rakefile
 - README.md
@@ -206,7 +204,7 @@ files:
 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.1'\n  "
+post_install_message: "\n  Add this to your radiant project with:\n    config.gem 'radiant-clipped-extension', :version => '~>1.0.2'\n  "
 rdoc_options: []
 
 require_paths: 

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

@@ -1,3 +0,0 @@
-module RadiantClippedExtension
-  VERSION = '1.0.1'
-end