mongodb_model 0.2.2 → 0.2.3

data/lib/mongo/model/assignment.rb

@@ -35,7 +35,7 @@ module Mongo::Model::Assignment
   end
 
   def initialize attributes = nil
-    super
+    super()
     set attributes if attributes
   end
 

data/lib/mongo/model/attribute_convertors.rb

@@ -4,11 +4,11 @@ require 'yaml'
 module Mongo::Model::AttributeConvertors
   CONVERTORS = {
     line: {
-      from_string: -> s {(s || "").split(',').collect{|s| s.strip}},
+      from_string: -> s {(s || "").split(',').collect{|s| s.strip}.sort},
       to_string:   -> v {v.join(', ')}
     },
     column: {
-      from_string: -> s {(s || "").split("\n").collect{|s| s.strip}},
+      from_string: -> s {(s || "").split("\n").collect{|s| s.strip}.sort},
       to_string:   -> v {v.join("\n")}
     },
     yaml: {

data/lib/mongo/model/callbacks.rb

@@ -12,7 +12,9 @@ module Mongo::Model::Callbacks
           args.each{|executor| set_callback method_name, :before, executor, opt}
         end
       end
+    end
 
+    [:validate, :create, :update, :save, :destroy, :build].each do |method_name|
       define_method "after_#{method_name}" do |*args, &block|
         opt = args.extract_options!
         if block

data/lib/mongo/model/file_model.rb

@@ -1,3 +1,4 @@
+require 'file_model'
 module Mongo::Model::FileModel
   inherit ::FileModel::Helper
 

data/lib/mongo/model/model.rb

@@ -7,8 +7,10 @@ module Mongo::Model
   def new_record?; !_id end
 
   inherited do
-    alias_method :eql?, :model_eql?
-    alias_method :==, :model_eq?
+    unless is?(Array) or is?(Hash)
+      alias_method :eql?, :model_eql?
+      alias_method :==, :model_eq?
+    end
   end
 
   def model_eql? o

data/lib/mongo/model/validation.rb

@@ -3,7 +3,7 @@ module Mongo::Model::Validation
     @_errors ||= Validatable::Errors.new
   end
 
-  def run_validations
+  def run_model_validations
     self.class.validations.each do |v|
       if v.respond_to?(:validate)
         v.validate self

data/lib/mongo/model.rb

@@ -1,7 +1,6 @@
 require 'mongodb_model/gems'
 
 require 'validatable'
-require 'file_model'
 require 'ruby_ext'
 require 'mongo/object'
 
@@ -20,14 +19,15 @@ module Mongo::Model; end
   query
   query_mixin
   scope
-  attribute_convertors
-  file_model
+  attribute_convertorshttp://alexeypetrushin.github.com/mongodb_model
   misc
   model
 ).each{|f| require "mongo/model/#{f}"}
 
 module Mongo
   module Model
+    autoload :FileModel, 'mongo/model/file_model'
+http://alexeypetrushin.github.com/mongodb_model
     inherit \
       Db,
       Conversion,
@@ -38,7 +38,6 @@ module Mongo
       QueryMixin,
       Scope,
       AttributeConvertors,
-      Mongo::Model::FileModel,
       Misc
   end
 end

data/spec/callbacks_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'Model callbacks' do
   with_mongo_model
 
-  after{remove_constants :TheModel, :Player}
+  after{remove_constants :Post, :Player}
 
   it "integration smoke test" do
     class Player
@@ -33,4 +33,28 @@ describe 'Model callbacks' do
 
     db.units.save(player).should be_true
   end
+
+  it "should have :build callback" do
+    class Post
+      inherit Mongo::Model
+      collection :posts
+
+      class Tags < Array
+      end
+
+      def tags
+        @tags ||= Tags.new
+      end
+      attr_writer :tags
+
+      after_build do |post|
+        post.tags = Tags.new.replace post.tags
+      end
+    end
+
+    post = Post.new
+    post.save!
+
+    Post.first.tags.class.should == Post::Tags
+  end
 end

data/spec/equality_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'Model equality' do
   with_mongo_model
 
-  after{remove_constants :Player}
+  after{remove_constants :Player, :Tags}
 
   it "integration smoke test" do
     class Player
@@ -29,4 +29,13 @@ describe 'Model equality' do
     player1.mission.name = 'Into the Flames'
     player1.should_not == player2
   end
+
+  it "should correct compare Array/Hash models (from error)" do
+    class Tags < Array
+      inherit Mongo::Model
+    end
+
+    tags = Tags.new.replace ['a', 'b']
+    tags.should_not == Tags.new
+  end
 end

data/spec/file_model_spec.rb

@@ -10,6 +10,7 @@ describe 'File Model' do
 
     class Unit
       inherit Mongo::Model
+      inherit Mongo::Model::FileModel
       collection :units
 
       attr_accessor :name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongodb_model
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-17 00:00:00.000000000Z
+date: 2011-09-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongodb
-  requirement: &2840810 !ruby/object:Gem::Requirement
+  requirement: &2781440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2840810
+  version_requirements: *2781440
 - !ruby/object:Gem::Dependency
   name: file_model
-  requirement: &2840570 !ruby/object:Gem::Requirement
+  requirement: &2781200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2840570
+  version_requirements: *2781200
 - !ruby/object:Gem::Dependency
   name: validatable2
-  requirement: &2840330 !ruby/object:Gem::Requirement
+  requirement: &2780960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2840330
+  version_requirements: *2780960
 - !ruby/object:Gem::Dependency
   name: ruby_ext
-  requirement: &2840090 !ruby/object:Gem::Requirement
+  requirement: &2780720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2840090
+  version_requirements: *2780720
 description: 
 email: 
 executables: []