mongodb 0.0.1 → 0.0.2

data/Rakefile

@@ -2,12 +2,10 @@ require 'rake_ext'
 
 project(
   name: "mongodb",
-  # official_name: "mongo_db",
-  version: '0.0.1',
+  # version: '0.1.0',
   gem: true,
-  summary: "MongDB ODM. In development, don't use it, come back at 11/8/25",
-  # Very small, schema-less, config-less Ruby ODM for MongoDB",
+  summary: "Object Model & Ruby driver enhancements for MongoDB",
 
   author: "Alexey Petrushin",
-  homepage: "http://github.com/alexeypetrushin/mongo_db"
+  homepage: "http://github.com/alexeypetrushin/mongodb"
 )

data/lib/mongodb/driver.rb

@@ -0,0 +1,33 @@
+require 'mongodb/gems'
+
+require 'mongo'
+
+class Mongo::Error < StandardError; end
+class Mongo::NotFound < Mongo::Error; end
+
+%w(
+  database
+  collection
+  dynamic_finders
+).each{|f| require "mongodb/driver/#{f}"}
+
+# defaults
+Mongo.class_eval do
+  class << self
+    def defaults; @defaults ||= {} end
+    attr_writer :defaults
+  end
+end
+
+# database
+Mongo::DB.send :include, Mongo::DBExt
+
+# collection
+Mongo::Collection.class_eval do
+  include Mongo::CollectionExt, Mongo::DynamicFinders
+
+  %w(insert update remove save count).each do |method|
+    alias_method "#{method}_without_ext", method
+    alias_method method, "#{method}_with_ext"
+  end
+end

data/lib/mongodb/driver/collection.rb

@@ -0,0 +1,156 @@
+require 'set'
+require 'date'
+
+module Mongo::CollectionExt
+  #
+  # CRUD
+  #
+  def save_with_ext doc, opts = {}
+    save_without_ext doc, reverse_merge_defaults(opts, :safe)
+  end
+
+  def insert_with_ext args, opts = {}
+    result = insert_without_ext args, reverse_merge_defaults(opts, :safe)
+
+    # fix for mongodriver, it will return single result if we supply [doc] as args
+    (args.is_a?(Array) and !result.is_a?(Array)) ? [result] : result
+  end
+
+  def update_with_ext selector, doc, opts = {}
+    selector = convert_underscore_to_dollar_in_selector selector
+    doc      = convert_underscore_to_dollar_in_update doc
+
+    # because :multi works only with $ operators, we need to check if it's applicable
+    opts = if doc.keys.any?{|k| k =~ /^\$/}
+      reverse_merge_defaults(opts, :safe, :multi)
+    else
+      reverse_merge_defaults(opts, :safe)
+    end
+
+    update_without_ext selector, doc, opts
+  end
+
+  def remove_with_ext selector = {}, opts = {}
+    selector = convert_underscore_to_dollar_in_selector selector
+    remove_without_ext selector, reverse_merge_defaults(opts, :safe, :multi)
+  end
+
+  def destroy *args
+    remove *args
+  end
+
+  def create *args
+    insert *args
+  end
+
+  #
+  # Querying
+  #
+  def first selector = {}, opts = {}
+    selector = convert_underscore_to_dollar_in_selector selector if selector.is_a? Hash
+
+    h = find_one selector, opts
+    symbolize_doc h
+  end
+
+  def first! selector = {}, opts = {}
+    first(selector, opts) || raise(Mongo::NotFound, "document with selector #{selector} not found!")
+  end
+
+  def all selector = {}, opts = {}, &block
+    if block
+      each selector, opts, &block
+    else
+      list = []
+      each(selector, opts){|doc| list << doc}
+      list
+    end
+  end
+
+  def each selector = {}, opts = {}, &block
+    selector = convert_underscore_to_dollar_in_selector selector
+
+    cursor = nil
+    begin
+      cursor = find selector, reverse_merge_defaults(opts, :batch_size)
+      cursor.each do |doc|
+        doc = symbolize_doc doc
+        block.call doc
+      end
+      nil
+    ensure
+      cursor.close if cursor
+    end
+    nil
+  end
+
+  def count_with_ext selector = {}, opts = {}
+    find(selector, opts).count()
+  end
+
+  protected
+    QUERY_KEYWORDS = [
+      :_lt, :_lte, :_gt, :_gte,
+      :_all, :_exists, :_mod, :_ne, :_in, :_nin,
+      :_nor, :_or, :_and,
+      :_size, :_type
+    ].to_set
+
+    UPDATE_KEYWORDS = [
+      :_inc, :_set, :_unset, :_push, :_pushAll, :_addToSet, :_pop, :_pull, :_pullAll, :_rename, :_bit
+    ].to_set
+
+    def reverse_merge_defaults opts, *keys
+      h = opts.clone
+      keys.each do |k|
+        h[k] = Mongo.defaults[k] if Mongo.defaults.include?(k) and !h.include?(k)
+      end
+      h
+    end
+
+    # symbolizing hashes
+    def symbolize_doc doc
+      return doc unless Mongo.defaults[:symbolize]
+
+      Mongo::CollectionExt.convert_doc doc do |k, v, result|
+        k = k.to_sym if k.is_a? String
+        result[k] = v
+      end
+    end
+
+    # replaces :_lt to :$lt in query
+    def convert_underscore_to_dollar_in_selector selector
+      return selector unless Mongo.defaults[:convert_underscore_to_dollar]
+
+      Mongo::CollectionExt.convert_doc selector do |k, v, result|
+        k = "$#{k.to_s[1..-1]}".to_sym if QUERY_KEYWORDS.include?(k)
+        result[k] = v
+      end
+    end
+
+    # replaces :_set to :$set in query
+    def convert_underscore_to_dollar_in_update update
+      return update unless Mongo.defaults[:convert_underscore_to_dollar]
+
+      Mongo::CollectionExt.convert_doc update do |k, v, result|
+        k = "$#{k.to_s[1..-1]}".to_sym if UPDATE_KEYWORDS.include?(k)
+        result[k] = v
+      end
+    end
+
+    # walks on hash and creates another (also works with nested & arrays)
+    def self.convert_doc doc, &block
+      if doc.is_a? Hash
+        result = {}
+        doc.each do |k, v|
+          v = convert_doc v, &block
+          block.call k, v, result
+        end
+        result
+      elsif doc.is_a? Array
+        doc.collect{|v| convert_doc v, &block}
+      else
+        doc
+      end
+    end
+end

