model_attachment 0.0.18 → 0.0.20

data/Gemfile

@@ -1,5 +1,7 @@
 source 'http://rubygems.org'
 
+gem 'activerecord'
+gem 'sqlite3'
 gem 'rake'
 gem 'test-unit'
 

data/lib/model_attachment/version.rb

@@ -1,3 +1,3 @@
 module ModelAttachment
-  VERSION = "0.0.18"
-end
+  VERSION = "0.0.20"
+end

data/lib/model_attachment.rb

@@ -124,13 +124,13 @@ module ModelAttachment
     # * +path+: sets the path, defaults to /documents/send
     # * +type+: sets the type, types come from the has_attachment method, ex. small, large
     def url(options = {})
-      proto       = options[:proto]        || "http"
+      proto       = options[:proto]        || "http://"
       port        = options[:port]
       server_name = options[:server_name]  || "localhost"
       url_path    = options[:path]         || "/#{self.class.to_s.downcase.pluralize}/"
       type        = options[:type]
       
-      server_name += ":" + port.to_s if port
+      server_name += ":" + port.to_s if !port.nil? && port != 80 && port != 443
       type_string = "?type=#{type}" if type
       
       # if we aren't using aws set @bucket to nil
@@ -142,10 +142,10 @@ module ModelAttachment
       if public?
         url_path = path.gsub(/^\/public(.*)/, '\1')
         type_string = "_#{type}" if type
-        url = "#{proto}://#{server_name}#{url_path}#{basename}#{type_string}#{extension}"
+        url = "#{proto}#{server_name}#{url_path}#{basename}#{type_string}#{extension}"
       elsif bucket.nil?
         # otherwise use private url with deliver
-        url = "#{proto}://#{server_name}#{url_path}#{id}#{type_string}"
+        url = "#{proto}#{server_name}#{url_path}#{id}#{type_string}"
       else
         # if bucket is set, then use aws url
         url = aws_url(type)
@@ -220,7 +220,8 @@ module ModelAttachment
     # save the correct attribute info before the save
     def save_attributes
       return if file_name.nil? || file_name.class.to_s == "String"
-      @temp_file = self.file_name
+      # this used to be @temp_file = self.file_name but some change must have happened between 3.0.1 and 3.0.5
+      @temp_file = (self.file_name.class == "ActionDispatch::Http::UploadFile" ? self.file_name.tempfile : self.file_name)
 
       # get original filename info and clean up for storage
       filename = File.basename(@temp_file)
@@ -254,7 +255,11 @@ module ModelAttachment
         FileUtils.chmod(0755, full_path)
         
         if File.exists?(@temp_file.path)
-          FileUtils.mv(@temp_file.path, full_path + basename + extension)
+          new_file = full_path + basename + extension
+          FileUtils.mv(@temp_file.path, new_file)
+          if File.exists?(new_file)
+            File.open(new_file).chmod(0640)
+          end
         else 
           raise "File Error: #{@temp_file.path} does not exist"
         end
@@ -283,7 +288,7 @@ module ModelAttachment
           new_filename = full_filename(name)
           log("Create #{name} by running #{command} on #{old_filename}")
           log("Created: #{new_filename}")
-          `#{command} #{old_filename} #{new_filename}`
+          `#{command} #{old_filename} #{new_filename} ; chmod 640 #{new_filename}`
         rescue Exception => e
           puts "Process Images Error: #{e.message}"
           puts "\tBacktrace: #{e.backtrace[0]}"

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: model_attachment
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 18
-  version: 0.0.18
+  prerelease: 
+  version: 0.0.20
 platform: ruby
 authors: 
 - Steve Walker
@@ -14,21 +10,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-29 00:00:00 -04:00
+date: 2011-03-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: aws-s3
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 description: Simple file attachment gem
 email: 
@@ -64,6 +58,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: -2213741255093125105
       segments: 
       - 0
       version: "0"
@@ -72,15 +67,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: model_attachment
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: A simple file attachment gem