carrierwave-datamapper 0.2.0 → 0.2.1

data/README.rdoc

@@ -3,18 +3,28 @@
 This gem adds support for DataMapper to CarrierWave, see the CarrierWave
 documentation for more detailed usage instructions.
 
-Install it like this:
+= Installation
 
     gem install carrierwave-datamapper
 
-Use it like this:
+Using bundler:
+
+    gem 'carrierwave-datamapper', :require => 'carrierwave/datamapper'
+
+= Usage
 
     require 'carrierwave/datamapper'
 
-Make sure to disable auto_validation on the mounted column.
+    class ImageUploader < CarrierWave::Uploader::Base
+      include CarrierWave::MiniMagick
+    end
 
-Using bundler:
+    class Image
+      include DataMapper::Resource
 
-    gem 'carrierwave-datamapper', :require => 'carrierwave/datamapper'
+      property :id, Serial
+
+      mount_uploader :source, ImageUploader
+    end
 
 This used to be part of CarrierWave but has been extracted.

data/carrierwave-datamapper.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.name        = "carrierwave-datamapper"
   s.version     = Carrierwave::Datamapper::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Jonas Nicklas", "Trevor Turk"]
+  s.authors     = ["Jonas Nicklas", "Trevor Turk", "Piotr Solnica"]
   s.email       = ["jonas.nicklas@gmail.com"]
   s.homepage    = "https://github.com/jnicklas/carrierwave-datamapper"
   s.summary     = %q{Datamapper support for CarrierWave}
@@ -19,10 +19,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "dm-core", ["~> 1.0"]
-  s.add_dependency "carrierwave", ["~> 0.5.6"]
-  s.add_development_dependency "rspec", ["~> 2.0"]
-  s.add_development_dependency "dm-validations", ["~> 1.0"]
-  s.add_development_dependency "dm-migrations", ["~> 1.0"]
-  s.add_development_dependency "dm-sqlite-adapter", ["~> 1.0"]
+  s.add_dependency "dm-core", ["~> 1.1"]
+  s.add_dependency "carrierwave", ["~> 0.6.0"]
+
+  s.add_development_dependency "rake", ["~> 0.9.2"]
+  s.add_development_dependency "rspec", ["~> 2.8"]
+  s.add_development_dependency "dm-validations", ["~> 1.1"]
+  s.add_development_dependency "dm-migrations", ["~> 1.1"]
+  s.add_development_dependency "dm-sqlite-adapter", ["~> 1.1"]
 end

data/lib/carrierwave/datamapper.rb

@@ -18,14 +18,18 @@ module CarrierWave
         properties.delete(properties[column])
       end
 
-      property column, Property::Uploader
+      uploader_property = if options[:mount_on]
+                            properties[options[:mount_on]]
+                          else
+                            property column, Property::Uploader
+                          end
 
       super
 
       alias_method :read_uploader,  :attribute_get
       alias_method :write_uploader, :attribute_set
 
-      pre_hook = ::DataMapper.const_defined?(:Validate) ? :valid? : :save
+      pre_hook = ::DataMapper.const_defined?(:Validations) ? :valid? : :save
 
       before pre_hook, "write_#{column}_identifier".to_sym
       after  :save,    "store_#{column}!".to_sym
