carrierwave-datamapper 0.1.1 → 0.2.0

data/carrierwave-datamapper.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "dm-core", ["~> 1.0"]
-  s.add_dependency "carrierwave"
+  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"]

data/lib/carrierwave/datamapper.rb

@@ -1,6 +1,8 @@
 # encoding: utf-8
 
+require 'carrierwave'
 require 'dm-core'
+require 'carrierwave/datamapper/property/uploader'
 
 module CarrierWave
   module DataMapper
@@ -11,14 +13,23 @@ module CarrierWave
     # See +CarrierWave::Mount#mount_uploader+ for documentation
     #
     def mount_uploader(column, uploader, options={}, &block)
+      if properties.named?(column)
+        warn "Defining property for an uploader is deprecated at #{caller[2]}"
+        properties.delete(properties[column])
+      end
+
+      property column, Property::Uploader
+
       super
 
-      alias_method :read_uploader, :attribute_get
+      alias_method :read_uploader,  :attribute_get
       alias_method :write_uploader, :attribute_set
-      after :save, "store_#{column}!".to_sym
+
       pre_hook = ::DataMapper.const_defined?(:Validate) ? :valid? : :save
+
       before pre_hook, "write_#{column}_identifier".to_sym
-      after :destroy, "remove_#{column}!".to_sym
+      after  :save,    "store_#{column}!".to_sym
+      after  :destroy, "remove_#{column}!".to_sym
 
       # FIXME: Hack to work around Datamapper not triggering callbacks
       # for objects that are not dirty. By explicitly calling
@@ -39,4 +50,4 @@ module CarrierWave
   end # DataMapper
 end # CarrierWave
 
-DataMapper::Model.send(:include, CarrierWave::DataMapper)
+DataMapper::Model.append_extensions(CarrierWave::DataMapper)

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

@@ -0,0 +1,19 @@
+module CarrierWave
+  module DataMapper
+    module Property
+      class Uploader < ::DataMapper::Property::String
+        def custom?
+          true
+        end
+
+        def initialize(model, name, options = {})
+          if ::DataMapper.const_defined?(:Validate)
+            options[:auto_validation] = false
+          end
+
+          super
+        end
+      end
+    end # Property
+  end # DataMapper
+end # CarrierWave

data/lib/carrierwave/datamapper/version.rb

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

data/spec/datamapper_spec.rb

@@ -20,13 +20,6 @@ describe CarrierWave::DataMapper do
       storage_names[:default] = 'events'
 
       property :id, DataMapper::Property::Serial
-
-      # auto validation off currently for inferred type
-      # validation. issue is that validations are done on
-      # the value returned by model#property_name which is overloaded
-      # by carrierwave. pull request in @dm-more to remedy this.
-      property :image, String, :auto_validation => false
-
       mount_uploader :image, uploader
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: carrierwave-datamapper
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-19 00:00:00 -04:00
+date: 2011-07-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,12 +40,14 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
         - 0
-        version: "0"
+        - 5
+        - 6
+        version: 0.5.6
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -124,6 +126,7 @@ files:
 - Rakefile
 - carrierwave-datamapper.gemspec
 - lib/carrierwave/datamapper.rb
+- lib/carrierwave/datamapper/property/uploader.rb
 - lib/carrierwave/datamapper/version.rb
 - spec/datamapper_spec.rb
 - spec/fixtures/test.jpeg