joint 0.3.2 → 0.4

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2010 John Nunemaker
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/joint.rb

@@ -11,7 +11,10 @@ module Joint
   end
 
   module ClassMethods
-    def attachment(name)
+    def attachment(name, options = {})
+      options.symbolize_keys!
+      name = name.to_sym
+
       self.attachment_names << name
 
       after_save     :save_attachments
@@ -23,24 +26,28 @@ module Joint
       key "#{name}_size".to_sym, Integer
       key "#{name}_type".to_sym, String
 
+      validates_presence_of(name) if options[:required]
+
       class_eval <<-EOC
         def #{name}
           @#{name} ||= AttachmentProxy.new(self, :#{name})
         end
 
         def #{name}?
-          self.send(:#{name}_id?)
+          !nil_attachments.include?(:#{name}) && self.send(:#{name}_id?)
         end
 
         def #{name}=(file)
           if file.nil?
             nil_attachments << :#{name}
+            assigned_attachments.delete(:#{name})
           else
-            self["#{name}_id"]             = BSON::ObjectID.new if self["#{name}_id"].nil?
+            self["#{name}_id"]             = BSON::ObjectId.new if self["#{name}_id"].nil?
             self["#{name}_size"]           = File.size(file)
             self["#{name}_type"]           = Wand.wave(file.path)
             self["#{name}_name"]           = Joint.file_name(file)
             assigned_attachments[:#{name}] = file
+            nil_attachments.delete(:#{name})
           end
         end
       EOC
@@ -77,7 +84,21 @@ module Joint
       end
 
       def destroy_nil_attachments
-        nil_attachments.each { |name| grid.delete(send(name).id) }
+        # currently MM does not send sets to instance as well
+        nil_attachments.each do |name|
+          grid.delete(send(name).id)
+          send(:"#{name}_id=", nil)
+          send(:"#{name}_size=", nil)
+          send(:"#{name}_type=", nil)
+          send(:"#{name}_name=", nil)
+          set({
+            :"#{name}_id"   => nil,
+            :"#{name}_size" => nil,
+            :"#{name}_type" => nil,
+            :"#{name}_name" => nil,
+          })
+        end
+
         nil_attachments.clear
       end
 
@@ -107,6 +128,10 @@ module Joint
       @instance.send("#{@name}_type")
     end
 
+    def nil?
+      !@instance.send("#{@name}?")
+    end
+
     def grid_io
       @grid_io ||= @instance.grid.get(id)
     end

data/lib/joint/version.rb

@@ -1,3 +1,3 @@
 module Joint
-  Version = '0.3.2'
+  Version = '0.4'
 end

data/test/test_joint.rb

@@ -112,8 +112,8 @@ class JointTest < Test::Unit::TestCase
       subject.image_id.should_not be_nil
       subject.file_id.should_not be_nil
 
-      subject.image_id.should be_instance_of(BSON::ObjectID)
-      subject.file_id.should be_instance_of(BSON::ObjectID)
+      subject.image_id.should be_instance_of(BSON::ObjectId)
+      subject.file_id.should be_instance_of(BSON::ObjectId)
     end
 
     should "allow accessing keys through attachment proxy" do
@@ -126,8 +126,8 @@ class JointTest < Test::Unit::TestCase
       subject.image.id.should_not be_nil
       subject.file.id.should_not be_nil
 
-      subject.image.id.should be_instance_of(BSON::ObjectID)
-      subject.file.id.should be_instance_of(BSON::ObjectID)
+      subject.image.id.should be_instance_of(BSON::ObjectId)
+      subject.file.id.should be_instance_of(BSON::ObjectId)
     end
 
     should "proxy unknown methods to GridIO object" do
@@ -152,6 +152,11 @@ class JointTest < Test::Unit::TestCase
       subject.file?.should be(true)
     end
 
+    should "respond with false when asked if the attachment is nil?" do
+      subject.image.nil?.should be(false)
+      subject.file.nil?.should be(false)
+    end
+
     should "clear assigned attachments so they don't get uploaded twice" do
       Mongo::Grid.any_instance.expects(:put).never
       subject.save
@@ -231,6 +236,16 @@ class JointTest < Test::Unit::TestCase
       assert_grid_difference(-1)  { subject.save }
     end
 
+    should "know that the attachment has been nullified" do
+      subject.image = nil
+      subject.image?.should be(false)
+    end
+
+    should "respond with true when asked if the attachment is nil?" do
+      subject.image = nil
+      subject.image.nil?.should be(true)
+    end
+
     should "clear nil attachments after save and not attempt to delete again" do
       Mongo::Grid.any_instance.expects(:delete).once
       subject.image = nil
@@ -238,6 +253,21 @@ class JointTest < Test::Unit::TestCase
       Mongo::Grid.any_instance.expects(:delete).never
       subject.save
     end
+
+    should "clear id, name, type, size" do
+      subject.image = nil
+      subject.save
+      assert_nil subject.image_id
+      assert_nil subject.image_name
+      assert_nil subject.image_type
+      assert_nil subject.image_size
+      subject.reload
+      assert_nil subject.image_id
+      assert_nil subject.image_name
+      assert_nil subject.image_type
+      assert_nil subject.image_size
+    end
+
   end
 
   context "Retrieving attachment that does not exist" do
@@ -251,6 +281,10 @@ class JointTest < Test::Unit::TestCase
       subject.image?.should be(false)
     end
 
+    should "respond with true when asked if the attachment is nil?" do
+      subject.image.nil?.should be(true)
+    end
+
     should "raise Mongo::GridFileNotFound" do
       assert_raises(Mongo::GridFileNotFound) { subject.image.read }
     end
@@ -281,4 +315,28 @@ class JointTest < Test::Unit::TestCase
       assert_equal 'testing.txt', doc.image_name
     end
   end
+
+  context "Validating attachment presence" do
+    setup do
+      @model_class = Class.new do
+        include MongoMapper::Document
+        plugin Joint
+        attachment :file, :required => true
+      end
+    end
+
+    should "work" do
+      model = @model_class.new
+      model.should_not be_valid
+
+      model.file = @file
+      model.should be_valid
+
+      model.file = nil
+      model.should_not be_valid
+
+      model.file = @image
+      model.should be_valid
+    end
+  end
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: joint
 version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 4
+  version: "0.4"
 platform: ruby
 authors: 
 - John Nunemaker
@@ -14,16 +14,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-18 00:00:00 -04:00
+date: 2010-09-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: wand
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 0
         - 2
@@ -35,9 +37,11 @@ dependencies:
   name: mime-types
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -47,9 +51,11 @@ dependencies:
   name: mongo_mapper
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
         - 7
@@ -58,66 +64,58 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: shoulda
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: mocha
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: jnunemaker-matchy
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: jnunemaker-matchy
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id007
 description: MongoMapper and GridFS joined in file upload love.
 email: nunemaker@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
-- README.rdoc
-- Rakefile
-- lib/joint.rb
 - lib/joint/version.rb
+- lib/joint.rb
 - test/fixtures/harmony.png
 - test/fixtures/mr_t.jpg
 - test/fixtures/test1.txt
@@ -125,33 +123,39 @@ files:
 - test/fixtures/unixref.pdf
 - test/helper.rb
 - test/test_joint.rb
+- LICENSE
+- README.rdoc
 has_rdoc: true
 homepage: http://github.com/jnunemaker/joint
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: MongoMapper and GridFS joined in file upload love.

data/Rakefile

@@ -1,38 +0,0 @@
-require 'rubygems'
-require 'rake'
-require 'jeweler'
-require 'rake/testtask'
-
-require File.join(File.dirname(__FILE__), 'lib', 'joint', 'version')
-
-Jeweler::Tasks.new do |gem|
-  gem.name        = "joint"
-  gem.summary     = %Q{MongoMapper and GridFS joined in file upload love.}
-  gem.description = %Q{MongoMapper and GridFS joined in file upload love.}
-  gem.email       = "nunemaker@gmail.com"
-  gem.homepage    = "http://github.com/jnunemaker/joint"
-  gem.authors     = ["John Nunemaker"]
-  gem.version     = Joint::Version
-  gem.files       = FileList['lib/**/*.rb', 'bin/*', '[A-Z]*', 'test/**/*'].to_a
-  gem.test_files  = FileList['test/**/*'].to_a
-  
-  gem.add_dependency 'wand', '>= 0.2.1'
-  gem.add_dependency 'mime-types'
-  gem.add_dependency 'mongo_mapper', '>= 0.7.4'
-
-  gem.add_development_dependency 'jeweler'
-  gem.add_development_dependency 'shoulda'
-  gem.add_development_dependency 'mocha'
-  gem.add_development_dependency 'jnunemaker-matchy'
-end
-Jeweler::GemcutterTasks.new
-
-Rake::TestTask.new(:test) do |test|
-  test.libs      << 'lib' << 'test'
-  test.ruby_opts << '-rubygems'
-  test.pattern   = 'test/**/test_*.rb'
-  test.verbose   = true
-end
-
-task :test    => :check_dependencies
-task :default => :test