carrierwave_securefile 0.1.2 → 0.2.0

data/.rvmrc

@@ -0,0 +1 @@
+rvm use 1.9.3

data/Gemfile

@@ -7,7 +7,7 @@ source "http://rubygems.org"
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
+  gem "bundler" #, "~> 1.0.21"
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
 end

data/Gemfile.lock

@@ -0,0 +1,28 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.1.3)
+      multi_json (~> 1.0)
+    carrierwave (0.5.8)
+      activesupport (~> 3.0)
+    crypt19 (1.2.1)
+    git (1.2.5)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+    multi_json (1.0.3)
+    rake (0.9.2.2)
+    rcov (0.9.11)
+    shoulda (2.11.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  carrierwave (~> 0.5.8)
+  crypt19 (= 1.2.1)
+  jeweler (~> 1.6.4)
+  rcov
+  shoulda

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/carrierwave_securefile.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "carrierwave_securefile"
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Doug Clark"]
-  s.date = "2011-11-28"
+  s.date = "2011-12-05"
   s.description = "Secure, encrypted file uploads using Crypt19 and CarrierWave"
   s.email = "doug@dougclarkonline.com"
   s.extra_rdoc_files = [
@@ -18,11 +18,15 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".rvmrc",
     "Gemfile",
+    "Gemfile.lock",
+    "Icon\r",
     "LICENSE.txt",
     "README.md",
     "Rakefile",
     "VERSION",
+    "carrierwave_securefile-0.1.2.gem",
     "carrierwave_securefile.gemspec",
     "lib/carrierwave/securefile.rb",
     "lib/carrierwave/securefile/configuration.rb",
@@ -45,14 +49,14 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<carrierwave>, ["~> 0.5.8"])
       s.add_runtime_dependency(%q<crypt19>, ["= 1.2.1"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<carrierwave>, ["~> 0.5.8"])
       s.add_dependency(%q<crypt19>, ["= 1.2.1"])
       s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
@@ -60,7 +64,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<carrierwave>, ["~> 0.5.8"])
     s.add_dependency(%q<crypt19>, ["= 1.2.1"])
     s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])
   end

data/lib/carrierwave/securefile/configuration.rb

@@ -10,7 +10,30 @@ module CarrierWave
 		end
 		
 		class Configuration
-			attr_accessor :cypher
+			attr_accessor :cypher, :encryption_type
+		end
+		
+		class << self
+			
+			def cryptable
+				configuration = CarrierWave::SecureFile.configuration
+				begin
+					if configuration.encryption_type.downcase == "blowfish"
+						Crypt::Blowfish
+					# elsif configuration.encryption_type.downcase == "idea"
+					# 	Crypt::IDEA
+					elsif configuration.encryption_type.downcase == "rijndael"
+						Crypt::Rijndael
+					elsif configuration.encryption_type.downcase == "gost"
+						Crypt::Gost
+					else
+						Crypt::Blowfish
+					end
+				rescue
+					Crypt::Blowfish
+				end
+			end
+			
 		end
 
 	end

data/lib/carrierwave/securefile/downloader.rb

@@ -2,24 +2,23 @@ module CarrierWave
 	module SecureFile
 		module Downloader
 
-
 			class << self
 
-				def call(uploader_model,activerecord_record)
+				def call(uploader_model, activerecord_record, file_field)
+					Rails.logger.debug "Downloading using #{CarrierWave::SecureFile.cryptable}..."
 					downloader = uploader_model.new
 					uploaded_file = activerecord_record
-					downloader.download!(uploaded_file.user_file.to_s)
+					eval "downloader.download!(uploaded_file.#{file_field}.to_s)"
 					file = downloader.to_s
 					ext_file = file + ".x1"
 					File.rename(file,ext_file)
-					p "Downloader Configuration: "
 					configuration = CarrierWave::SecureFile.configuration
-					bf = Crypt::Blowfish.new(configuration.cypher)
+					bf = CarrierWave::SecureFile.cryptable.new(configuration.cypher)
 					bf.decrypt_file(ext_file, file)
 					File.unlink(ext_file)
 					return { :file => file, :content_type => uploaded_file.content_type }
 				end
