model_attachment 0.0.13 → 0.0.14

data/Gemfile

@@ -0,0 +1,7 @@
+source 'http://rubygems.org'
+
+gem 'rake'
+gem 'test-unit'
+
+gem 'rspec'
+gem 'aws-s3'

data/Rakefile

@@ -1,10 +1,13 @@
+require 'bundler'
+Bundler.setup
+
+#require 'rspec/core/rake_task'
+#Rspec::Core::RakeTask.new(:spec)
+
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-$LOAD_PATH << File.join(File.dirname(__FILE__), 'lib')
-require 'model_attachment'
-
 desc 'Default: run unit tests.'
 task :default => [:clean, :test]
 
@@ -15,10 +18,13 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = true
 end
 
-desc 'Start an IRB session with all necessary files required.'
-task :shell do |t|
-  chdir File.dirname(__FILE__)
-  exec 'irb -I lib/ -I lib/model_attachment -r rubygems -r active_record -r tempfile -r init'
+desc 'Clean up files.'
+task :clean do |t|
+  FileUtils.rm_rf "doc"
+  FileUtils.rm_rf "tmp"
+  FileUtils.rm_rf "pkg"
+  FileUtils.rm "test/test.log" rescue nil
+  Dir.glob("model_attachment-*.gem").each{|f| FileUtils.rm f }
 end
 
 desc 'Generate documentation for the model_attachment plugin.'
@@ -30,67 +36,12 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-desc 'Update documentation on website'
-task :sync_docs => 'rdoc' do
-  `rsync -ave ssh doc/ steve@rsweb2:/var/sites/stephenwalker/shared/system/docs/model_attachment`
-end
+gemspec = eval(File.read("model_attachment.gemspec"))
 
-desc 'Clean up files.'
-task :clean do |t|
-  FileUtils.rm_rf "doc"
-  FileUtils.rm_rf "tmp"
-  FileUtils.rm_rf "pkg"
-  FileUtils.rm "test/debug.log" rescue nil
-  FileUtils.rm "test/model_attachment.db" rescue nil
-  Dir.glob("model_attachment-*.gem").each{|f| FileUtils.rm f }
-end
-
-include_file_globs = ["README*",
-                      "LICENSE",
-                      "Rakefile",
-                      "init.rb",
-                      "Manifest.txt",
-                      "{generators,lib,tasks,test}/**/*"]
-
-exclude_file_globs = ["test/amazon.yml",
-                      "test/test.log"]
-
-spec = Gem::Specification.new do |s| 
-  s.name              = "model_attachment"
-  s.description       = "Simple file attachment for ActiveRecord models"
-  s.version           = ModelAttachment::VERSION
-  s.author            = "Steve Walker"
-  s.email             = "steve@blackboxweb.com"
-  s.homepage          = "http://github.com/stw/model_attachment"
-  s.platform          = Gem::Platform::RUBY
-  s.summary           = "Attach files to ActiveRecord models and run commands on images"
-  s.files             = FileList[include_file_globs].to_a - FileList[exclude_file_globs].to_a
-  s.require_path      = "lib"
-  s.test_files        = FileList["test/**/test_*.rb"].to_a
-  s.rubyforge_project = "model_attachment"
-  s.has_rdoc          = true
-  s.extra_rdoc_files  = FileList["README*"].to_a
-  s.rdoc_options << '--line-numbers' << '--inline-source'
-  s.requirements << "ImageMagick"
-  s.add_development_dependency 'sqlite3-ruby'
-  s.add_development_dependency 'activerecord'
-end
-
-desc "Print a list of the files to be put into the gem"
-task :manifest => :clean do
-  spec.files.each do |file|
-    puts file
-  end
-end
- 
-desc "Generate a gemspec file for GitHub"
-task :gemspec => :clean do
-  File.open("#{spec.name}.gemspec", 'w') do |f|
-    f.write spec.to_ruby
-  end
-end 
+task :gem   => "#{gemspec.full_name}.gem"
+task :build => "#{gemspec.full_name}.gem"
 
-desc "Build the gem into the current directory"
-task :gem => :gemspec do
-  `gem build #{spec.name}.gemspec`
+file "#{gemspec.full_name}.gem" => gemspec.files + ["model_attachment.gemspec"] do
+  system "gem build model_attachment.gemspec"
+  system "gem install model_attachment-#{ModelAttachment::VERSION}.gem"
 end

data/lib/model_attachment.rb

@@ -11,10 +11,10 @@ require 'rubygems'
 require 'yaml'
 require 'model_attachment/upfile'
 require 'model_attachment/amazon'
+require 'model_attachment/version'
 
 # The base module that gets included in ActiveRecord::Base.
 module ModelAttachment
