glebtv-carrierwave-mongoid 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 107af04022af867c958e4a5fd97f29eb6baedc5c
-  data.tar.gz: 2c5bb6025324a49ff388155320551d4061a308ed
+  metadata.gz: 7e4c80f2f675129ba495c84135384e16955759ee
+  data.tar.gz: 9fc59522be038f7ef9ffaba8345c30bd28ed2f3d
 SHA512:
-  metadata.gz: 88284fdbd0ac466779c1a583df0fa7be58e3e401f22290166268c612b0357d18346e972a8bf5c623022786c81bb67e23dc383555a69eddf624bcace1f8a3a65d
-  data.tar.gz: 9ba9b00ac450db8677d71d76feb097c80e095906a5cd6093c696d2cc5f409d87795ebfbaf45574a0d4e909d26dae228e1075bf2a27af027c91429a3594bceb05
+  metadata.gz: 1cd03be3e03935d3491ba5498cd2f6898220762bbc6f530ac912d3624896f0249623459d6b21187c4e2c899ac01faf41d3474f19b54a7eba4b7e01a31570a492
+  data.tar.gz: 39561d9e5556eac1e329f21618595daf2b4348ee6e662d457a9f295d3e08880d0c3013d25f122ad926656554ee80ccdbab87d573bb6e2335960d71614ddc88f3

data/.gitignore

@@ -3,7 +3,5 @@ pkg/*
 *.sw*
 .bundle
 spec/public
-.rvmrc
-.ruby-version
 gemfiles/*.lock
 log/*

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.0.0-p247

data/Gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    glebtv-carrierwave-mongoid (0.6.2)
+    glebtv-carrierwave-mongoid (0.6.3)
       carrierwave (~> 0.9.0)
       mongoid (>= 3.0, < 5.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
+    activemodel (3.2.14)
+      activesupport (= 3.2.14)
       builder (~> 3.0.0)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
+    activesupport (3.2.14)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     builder (3.0.4)
     carrierwave (0.9.0)
@@ -21,9 +21,9 @@ GEM
       json (>= 1.7)
     coderay (1.0.9)
     diff-lcs (1.2.4)
-    i18n (0.6.1)
+    i18n (0.6.4)
     json (1.8.0)
-    method_source (0.8.1)
+    method_source (0.8.2)
     mini_magick (3.6.0)
       subexec (~> 0.2.1)
     mongoid (3.1.4)
@@ -32,7 +32,7 @@ GEM
       origin (~> 1.0)
       tzinfo (~> 0.3.22)
     moped (1.5.0)
-    multi_json (1.7.7)
+    multi_json (1.7.8)
     origin (1.1.0)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
@@ -43,11 +43,11 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.3)
+    rspec-core (2.14.4)
     rspec-expectations (2.14.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.1)
-    slop (3.4.5)
+    rspec-mocks (2.14.2)
+    slop (3.4.6)
     subexec (0.2.3)
     tzinfo (0.3.37)
 

data/lib/carrierwave/mongoid.rb

@@ -12,7 +12,9 @@ module CarrierWave
     #
     def mount_uploader(column, uploader=nil, options={}, &block)
       field_name = options[:mount_on] || column
-      field field_name unless fields.keys.include?(field_name.to_s)
+      unless fields.keys.include?(field_name.to_s) || fields.values.map { |f| f.options[:as] }.include?(field_name.to_s)
+        field field_name
+      end
 
       super
 

data/lib/carrierwave/mongoid/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Mongoid
-    VERSION = "0.6.2"
+    VERSION = "0.6.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glebtv-carrierwave-mongoid
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - GlebTv
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-20 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -111,6 +111,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .ruby-gemset
+- .ruby-version
 - .travis.yml
 - Gemfile
 - Gemfile.lock
@@ -157,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: This fork makes GridFS optional