mm-carrierwave 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -2,113 +2,45 @@ PATH
   remote: .
   specs:
     mm-carrierwave (0.0.1)
+      carrierwave (~> 0.5)
+      mongo_mapper (~> 0.9)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.6)
+      activesupport (= 3.0.6)
       builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
-    arel (2.0.6)
-    bson (1.1.5)
-    bson_ext (1.1.5)
+      i18n (~> 0.5.0)
+    activesupport (3.0.6)
+    bson (1.3.0)
     builder (2.1.2)
-    carrierwave (0.5.1)
+    carrierwave (0.5.3)
       activesupport (~> 3.0)
     diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
     i18n (0.5.0)
-    jnunemaker-validatable (1.8.4)
-      activesupport (>= 2.3.4)
-    json (1.4.6)
-    mail (2.2.12)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
-    mini_magick (2.3)
-      subexec (~> 0.0.4)
-    mongo (1.1.5)
-      bson (>= 1.1.5)
-    mongo_mapper (0.8.6)
-      activesupport (>= 2.3.4)
-      jnunemaker-validatable (~> 1.8.4)
+    mongo (1.3.0)
+      bson (>= 1.3.0)
+    mongo_mapper (0.9.0)
+      activemodel (~> 3.0.0)
+      activesupport (~> 3.0.0)
       plucky (~> 0.3.6)
-    plucky (0.3.6)
+    plucky (0.3.7)
       mongo (~> 1.1)
-    polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
-      rack (>= 1.0.0)
-    rack-test (0.5.6)
-      rack (>= 1.0)
-    rails (3.0.3)
-      actionmailer (= 3.0.3)
-      actionpack (= 3.0.3)
-      activerecord (= 3.0.3)
-      activeresource (= 3.0.3)
-      activesupport (= 3.0.3)
-      bundler (~> 1.0)
-      railties (= 3.0.3)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
-      rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.8.7)
-    rspec (2.1.0)
-      rspec-core (~> 2.1.0)
-      rspec-expectations (~> 2.1.0)
-      rspec-mocks (~> 2.1.0)
-    rspec-core (2.1.0)
-    rspec-expectations (2.1.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.1.0)
-    subexec (0.0.4)
-    thor (0.14.6)
+    rspec-mocks (2.5.0)
     timecop (0.3.5)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activemodel
-  bson_ext (= 1.1.5)
-  carrierwave
-  jnunemaker-validatable
-  json
-  mini_magick (~> 2.3)
   mm-carrierwave!
-  mongo_mapper
-  rails (~> 3.0.0)
-  rspec (~> 2.1.0)
+  rspec (~> 2.1)
   timecop

data/lib/carrierwave/orm/mongomapper.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'mongo_mapper'
+require 'carrierwave/validations/active_model'
 
 module CarrierWave
   module MongoMapper
@@ -17,8 +18,10 @@ module CarrierWave
       alias_method :read_uploader, :read_attribute
       alias_method :write_uploader, :write_attribute
 
-     # validates_integrity_of  column if uploader_option(column.to_sym, :validate_integrity)
-     # validates_processing_of column if uploader_option(column.to_sym, :validate_processing)
+      include CarrierWave::Validations::ActiveModel
+
+      validates_integrity_of  column if uploader_option(column.to_sym, :validate_integrity)
+      validates_processing_of column if uploader_option(column.to_sym, :validate_processing)
 
       after_save "store_#{column}!".to_sym
       before_save "write_#{column}_identifier".to_sym
@@ -27,4 +30,4 @@ module CarrierWave
   end
 end
 
-MongoMapper::Document.append_extensions(CarrierWave::MongoMapper)
+MongoMapper::Plugins::Rails::ClassMethods.send(:include, CarrierWave::MongoMapper)

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Mm
   module Carrierwave
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/mm-carrierwave.gemspec

@@ -17,14 +17,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "rails", ["~> 3.0.0"]
-  s.add_development_dependency('rspec', ["~> 2.1.0"])
-  s.add_development_dependency "mini_magick", ["~> 2.3"]
-  s.add_development_dependency "bson_ext", ["= 1.1.5"]
-  s.add_development_dependency "carrierwave"
-  s.add_development_dependency "activemodel"
-  s.add_development_dependency "mongo_mapper"
+  s.add_dependency 'mongo_mapper', ['~> 0.9']
+  s.add_dependency 'carrierwave', ['~> 0.5']
+  s.add_development_dependency('rspec', ["~> 2.1"])
   s.add_development_dependency "timecop"
-  s.add_development_dependency "json"
-  s.add_development_dependency "jnunemaker-validatable"
 end

data/spec/lib/carrierwave/orm/mongomapper_spec.rb

@@ -138,7 +138,7 @@ describe CarrierWave::MongoMapper do
 
     end
 
-    pending 'when validating integrity' do
+    context 'when validating integrity' do
       before do
         mongo_user_klass = reset_mongo_class(WhiteListUploader)
         @doc = mongo_user_klass.new
@@ -149,11 +149,11 @@ describe CarrierWave::MongoMapper do
         @doc.should_not be_valid
       end
 
-      it "should use I18n for integrity error messages" do
+      pending "should use I18n for integrity error messages" do
         @doc.valid?
         @doc.errors[:image].should == ['is not an allowed file type']
 
-        change_locale_and_store_translations(:pt, :activemodel => {
+        change_locale_and_store_translations(:pt, :carrierwave => {
           :errors => {
             :messages => {
               :carrierwave_integrity_error => 'tipo de imagem não permitido.'
@@ -166,7 +166,7 @@ describe CarrierWave::MongoMapper do
       end
     end
 
-    pending 'when validating processing' do
+    context 'when validating processing' do
       before do
         mongo_user_klass = reset_mongo_class(ProcessingErrorUploader)
         @doc = mongo_user_klass.new
@@ -177,11 +177,11 @@ describe CarrierWave::MongoMapper do
         @doc.should_not be_valid
       end
 
-      it "should use I18n for processing error messages" do
+      pending "should use I18n for processing error messages" do
         @doc.valid?
         @doc.errors[:image].should == ['failed to be processed']
 
-        change_locale_and_store_translations(:pt, :activemodel => {
+        change_locale_and_store_translations(:pt, :carrierwave => {
           :errors => {
             :messages => {
               :carrierwave_processing_error => 'falha ao processar imagem.'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mm-carrierwave
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Robert Beekman
@@ -15,146 +15,58 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-21 00:00:00 +01:00
+date: 2011-04-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: mongo_mapper
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 25
         segments: 
-        - 3
-        - 0
         - 0
-        version: 3.0.0
-  type: :development
+        - 9
+        version: "0.9"
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: carrierwave
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 1
         segments: 
-        - 2
-        - 1
         - 0
-        version: 2.1.0
-  type: :development
+        - 5
+        version: "0.5"
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: mini_magick
+  name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 1
         segments: 
         - 2
-        - 3
-        version: "2.3"
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bson_ext
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
         - 1
-        - 1
-        - 5
-        version: 1.1.5
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: carrierwave
-  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: activemodel
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+        version: "2.1"
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: mongo_mapper
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id007
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: timecop
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: jnunemaker-validatable
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -164,7 +76,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id010
+  version_requirements: *id004
 description: Mongomapper ORM for Carrierwave
 email: 
 - robert@80beans.com