@@ -37,14 +41,16 @@ module CarrierWave
       class_eval <<-RUBY
         def remove_#{column}=(value)
           _mounter(:#{column}).remove = value
-          attribute_set(:#{column}, '') if _mounter(:#{column}).remove?
+          attribute_set(:#{uploader_property.name}, '') if _mounter(:#{column}).remove?
         end
 
         def #{column}=(value)
-          attribute_set(:#{column}, value)
+          attribute_set(:#{uploader_property.name}, value)
           super(value)
         end
       RUBY
+
+      uploader_property
     end
 
   end # DataMapper

data/lib/carrierwave/datamapper/property/uploader.rb

@@ -2,12 +2,15 @@ module CarrierWave
   module DataMapper
     module Property
       class Uploader < ::DataMapper::Property::String
+
+        length 255
+
         def custom?
           true
         end
 
         def initialize(model, name, options = {})
-          if ::DataMapper.const_defined?(:Validate)
+          if ::DataMapper.const_defined?(:Validations)
             options[:auto_validation] = false
           end
 

data/lib/carrierwave/datamapper/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Datamapper
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/spec/integration/datamapper_spec.rb

@@ -0,0 +1,207 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe CarrierWave::DataMapper do
+  let(:uploader)      { Class.new(CarrierWave::Uploader::Base) }
+  let(:uploader_name) { :image }
+  let(:file)          { stub_file('test.jpeg') }
+
+
+  let(:described_class) do
+    klass = Class.new do
+      include DataMapper::Resource
+
+      storage_names[:default] = 'events'
+
+      property :id, DataMapper::Property::Serial
+
+      def self.name; :event; end
+    end
+
+    klass.mount_uploader uploader_name, uploader
+    klass
+  end
+
+  before do
+    DataMapper.finalize.auto_migrate!
+  end
+
+  let(:object) { described_class.new }
+
+  describe '#image' do
+    subject { object.image }
+
+    context 'with a new resource' do
+      context 'when nothing has been assigned' do
+        let(:object) { described_class.new }
+
+        it { should be_blank }
+      end
+
+      context 'when file name is set' do
+        before do
+          object.attribute_set(:image, 'test.jpeg')
+          object.save
+          object.reload
+        end
+
+        its(:current_path) { should == public_path('uploads/test.jpeg') }
+      end
+    end
+
+    context 'with a persisted resource' do
+      let(:object) { described_class.first }
+
+      context 'when an empty string has been assigned' do
+        before do
+          repository(:default).adapter.execute("INSERT INTO events (image) VALUES ('')")
+        end
+
+        it { should be_blank }
+      end
+
+      context 'when a value is stored in the database' do
+        before do
+          repository(:default).adapter.execute("INSERT INTO events (image) VALUES ('test.jpg')")
+        end
+
+        it { should be_an_instance_of(uploader) }
+      end
+    end
+  end
+
+  describe '#image=' do
+    context 'when a file is assigned' do
+      before do
+        object.image = file
+      end
+
+      it "caches a file" do
+        object.image.should be_an_instance_of(uploader)
+      end
+
+      it "copies a file into into the cache directory" do
+        object.image.current_path.should =~ %r[^#{public_path('uploads/tmp')}]
+      end
+
+      context "with a saved resource" do
+        before do
+          object.save
+          object.image = stub_file('test.jpeg')
+        end
+
+        it "marks the resource as dirty" do
+          object.dirty?.should be(true)
+        end
+      end
+    end
+
+    context 'when nil is assigned' do
+      before do
+        object.image = nil
+      end
+
+      it "does nothing" do
+        object.image.should be_blank
+      end
+    end
+
+    context 'when nil is assigned' do
+      before do
+        object.image = 'nil'
+      end
+
+      it "does nothing" do
+        object.image.should be_blank
+      end
+    end
+
+    it "should write nothing to the database, to prevent overriden filenames to fail because of unassigned attributes" do
+      object.attribute_get(:image).should be_nil
+    end
+  end
+
+  describe '#save' do
+    context 'when no file has been assigned' do
+      before do
+        object.save
+      end
+
+      it "does nothing" do
+        object.image.should be_blank
+      end
+    end
+
+    context 'when a file has been assigned' do
+      before do
+        object.image = file
+        object.save
+      end
+
+      context 'without validations' do
+        it "copies the file to the upload directory" do
+          object.image.should be_an_instance_of(uploader)
+          object.image.current_path.should == public_path('uploads/test.jpeg')
+        end
+
+        it "assigns the filename to the database" do
+          object.reload
+          object.attribute_get(:image).should == 'test.jpeg'
+        end
+
+        context 'when remove_image? returns true' do
+          before do
+            object.remove_image = true
+            object.save
+            object.reload
+          end
+
+          it "removes the image" do
+            object.image.should be_blank
+            object.attribute_get(:image).should == ''
+          end
+        end
+      end
+
+      context "with validations" do
+        before(:all) do
+          described_class.validates_with_block(:textfile) { [false, "FAIL!"] }
+        end
+
+        it "should do nothing when a validation fails" do
+          object.image.should be_an_instance_of(uploader)
+          object.image.current_path.should =~ %r[^#{public_path('uploads/tmp')}]
+        end
+
+        it "should assign the filename before validation" do
+          object.reload
+          object.attribute_get(:image).should == 'test.jpeg'
+        end
+      end
+    end
+  end
+
+  describe '#destroy' do
+    context 'when no file has been assigned' do
+      it "does nothing when no file has been assigned" do
+        object.destroy
+      end
+    end
+
+    context 'when a file has been assigned' do
+      before do
+        object.image = file
+        object.save.should be_true
+        File.exist?(public_path('uploads/test.jpeg')).should be_true
+        object.image.should be_an_instance_of(uploader)
+        object.image.current_path.should == public_path('uploads/test.jpeg')
+        object.destroy
+      end
+
+      it "removes the file from the filesystem" do
+        File.exist?(public_path('uploads/test.jpeg')).should be_false
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -2,9 +2,13 @@ require 'rubygems'
 require 'bundler/setup'
 require 'rspec'
 
-require 'carrierwave'
 require 'carrierwave/datamapper'
 
+require 'dm-validations'
+require 'dm-migrations'
+
+DataMapper.setup(:default, 'sqlite3::memory:')
+
 def file_path( *paths )
   File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', *paths))
 end

data/spec/unit/carrier_wave/data_mapper/mount_uploader_spec.rb

@@ -0,0 +1,80 @@
+require 'spec_helper'
+
+describe CarrierWave::DataMapper, '.mount_uploader' do
+  let(:described_class) do
+    Class.new do
+      include DataMapper::Resource
+      property :id, DataMapper::Property::Serial
+
+      def self.name; :spec_model; end
+    end
+  end
+
+  let(:uploader_name) { :image }
+  let(:uploader)      { Class.new(CarrierWave::Uploader::Base) }
+
+  before do
+    DataMapper.finalize
+  end
+
+  describe 'Model' do
+    specify { described_class.should respond_to(:mount_uploader) }
+  end
+
+  context 'after mounting an uploader' do
+    let!(:uploader_property) do
+      described_class.mount_uploader(uploader_name, uploader)
+    end
+
+    describe 'Uploader Property' do
+      subject { uploader_property }
+
+      it { should be_instance_of(CarrierWave::DataMapper::Property::Uploader) }
+
+      its(:name)    { should == uploader_name }
+      its(:custom?) { should be(true) }
+
+      specify 'has auto-validation turned off' do
+        subject.options[:auto_validation].should be(false)
+      end
+    end
+
+    describe 'Resource' do
+      subject { described_class.new }
+
+      it { should respond_to("remove_#{uploader_name}=") }
+      it { should respond_to("#{uploader_name}=") }
+    end
+  end
+
+  context "when using the :mount_on option" do
+    let(:uploader_column) { :image_file_name }
+
+    let(:described_class) do
+      Class.new do
+        include DataMapper::Resource
+
+        property :id, DataMapper::Property::Serial
+
+        property :image_file_name, String
+
+        def self.name; :spec_model; end
+      end
+    end
+
+    let!(:uploader_property) do
+      described_class.mount_uploader uploader_name, uploader,
+                                     :mount_on => :image_file_name
+    end
+
+    it "should not define a new uploader property" do
+      described_class.properties.should_not be_named(:image)
+    end
+
+    describe 'Uploader Property' do
+      subject { uploader_property }
+
+      its(:name)    { should == uploader_column }
+    end
+  end
+end

metadata

@@ -1,125 +1,102 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: carrierwave-datamapper
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.2.1
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Jonas Nicklas
 - Trevor Turk
+- Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-12 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: dm-core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70257289127860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: carrierwave
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70257289127860
+- !ruby/object:Gem::Dependency
+  name: carrierwave
+  requirement: &70257289124900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 5
-        - 6
-        version: 0.5.6
+      - !ruby/object:Gem::Version
+        version: 0.6.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70257289124900
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70257289122560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: 0.9.2
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: dm-validations
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70257289122560
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70257289120980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :development
+  prerelease: false
+  version_requirements: *70257289120980
+- !ruby/object:Gem::Dependency
+  name: dm-validations
+  requirement: &70257289119660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: dm-migrations
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70257289119660
+- !ruby/object:Gem::Dependency
+  name: dm-migrations
+  requirement: &70257289118460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: dm-sqlite-adapter
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70257289118460
+- !ruby/object:Gem::Dependency
+  name: dm-sqlite-adapter
+  requirement: &70257289117680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: *70257289117680
 description: Datamapper support for CarrierWave
-email: 
+email:
 - jonas.nicklas@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.rdoc
@@ -128,44 +105,36 @@ files:
 - lib/carrierwave/datamapper.rb
 - lib/carrierwave/datamapper/property/uploader.rb
 - lib/carrierwave/datamapper/version.rb
-- spec/datamapper_spec.rb
 - spec/fixtures/test.jpeg
+- spec/integration/datamapper_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
+- spec/unit/carrier_wave/data_mapper/mount_uploader_spec.rb
 homepage: https://github.com/jnicklas/carrierwave-datamapper
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: carrierwave-datamapper
-rubygems_version: 1.4.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Datamapper support for CarrierWave
-test_files: 
-- spec/datamapper_spec.rb
+test_files:
 - spec/fixtures/test.jpeg
+- spec/integration/datamapper_spec.rb
 - spec/spec_helper.rb
+- spec/unit/carrier_wave/data_mapper/mount_uploader_spec.rb

data/spec/datamapper_spec.rb

@@ -1,169 +0,0 @@
-# encoding: utf-8
-
-require 'spec_helper'
-
-require 'dm-core'
-require 'dm-validations'
-require 'dm-migrations'
-
-DataMapper.setup(:default, 'sqlite3::memory:')
-
-describe CarrierWave::DataMapper do
-
-  before do
-    uploader = Class.new(CarrierWave::Uploader::Base)
-
-    @class = Class.new
-    @class.class_eval do
-      include DataMapper::Resource
-
-      storage_names[:default] = 'events'
-
-      property :id, DataMapper::Property::Serial
-      mount_uploader :image, uploader
-    end
-
-    @class.auto_migrate!
-
-    @uploader = uploader
-
-    @event = @class.new
-  end
-
-  describe '#image' do
-
-    it "should return blank uploader when nothing has been assigned" do
-      @event.image.should be_blank
-    end
-
-    it "should return blank uploader when an empty string has been assigned" do
-      repository(:default).adapter.execute("INSERT INTO events (image) VALUES ('')")
-      @event = @class.first
-
-      @event.image.should be_blank
-    end
-
-    it "should retrieve a file from the storage if a value is stored in the database" do
-      repository(:default).adapter.execute("INSERT INTO events (image) VALUES ('test.jpg')")
-      @event = @class.first
-
-      @event.save
-      @event.reload
-      @event.image.should be_an_instance_of(@uploader)
-    end
-
-    it "should set the path to the store dir" do
-      @event.attribute_set(:image, 'test.jpeg')
-      @event.save
-      @event.reload
-      @event.image.current_path.should == public_path('uploads/test.jpeg')
-    end
-
-  end
-
-  describe '#image=' do
-
-    it "should cache a file" do
-      @event.image = stub_file('test.jpeg')
-      @event.image.should be_an_instance_of(@uploader)
-    end
-
-    it "should write nothing to the database, to prevent overriden filenames to fail because of unassigned attributes" do
-      @event.attribute_get(:image).should be_nil
-    end
-
-    it "should copy a file into into the cache directory" do
-      @event.image = stub_file('test.jpeg')
-      @event.image.current_path.should =~ /^#{public_path('uploads/tmp')}/
-    end
-
-    it "should do nothing when nil is assigned" do
-      @event.image = nil
-      @event.image.should be_blank
-    end
-
-    it "should do nothing when an empty string is assigned" do
-      @event.image = ''
-      @event.image.should be_blank
-    end
-
-    context "with a saved resource" do
-      it "should mark the resource as dirty" do
-        @event.image = stub_file('test.jpeg')
-        @event.save
-        @event.image = stub_file('test.jpeg')
-        @event.dirty?.should be(true)
-      end
-    end
-  end
-
-  describe '#save' do
-
-    it "should do nothing when no file has been assigned" do
-      @event.save
-      @event.image.should be_blank
-    end
-
-    it "should copy the file to the upload directory when a file has been assigned" do
-      @event.image = stub_file('test.jpeg')
-      @event.save
-      @event.image.should be_an_instance_of(@uploader)
-      @event.image.current_path.should == public_path('uploads/test.jpeg')
-    end
-
-    it "should assign the filename to the database" do
-      @event.image = stub_file('test.jpeg')
-      @event.save
-      @event.reload
-      @event.attribute_get(:image).should == 'test.jpeg'
-    end
-
-    it "should remove the image if remove_image? returns true" do
-      @event.image = stub_file('test.jpeg')
-      @event.save
-      @event.remove_image = true
-      @event.save
-      @event.reload
-      @event.image.should be_blank
-      @event.attribute_get(:image).should == ''
-    end
-
-    describe "with validations" do
-      it "should do nothing when a validation fails" do
-        @class.validates_with_block(:textfile) { [false, "FAIL!"] }
-        @event.image = stub_file('test.jpeg')
-        @event.save
-        @event.image.should be_an_instance_of(@uploader)
-        @event.image.current_path.should =~ /^#{public_path('uploads/tmp')}/
-      end
-
-      it "should assign the filename before validation" do
-        @class.validates_with_block(:image) { [false, "FAIL!"] if self.image.nil? }
-        @event.image = stub_file('test.jpeg')
-        @event.save
-        @event.reload
-        @event.attribute_get(:image).should == 'test.jpeg'
-      end
-    end
-
-  end
-
-  describe '#destroy' do
-
-    it "should do nothing when no file has been assigned" do
-      @event.destroy
-    end
-
-    it "should remove the file from the filesystem" do
-      @event.image = stub_file('test.jpeg')
-      @event.save.should be_true
-      File.exist?(public_path('uploads/test.jpeg')).should be_true
-      @event.image.should be_an_instance_of(@uploader)
-      @event.image.current_path.should == public_path('uploads/test.jpeg')
-      @event.destroy
-      File.exist?(public_path('uploads/test.jpeg')).should be_false
-    end
-
-  end
-
-end