radiant-downloads-extension 0.5.4 → 0.6.0

data/app/controllers/downloads_controller.rb

@@ -4,16 +4,12 @@ class DownloadsController < ReaderActionController
   
   def show
     @download = Download.find(params[:id])
-    if @download.available_to?(current_reader)
-      response.headers['X-Accel-Redirect'] = @download.document.url
-      response.headers["Content-Type"] = @download.document_content_type
-      response.headers['Content-Disposition'] = "attachment; filename=#{@download.document_file_name}" 
-      response.headers['Content-Length'] = @download.document_file_size
-      render :nothing => true
-    else
-      flash[:error] = "Sorry: you don't have permission to download that file."
-      render :template => 'reader/permission_denied'
-    end
+    raise ReaderError::AccessDenied, t("downloads_extension.permission_denied") unless @download.visible_to?(current_reader)
+    response.headers['X-Accel-Redirect'] = @download.document.url
+    response.headers["Content-Type"] = @download.document_content_type
+    response.headers['Content-Disposition'] = "attachment; filename=#{@download.document_file_name}" 
+    response.headers['Content-Length'] = @download.document_file_size
+    render :nothing => true
   end
   
 end

data/app/models/download.rb

@@ -1,9 +1,8 @@
 class Download < ActiveRecord::Base
   
-  is_site_scoped if defined? ActiveRecord::SiteNotFound
+  has_groups
   belongs_to :created_by, :class_name => 'User'
   belongs_to :updated_by, :class_name => 'User'
-  has_and_belongs_to_many :groups
   default_scope :order => 'updated_at DESC, created_at DESC'
 
   has_attached_file :document,
@@ -11,21 +10,7 @@ class Download < ActiveRecord::Base
                     :path => ":rails_root/secure_downloads/:id/:basename:no_original_style.:extension"
 
   validates_attachment_presence :document
-  
-  def has_group?(group=nil)
-    return true if groups and group.nil?
-    return false if group.nil?
-    return groups.include?(group)
-  end
-  
-  def available_to?(reader=nil)
-    permitted_groups = self.groups  
-    return true if permitted_groups.empty?
-    return false if reader.nil?
-    return true if reader.is_admin?
-    return reader.in_any_of_these_groups?(permitted_groups)
-  end
-  
+
   def document_ok?
     self.document.exists?
   end

data/app/views/admin/downloads/_form.html.haml

@@ -23,15 +23,7 @@
             = link_to @download.document_file_name, download_url(@download)
 
       - form.edit_access do
-        %p.access
-          = f.label :groups, "Available to"
-          - Group.find(:all).each do |group|
-            %span.checkbox
-              = check_box_tag "download[group_ids][]", group.id, @download.has_group?(group)
-              = group.name
-          %br
-          %span.formnote
-            If no group is ticked, any logged-in reader can download this file.
+        = render :partial => "admin/groups/edit_access", :locals => {:groupee => @download}
 
   = javascript_tag "$('download_name').activate()"
 

data/app/views/admin/downloads/edit.html.haml

@@ -5,3 +5,5 @@
   - main.edit_form do
     - form_for :download, :url => admin_download_path(@download), :html => { :method => "put", :multipart => true } do |f|
       = render :partial => 'form', :locals => { :f => f }
+  - main.edit_popups do
+    = render :partial => 'admin/groups/popup', :locals => {:groupee => @download}

data/app/views/admin/downloads/new.html.haml

@@ -5,3 +5,5 @@
   - main.edit_form do
     - form_for :download, :url => admin_downloads_path, :html => { :multipart => true } do |f|
       = render :partial => "form", :locals => { :f => f }
+  - main.edit_popups do
+    = render :partial => 'admin/groups/popup', :locals => {:groupee => @download}

data/config/locales/en.yml

@@ -0,0 +1,14 @@
+en:
+  activerecord:
+    attributes:
+      download:
+    errors:
+      models:
+        download:
+          attributes:
+  config:
+    download:
+  download: "download"
+  downloads: "Downloads"
+  downloads_extension:
+    permission_denied: "You do not have permission to download the requested file."

data/downloads_extension.rb

@@ -8,7 +8,6 @@ class DownloadsExtension < Radiant::Extension
   url RadiantDownloadsExtension::URL
     
   def activate
-    Group.send :include, DownloadGroup
     Page.send :include, DownloadTags
     UserActionObserver.instance.send :add_observer!, Download 
 

data/lib/download_ui.rb

@@ -21,7 +21,7 @@ module DownloadUI
         def load_default_download_regions
           OpenStruct.new.tap do |download|
             download.edit = Radiant::AdminUI::RegionSet.new do |edit|
-              edit.main.concat %w{edit_header edit_form}
+              edit.main.concat %w{edit_header edit_form edit_popups}
               edit.form.concat %w{edit_title edit_description edit_document edit_access}
               edit.form_bottom.concat %w{edit_timestamp edit_buttons}
             end

data/lib/radiant-downloads-extension.rb

@@ -1,5 +1,5 @@
 module RadiantDownloadsExtension
-  VERSION = '0.5.4'
+  VERSION = '0.6.0'
   SUMMARY = %q{Secure file distribution for radiant readers}
   DESCRIPTION = %q{Controlled file access using nginx's local redirects. Requires reader extension.}
   URL = "http://radiant.spanner.org/downloads"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-downloads-extension
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
-  - 4
-  version: 0.5.4
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - William Ross
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-12 00:00:00 Z
+date: 2011-10-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: paperclip
@@ -50,15 +50,14 @@ files:
 - app/views/admin/downloads/edit.html.haml
 - app/views/admin/downloads/index.html.haml
 - app/views/admin/downloads/new.html.haml
+- config/locales/en.yml
 - config/routes.rb
 - db/migrate/001_create_downloads.rb
 - downloads_extension.rb
-- lib/download_group.rb
 - lib/download_tags.rb
 - lib/download_ui.rb
 - lib/radiant-downloads-extension.rb
 - lib/tasks/downloads_extension_tasks.rake
-- radiant-downloads-extension-0.5.3.gem
 - radiant-downloads-extension.gemspec
 - Rakefile
 - README.markdown
@@ -77,7 +76,7 @@ files:
 homepage: http://radiant.spanner.org/downloads
 licenses: []
 
-post_install_message: "\n  Add this to your radiant project with a line in your Gemfile:\n\n    gem 'radiant-downloads-extension', '~> 0.5.4'\n\n  "
+post_install_message: "\n  Add this to your radiant project with a line in your Gemfile:\n\n    gem 'radiant-downloads-extension', '~> 0.6.0'\n\n  "
 rdoc_options: []
 
 require_paths: 

data/lib/download_group.rb

@@ -1,7 +0,0 @@
-module DownloadGroup
-  def self.included(base)
-    base.class_eval {
-      has_and_belongs_to_many :downloads
-    }
-  end
-end