mongomodel 0.5.0 → 0.5.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d20a72c67b166e32f7b15d679f2be9da9e4aeb9a
+  data.tar.gz: 579a68306b9f69d20e6b18fd1c39dde098a66d50
+SHA512:
+  metadata.gz: 4d9493996ffb93bbb4fdb1c26ab3e4ac7311f10b97f10b7873fb443c4624c0972fc536bafae0a3e31e2049a573e612167cbc8c9fdea27f6f05c0808137624523
+  data.tar.gz: b4560d5934a94b17c14505838d2cfded8cdd5bdeb9d54ec000b7f360760b108e043d3d259c1e56133b9b94bf5809e2ceaf2f5bfc104f58349005215cd68b4fc0

data/.travis.yml

@@ -7,11 +7,13 @@ rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
+  - 2.1.0
 
 gemfile:
   - gemfiles/rails-3.1.gemfile
   - gemfiles/rails-3.2.gemfile
-  - gemfiles/rails-4.gemfile
+  - gemfiles/rails-4.0.gemfile
+  - gemfiles/rails-4.1.gemfile
   - gemfiles/rails-4-observers.gemfile
   - gemfiles/rails-4-protected-attributes.gemfile
   - gemfiles/mongo_mapper.gemfile
@@ -20,7 +22,9 @@ gemfile:
 matrix:
   exclude:
     - rvm: 1.8.7
-      gemfile: gemfiles/rails-4.gemfile
+      gemfile: gemfiles/rails-4.0.gemfile
+    - rvm: 1.8.7
+      gemfile: gemfiles/rails-4.1.gemfile
     - rvm: 1.8.7
       gemfile: gemfiles/rails-4-observers.gemfile
     - rvm: 1.8.7

data/gemfiles/rails-3.2.gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
-gem "activesupport", "3.2.13"
-gem "activemodel", "3.2.13"
+gem "activesupport", "3.2.17"
+gem "activemodel", "3.2.17"
 
 gem "bson_ext", "~> 1.8"
 gem "tzinfo"

data/gemfiles/rails-4.0.gemfile

@@ -0,0 +1,10 @@
+source "https://rubygems.org"
+
+gem "activesupport", "4.0.3"
+gem "activemodel", "4.0.3"
+
+gem "bson_ext", "~> 1.8"
+gem "tzinfo"
+gem "rake"
+
+gemspec :path => "../"

data/gemfiles/rails-4.1.gemfile

@@ -0,0 +1,10 @@
+source "https://rubygems.org"
+
+gem "activesupport", :github => "rails/rails", :branch => "4-1-stable"
+gem "activemodel", :github => "rails/rails", :branch => "4-1-stable"
+
+gem "bson_ext", "~> 1.8"
+gem "tzinfo"
+gem "rake"
+
+gemspec :path => "../"

data/lib/mongomodel/concerns/callbacks.rb

@@ -199,34 +199,16 @@ module MongoModel
       :after_create, :before_update, :around_update, :after_update,
       :before_destroy, :around_destroy, :after_destroy
     ]
-
+    
+    module ClassMethods
+      include ActiveModel::Callbacks
+    end
+    
     included do
-      extend ActiveModel::Callbacks
+      include ActiveModel::Validations::Callbacks
       
       define_model_callbacks :initialize, :find, :only => :after
       define_model_callbacks :save, :create, :update, :destroy
-      
-      define_callbacks :validation, :terminator => "result == false", :scope => [:kind, :name]
-    end
-    
-    module ClassMethods
-      def before_validation(*args, &block)
-        options = args.extract_options!
-        if options[:on]
-          options[:if] = Array.wrap(options[:if])
-          options[:if] << "@_on_validate == :#{options[:on]}"
-        end
-        set_callback(:validation, :before, *(args << options), &block)
-      end
-
-      def after_validation(*args, &block)
-        options = args.extract_options!
-        options[:if] = Array.wrap(options[:if])
-        options[:if] << "!halted && value != false"
-        options[:if] << "@_on_validate == :#{options[:on]}" if options[:on]
-        options[:prepend] = true
-        set_callback(:validation, :after, *(args << options), &block)
-      end
     end
     
     def initialize(*args, &block) #:nodoc:
@@ -234,11 +216,6 @@ module MongoModel
       run_callbacks_with_embedded(:initialize)
     end
     
-    def valid?(*) #:nodoc:
-      @_on_validate = new_record? ? :create : :update
-      run_callbacks(:validation) { super }
-    end
-    
     def run_callbacks_with_embedded(kind, *args, &block)
       if block_given?
         embedded_callbacks = nest_embedded_callbacks(kind, *args, &block)

data/lib/mongomodel/document/validations/uniqueness.rb

@@ -5,25 +5,14 @@ module MongoModel
     module Validations
       class UniquenessValidator < ActiveModel::EachValidator
         def initialize(options)
-          super(options.reverse_merge(:case_sensitive => true))
+          options = options.reverse_merge(:case_sensitive => true)
+          
+          ActiveSupport::Deprecation.silence { super }
+          setup!(options[:class]) if options[:class] && !@klass
         end
         
         def setup(klass)
-          @klass = klass
-          
-          # Enable safety checks on save
-          klass.save_safely = true
-          
-          # Create unique indexes to deal with race condition
-          attributes.each do |attr_name|
-            if options[:case_sensitive]
-              klass.index *[attr_name] + Array.wrap(options[:scope]) << { :unique => true }
-            else
-              lowercase_key = "_lowercase_#{attr_name}"
-              klass.before_save { attributes[lowercase_key] = send(attr_name).downcase }
-              klass.index *[lowercase_key] + Array.wrap(options[:scope]) << { :unique => true }
-            end
-          end
+          setup!(klass)
         end
         
         def validate_each(record, attribute, value)
@@ -48,7 +37,24 @@ module MongoModel
         end
       
       private
-      
+        def setup!(klass)
+          @klass = klass
+          
+          # Enable safety checks on save
+          klass.save_safely = true
+          
+          # Create unique indexes to deal with race condition
+          attributes.each do |attr_name|
+            if options[:case_sensitive]
+              klass.index *[attr_name] + Array.wrap(options[:scope]) << { :unique => true }
+            else
+              lowercase_key = "_lowercase_#{attr_name}"
+              klass.before_save { attributes[lowercase_key] = send(attr_name).downcase }
+              klass.index *[lowercase_key] + Array.wrap(options[:scope]) << { :unique => true }
+            end
+          end
+        end
+        
         # The check for an existing value should be run from a class that
         # isn't abstract. This means working down from the current class
         # (self), to the first non-abstract class. Since classes don't know

data/lib/mongomodel/version.rb

@@ -1,3 +1,3 @@
 module MongoModel
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/mongomodel.gemspec

@@ -5,6 +5,7 @@ Gem::Specification.new do |s|
   s.name        = "mongomodel"
   s.version     = MongoModel::VERSION
   s.platform    = Gem::Platform::RUBY
+  s.licenses    = ["MIT"]
   s.authors     = ["Sam Pohlenz"]
   s.email       = ["sam@sampohlenz.com"]
   s.homepage    = "http://www.mongomodel.org"
@@ -18,9 +19,9 @@ Gem::Specification.new do |s|
   s.add_dependency "activemodel",   ">= 3.1"
   s.add_dependency "mongo",         "~> 1.8"
 
-  s.add_development_dependency "bundler",     ">= 1.0.0"
-  s.add_development_dependency "rspec",       "~> 2.8"
-  s.add_development_dependency "guard-rspec", "~> 0.5.0"
+  s.add_development_dependency "bundler",  ">= 1.0"
+  s.add_development_dependency "rspec",    "~> 2.8"
+  s.add_development_dependency "minitest", ">= 4.2"
 
   s.files        = `git ls-files`.split("\n")
   s.require_path = 'lib'

data/spec/mongomodel/concerns/activemodel_spec.rb

@@ -3,8 +3,16 @@ require 'spec_helper'
 module MongoModel
   specs_for(Document, EmbeddedDocument) do
     shared_examples_for "ActiveModel" do
-      require 'test/unit/assertions'
-      include Test::Unit::Assertions
+      begin
+        require 'minitest/assertions'
+      rescue LoadError
+        require 'minitest/unit'
+      end
+      
+      include Minitest::Assertions
+      
+      attr_accessor :assertions
+      before(:all) { self.assertions = 0 }
 
       include ActiveModel::Lint::Tests
 

data/spec/mongomodel/concerns/attribute_methods_spec.rb

@@ -36,7 +36,7 @@ module MongoModel
       end
       
       context "on a class with an included concern that defines the property" do
-        module TestConcern
+        define_module(:TestConcern) do
           extend ActiveSupport::Concern
           
           included do

data/spec/spec_helper.rb

@@ -12,6 +12,12 @@ Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each { |f| require f }
 require 'active_support/time'
 Time.zone = "Australia/Melbourne"
 
+begin
+  I18n.config.enforce_available_locales = false
+rescue NoMethodError
+  # Ignore
+end
+
 RSpec.configure do |config|
   include SpecsFor
   include DefineClass

data/spec/support/helpers/define_class.rb

@@ -21,4 +21,17 @@ module DefineClass
       klass
     end
   end
+  
+  def define_module(name, &block)
+    before(:each) do
+      Object.send(:remove_const, name) if Object.const_defined?(name)
+      
+      mod = Module.new
+      
+      Object.const_set(name, mod)
+      
+      mod.class_eval(&block) if block_given?
+      mod
+    end
+  end
 end

metadata

@@ -1,112 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: mongomodel
 version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+  version: 0.5.1
 platform: ruby
 authors:
 - Sam Pohlenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: mongo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '4.2'
 description: MongoModel is a MongoDB ORM for Ruby/Rails similar to ActiveRecord and
   DataMapper.
 email:
@@ -115,8 +102,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE
@@ -129,7 +116,8 @@ files:
 - gemfiles/rails-3.2.gemfile
 - gemfiles/rails-4-observers.gemfile
 - gemfiles/rails-4-protected-attributes.gemfile
-- gemfiles/rails-4.gemfile
+- gemfiles/rails-4.0.gemfile
+- gemfiles/rails-4.1.gemfile
 - lib/mongomodel.rb
 - lib/mongomodel/attributes/mongo.rb
 - lib/mongomodel/attributes/store.rb
@@ -289,30 +277,27 @@ files:
 - spec/support/matchers/run_callbacks.rb
 - spec/support/models.rb
 homepage: http://www.mongomodel.org
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3084382199068025224
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: mongomodel
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: MongoDB ORM for Ruby/Rails
 test_files: []

data/gemfiles/rails-4.gemfile

@@ -1,10 +0,0 @@
-source "https://rubygems.org"
-
-gem "activesupport", :github => "rails/rails", :branch => "4-0-stable"
-gem "activemodel", :github => "rails/rails", :branch => "4-0-stable"
-
-gem "bson_ext", "~> 1.8"
-gem "tzinfo"
-gem "rake"
-
-gemspec :path => "../"