-  VERSION = "0.0.13"
   
   class << self
     
@@ -50,6 +50,7 @@ module ModelAttachment
     
       if options[:aws] == :default
         config_file = File.join(Rails.root, "config", "amazon.yml")
+        $stderr.puts "Config: " + config_file
         if File.exist?(config_file)
           options[:aws] = config_file
           include AmazonInstanceMethods
@@ -328,8 +329,16 @@ module ModelAttachment
   
 end
 
-# Set it up in our model
+# Rails 3
 if Object.const_defined?("ActiveRecord")
-  ActiveRecord::Base.send(:include, ModelAttachment)
-  File.send(:include, ModelAttachment::Upfile)
+  ActiveSupport.on_load(:active_record) do
+    include ModelAttachment
+    File.send(:include, ModelAttachment::Upfile)
+  end
 end
+
+# Set it up in our model
+# if Object.const_defined?("ActiveRecord")
+#   ActiveRecord::Base.send(:include, ModelAttachment)
+#   File.send(:include, ModelAttachment::Upfile)
+# end

data/lib/model_attachment/version.rb

@@ -0,0 +1,3 @@
+module ModelAttachment
+  VERSION = "0.0.14"
+end

data/test/{model_attachment_test.rb → model_attachment/model_attachment_test.rb}

@@ -9,16 +9,24 @@ require 'test/unit'
 
 require 'rubygems'
 require 'active_record'
+require 'logger'
 require 'fileutils'
 
-$:.unshift File.dirname(__FILE__) + '/../lib'
-require File.dirname(__FILE__) + '/../init'
+$:.unshift File.dirname(__FILE__) + '/../../lib'
+require 'model_attachment'
 
-RAILS_ROOT = File.dirname(__FILE__)
+class Rails
+  def self.root
+    File.dirname(__FILE__) + "/.."
+  end
+end
+
+RAILS_ROOT = File.dirname(__FILE__) + "/.."
 
 class Test::Unit::TestCase
 end
 
+
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 
 # keep AR from printing schema statements
@@ -80,7 +88,7 @@ end
 
 class DocumentWithAWS < Document
   has_attachment :path => "/system/:domain/:folder/:document/:version/", 
-    :aws => File.join(File.dirname(__FILE__), "amazon.yml"),
+    :aws => File.join(Rails.root, "amazon.yml"),
     :types => {
       :small => { :command => '/opt/local/bin/convert -geometry 100x100' } 
     },
@@ -170,7 +178,7 @@ class ModelAttachmentTest < Test::Unit::TestCase
     document.save
     assert File.exist?(RAILS_ROOT + "/system/bbs/1/1/0/test3.jpg")
     
-    assert_equal "http://localhost:3000/documentwithaws/deliver/1", document.url(:port => "3000")
+    assert_equal "http://localhost:3000/documentwithaws/1", document.url(:port => "3000")
     assert_equal "test3.jpg", document.file_name
     assert_equal String, document.file_name.class
     assert_equal "image/jpeg", document.content_type

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 13
-  version: 0.0.13
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
 - Steve Walker
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-14 00:00:00 -04:00
+date: 2010-06-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
+  name: aws-s3
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -28,48 +28,35 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activerecord
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id002
-description: Simple file attachment for ActiveRecord models
-email: steve@blackboxweb.com
+description: Simple file attachment gem
+email: 
+- swalker@walkertek.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
-- README.rdoc
-- LICENSE
-- Rakefile
-- init.rb
-- Manifest.txt
 - lib/model_attachment/amazon.rb
 - lib/model_attachment/upfile.rb
+- lib/model_attachment/version.rb
 - lib/model_attachment.rb
+- LICENSE
+- README.rdoc
+- Gemfile
+- Rakefile
+- test/model_attachment/model_attachment_test.rb
 - test/assets/test.jpg
-- test/model_attachment_test.rb
 has_rdoc: true
 homepage: http://github.com/stw/model_attachment
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --inline-source
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -86,14 +73,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
-requirements: 
-- ImageMagick
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
+requirements: []
+
 rubyforge_project: model_attachment
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Attach files to ActiveRecord models and run commands on images
+summary: A simple file attachment gem
 test_files: []
 

data/Manifest.txt

@@ -1,12 +0,0 @@
-README.rdoc
-LICENSE
-Rakefile
-init.rb
-Manifest.txt
-lib/model_attachment
-lib/model_attachment/amazon.rb
-lib/model_attachment/upfile.rb
-lib/model_attachment.rb
-test/assets
-test/assets/test.jpg
-test/model_attachment_test.rb

data/init.rb

@@ -1 +0,0 @@
-require File.join(File.dirname(__FILE__), "lib", "model_attachment")