data/lib/mongodb/driver/database.rb

@@ -0,0 +1,6 @@
+module Mongo::DBExt
+  protected
+    def method_missing collection_name
+      self.collection collection_name
+    end
+end

data/lib/mongodb/driver/dynamic_finders.rb

@@ -0,0 +1,41 @@
+module Mongo::DynamicFinders
+  protected
+    #
+    # first_by_field, all_by_field, each_by_field, first_by_field
+    #
+    def method_missing clause, *args, &block
+      if clause =~ /^([a-z]_by_[a-z_])|(by_[a-z_])/
+        clause = clause.to_s
+
+        bang = clause =~ /!$/
+        clause = clause[0..-2] if bang
+
+        finder, field = if clause =~ /^by_/
+          ['first', clause.sub(/by_/, '')]
+        else
+          clause.split(/_by_/, 2)
+        end
+
+        finder = 'first' if finder == 'find'
+        field = '_id'    if field  == 'id'
+
+        if bang
+          raise "You can't use bang version with :#{finder}!" unless finder == 'first'
+          finder = "#{finder}!"
+        end
+
+        raise "invalid arguments for finder (#{args})!" unless args.size == 1
+        field_value = args.first
+
+        finder, field = finder.to_sym, field.to_sym
+
+        if respond_to? finder
+          send finder, {field => field_value}, &block
+        else
+          super
+        end
+      else
+        super
+      end
+    end
+end

data/lib/{mongo_db → mongodb}/driver/spec.rb

@@ -1,31 +1,31 @@
-MONGO_TEST_DATABASE = 'default_test'
+MONGO_TEST_DATABASE_NAME = 'default_test'
 
-rspec do    
+rspec do
   def mongo
     $mongo || raise('Mongo not defined (use :with_mongo helper)!')
   end