-
+				
 			end
 
 

data/lib/carrierwave/securefile/uploader.rb

@@ -5,10 +5,11 @@ module CarrierWave
 
 			def self.secure_file(model=nil, file)
 				if model
+					Rails.logger.debug "Uploading using #{CarrierWave::SecureFile.cryptable}..."
 					ext_file = file + ".x1"
 					File.rename(file, ext_file)
 					configuration = CarrierWave::SecureFile.configuration
-					bf = Crypt::Blowfish.new(configuration.cypher)
+					bf = CarrierWave::SecureFile.cryptable.new(configuration.cypher)
 					bf.encrypt_file(ext_file, file)
 					File.unlink(ext_file)
 					file

data/lib/carrierwave_securefile.rb

@@ -1,16 +1,40 @@
 require 'digest/md5'
+require 'logger'
 # require 'carrierwave/securefile.rb'
 require 'carrierwave/securefile/uploader.rb'
 require 'carrierwave/securefile/downloader.rb'
 require 'carrierwave/securefile/configuration.rb'
 
-unless defined? Crypt
-	begin
+if defined? Crypt
+
+	begin # require blowfish
 		require 'crypt/blowfish'
 	rescue LoadError
 		puts "WARNING: Failed to require crypt/blowfish, encryption may fail!"
 		puts "         You may need to add the crypt19 gem."
 	end
+
+	begin # require gost
+		require 'crypt/gost'
+	rescue LoadError
+		puts "WARNING: Failed to require crypt/gost, encryption may fail!"
+		puts "         You may need to add the crypt19 gem."
+	end
+
+	begin # require rijndael
+		require 'crypt/rijndael'
+	rescue LoadError
+		puts "WARNING: Failed to require crypt/rijndael, encryption may fail!"
+		puts "         You may need to add the crypt19 gem."
+	end
+
+	# begin # require idea
+	# 	require 'crypt/idea'
+	# rescue LoadError
+	# 	puts "WARNING: Failed to require crypt/idea, encryption may fail!"
+	# 	puts "         You may need to add the crypt19 gem."
+	# end
+	# 
 end
 
 module CarrierWave

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave_securefile
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-28 00:00:00.000000000 Z
+date: 2011-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &70238583705540 !ruby/object:Gem::Requirement
+  requirement: &70119079608620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.5.8
   type: :runtime
   prerelease: false
-  version_requirements: *70238583705540
+  version_requirements: *70119079608620
 - !ruby/object:Gem::Dependency
   name: crypt19
-  requirement: &70238583704360 !ruby/object:Gem::Requirement
+  requirement: &70119079608060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70238583704360
+  version_requirements: *70119079608060
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70238583703680 !ruby/object:Gem::Requirement
+  requirement: &70119079607540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +43,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70238583703680
+  version_requirements: *70119079607540
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70238583702440 !ruby/object:Gem::Requirement
+  requirement: &70119079606880 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70238583702440
+  version_requirements: *70119079606880
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70238583728400 !ruby/object:Gem::Requirement
+  requirement: &70119079622700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70238583728400
+  version_requirements: *70119079622700
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70238583727520 !ruby/object:Gem::Requirement
+  requirement: &70119079622120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70238583727520
+  version_requirements: *70119079622120
 description: Secure, encrypted file uploads using Crypt19 and CarrierWave
 email: doug@dougclarkonline.com
 executables: []
@@ -86,11 +86,15 @@ extra_rdoc_files:
 - README.md
 files:
 - .document
+- .rvmrc
 - Gemfile
+- Gemfile.lock
+- ! "Icon\r"
 - LICENSE.txt
 - README.md
 - Rakefile
 - VERSION
+- carrierwave_securefile-0.1.2.gem
 - carrierwave_securefile.gemspec
 - lib/carrierwave/securefile.rb
 - lib/carrierwave/securefile/configuration.rb
@@ -114,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1595986856996859556
+      hash: -2188438683901304360
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: