glebtv-carrierwave-mongoid 0.6.5 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c88e0e0662ea059d12b9b6d8d6c692552ac4c25
-  data.tar.gz: f145561e76ac5ddb30ba2c38d4f4dcdc548ed4de
+  metadata.gz: 5e1bca5dfb3392fd94d0b2a8e9f6bce23e6fbe28
+  data.tar.gz: 9b54fcc0f39bc7868eef019eac4f13526d676e46
 SHA512:
-  metadata.gz: 1c079cfc4e0d55bb0e3336e3cf7f0171222ff803c99a55c4e6db18b4b89c82270976279fa2a9b10281bf25509e0e71fd67ff915f3c0843ce5b208c35207204b9
-  data.tar.gz: 606aa75b38a400347eee1033a7685c745225bc3d2309bf06a39621ec4148650eb3695b26c591977e9f7f1758331013691c2ba663e1812dc23502e30c58af096c
+  metadata.gz: a0556f211d51b45f9fad88b21c2b1a5a2e831d406360a53879ef0aba9f6150f8ac194d4c17e7702aee0d04eb862b6d621310b9b30da78c281268056e282339e3
+  data.tar.gz: 71987c56d274d9179415f6b6714f166f1028806c8a3901293bdaf432704571c69a52d052a4f5cf6dc29395adc835f209d5b8194005aab2f99ecb0f4de18f8e5d

data/.travis.yml

@@ -7,13 +7,5 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - jruby-19mode
-  - rbx-19mode
+  - 2.1.0
 
-gemfile:
-  - Gemfile
-  - gemfiles/carrierwave-0.8.gemfile
-  - gemfiles/carrierwave-master.gemfile
-  - gemfiles/mongoid-3.0.gemfile
-  - gemfiles/mongoid-3.1.gemfile
-  - gemfiles/mongoid-4.0.gemfile

data/Gemfile.lock

@@ -1,55 +1,67 @@
 PATH
   remote: .
   specs:
-    glebtv-carrierwave-mongoid (0.6.5)
-      carrierwave (>= 0.8.0, < 0.10.0)
-      mongoid (>= 3.0, < 5.0)
-      mongoid (>= 3.0, < 5.0)
+    glebtv-carrierwave-mongoid (0.7.0)
+      carrierwave (~> 0.9.0)
+      mongoid (~> 4.0.0.alpha1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.15)
-      activesupport (= 3.2.15)
-      builder (~> 3.0.0)
-    activesupport (3.2.15)
+    activemodel (4.0.3)
+      activesupport (= 4.0.3)
+      builder (~> 3.1.0)
+    activesupport (4.0.3)
       i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    builder (3.0.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    atomic (1.1.14)
+    bson (2.2.0)
+    builder (3.1.4)
     carrierwave (0.9.0)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       json (>= 1.7)
-    coderay (1.0.9)
-    diff-lcs (1.2.4)
-    i18n (0.6.5)
+    coderay (1.1.0)
+    connection_pool (1.2.0)
+    diff-lcs (1.2.5)
+    i18n (0.6.9)
     json (1.8.1)
     method_source (0.8.2)
-    mini_magick (3.6.0)
+    mini_magick (3.7.0)
       subexec (~> 0.2.1)
-    mongoid (3.1.5)
-      activemodel (~> 3.2)
-      moped (~> 1.4)
-      origin (~> 1.0)
-      tzinfo (~> 0.3.29)
-    moped (1.5.1)
-    multi_json (1.8.2)
-    origin (1.1.0)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
+    minitest (4.7.5)
+    mongoid (4.0.0.beta1)
+      activemodel (>= 4.0.0)
+      moped (~> 2.0.beta6)
+      origin (~> 2.1)
+      tzinfo (>= 0.3.37)
+    moped (2.0.0.beta6)
+      bson (~> 2.2)
+      connection_pool (~> 1.2)
+      optionable (~> 0.2.0)
+    multi_json (1.8.4)
+    optionable (0.2.0)
+    origin (2.1.0)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rake (10.1.0)
+    rake (10.1.1)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.6)
-    rspec-expectations (2.14.3)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    slop (3.4.6)
+    rspec-mocks (2.14.5)
+    slop (3.4.7)
     subexec (0.2.3)
+    thread_safe (0.1.3)
+      atomic
     tzinfo (0.3.38)
 
 PLATFORMS
@@ -59,5 +71,5 @@ DEPENDENCIES
   glebtv-carrierwave-mongoid!
   mini_magick
   pry
-  rake (~> 10.0)
-  rspec (~> 2.14)
+  rake
+  rspec

data/glebtv-carrierwave-mongoid.gemspec

@@ -18,11 +18,11 @@ 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 "mongoid", [">= 3.0", "< 5.0"]
-  s.add_dependency "carrierwave", [">= 0.8.0", "< 0.10.0"]
-  s.add_dependency "mongoid", [">= 3.0", "< 5.0"]
-  s.add_development_dependency "rspec", ["~> 2.14"]
-  s.add_development_dependency "rake", ["~> 10.0"]
+  s.add_dependency "mongoid", '~> 4.0.0.alpha1'
+  s.add_dependency "carrierwave", '~> 0.9.0'
+
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "rake"
   s.add_development_dependency "mini_magick"
   s.add_development_dependency "pry"
 end

data/lib/carrierwave/mongoid.rb

@@ -75,7 +75,11 @@ module CarrierWave
 
         def find_previous_model_for_#{column}
           if self.embedded?
-            ancestors       = [[ self.metadata.key, self._parent ]].tap { |x| x.unshift([ x.first.last.metadata.key, x.first.last._parent ]) while x.first.last.embedded? }
+            if self.respond_to?(:__metadata) # Mongoid >= 4.0.0.beta1
+              ancestors = [[ self.__metadata.key, self._parent ]].tap { |x| x.unshift([ x.first.last.__metadata.key, x.first.last._parent ]) while x.first.last.embedded? }
+            else # Mongoid < 4.0.0.beta1
+              ancestors = [[ self.metadata.key, self._parent ]].tap { |x| x.unshift([ x.first.last.metadata.key, x.first.last._parent ]) while x.first.last.embedded? }
+            end
             first_parent = ancestors.first.last
             reloaded_parent = first_parent.class.unscoped.find(first_parent.to_key.first)
             association = ancestors.inject(reloaded_parent) { |parent,(key,ancestor)| (parent.is_a?(Array) ? parent.find(ancestor.to_key.first) : parent).send(key) }

data/lib/carrierwave/mongoid/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Mongoid
-    VERSION = "0.6.5"
+    VERSION = "0.7.0"
   end
 end

data/spec/mongoid_spec.rb

@@ -547,7 +547,7 @@ describe CarrierWave::Mongoid do
 
         @class.class_eval do
           embeds_one :mongo_location
-          default_scope where(:always_false => false)
+          default_scope -> { where(:always_false => false) }
         end
 
         @doc = @class.new
@@ -642,7 +642,7 @@ describe CarrierWave::Mongoid do
 
         @class.class_eval do
           embeds_many :mongo_locations
-          default_scope where(:always_false => false)
+          default_scope -> { where(:always_false => false) }
         end
 
         @doc = @class.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glebtv-carrierwave-mongoid
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors:
 - GlebTv
@@ -10,96 +10,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 4.0.0.alpha1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 4.0.0.alpha1
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-- !ruby/object:Gem::Dependency
-  name: mongoid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -144,11 +112,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/carrierwave-0.8.gemfile
-- gemfiles/carrierwave-master.gemfile
-- gemfiles/mongoid-3.0.gemfile
-- gemfiles/mongoid-3.1.gemfile
-- gemfiles/mongoid-4.0.gemfile
 - glebtv-carrierwave-mongoid.gemspec
 - lib/carrierwave/mongoid.rb
 - lib/carrierwave/mongoid/version.rb
@@ -185,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: This fork makes GridFS optional

data/gemfiles/carrierwave-0.8.gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gem "carrierwave", "~> 0.8.0"
-
-gemspec path: "../"

data/gemfiles/carrierwave-master.gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gem "carrierwave", github: "carrierwaveuploader/carrierwave", branch: "master"
-
-gemspec path: "../"

data/gemfiles/mongoid-3.0.gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gem "mongoid", github: "mongoid/mongoid", branch: "3.0.0-stable"
-gem "activemodel", "~> 3.2"
-
-gemspec path: "../"

data/gemfiles/mongoid-3.1.gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gem "mongoid", github: "mongoid/mongoid", branch: "3.1.0-stable"
-
-gemspec path: "../"

data/gemfiles/mongoid-4.0.gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-gem "mongoid-grid_fs", github: "ahoward/mongoid-grid_fs", branch: "master"
-gem "mongoid", github: "mongoid/mongoid", branch: "master"
-
-gemspec path: "../"