-  
-  def clear_mongo name = MONGO_TEST_DATABASE
+
+  def clear_mongo name = MONGO_TEST_DATABASE_NAME
     mongo.db.collection_names.each do |name|
       next if name =~ /^system\./
       mongo.db.collection(name).drop
     end
   end
-  
+
   class << self
     def with_mongo
-      require 'ostruct'
-    
       before :all do
+        require 'ostruct'
+
         $mongo = OpenStruct.new.tap do |m|
           m.connection = Mongo::Connection.new
-          m.db = m.connection.db MONGO_TEST_DATABASE
+          m.db = m.connection.db MONGO_TEST_DATABASE_NAME
         end
-      end      
+      end
       after(:all){$mongo = nil}
-    
-      before do        
-        clear_mongo        
+
+      before do
+        clear_mongo
       end
     end
   end

data/lib/mongodb/gems.rb

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

data/lib/mongodb/integration/locales.rb

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

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

@@ -0,0 +1,27 @@
+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/migration.rb

@@ -0,0 +1,8 @@
+require 'mongodb/driver'
+
+class Mongo::Migration; end
+
+%w(
+  definition
+  migration
+).each{|f| require "mongodb/migration/#{f}"}

data/lib/mongodb/migration/definition.rb

@@ -0,0 +1,19 @@
+class Mongo::Migration::Definition
+  def upgrade &block
+    if block
+      @upgrade = block
+    else
+      @upgrade
+    end
+  end
+  alias_method :up, :upgrade
+
+  def downgrade &block
+    if block
+      @downgrade = block
+    else
+      @downgrade
+    end
+  end
+  alias_method :down, :downgrade
+end

data/lib/mongodb/migration/migration.rb

@@ -0,0 +1,68 @@
+class Mongo::Migration
+  def initialize db
+    @db, @definitions = db, {}
+  end
+
+  def add version, &block
+    raise "version should be an Integer! (but you provided '#{version}' instad)!" unless version.is_a? Integer
+    definition = Definition.new
+    block.call definition
+    definitions[version] = definition
+  end
+
+  def update version = nil
+    version ||= definitions.keys.max
+
+    if current_version == version
+      info "database '#{db.name}' already is of #{version} version, no migration needed"
+      return false
+    else
+      info "updating '#{db.name}' to #{version}"
+    end
+
+    increase_db_version while current_version < version
+    decrease_db_version while current_version > version
+    true
+  end
+
+  def current_version
+    if doc = db.db_metadata.first(name: 'migration')
+      doc[:version] || doc['version']
+    else
+      0
+    end
+  end
+
+  protected
+    attr_accessor :db, :definitions
+
+    def info msg
+      db.connection.logger and db.connection.logger.info(msg)
+    end
+
+    def update_version new_version
+      db.db_metadata.update({name: 'migration'}, {name: 'migration', version: new_version}, {upsert: true, safe: true})
+    end
+
+    def increase_db_version
+      new_version = current_version + 1
+      migration = definitions[new_version]
+      raise "no upgrade of #{db.name} database to #{new_version} version!" unless migration and migration.up
+
+      migration.up.call db
+      update_version new_version
+
+      info "database '#{db.name}' upgraded to #{new_version} version."
+    end
+
+    def decrease_db_version
+      new_version = current_version - 1
+      migration = definitions[new_version + 1]
+      raise "no downgrade of #{db.name} database to #{new_version} version!" unless migration and migration.down
+
+      migration.down.call db
+      update_version new_version
+
+      info "database '#{db.name}' downgraded to #{new_version} version."
+    end
+end

data/lib/mongodb/migration/tasks.rb

@@ -0,0 +1,19 @@
+# namespace :db do
+#   desc "Migrate Database"
+#   task migrate: :migration_evnironment do
+#     require 'mongo_migration'
+#
+#     database_name = (ENV['d'] || ENV['database'] || :default).to_sym
+#     version = ENV['v'] || ENV['version']
+#
+#     if version.blank?
+#       size = Mongo.migration.definitions[database_name].size
+#       highest_defined_version = size == 0 ? 0 : size - 1
+#       version = highest_defined_version
+#     else
+#       version = version.to_i
+#     end
+#
+#     Mongo.migration.update version, database_name
+#   end
+# end