mongo_db 0.1.11 → 0.1.12

data/lib/mongo_db/gems.rb

@@ -1,2 +1,6 @@
-# gem 'activemodel', '~> 3.0'
-gem 'mongo',       '~> 1.3'
+gem 'mongo',    '~> 1.3'
+gem 'i18n',     '>= 0.5'
+
+if respond_to? :fake_gem
+  fake_gem 'ruby_ext'
+end

data/lib/mongo_db/model.rb

@@ -1,11 +1,6 @@
-begin
-  require 'ruby_ext'
-rescue LoadError => e
-  warn 'Model requires the ruby_ext gem, please install it'
-  raise e
-end
-
 require 'mongo_db/object'
+require 'ruby_ext'
+require 'i18n'
 
 module Mongo::Model; end
 

data/lib/mongo_db/object/object_helper.rb

@@ -34,20 +34,28 @@ module Mongo::ObjectHelper
       ::Mongo::ObjectSerializer.new(arg).remove opts, self
     end
   end
+  
+  def save! doc, opts = {}
+    save(doc, opts) || raise(Mongo::Error, "can't save #{doc.inspect}!")
+  end
 
 
   #
   # Querying
   #
-  def first *args, &block
-    doc = super *args, &block
-    ::Mongo::ObjectSerializer.build(doc)
+  def first selector = {}, opts = {}, &block
+    opts = opts.clone
+    object = (opts.delete(:object) == false) ? false : true
+    doc = super selector, opts, &block
+    object ? ::Mongo::ObjectSerializer.build(doc) : doc
   end
-
-  def each *args, &block
-    super *args do |doc|
-      obj = ::Mongo::ObjectSerializer.build(doc)
-      block.call obj
+  
+  def each selector = {}, opts = {}, &block
+    opts = opts.clone
+    object = (opts.delete(:object) == false) ? false : true
+    super selector, opts do |doc|
+      doc = ::Mongo::ObjectSerializer.build(doc) if object
+      block.call doc
     end
     nil
   end

data/spec/integration/am_validation_spec.rb

@@ -1,34 +1,34 @@
-require 'model/spec_helper'
-require 'active_model'
-
-describe "Validations" do
-  with_mongo_model
-
-  before do
-    class Unit
-      inherit Mongo::Model
-      collection :units
-
-      include ActiveModel::Validations
-
-      attr_accessor :name, :status
-
-      validates_presence_of :name
-    end
-  end
-
-  after{remove_constants :Unit}
-
-  it "ActiveModel integration smoke test" do
-    unit = Unit.new
-    unit.should be_invalid
-    unit.errors.size.should == 1
-    unit.errors.first.first.should == :name
-    unit.save.should be_false
-
-    unit.name = 'Zeratul'
-    unit.should be_valid
-    unit.errors.should be_empty
-    unit.save.should be_true
-  end
-end
+# require 'model/spec_helper'
+# require 'active_model'
+# 
+# describe "Validations" do
+#   with_mongo_model
+# 
+#   before do
+#     class Unit
+#       inherit Mongo::Model
+#       collection :units
+# 
+#       include ActiveModel::Validations
+# 
+#       attr_accessor :name, :status
+# 
+#       validates_presence_of :name
+#     end
+#   end
+# 
+#   after{remove_constants :Unit}
+# 
+#   it "ActiveModel integration smoke test" do
+#     unit = Unit.new
+#     unit.should be_invalid
+#     unit.errors.size.should == 1
+#     unit.errors.first.first.should == :name
+#     unit.save.should be_false
+# 
+#     unit.name = 'Zeratul'
+#     unit.should be_valid
+#     unit.errors.should be_empty
+#     unit.save.should be_true
+#   end
+# end

data/spec/integration/validatable2_spec.rb

@@ -0,0 +1,34 @@
+require 'model/spec_helper'
+require 'validatable'
+
+describe "Integration with validatable2" do
+  with_mongo_model
+
+  before do
+    class Unit
+      inherit Mongo::Model
+      collection :units
+
+      include Validatable
+
+      attr_accessor :name, :status
+
+      validates_presence_of :name
+    end
+  end
+
+  after{remove_constants :Unit}
+
+  it "ActiveModel integration smoke test" do
+    unit = Unit.new
+    unit.should_not be_valid
+    unit.errors.size.should == 1
+    unit.errors.first.first.should == :name
+    unit.save.should be_false
+
+    unit.name = 'Zeratul'
+    unit.should be_valid
+    unit.errors.should be_empty
+    unit.save.should be_true
+  end
+end

data/spec/object/crud_spec.rb

@@ -19,6 +19,11 @@ describe "Object CRUD" do
     end
 
     it_should_behave_like "object CRUD"
+    
+    it "should allow to read object as hash" do
+      db.units.save! @zeratul
+      db.units.first({}, object: false).class.should == Hash
+    end
   end
 
   describe 'embedded' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo_db
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-23 00:00:00.000000000Z
+date: 2011-08-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &753720 !ruby/object:Gem::Requirement
+  requirement: &2847970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,29 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *753720
+  version_requirements: *2847970
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &2850730 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2850730
+- !ruby/object:Gem::Dependency
+  name: ruby_ext
+  requirement: &2851810 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2851810
 description: 
 email: 
 executables: []
@@ -37,8 +59,6 @@ files:
 - lib/mongo_db/driver.rb
 - lib/mongo_db/gems.rb
 - lib/mongo_db/integration/locales/activemodel/ru.yml
-- lib/mongo_db/integration/locales/mongo_mapper/en.yml
-- lib/mongo_db/integration/locales/mongo_mapper/ru.yml
 - lib/mongo_db/integration/locales.rb
 - lib/mongo_db/migration/definition.rb
 - lib/mongo_db/migration/migration.rb
@@ -69,6 +89,7 @@ files:
 - spec/driver/spec_helper.rb
 - spec/integration/am_conversion_spec.rb
 - spec/integration/am_validation_spec.rb
+- spec/integration/validatable2_spec.rb
 - spec/migration/migration_spec.rb
 - spec/model/assignment_spec.rb
 - spec/model/attribute_convertors_spec.rb

data/lib/mongo_db/integration/locales/mongo_mapper/en.yml

@@ -1,4 +0,0 @@
-en:
-  errors:
-    messages:
-      taken: "has already been taken"

data/lib/mongo_db/integration/locales/mongo_mapper/ru.yml

@@ -1,4 +0,0 @@
-ru:
-  errors:
-    messages:
-      taken: "уже занято"