radiant-assets-extension 0.0.10 → 0.0.12

data/Rakefile

@@ -1,117 +1 @@
-# Determine where the RSpec plugin is by loading the boot
-unless defined? RADIANT_ROOT
-  ENV["RAILS_ENV"] = "test"
-  case
-  when ENV["RADIANT_ENV_FILE"]
-    require File.dirname(ENV["RADIANT_ENV_FILE"]) + "/boot"
-  when File.dirname(__FILE__) =~ %r{vendor/radiant/vendor/extensions}
-    require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../../")}/config/boot"
-  else
-    require "#{File.expand_path(File.dirname(__FILE__) + "/../../../")}/config/boot"
-  end
-end
-
-require 'rake'
-require 'rake/rdoctask'
-require 'rake/testtask'
-
-rspec_base = File.expand_path(RADIANT_ROOT + '/vendor/plugins/rspec/lib')
-$LOAD_PATH.unshift(rspec_base) if File.exist?(rspec_base)
-require 'spec/rake/spectask'
-require 'cucumber'
-require 'cucumber/rake/task'
-
-# Cleanup the RADIANT_ROOT constant so specs will load the environment
-Object.send(:remove_const, :RADIANT_ROOT)
-
-extension_root = File.expand_path(File.dirname(__FILE__))
-
-task :default => :spec
-task :stats => "spec:statsetup"
-
-desc "Run all specs in spec directory"
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""]
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-task :features => 'spec:integration'
-
-namespace :spec do
-  desc "Run all specs in spec directory with RCov"
-  Spec::Rake::SpecTask.new(:rcov) do |t|
-    t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""]
-    t.spec_files = FileList['spec/**/*_spec.rb']
-    t.rcov = true
-    t.rcov_opts = ['--exclude', 'spec', '--rails']
-  end
-  
-  desc "Print Specdoc for all specs"
-  Spec::Rake::SpecTask.new(:doc) do |t|
-    t.spec_opts = ["--format", "specdoc", "--dry-run"]
-    t.spec_files = FileList['spec/**/*_spec.rb']
-  end
-
-  [:models, :controllers, :views, :helpers].each do |sub|
-    desc "Run the specs under spec/#{sub}"
-    Spec::Rake::SpecTask.new(sub) do |t|
-      t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""]
-      t.spec_files = FileList["spec/#{sub}/**/*_spec.rb"]
-    end
-  end
-  
-  desc "Run the Cucumber features"
-  Cucumber::Rake::Task.new(:integration) do |t|
-    t.fork = true
-    t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'pretty')]
-    # t.feature_pattern = "#{extension_root}/features/**/*.feature"
-    t.profile = "default"
-  end
-
-  # Setup specs for stats
-  task :statsetup do
-    require 'code_statistics'
-    ::STATS_DIRECTORIES << %w(Model\ specs spec/models)
-    ::STATS_DIRECTORIES << %w(View\ specs spec/views)
-    ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers)
-    ::STATS_DIRECTORIES << %w(Helper\ specs spec/views)
-    ::CodeStatistics::TEST_TYPES << "Model specs"
-    ::CodeStatistics::TEST_TYPES << "View specs"
-    ::CodeStatistics::TEST_TYPES << "Controller specs"
-    ::CodeStatistics::TEST_TYPES << "Helper specs"
-    ::STATS_DIRECTORIES.delete_if {|a| a[0] =~ /test/}
-  end
-
-  namespace :db do
-    namespace :fixtures do
-      desc "Load fixtures (from spec/fixtures) into the current environment's database.  Load specific fixtures using FIXTURES=x,y"
-      task :load => :environment do
-        require 'active_record/fixtures'
-        ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)
-        (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(RAILS_ROOT, 'spec', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
-          Fixtures.create_fixtures('spec/fixtures', File.basename(fixture_file, '.*'))
-        end
-      end
-    end
-  end
-end
-
-desc 'Generate documentation for the assets extension.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'AssetsExtension'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-# For extensions that are in transition
-desc 'Test the assets extension.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-# Load any custom rakefiles for extension
-Dir[File.dirname(__FILE__) + '/tasks/*.rake'].sort.each { |f| require f }
+require "bundler/gem_tasks"

data/app/controllers/admin/assets_controller.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 class Admin::AssetsController < Admin::ResourceController
   include Admin::UploadHandler
   paginate_models

data/app/controllers/admin/attachments_controller.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 class Admin::AttachmentsController < Admin::ResourceController
   include Admin::UploadHandler
   

data/app/controllers/admin/upload_handler.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 module Admin::UploadHandler
   private
     # HACK: sending JSON as text/html

data/app/helpers/assets_helper.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 module AssetsHelper  
   def asset_listing(asset)
     asset_icon(asset) +

data/app/models/asset.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 class Asset < ActiveRecord::Base
   has_many :attachments, :as => :attachable, :dependent => :destroy
   

data/app/models/asset_tags.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 module AssetTags
   include Radiant::Taggable
   class TagError < StandardError;end

data/app/models/attachment.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 require 'acts_as_list'
 
 class Attachment < ActiveRecord::Base

data/assets_extension.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 # Uncomment this if you reference any of your controllers in activate
 # require_dependency 'application_controller'
 require 'radiant-assets-extension'
@@ -20,7 +21,7 @@ class AssetsExtension < Radiant::Extension
     dragonfly.define_macro(ActiveRecord::Base, :image_accessor)
     dragonfly.url_path_prefix = path
     # TODO: optional SSL support for url_host. could protocol-relative urls be used?
-    dragonfly.url_host = 'http://' + Radiant::Config['assets.host'] if Radiant::Config['assets.host']
+    dragonfly.url_host = 'http://' + Radiant::Config['assets.host'] unless Radiant::Config['assets.host'].blank?
     if RadiantAssetsExtension::S3Store.enabled?
       dragonfly.datastore = RadiantAssetsExtension::S3Store.new
       dragonfly.datastore.configure do |c|

data/db/migrate/20110224001246_add_images_table.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 class AddImagesTable < ActiveRecord::Migration
   def self.up
     create_table :images do |table|

data/db/migrate/20110225021327_add_caption.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 class AddCaption < ActiveRecord::Migration
   def self.up
     add_column :images, :caption, :string

data/db/migrate/20110225023017_rename_model_class.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 class RenameModelClass < ActiveRecord::Migration
   def self.up
     rename_table :images, :assets

data/db/migrate/20110225174217_add_caching_columns_to_asset.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 class AddCachingColumnsToAsset < ActiveRecord::Migration
   def self.up
     add_column :assets, :upload_name, :string

data/db/migrate/20110225210821_add_attachment_to_pages.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 class AddAttachmentToPages < ActiveRecord::Migration
   def self.up
     create_table :attachments do |t|

data/db/migrate/20110225210912_add_timestamps_and_locking_to_assets.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 class AddTimestampsAndLockingToAssets < ActiveRecord::Migration
   def self.up
     add_column :assets, :lock_version, :integer, :default => 0

data/db/migrate/20110320152044_add_position_to_attachments.rb

@@ -1,8 +1,10 @@
+# -*- encoding: utf-8 -*-
 class AddPositionToAttachments < ActiveRecord::Migration
   def self.up
     add_column :attachments, :position, :integer
-    Page.all(:include => :attachments).each do |page|
-      page.attachments.each_with_index do |attachment, index|
+    Page.all.each do |page|
+      page_attachments = Attachment.find_all_by_page_id page.id
+      page_attachments.each_with_index do |attachment, index|
         attachment.update_attributes :position => index+1
       end
     end

data/db/migrate/20110321005357_make_attachments_polymorphic.rb

@@ -1,12 +1,15 @@
+# -*- encoding: utf-8 -*-
 class MakeAttachmentsPolymorphic < ActiveRecord::Migration
   def self.up
     rename_column :attachments, :page_id, :parent_id
     add_column :attachments, :parent_type, :string
-    Attachment.update_all 'parent_type = "Page"'
+    # use single quotes in query to be compatible with postgres
+    Attachment.update_all "parent_type = 'Page'"
 
     rename_column :attachments, :asset_id, :attachable_id
     add_column :attachments, :attachable_type, :string
-    Attachment.update_all 'attachable_type = "Asset"'
+    # use single quotes in query to be compatible with postgres
+    Attachment.update_all "attachable_type = 'Asset'"
   end
 
   def self.down

data/lib/radiant-assets-extension.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 module RadiantAssetsExtension
-  VERSION = '0.0.10'
+  VERSION = '0.0.12'
 end

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

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 require 'dragonfly'
 require 'aws/s3'
 

data/lib/tasks/assets_extension_tasks.rake

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 namespace :radiant do
   namespace :extensions do
     namespace :assets do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-assets-extension
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - Gerrit Kaiser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-21 00:00:00 +01:00
+date: 2011-11-10 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -127,7 +127,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.10'\n  "
+post_install_message: "\n  Add this to your radiant project with:\n    config.gem 'radiant-assets-extension', :version => '0.0.12'\n  "
 rdoc_options: []
 
 require_paths: 
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Simple asset management (images and other uploads) for Radiant CMS