tb_media 1.0.1 → 1.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjQxMzBlNGVlYTQ2YTA0Y2JhZGRkOGNkOWFkNDU1YTM4MGFmNzU3Mw==
+    NjNhZmM2NWMwNDU3YjJlYjEyYjMzNjNkY2JhYjY1MTBhZjNkOTkxMQ==
   data.tar.gz: !binary |-
-    YmM2ZWMyMGNiNmQ3MjIyYTRkOWM4NDRmNjcyYTgxNzVmNTBkMTgyYQ==
+    NzI5ZWEzNzIwNTNkNmQ4YzM0MjVhODFlZmQ4MmU4ODNmODFiZWJkMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDg1Yjk0YTJlOWE4NGE2YzMyNDkwOTE4OTJlM2RjNWZhZGE4YmUxMWUxYzk5
-    Zjg5YWQ0N2E3N2FjOGY3NGFiOGFiM2M1Njg2OTVkZmViNDVhNTVjNDMwNGVk
-    ZDY5NWVmMmI5NTkzZjlhZGY1ZDZlZmYwZmY1Nzg2YzYwNTk1NTQ=
+    MjQ2ZDIwMjI2ZjkyNDQ4MmM2MmU1N2Y1N2M3OTYyYmMyOWY0YmFmYThkNmYw
+    ODM2N2ZmZDM0OWNjNWUzYzFiZmEyYjljNWU1OGRjNjA1MmY5ZjFlMDkwMTA4
+    YWJlNzhmYThkN2Q1MGU3ZjAzYzA3NTNlYThmOWQ3ZjdhMzM0MjE=
   data.tar.gz: !binary |-
-    Nzc5M2ZhZmIyZTA2MGNlMGMyNDBmNjNkNmZjYjIyNzQ5ZjRjNTc5Y2FjNzk5
-    ODk1ODdmOWIxZDRhMWI1NzUxMmQyZTI1OWQwODI5Y2I4OWZmYzQyNTEzYWFl
-    YTYzZWU5MzhmNGI0N2RmODE4ZDA3YTA1ZmYxMDJkMjU0NzFmMTc=
+    NjdlNjU0OWVmZjM0ZjVmYjZkZjQ1YTJhNDllMzllNTE5ZDkxMmEyMDQ4ZTg0
+    ZWMyZTc3Mjg2MWM3MTY2M2ZjZTc4ZTlkZjA0NzMwNDMwZTllMjFkMjBiZDI0
+    OTEzYWUwNTg4YTljNzBlOTUxZTkyZDk5YTM0OTg2ZjFmNzkzZTk=

data/app/controllers/protected_media_controller.rb

@@ -5,17 +5,15 @@ class ProtectedMediaController < Spud::ApplicationController
   def show
     @media = SpudMedia.where(:id => params[:id]).first
     if @media.blank?
-      flash[:error] = "The requested file could not be found"
-      redirect_to(root_url)
+      raise Spud::NotFoundError.new(:item => 'media')
     else
       if Spud::Media.config.paperclip_storage == :s3
         secure_url = @media.attachment.s3_object(params[:style]).url_for(:read, :secure => true, :expires => 10.minutes)
         redirect_to(secure_url.to_s)
       else
-        filepath = File.join(Rails.root, @media.attachment.path(params[:style]))
+        filepath = @media.attachment.path(params[:style])
         if !File.exists?(filepath)
-          flash[:error] = "The requested file could not be found"
-          redirect_to root_path
+          raise Spud::NotFoundError.new(:item => 'media')
         else
           send_file(filepath, :disposition => 'inline')
         end
@@ -23,4 +21,4 @@ class ProtectedMediaController < Spud::ApplicationController
     end
   end
 
-end
+end

data/app/models/spud_media.rb

@@ -114,8 +114,8 @@ class SpudMedia < ActiveRecord::Base
     end
   end
 
-   # If is_protected has changed, we need to make sure we are setting the appropriate permissions
-   # This means either moving the file in the filesystem or setting the appropriate ACL in S3
+  # If is_protected has changed, we need to make sure we are setting the appropriate permissions
+  # This means either moving the file in the filesystem or setting the appropriate ACL in S3
   def validate_permissions
     if Spud::Media.config.paperclip_storage == :filesystem
       validate_permissions_filesystem
@@ -135,7 +135,7 @@ private
       new_path = Paperclip::Interpolations.interpolate(Spud::Media.config.storage_path, attachment, 'original') 
     end
     new_base_dir = File.dirname(File.dirname(new_path))
-    old_base_dir= File.dirname(File.dirname(old_path))
+    old_base_dir = File.dirname(File.dirname(old_path))
     if File.directory?(old_base_dir)
       FileUtils.mv(old_base_dir, new_base_dir)
     end

data/lib/spud_media/configuration.rb

@@ -4,8 +4,8 @@ module Spud
     config_accessor :paperclip_storage,:s3_credentials,:storage_path,:storage_path_protected,:storage_url
     self.paperclip_storage = :filesystem
     self.s3_credentials = "#{Rails.root}/config/s3.yml"
-    self.storage_path = "public/system/spud_media/:id/:style/:basename.:extension"
-    self.storage_path_protected = "public/system/spud_media_protected/:id/:style/:basename.:extension"
+    self.storage_path = ":rails_root/public/system/spud_media/:id/:style/:basename.:extension"
+    self.storage_path_protected = ":rails_root/public/system/spud_media_protected/:id/:style/:basename.:extension"
     self.storage_url = "/system/spud_media/:id/:style/:basename.:extension"
   end
-end
+end

data/lib/spud_media/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Media
-		VERSION = "1.0.1"
+		VERSION = "1.0.2"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_media
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Greg Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2014-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails