file_share 0.1.9 → 0.1.11

data/Gemfile

@@ -1,16 +1,7 @@
 source 'http://rubygems.org'
-
-gem 'rails', '3.0.4'
-
-gem 'sqlite3'
-
-gem "formtastic"
-
 group :development, :test do
-  gem "acts_as_fu"
+  gem "formtastic"
   gem "capybara"
-  gem "cucumber-rails"
-  gem "engineer"
-  gem "rcov"
-  gem "rspec-rails"
+  gem "database_cleaner"
 end
+gemspec :path => File.expand_path('..', __FILE__)

data/Gemfile.lock

@@ -1,37 +1,45 @@
+PATH
+  remote: .
+  specs:
+    file_share (0.1.11)
+      file_share
+      formtastic
+      rails (= 3.0.7)
+
 GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.4)
-      actionpack (= 3.0.4)
+    actionmailer (3.0.7)
+      actionpack (= 3.0.7)
       mail (~> 2.2.15)
-    actionpack (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
+    actionpack (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4)
+      i18n (~> 0.5.0)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
+      rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.4)
-      activesupport (= 3.0.4)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
+      i18n (~> 0.5.0)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
-    activesupport (3.0.4)
+    activeresource (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+    activesupport (3.0.7)
     acts_as_fu (0.0.7.2)
       activerecord
       sqlite3-ruby
-    arel (2.0.8)
+    arel (2.0.9)
     builder (2.1.2)
     capybara (0.4.1.2)
       celerity (>= 0.7.9)
@@ -42,40 +50,42 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (>= 0.0.27)
       xpath (~> 0.1.3)
-    celerity (0.8.8)
-    childprocess (0.1.7)
-      ffi (~> 0.6.3)
-    cucumber (0.10.0)
+    celerity (0.8.9)
+    childprocess (0.1.9)
+      ffi (~> 1.0.6)
+    cucumber (0.10.2)
       builder (>= 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.3.2)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-    cucumber-rails (0.3.2)
-      cucumber (>= 0.8.0)
+      diff-lcs (>= 1.1.2)
+      gherkin (>= 2.3.5)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
+    cucumber-rails (0.4.1)
+      cucumber (>= 0.10.1)
+      nokogiri (>= 1.4.4)
+      rack-test (>= 0.5.7)
     culerity (0.2.15)
+    database_cleaner (0.6.7)
     diff-lcs (1.1.2)
     engineer (0.2.3)
       jeweler (>= 1.4.0)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    ffi (0.6.3)
-      rake (>= 0.8.7)
+    ffi (1.0.8)
     formtastic (1.2.3)
       actionpack (>= 2.3.7)
       activesupport (>= 2.3.7)
       i18n (~> 0.4)
-    gherkin (2.3.3)
-      json (~> 1.4.6)
+    gherkin (2.3.7)
+      json (>= 1.4.6)
     git (1.2.5)
     i18n (0.5.0)
-    jeweler (1.5.2)
+    jeweler (1.6.0)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    json (1.4.6)
+    json (1.5.1)
     json_pure (1.5.1)
-    mail (2.2.15)
+    mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -83,43 +93,43 @@ GEM
     mime-types (1.16)
     nokogiri (1.4.4)
     polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
+    rack (1.2.2)
+    rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.4)
-      actionmailer (= 3.0.4)
-      actionpack (= 3.0.4)
-      activerecord (= 3.0.4)
-      activeresource (= 3.0.4)
-      activesupport (= 3.0.4)
+    rails (3.0.7)
+      actionmailer (= 3.0.7)
+      actionpack (= 3.0.7)
+      activerecord (= 3.0.7)
+      activeresource (= 3.0.7)
+      activesupport (= 3.0.7)
       bundler (~> 1.0)
-      railties (= 3.0.4)
-    railties (3.0.4)
-      actionpack (= 3.0.4)
-      activesupport (= 3.0.4)
+      railties (= 3.0.7)
+    railties (3.0.7)
+      actionpack (= 3.0.7)
+      activesupport (= 3.0.7)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
     rcov (0.9.9)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.0)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    rspec-rails (2.5.0)
+    rspec-mocks (2.6.0)
+    rspec-rails (2.6.0)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.5.0)
+      rspec (~> 2.6.0)
     rubyzip (0.9.4)
-    selenium-webdriver (0.1.3)
-      childprocess (~> 0.1.5)
-      ffi (~> 0.6.3)
+    selenium-webdriver (0.2.0)
+      childprocess (>= 0.1.7)
+      ffi (>= 1.0.7)
       json_pure
       rubyzip
     sqlite3 (1.3.3)
@@ -129,8 +139,8 @@ GEM
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.24)
-    xpath (0.1.3)
+    tzinfo (0.3.27)
+    xpath (0.1.4)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -140,9 +150,11 @@ DEPENDENCIES
   acts_as_fu
   capybara
   cucumber-rails
+  database_cleaner
   engineer
+  file_share!
   formtastic
-  rails (= 3.0.4)
+  jeweler
   rcov
   rspec-rails
   sqlite3

data/Rakefile

@@ -8,7 +8,7 @@ FileShare::Application.load_tasks
 
 excluded_files = %w(config/database.yml public/files)
 
-Engineer::Tasks.new do |gem|
+Jeweler::Tasks.new do |gem|
   gem.name = "file_share"
   gem.summary = %Q{Provides basic file management features.}
   gem.description = %Q{Simple versioned event management for Rails 3.}
@@ -22,17 +22,17 @@ Engineer::Tasks.new do |gem|
     "db/**/*.rb"
   ]
   excluded_files.each{|f| gem.files.exclude(f)}
-  
-  # Include Bundler dependencies
-  Bundler.definition.dependencies.each do |dependency|
-    next if dependency.name == "engineer"
 
-    if (dependency.groups & [:default, :production]).any?
-      gem.add_dependency dependency.name, *dependency.requirement.as_list
-    else
-      gem.add_development_dependency dependency.name, *dependency.requirement.as_list
-    end
-  end
+  gem.add_dependency 'rails', '3.0.7'
+  gem.add_dependency 'formtastic'
+
+  gem.add_development_dependency 'jeweler'
+  gem.add_development_dependency "acts_as_fu"
+  gem.add_development_dependency "capybara"
+  gem.add_development_dependency "cucumber-rails"
+  gem.add_development_dependency "rcov"
+  gem.add_development_dependency "rspec-rails"
+  gem.add_development_dependency 'sqlite3'
 
   # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
 end

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.1.11

data/app/models/file_attachment.rb

@@ -18,7 +18,9 @@ class FileAttachment < ActiveRecord::Base
   belongs_to :attachable, :polymorphic => true
   
   before_validation :autofill_blank_name, :on => :create
-  before_validation :save_to_folder_path, :on => :create
+  #before_validation :save_to_folder_path, :on => :create
+  before_validation :build_filepath
+  after_save :save_to_folder_path, :if => Proc.new{|file| file.uploaded_file.present?}
   before_save :normalize_attachable_fields
   before_destroy :move_file_to_trash_folder!
 
@@ -28,6 +30,13 @@ class FileAttachment < ActiveRecord::Base
   scope :attached, where('attachable_id IS NOT NULL')
   
   private
+    def attachable_folder
+      if attachable_type.blank? or attachable_id.blank?
+        "general"
+      else
+        File.join attachable_type.underscore.downcase, attachable_id.to_s
+      end
+    end
     def normalize_attachable_fields
       if attachable_type.blank? || attachable_id.blank?
         self.attachable_type = nil
@@ -35,25 +44,27 @@ class FileAttachment < ActiveRecord::Base
       end
     end
     def move_file_to_trash_folder!
-      ensure_folder_path_exists(TRASH_FOLDER)
-      trash_filename = generate_unique_filename(TRASH_FOLDER)
+      trash_folder = File.join FOLDER_PATH, attachable_folder, 'trash'
+      ensure_folder_path_exists(trash_folder)
+      trash_filename = generate_unique_filename(trash_folder)
       
-      FileUtils.mv(full_path, File.join(TRASH_FOLDER, trash_filename))
+      FileUtils.mv(full_path, File.join(trash_folder, trash_filename))
       
-      unless File.exists?(File.join(TRASH_FOLDER, trash_filename))
-        raise Errno::ENOENT("The file at #{File.join(FOLDER_ROOT, filepath)} should be in the trash at #{File.join(TRASH_FOLDER, trash_filename)}")
+      unless File.exists?(File.join(trash_folder, trash_filename))
+        raise Errno::ENOENT("The file at #{File.join(FOLDER_ROOT, filepath)} should be in the trash at #{File.join(trash_folder, trash_filename)}")
       end
-      logger.info("Moved File Attachment to Trash: #{File.join(TRASH_FOLDER, trash_filename)}")
+      logger.info("Moved File Attachment to Trash: #{File.join(trash_folder, trash_filename)}")
     end
     def save_to_folder_path
       ensure_folder_path_exists
       build_filepath
       File.open(full_path, "wb") { |f| f.write(uploaded_file.read) }
       return true if file_saved?
-      errors.add_to_base("The file could not be saved. Please try again or contact someone and make a note of how many files, what kind, etc.")
+      errors.add(:base, "The file could not be saved. Please try again or contact someone and make a note of how many files, what kind, etc.")
       false
     end
-    def generate_unique_filename(dest_path=FOLDER_PATH)
+    def generate_unique_filename(dest_path=nil)
+      dest_path ||= File.join FOLDER_PATH, attachable_folder
       base_filename = File.basename(uploaded_file && uploaded_file.original_filename || filepath)
       new_filename = base_filename
       path = File.join dest_path, new_filename
@@ -62,14 +73,16 @@ class FileAttachment < ActiveRecord::Base
         count += 1
         new_filename = base_filename.gsub File.extname(base_filename), "-#{count}#{File.extname(base_filename)}"
         path = File.join dest_path, new_filename
+        raise "Unable to generate a unique filename for #{base_filename}; tried #{count} times." if count > 99
       end
       new_filename
     end
-    def ensure_folder_path_exists(dest_path=FOLDER_PATH)
+    def ensure_folder_path_exists(dest_path=nil)
+      dest_path ||= File.join FOLDER_PATH, attachable_folder
       FileUtils.mkdir_p dest_path
     end
     def build_filepath
-      self.filepath = File.join FOLDER, generate_unique_filename
+      self.filepath = File.join FOLDER, attachable_folder, generate_unique_filename
     end
     def autofill_blank_name
       if name.blank?
@@ -79,7 +92,7 @@ class FileAttachment < ActiveRecord::Base
   protected
   public
     def full_path
-      "#{FOLDER_ROOT}/#{filepath}"
+      File.join FOLDER_ROOT, filepath
     end
     def file_saved?
       return true if File.exists?(full_path) && File.basename(full_path) != FOLDER
@@ -94,4 +107,19 @@ class FileAttachment < ActiveRecord::Base
       self.attachable_type = p[0].blank? ? nil : p[0]
       self.attachable_id = p[1].blank? ? nil : p[1]
     end
+    
+    # update fs & db filepaths with updated values (eg after dev changes)
+    def update_filepath
+      old_path = full_path.dup
+      build_filepath
+      FileUtils.mv(old_path, full_path)
+      unless file_saved?
+        msg = "Error updating filepath for #{name}"
+        logger.error(msg)
+        errors.add(:base, msg)
+        false
+      else
+        self.save
+      end
+    end
 end

data/config/cucumber.yml

@@ -1,7 +1,7 @@
 <%
 rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
 rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
-std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} --strict --tags ~@wip"
+std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} --strict --tags ~@wip"
 %>
 default: <%= std_opts %> features
 wip: --tags @wip:3 --wip features

data/lib/file_share.rb

@@ -1,3 +1,3 @@
 module FileShare
-  require "file_share/engine" if defined?(Rails)
+  require "file_share/engine"
 end

data/lib/file_share/engine.rb

@@ -1,22 +1,6 @@
-require "file_share"
-require "rails"
-
 module FileShare
   class Engine < Rails::Engine
     ASSET_PREFIX = "file_share"
-    ENGINEER_VERSION = "0.2.3"
-
-    initializer "file_share.require_dependencies" do
-      require 'bundler'
-      gemfile = Bundler::Definition.build(root.join('Gemfile'), root.join('Gemfile.lock'), {})
-      specs = gemfile.dependencies.select do |d|
-        d.name != 'engineer' and (d.groups & [:default, :production]).any?
-      end
-
-      specs.collect { |s| s.autorequire || [s.name] }.flatten.each do |r|
-        require r
-      end
-    end
 
     initializer "file_share.asset_path" do |app|
       app.config.middleware.use ::ActionDispatch::Static, "#{root}/public"

data/lib/tasks/cucumber.rake

@@ -43,6 +43,10 @@ begin
   task :features => :cucumber do
     STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
   end
+
+  # In case we don't have ActiveRecord, append a no-op task that we can depend upon.
+  task 'db:test:prepare' do
+  end
 rescue LoadError
   desc 'cucumber rake task not available (cucumber not installed)'
   task :cucumber do

data/spec/models/file_attachment_spec.rb

@@ -1,57 +1,101 @@
 require 'spec_helper'
 
 describe FileAttachment do
-  
+
   include ActionDispatch::TestProcess # for fixture_file_upload
-  
+
   before(:each) do
-    @path = File.join(Rails.root.to_s, 'public', 'files')
+    File.stub(:open)
+    @path = File.join(Rails.root.to_s, 'public', 'files', 'general')
     @full_path = File.join(@path, 'somefile.txt')
     @trash_path = File.join(@path, 'trash', 'somefile.txt')
