mongodb 0.0.2 → 0.0.3

data/Rakefile

@@ -4,7 +4,7 @@ project(
   name: "mongodb",
   # version: '0.1.0',
   gem: true,
-  summary: "Object Model & Ruby driver enhancements for MongoDB",
+  summary: "Save any Ruby object to MongoDB",
 
   author: "Alexey Petrushin",
   homepage: "http://github.com/alexeypetrushin/mongodb"

data/lib/mongodb/object/object_helper.rb

@@ -34,7 +34,7 @@ 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
@@ -49,7 +49,7 @@ module Mongo::ObjectHelper
     doc = super selector, opts, &block
     object ? ::Mongo::ObjectSerializer.build(doc) : doc
   end
-  
+
   def each selector = {}, opts = {}, &block
     opts = opts.clone
     object = (opts.delete(:object) == false) ? false : true

data/readme.md

@@ -1,8 +1,8 @@
-Object Model & Ruby driver enhancements for MongoDB.
+Ruby object persistence & driver enhancements for MongoDB.
 
-1. Driver enchancements & Migrations.
-2. Persistence for any Ruby object.
-3. Object Model (callbacks, validations, mass-assignment, finders, ...).
+1. Driver enchancements.
+2. Migrations.
+3. Persistence for any Ruby object.
 
 Lower layers are independent from upper, use only what You need.
 
@@ -62,6 +62,58 @@ Source: examples/driver.rb
 More docs - there's no need for more docs, the whole point of this extension is to be small, intuitive, 100% compatible with the official driver, and require no extra knowledge.
 So, please use standard Ruby driver documentation.
 
+# Migrations
+
+Define migration steps, specify desired version and apply it (usually all this should be done via Rake task).
+
+``` ruby
+require 'mongodb/migration'
+
+# Connection & db.
+connection = Mongo::Connection.new
+db = connection.db 'default_test'
+db.units.drop
+
+# Initialize migration (usually all this should be done inside of :migrate
+# rake task).
+migration = Mongo::Migration.new db
+
+# Define migrations.
+# Usually they are defined as files in some folder and You loading it by
+# using something like this:
+#   Dir['<runtime_dir>/db/migrations/*.rb'].each{|fname| load fname}
+migration.add 1 do |m|
+  m.up{|db|   db.units.save   name: 'Zeratul'}
+  m.down{|db| db.units.remove name: 'Zeratul'}
+end
+
+# Let's add another one.
+migration.add 2 do |m|
+  m.up{|db|   db.units.save   name: 'Tassadar'}
+  m.down{|db| db.units.remove name: 'Tassadar'}
+end
+
+# Specify what version of database You need and apply migration.
+migration.update 2
+
+migration.current_version                        # => 2
+db.units.count                                   # => 2
+
+# You can rollback it the same way.
+migration.update 0
+
+migration.current_version                        # => 0
+db.units.count                                   # => 0
+
+# To update to the highest version just call it without the version specified
+migration.update
+
+migration.current_version                        # => 2
+db.units.count                                   # => 2
+```
+
+Source: examples/migration.rb
+
 # Persistence for any Ruby object
 
 Save any Ruby object to MongoDB, as if it's a document. Objects can be any type, simple or composite with other objects / arrays / hashes inside.
@@ -124,131 +176,6 @@ db.units.all name: {_gt: 'Z'}                      # => [zeratul]
 
 Source: examples/object.rb
 
-# Object Model
-
-- The same API for pure driver and Models.
-- Minimum extra abstractions, trying to keep things as close to the MongoDB semantic as possible.
-- Schema-less, dynamic (with ability to specify types for mass-assignment).
-- Models can be saved to any collection.
-- Full support for embedded objects (validations, callbacks, ...).
-- Scope, default_scope
-- Doesn't try to mimic ActiveRecord, MongoDB is differrent and this tool designed to get most of it.
-- Very small, see [code stats][code_stats].
-
-Other ODM usually try to cover simple but non-standard API of MongoDB behind complex ORM-like abstractions. This tool **exposes simplicity and power of MongoDB and leverages it's differences**.
-
-``` ruby
-# Connecting to MongoDB.
-require 'mongodb/model'
-Mongo.defaults.merge! symbolize: true, multi: true, safe: true
-connection = Mongo::Connection.new
-db = connection.db 'default_test'
-db.units.drop
-Mongo::Model.db = db
-
-# Let's define the game unit.
-class Unit
-  inherit Mongo::Model
-  collection :units
-
-  attr_accessor :name, :status, :stats
-
-  scope :alive, status: 'alive'
-
-  class Stats
-    inherit Mongo::Model
-    attr_accessor :attack, :life, :shield
-  end
-end
-
-# Create.
-zeratul  = Unit.build(name: 'Zeratul',  status: 'alive', stats: Unit::Stats.build(attack: 85, life: 300, shield: 100))
-tassadar = Unit.build(name: 'Tassadar', status: 'dead',  stats: Unit::Stats.build(attack: 0,  life: 80,  shield: 300))
-
-zeratul.save
-tassadar.save
-
-# Udate (we made error - mistakenly set Tassadar's attack as zero, let's fix it).
-tassadar.stats.attack = 20
-tassadar.save
-
-# Querying first & all, there's also :each, the same as :all.
-Unit.first name: 'Zeratul'                         # => zeratul
-Unit.all name: 'Zeratul'                           # => [zeratul]
-Unit.all name: 'Zeratul' do |unit|
-  unit                                             # => zeratul
-end
-
-# Simple finders (bang versions also availiable).
-Unit.by_name 'Zeratul'                             # => zeratul
-Unit.first_by_name 'Zeratul'                       # => zeratul
-Unit.all_by_name 'Zeratul'                         # => [zeratul]
-
-# Scopes.
-Unit.alive.count                                   # => 1
-Unit.alive.first                                   # => zeratul
-
-# Callbacks & callbacks on embedded models.
-
-# Validations.
-
-# Save model to any collection.
-```
-
-Source: examples/model.rb
-
-# Migrations
-
-Define migration steps, specify desired version and apply it (usually all this should be done via Rake task).
-
-``` ruby
-require 'mongodb/migration'
-
-# Connection & db.
-connection = Mongo::Connection.new
-db = connection.db 'default_test'
-db.units.drop
-
-# Initialize migration (usually all this should be done inside of :migrate
-# rake task).
-migration = Mongo::Migration.new db
-
-# Define migrations.
-# Usually they are defined as files in some folder and You loading it by
-# using something like this:
-#   Dir['<runtime_dir>/db/migrations/*.rb'].each{|fname| load fname}
-migration.add 1 do |m|
-  m.up{|db|   db.units.save   name: 'Zeratul'}
-  m.down{|db| db.units.remove name: 'Zeratul'}
-end
-
-# Let's add another one.
-migration.add 2 do |m|
-  m.up{|db|   db.units.save   name: 'Tassadar'}
-  m.down{|db| db.units.remove name: 'Tassadar'}
-end
-
-# Specify what version of database You need and apply migration.
-migration.update 2
-
-migration.current_version                        # => 2
-db.units.count                                   # => 2
-
-# You can rollback it the same way.
-migration.update 0
-
-migration.current_version                        # => 0
-db.units.count                                   # => 0
-
-# To update to the highest version just call it without the version specified
-migration.update
-
-migration.current_version                        # => 2
-db.units.count                                   # => 2
-```
-
-Source: examples/migration.rb
-
 # Installation
 
 ``` bash

data/spec/object/crud_spec.rb

@@ -19,7 +19,7 @@ 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongodb
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2783590 !ruby/object:Gem::Requirement
+  requirement: &2820100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2783590
+  version_requirements: *2820100
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2783300 !ruby/object:Gem::Requirement
+  requirement: &2784980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *2783300
+  version_requirements: *2784980
 - !ruby/object:Gem::Dependency
   name: ruby_ext
-  requirement: &2783060 !ruby/object:Gem::Requirement
+  requirement: &2784710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2783060
+  version_requirements: *2784710
 description: 
 email: 
 executables: []
@@ -58,25 +58,10 @@ files:
 - lib/mongodb/driver/spec.rb
 - lib/mongodb/driver.rb
 - lib/mongodb/gems.rb
-- lib/mongodb/integration/locales/activemodel/ru.yml
-- lib/mongodb/integration/locales.rb
 - lib/mongodb/migration/definition.rb
 - lib/mongodb/migration/migration.rb
 - lib/mongodb/migration/tasks.rb
 - lib/mongodb/migration.rb
-- lib/mongodb/model/assignment.rb
-- lib/mongodb/model/attribute_convertors.rb
-- lib/mongodb/model/callbacks.rb
-- lib/mongodb/model/crud.rb
-- lib/mongodb/model/db.rb
-- lib/mongodb/model/misc.rb
-- lib/mongodb/model/model.rb
-- lib/mongodb/model/query.rb
-- lib/mongodb/model/scope.rb
-- lib/mongodb/model/spec.rb
-- lib/mongodb/model/support/types.rb
-- lib/mongodb/model/validation.rb
-- lib/mongodb/model.rb
 - lib/mongodb/object/object_helper.rb
 - lib/mongodb/object/object_serializer.rb
 - lib/mongodb/object.rb
@@ -87,20 +72,7 @@ files:
 - spec/driver/fixes_spec.rb
 - spec/driver/hash_helper_spec.rb
 - 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
-- spec/model/callbacks_spec.rb
-- spec/model/crud_spec.rb
-- spec/model/db_spec.rb
-- spec/model/misc_spec.rb
-- spec/model/query_spec.rb
-- spec/model/scope_spec.rb
-- spec/model/spec_helper.rb
-- spec/model/validation_spec.rb
 - spec/object/callbacks_spec.rb
 - spec/object/crud_shared.rb
 - spec/object/crud_spec.rb
@@ -129,5 +101,5 @@ rubyforge_project:
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: Object Model & Ruby driver enhancements for MongoDB
+summary: Save any Ruby object to MongoDB
 test_files: []

data/lib/mongodb/integration/locales.rb

@@ -1,4 +0,0 @@
-require 'i18n'
-
-dir = File.dirname __FILE__
-I18n.load_path += Dir["#{dir}/locales/**/*.{rb,yml}"]

data/lib/mongodb/integration/locales/activemodel/ru.yml

@@ -1,27 +0,0 @@
-ru:
-  errors:
-    # The default format to use in full error messages.
-    format: "%{attribute} %{message}"
-
-    # The values :model, :attribute and :value are always available for interpolation
-    # The value :count is available when applicable. Can be used for pluralization.
-    messages:
-      inclusion: "недопустимое значение"
-      exclusion: "недопустимо"
-      invalid: "неверно"
-      confirmation: "не совпадает с подтверждением"
-      accepted: "долно быть принято"
-      empty: "не может быть пустым"
-      blank: "не может быть пустым"
-      too_long: "слишком длинно (максимально допустимо %{count})"
-      too_short: "слищком коротко (минимально допустимо %{count})"
-      wrong_length: "неверная длинна (должно быть %{count})"
-      not_a_number: "не номер"
-      not_an_integer: "долно быть целочисленно"
-      greater_than: "должно быть больше чем %{count}"
-      greater_than_or_equal_to: "должно быть больше чем или равно %{count}"
-      equal_to: "должно быть равно %{count}"
-      less_than: "должно быть меньше чем %{count}"
-      less_than_or_equal_to: "должно быть меньше чем или равно %{count}"
-      odd: "должно быть не четно"
-      even: "должно быть четно"

data/lib/mongodb/model.rb

@@ -1,26 +0,0 @@
-require 'mongodb/object'
-require 'ruby_ext'
-require 'i18n'
-
-module Mongo::Model; end
-
-%w(
-  support/types
-
-  db
-  assignment
-  callbacks
-  validation
-  crud
-  query
-  scope
-  attribute_convertors
-  misc
-  model
-).each{|f| require "mongodb/model/#{f}"}
-
-module Mongo
-  module Model
-    inherit Db, Assignment, Callbacks, Validation, Crud, Query, Scope, AttributeConvertors, Misc
-  end
-end

data/lib/mongodb/model/assignment.rb

@@ -1,65 +0,0 @@
-module Mongo::Model::Assignment
-  class Dsl < BasicObject
-    def initialize
-      @attributes = {}
-    end
-
-    def self.const_missing name
-      # BasicObject doesn't have access to any constants like String, Symbol, ...
-      ::Object.const_get name
-    end
-
-    def to_h; attributes end
-
-    protected
-      attr_reader :attributes
-
-      def method_missing attribute_name, *args
-        attribute_name.must_be.a Symbol
-
-        args.size.must_be.in 1..2
-        if args.first.is_a? Class
-          type, mass_assignment = args
-          mass_assignment ||= false
-          type.must.respond_to :cast
-        else
-          type, mass_assignment = nil, args.first
-        end
-
-        attributes[attribute_name] = [type, mass_assignment]
-      end
-  end
-
-  def set attributes, options = {}
-    if rules = self.class._assign
-      force = options[:force]
-      attributes.each do |n, v|
-        n = n.to_sym
-        if rule = rules[n]
-          type, mass_assignment = rule
-          if mass_assignment or force
-            v = type.cast(v) if type
-            send "#{n}=", v
-          end
-        end
-      end
-    else
-      attributes.each{|n, v| send "#{n}=", v}
-    end
-    self
-  end
-
-  def set! attributes, options = {}
-    set attributes, options.merge(force: true)
-  end
-
-  module ClassMethods
-    inheritable_accessor :_assign, nil
-
-    def assign &block
-      dsl = ::Mongo::Model::Assignment::Dsl.new
-      dsl.instance_eval &block
-      self._assign = (_assign || {}).merge dsl.to_h
-    end
-  end
-end