joint 0.5.1 → 0.5.2

data/Gemfile

@@ -1,5 +1,5 @@
 source "http://rubygems.org"
 
-gem 'i18n'
+gem 'i18n', '0.4.2'
 gem 'bson_ext', '~> 1.1', :require => false
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    joint (0.5)
+    joint (0.5.1)
       mime-types
       mongo_mapper (~> 0.8.6)
       wand (~> 0.3)
@@ -37,7 +37,7 @@ PLATFORMS
 
 DEPENDENCIES
   bson_ext (~> 1.1)
-  i18n
+  i18n (= 0.4.2)
   jnunemaker-matchy
   joint!
   mime-types

data/lib/joint.rb

@@ -3,150 +3,38 @@ require 'mime/types'
 require 'wand'
 
 module Joint
-  autoload :Version, 'joint/version'
-
   def self.configure(model)
     model.class_inheritable_accessor :attachment_names
     model.attachment_names = Set.new
     model.send(:include, model.attachment_accessor_module)
   end
 
-  module ClassMethods
-    def attachment_accessor_module
-      @attachment_accessor_module ||= Module.new
-    end
-
-    def attachment(name, options = {})
-      options.symbolize_keys!
-      name = name.to_sym
-
-      self.attachment_names << name
-
-      after_save     :save_attachments
-      after_save     :destroy_nil_attachments
-      before_destroy :destroy_all_attachments
-
-      key :"#{name}_id",   ObjectId
-      key :"#{name}_name", String
-      key :"#{name}_size", Integer
-      key :"#{name}_type", String
-
-      validates_presence_of(name) if options[:required]
-
-      attachment_accessor_module.module_eval <<-EOC
-        def #{name}
-          @#{name} ||= AttachmentProxy.new(self, :#{name})
-        end
-
-        def #{name}?
-          !nil_attachments.include?(:#{name}) && send(:#{name}_id?)
-        end
-
-        def #{name}=(file)
-          if file.nil?
-            nil_attachments << :#{name}
-            assigned_attachments.delete(:#{name})
-          else
-            send("#{name}_id=", BSON::ObjectId.new) if send("#{name}_id").nil?
-            send("#{name}_size=", File.size(file))
-            send("#{name}_type=", Wand.wave(file.path, :original_filename => Joint.file_name(file)))
-            send("#{name}_name=", Joint.file_name(file))
-            assigned_attachments[:#{name}] = file
-            nil_attachments.delete(:#{name})
-          end
-        end
-      EOC
+  def self.name(file)
+    if file.respond_to?(:original_filename)
+      file.original_filename
+    else
+      File.basename(file.path)
     end
   end
 
-  module InstanceMethods
-    def grid
-      @grid ||= Mongo::Grid.new(database)
+  def self.size(file)
+    if file.respond_to?(:size)
+      file.size
+    else
+      File.size(file)
     end
-
-    private
-      def assigned_attachments
-        @assigned_attachments ||= {}
-      end
-
-      def nil_attachments
-        @nil_attachments ||= Set.new
-      end
-
-      # IO must respond to read and rewind
-      def save_attachments
-        assigned_attachments.each_pair do |name, io|
-          next unless io.respond_to?(:read)
-          io.rewind if io.respond_to?(:rewind)
-          grid.delete(send(name).id)
-          grid.put(io.read, {
-            :_id          => send(name).id,
-            :filename     => send(name).name,
-            :content_type => send(name).type,
-          })
-        end
-        assigned_attachments.clear
-      end
-
-      def destroy_nil_attachments
-        # 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
-
-      def destroy_all_attachments
-        self.class.attachment_names.map { |name| grid.delete(send(name).id) }
-      end
   end
 
-  class AttachmentProxy
-    def initialize(instance, name)
-      @instance, @name = instance, name
+  def self.type(file)
+    if file.respond_to?(:content_type)
+      file.content_type
+    else
+      Wand.wave(file.path, :original_filename => Joint.name(file))
     end
-
-    def id
-      @instance.send("#{@name}_id")
-    end
-
-    def name
-      @instance.send("#{@name}_name")
-    end
-
-    def size
-      @instance.send("#{@name}_size")
-    end
-
-    def type
-      @instance.send("#{@name}_type")
-    end
-
-    def nil?
-      !@instance.send("#{@name}?")
-    end
-
-    def grid_io
-      @grid_io ||= @instance.grid.get(id)
-    end
-
-    def method_missing(method, *args, &block)
-      grid_io.send(method, *args, &block)
-    end
-  end
-
-  def self.file_name(file)
-    file.respond_to?(:original_filename) ? file.original_filename : File.basename(file.path)
   end
 end
+
+require 'joint/class_methods'
+require 'joint/instance_methods'
+require 'joint/attachment_proxy'
+require 'joint/io'

data/lib/joint/attachment_proxy.rb

@@ -0,0 +1,35 @@
+module Joint
+  class AttachmentProxy
+    def initialize(instance, name)
+      @instance, @name = instance, name
+    end
+
+    def id
+      @instance.send("#{@name}_id")
+    end
+
+    def name
+      @instance.send("#{@name}_name")
+    end
+
+    def size
+      @instance.send("#{@name}_size")
+    end
+
+    def type
+      @instance.send("#{@name}_type")
+    end
+
+    def nil?
+      !@instance.send("#{@name}?")
+    end
+
+    def grid_io
+      @grid_io ||= @instance.grid.get(id)
+    end
+
+    def method_missing(method, *args, &block)
+      grid_io.send(method, *args, &block)
+    end
+  end
+end

data/lib/joint/class_methods.rb

@@ -0,0 +1,49 @@
+module Joint
+  module ClassMethods
+    def attachment_accessor_module
+      @attachment_accessor_module ||= Module.new
+    end
+
+    def attachment(name, options = {})
+      options.symbolize_keys!
+      name = name.to_sym
+
+      self.attachment_names << name
+
+      after_save     :save_attachments
+      after_save     :destroy_nil_attachments
+      before_destroy :destroy_all_attachments
+
+      key :"#{name}_id",   ObjectId
+      key :"#{name}_name", String
+      key :"#{name}_size", Integer
+      key :"#{name}_type", String
+
+      validates_presence_of(name) if options[:required]
+
+      attachment_accessor_module.module_eval <<-EOC
+        def #{name}
+          @#{name} ||= AttachmentProxy.new(self, :#{name})
+        end
+
+        def #{name}?
+          !nil_attachments.include?(:#{name}) && send(:#{name}_id?)
+        end
+
+        def #{name}=(file)
+          if file.nil?
+            nil_attachments << :#{name}
+            assigned_attachments.delete(:#{name})
+          else
+            send("#{name}_id=", BSON::ObjectId.new) if send("#{name}_id").nil?
+            send("#{name}_name=", Joint.name(file))
+            send("#{name}_size=", Joint.size(file))
+            send("#{name}_type=", Joint.type(file))
+            assigned_attachments[:#{name}] = file
+            nil_attachments.delete(:#{name})
+          end
+        end
+      EOC
+    end
+  end
+end

data/lib/joint/instance_methods.rb

@@ -0,0 +1,54 @@
+module Joint
+  module InstanceMethods
+    def grid
+      @grid ||= Mongo::Grid.new(database)
+    end
+
+    private
+      def assigned_attachments
+        @assigned_attachments ||= {}
+      end
+
+      def nil_attachments
+        @nil_attachments ||= Set.new
+      end
+
+      # IO must respond to read and rewind
+      def save_attachments
+        assigned_attachments.each_pair do |name, io|
+          next unless io.respond_to?(:read)
+          io.rewind if io.respond_to?(:rewind)
+          grid.delete(send(name).id)
+          grid.put(io.read, {
+            :_id          => send(name).id,
+            :filename     => send(name).name,
+            :content_type => send(name).type,
+          })
+        end
+        assigned_attachments.clear
+      end
+
+      def destroy_nil_attachments
+        # 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
+
+      def destroy_all_attachments
+        self.class.attachment_names.map { |name| grid.delete(send(name).id) }
+      end
+  end
+end

data/lib/joint/io.rb

@@ -0,0 +1,14 @@
+module Joint
+  class IO
+    attr_accessor :name, :content, :content_type, :size
+
+    def initialize(attrs={})
+      attrs.each { |key, value| send("#{key}=", value) }
+      @content_type ||= 'plain/text'
+      @size ||= @content.size unless @content.nil?
+    end
+
+    alias path name
+    alias read content
+  end
+end

data/lib/joint/version.rb

@@ -1,3 +1,3 @@
 module Joint
-  Version = '0.5.1'
+  Version = '0.5.2'
 end

data/specs.watchr

@@ -1,16 +1,3 @@
-def growl(title, msg, img)
-  %x{growlnotify -m #{ msg.inspect} -t #{title.inspect} --image ~/.watchr/#{img}.png}
-end
-
-def form_growl_message(str)
-  results = str.split("\n").last
-  if results =~ /[1-9]\s(failure|error)s?/
-    growl "Test Results", "#{results}", "fail"
-  elsif results != ""
-    growl "Test Results", "#{results}", "pass"
-  end
-end
-
 def run(cmd)
   puts(cmd)
   output = ""
@@ -21,7 +8,7 @@ def run(cmd)
       $stdout.flush
     end
   end
-  form_growl_message output
+  output
 end
 
 def run_test_file(file)
@@ -37,7 +24,7 @@ def related_test_files(path)
 end
 
 watch('test/test_helper\.rb') { system('clear'); run_all_tests }
-watch('test/test_.*\.rb')     { |m| system('clear'); run_test_file(m[0]) }
+watch('test/.*test_.*\.rb')     { |m| system('clear'); run_test_file(m[0]) }
 watch('lib/.*')               { |m| related_test_files(m[0]).each { |file| run_test_file(file) } }
 
 # Ctrl-\

data/test/helper.rb

@@ -37,4 +37,44 @@ class Test::Unit::TestCase
   def assert_no_grid_difference(&block)
     assert_grid_difference(0, &block)
   end
+end
+
+class Asset
+  include MongoMapper::Document
+  plugin Joint
+
+  key :title, String
+  attachment :image
+  attachment :file
+end
+
+class BaseModel
+  include MongoMapper::Document
+  plugin Joint
+  attachment :file
+end
+
+class Image < BaseModel; attachment :image end
+class Video < BaseModel; attachment :video end
+
+module JointTestHelpers
+  def all_files
+    [@file, @image, @image2, @test1, @test2]
+  end
+
+  def rewind_files
+    all_files.each { |file| file.rewind }
+  end
+
+  def open_file(name)
+    File.open(File.join(File.dirname(__FILE__), 'fixtures', name), 'r')
+  end
+
+  def grid
+    @grid ||= Mongo::Grid.new(MongoMapper.database)
+  end
+
+  def key_names
+    [:id, :name, :type, :size]
+  end
 end

data/test/joint/test_io.rb

@@ -0,0 +1,28 @@
+require 'helper'
+
+class IOTest < Test::Unit::TestCase
+  context "#initialize" do
+    should "set attributes from hash" do
+      Joint::IO.new(:name => 'foo').name.should == 'foo'
+    end
+  end
+
+  should "default content_type to plain text" do
+    Joint::IO.new.content_type.should == 'plain/text'
+  end
+
+  should "default size to content size" do
+    content = 'This is my content'
+    Joint::IO.new(:content => content).size.should == content.size
+  end
+
+  should "alias path to name" do
+    Joint::IO.new(:name => 'foo').path.should == 'foo'
+  end
+
+  context "#read" do
+    should "return content" do
+      Joint::IO.new(:content => 'Testing').read.should == 'Testing'
+    end
+  end
+end

data/test/test_joint.rb

@@ -1,45 +1,5 @@
 require 'helper'
 
-class Asset
-  include MongoMapper::Document
-  plugin Joint
-
-  key :title, String
-  attachment :image
-  attachment :file
-end
-
-class BaseModel
-  include MongoMapper::Document
-  plugin Joint
-  attachment :file
-end
-
-class Image < BaseModel; attachment :image end
-class Video < BaseModel; attachment :video end
-
-module JointTestHelpers
-  def all_files
-    [@file, @image, @image2, @test1, @test2]
-  end
-
-  def rewind_files
-    all_files.each { |file| file.rewind }
-  end
-
-  def open_file(name)
-    File.open(File.join(File.dirname(__FILE__), 'fixtures', name), 'r')
-  end
-
-  def grid
-    @grid ||= Mongo::Grid.new(MongoMapper.database)
-  end
-
-  def key_names
-    [:id, :name, :type, :size]
-  end
-end
-
 class JointTest < Test::Unit::TestCase
   include JointTestHelpers
 
@@ -56,6 +16,45 @@ class JointTest < Test::Unit::TestCase
     all_files.each { |file| file.close }
   end
 
+  context ".name" do
+    should "return original_filename" do
+      def @image.original_filename
+        'frank.jpg'
+      end
+      Joint.name(@image).should == 'frank.jpg'
+    end
+
+    should "fall back to File.basename" do
+      Joint.name(@image).should == 'mr_t.jpg'
+    end
+  end
+
+  context ".size" do
+    should "return size" do
+      def @image.size
+        25
+      end
+      Joint.size(@image).should == 25
+    end
+
+    should "fall back to File.size" do
+      Joint.size(@image).should == 13661
+    end
+  end
+
+  context ".type" do
+    should "return type" do
+      def @image.content_type
+        'plain/text'
+      end
+      Joint.type(@image).should == 'plain/text'
+    end
+
+    should "fall back to Wand" do
+      Joint.type(@image).should == 'image/jpeg'
+    end
+  end
+
   context "Using Joint plugin" do
     should "add each attachment to attachment_names" do
       Asset.attachment_names.should == Set.new([:image, :file])
@@ -343,4 +342,23 @@ class JointTest < Test::Unit::TestCase
       model.should be_valid
     end
   end
+
+  context "Assigning joint io instance" do
+    setup do
+      io = Joint::IO.new({
+        :name         => 'foo.txt',
+        :content_type => 'plain/text',
+        :content      => 'This is my stuff',
+        :size         => 19,
+      })
+      @asset = Asset.create(:file => io)
+    end
+
+    should "work" do
+      @asset.file_name.should == 'foo.txt'
+      @asset.file_size.should == 19
+      @asset.file_type.should == 'plain/text'
+      @asset.file.read.should == 'This is my stuff'
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: joint
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - John Nunemaker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-20 00:00:00 -05:00
+date: 2010-12-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -122,6 +122,10 @@ files:
 - Rakefile
 - joint.gemspec
 - lib/joint.rb
+- lib/joint/attachment_proxy.rb
+- lib/joint/class_methods.rb
+- lib/joint/instance_methods.rb
+- lib/joint/io.rb
 - lib/joint/version.rb
 - specs.watchr
 - test/fixtures/harmony.png
@@ -130,6 +134,7 @@ files:
 - test/fixtures/test2.txt
 - test/fixtures/unixref.pdf
 - test/helper.rb
+- test/joint/test_io.rb
 - test/test_joint.rb
 has_rdoc: true
 homepage: http://github.com/jnunemaker/joint
@@ -172,4 +177,5 @@ test_files:
 - test/fixtures/test2.txt
 - test/fixtures/unixref.pdf
 - test/helper.rb
+- test/joint/test_io.rb
 - test/test_joint.rb