-    
-    raise "Please back up and clean out public/files before running this spec" if File.exists?(@full_path) || File.exists?(File.join(@path, 'somefile-1.txt'))
-    
-    @file_attachment = FileAttachment.create!({
+
+    @file_attachment = FileAttachment.new({
       :description => 'unique description',
       :uploaded_file => fixture_file_upload(File.join(Rails.root.to_s, 'spec', 'fixtures', 'somefile.txt'), 'text/plain')
     })
+    @file_attachment.valid? # force build_filepath
   end
-  
-  after(:each) do  
-    if File.exists?(@full_path)
-      File.delete(@full_path)
-    end
-    if File.exists?(@trash_path)
-      File.delete(@trash_path)
-    end
-  end
-  
+
   it "should generate a unique name" do
-    FileUtils.mkdir_p @path
-    
-    new_file = FileAttachment.create!({
+    File.stub(:open)
+    File.stub(:exists?).with("#{@path}/somefile.txt"){ true }
+    File.stub(:exists?).with("#{@path}/somefile-1.txt"){ false }
+    File.should_receive(:open).with("#{@path}/somefile-1.txt", "wb").at_least(:once)
+    new_file = FileAttachment.create({
       :description => 'other description',
       :uploaded_file => fixture_file_upload(File.join(Rails.root.to_s, 'spec', 'fixtures', 'somefile.txt'), 'text/plain')
     })
-    
-    new_file.filepath.should_not == 'files/somefile.txt'
-    new_file.filepath.should == 'files/somefile-1.txt'
-    File.exists?(@full_path).should be_true
-    
-    File.delete(File.join(@path, 'somefile-1.txt'))
   end
   
   it "should know whether its file actually exists" do
+    File.stub(:exists?).with("#{@path}/somefile.txt"){ true }
     @file_attachment.file_saved?.should be_true
-    File.exists?(@full_path).should be_true
-    File.delete(@full_path)
+    File.stub(:exists?).with("#{@path}/somefile.txt"){ false }
     @file_attachment.file_saved?.should be_false
   end
   
   it "should move its file to the trash when destroyed" do
-    File.exists?(@full_path).should be_true
+    @file_attachment.should_receive(:move_file_to_trash_folder!)
     @file_attachment.destroy
-    File.exists?(@full_path).should be_false
-    File.exists?(@trash_path).should be_true
+  end
+  
+  it "should know how to throw files into the trash" do
+    @file_attachment.stub(:generate_unique_filename){ "somefile.txt" }
+    File.stub(:exists?){ true }
+    FileUtils.should_receive(:mv).with(@full_path, @trash_path)
+    @file_attachment.send(:move_file_to_trash_folder!)
+  end
+  
+  it "should be able to create a folder name that mirrors the attachable_type and attachable_id" do
+    @file_attachment.send(:attachable_folder).should eq "general"
+    module Blog; class Post; extend ActiveModel::Naming; def self.base_class; Blog::Post; end end end
+    blog_post = mock_model(Blog::Post)
+    @file_attachment.attachable = blog_post
+    @file_attachment.send(:attachable_folder).should eq "blog/post/#{blog_post.id}"
+    
+    class Event; extend ActiveModel::Naming; def self.base_class; Event; end end
+    event = mock_model(Event)
+    @file_attachment.attachable = event
+    @file_attachment.send(:attachable_folder).should eq "event/#{event.id}"
+  end
+  
+  it "should ensure that the destination folder exists" do
+    FileUtils.should_receive(:mkdir_p).with(@path)
+    @file_attachment.send(:ensure_folder_path_exists)
+  end
+  
+  context "should be able to update filepath in db & fs" do
+    before(:each) do
+      @old_path = File.join "files", "somefile.txt"
+      @file_attachment.filepath = @old_path
+      FileUtils.stub(:mv).with("#{Rails.root}/public/#{@old_path}", @full_path)
+    end
+    it "update the fs" do
+      FileUtils.should_receive(:mv).with("#{Rails.root}/public/#{@old_path}", @full_path)
+      @file_attachment.update_filepath
+    end
+    context "fs update succeeds :)" do
+      it "update the db" do
+        p "stubbing obj under test"
+        @file_attachment.stub(:file_saved?){ true }
+        @file_attachment.should_receive(:save)
+        @file_attachment.update_filepath
+      end
+    end
+    context "fs update fails :(" do
+      before(:each) do
+        @file_attachment.stub(:file_saved?){ false }
+      end
+      it "add error to base" do
+        p "stubbing obj under test"
+        @file_attachment.errors.should_receive(:add).with(:base, "Error updating filepath for #{@file_attachment.name}")
+        @file_attachment.update_filepath
+      end
+      it "return false" do
+        p "stubbing obj under test"
+        @file_attachment.update_filepath.should be_false
+      end
+    end
   end
 end