jamieorc-joint 0.5.6 → 0.6.1

data/Gemfile

@@ -1,5 +1,8 @@
-source "http://rubygems.org"
+source :rubygems
 
-gem 'i18n', '0.4.2'
-gem 'bson_ext', '~> 1.3', :require => false
-gemspec
+gemspec
+
+gem 'bson_ext', :require => false
+gem 'shoulda'
+gem 'mocha'
+gem 'jnunemaker-matchy'

data/Gemfile.lock

@@ -1,34 +1,39 @@
 PATH
   remote: .
   specs:
-    joint (0.5.6)
+    joint (0.6.1)
       mime-types
-      mongo_mapper (~> 0.8.6)
+      mongo_mapper (~> 0.9)
       wand (~> 0.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.3)
+    activemodel (3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activesupport (3.1.3)
+      multi_json (~> 1.0)
     bson (1.3.1)
     bson_ext (1.3.1)
-    i18n (0.4.2)
+    builder (3.0.0)
+    i18n (0.6.0)
     jnunemaker-matchy (0.4.0)
-    jnunemaker-validatable (1.8.4)
-      activesupport (>= 2.3.4)
-    mime-types (1.16)
+    mime-types (1.17.2)
     mocha (0.9.10)
       rake
     mongo (1.3.1)
       bson (>= 1.3.1)
-    mongo_mapper (0.8.6)
-      activesupport (>= 2.3.4)
-      jnunemaker-validatable (~> 1.8.4)
-      plucky (~> 0.3.6)
-    plucky (0.3.6)
-      mongo (~> 1.1)
+    mongo_mapper (0.10.1)
+      activemodel (~> 3.0)
+      activesupport (~> 3.0)
+      plucky (~> 0.4.0)
+    multi_json (1.0.3)
+    plucky (0.4.3)
+      mongo (~> 1.3)
     rake (0.8.7)
-    safe_shell (1.0.0)
+    safe_shell (1.0.1)
     shoulda (2.11.3)
     wand (0.4)
       mime-types
@@ -38,12 +43,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bson_ext (~> 1.3)
-  i18n (= 0.4.2)
+  bson_ext
   jnunemaker-matchy
   joint!
-  mime-types
   mocha
-  mongo_mapper (~> 0.8.6)
   shoulda
-  wand (~> 0.4)

data/joint.gemspec

@@ -4,7 +4,7 @@ require File.expand_path('../lib/joint/version', __FILE__)
 Gem::Specification.new do |s|
   s.name        = "jamieorc-joint"
   s.summary     = %Q{MongoMapper and GridFS joined in file upload love.}
-  s.description = %Q{MongoMapper and GridFS joined in file upload love.}
+  s.description = %Q{MongoMapper and GridFS joined in file upload love. Updates by Jamie for EmbeddedDocument.}
   s.email       = "jamieorc@gmail.com"
   s.homepage    = "http://github.com/jamieorc/joint"
   s.authors     = ["John Nunemaker", "Jamie Orchard-Hays"]
@@ -12,11 +12,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'wand', '~> 0.4'
   s.add_dependency 'mime-types'
-  s.add_dependency 'mongo_mapper', '~> 0.8.6'
-
-  s.add_development_dependency 'shoulda'
-  s.add_development_dependency 'mocha'
-  s.add_development_dependency 'jnunemaker-matchy'
+  s.add_dependency 'mongo_mapper', '~> 0.9'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/joint/attachment_proxy.rb

@@ -23,6 +23,7 @@ module Joint
     def nil?
       !@instance.send("#{@name}?")
     end
+    alias_method :blank?, :nil?
 
     def grid_io
       @grid_io ||= @instance.grid.get(id)

data/lib/joint/class_methods.rb

@@ -8,7 +8,7 @@ module Joint
       options.symbolize_keys!
       name = name.to_sym
 
-      self.attachment_names << name
+      self.attachment_names = attachment_names.dup.add(name)
 
       after_save     :save_attachments
       before_save    :nullify_nil_attachments_attributes

data/lib/joint/instance_methods.rb

@@ -19,7 +19,7 @@ module Joint
           next unless io.respond_to?(:read)
           io.rewind if io.respond_to?(:rewind)
           grid.delete(send(name).id)
-          grid.put(io.read, {
+          grid.put(io, {
             :_id          => send(name).id,
             :filename     => send(name).name,
             :content_type => send(name).type,

data/lib/joint/io.rb

@@ -1,3 +1,5 @@
+require 'stringio'
+
 module Joint
   class IO
     attr_accessor :name, :content, :type, :size
@@ -5,10 +7,17 @@ module Joint
     def initialize(attrs={})
       attrs.each { |key, value| send("#{key}=", value) }
       @type ||= 'plain/text'
-      @size ||= @content.size unless @content.nil?
+    end
+
+    def content=(value)
+      @io = StringIO.new(value || nil)
+      @size = value ? value.size : 0
+    end
+
+    def read(*args)
+      @io.read(*args)
     end
 
     alias path name
-    alias read content
   end
 end

data/lib/joint/version.rb

@@ -1,3 +1,3 @@
 module Joint
-  Version = '0.5.6'
+  Version = '0.6.1'
 end

data/lib/joint.rb

@@ -3,10 +3,12 @@ require 'mime/types'
 require 'wand'
 
 module Joint
-  def self.configure(model)
-    model.class_inheritable_accessor :attachment_names
-    model.attachment_names = Set.new
-    model.send(:include, model.attachment_accessor_module)
+  extend ActiveSupport::Concern
+
+  included do
+    class_attribute :attachment_names
+    self.attachment_names = Set.new
+    include attachment_accessor_module
   end
 
   def self.name(file)

data/test/helper.rb

@@ -1,3 +1,6 @@
+require 'bundler/setup'
+Bundler.setup(:default, 'test', 'development')
+
 require 'tempfile'
 require 'pp'
 require 'shoulda'
@@ -78,7 +81,9 @@ module JointTestHelpers
   end
 
   def open_file(name)
-    File.open(File.join(File.dirname(__FILE__), 'fixtures', name), 'r')
+    f = File.open(File.join(File.dirname(__FILE__), 'fixtures', name), 'r')
+    f.binmode
+    f
   end
 
   def grid

data/test/test_joint.rb

@@ -157,9 +157,9 @@ 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)
+    should "respond with false when asked if the attachment is blank?" do
+      subject.image.blank?.should be(false)
+      subject.file.blank?.should be(false)
     end
 
     should "clear assigned attachments so they don't get uploaded twice" do
@@ -232,9 +232,9 @@ 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)
+    should "respond with false when asked if the attachment is blank?" do
+      subject.image.blank?.should be(false)
+      subject.file.blank?.should be(false)
     end
 
     should "clear assigned attachments so they don't get uploaded twice" do
@@ -242,7 +242,6 @@ class JointTest < Test::Unit::TestCase
       subject.save
     end
   end
-  
 
   context "Updating existing attachment" do
     setup do
@@ -378,6 +377,11 @@ class JointTest < Test::Unit::TestCase
       subject.image.nil?.should be(true)
     end
 
+    should "respond with true when asked if the attachment is blank?" do
+      subject.image = nil
+      subject.image.blank?.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
@@ -424,6 +428,11 @@ class JointTest < Test::Unit::TestCase
       subject.image = nil
       subject.image.nil?.should be(true)
     end
+    
+    should "respond with true when asked if the attachment is blank?" do
+      subject.image = nil
+      subject.image.blank?.should be(true)
+    end
 
     should "clear nil attachments after save and not attempt to delete again" do
       Mongo::Grid.any_instance.expects(:delete).once
@@ -516,6 +525,8 @@ class JointTest < Test::Unit::TestCase
         include MongoMapper::Document
         plugin Joint
         attachment :file, :required => true
+
+        def self.name; "Foo"; end
       end
     end
 
@@ -539,15 +550,14 @@ class JointTest < Test::Unit::TestCase
       io = Joint::IO.new({
         :name    => 'foo.txt',
         :type    => 'plain/text',
-        :content => 'This is my stuff',
-        :size    => 19,
+        :content => 'This is my stuff'
       })
       @asset = Asset.create(:file => io)
     end
 
     should "work" do
       @asset.file_name.should == 'foo.txt'
-      @asset.file_size.should == 19
+      @asset.file_size.should == 16
       @asset.file_type.should == 'plain/text'
       @asset.file.read.should == 'This is my stuff'
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jamieorc-joint
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
-  - 5
   - 6
-  version: 0.5.6
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - John Nunemaker
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-23 00:00:00 -05:00
-default_executable: 
+date: 2011-11-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: wand
@@ -56,57 +55,14 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 25
         segments: 
         - 0
-        - 8
-        - 6
-        version: 0.8.6
+        - 9
+        version: "0.9"
   type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  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: 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: 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
-description: MongoMapper and GridFS joined in file upload love.
+description: MongoMapper and GridFS joined in file upload love. Updates by Jamie for EmbeddedDocument.
 email: jamieorc@gmail.com
 executables: []
 
@@ -139,7 +95,6 @@ files:
 - test/helper.rb
 - test/joint/test_io.rb
 - test/test_joint.rb
-has_rdoc: true
 homepage: http://github.com/jamieorc/joint
 licenses: []
 
@@ -169,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: MongoMapper and GridFS joined in file upload love.