mongo_db 0.1.5 → 0.1.6

data/spec/object/example_spec.rb

@@ -0,0 +1,64 @@
+require 'mongo_db/model'
+require 'rspec'
+
+describe "Object example" do
+  defaults = nil
+  before(:all){defaults = Mongo.defaults.clone}
+  after :all do
+    Mongo.defaults = defaults
+    Object.send :remove_const, :Unit if Object.const_defined? :Unit
+  end
+
+  it do
+    # let's define the game unit
+    class Unit
+      attr_reader :name, :stats
+
+      # don't forget to allow creating object with no arguments
+      def initialize name = nil, stats = nil
+        @name, @stats = name, stats
+      end
+
+      class Stats
+        attr_accessor :attack, :life, :shield
+
+        def initialize attack = nil, life = nil, shield = nil
+          @attack, @life, @shield = attack, life, shield
+        end
+      end
+    end
+
+    # connecting to MongoDB
+    require 'mongo_db/model'
+    Mongo.defaults.merge! symbolize: true, multi: true, safe: true
+    connection = Mongo::Connection.new
+    db = connection.db 'default_test'
+
+    # create
+    zeratul  = Unit.new('Zeratul',  Unit::Stats.new(85, 300, 100))
+    tassadar = Unit.new('Tassadar', Unit::Stats.new(0,  80,  300))
+
+    db.units.save zeratul
+    db.units.save tassadar
+
+    # udate (we made error - mistakenly set Tassadar's attack as zero, let's fix it)
+    tassadar.stats.attack = 20
+    db.units.save tassadar
+
+    # querying first & all, there's also :each, the same as :all
+    db.units.first name: 'Zeratul'                     # => zeratul
+    db.units.all name: 'Zeratul'                       # => [zeratul]
+    db.units.all name: 'Zeratul' do |unit|
+      unit                                             # => zeratul
+    end
+
+    # simple finders (bang versions also availiable)
+    db.units.by_name 'Zeratul'                         # => zeratul
+    db.units.first_by_name 'Zeratul'                   # => zeratul
+    db.units.all_by_name 'Zeratul'                     # => [zeratul]
+
+    # query sugar, use {life: {_lt: 100}} instead of {life: {:$lt => 100}}
+    Mongo.defaults.merge! convert_underscore_to_dollar: true
+    db.units.all('stats.life' => {_lt: 100})           # => [tassadar]
+  end
+end

data/spec/{model/object/crud.rb → object/object_crud_spec.rb}

@@ -1,37 +1,37 @@
-require 'spec_helper'
+require 'object/spec_helper'
 require 'object/crud_shared'
 
 describe "Object CRUD" do
-  with_mongo_model
-  
+  with_mongo
+
   describe 'simple' do
     before do
       class Person
-        def initialize name, info; @name, @info = name, info end
+        def initialize name = nil, info = nil; @name, @info = name, info end
         attr_accessor :name, :info
         def == o; [self.class, name, info] == [o.class, o.respond_to(:name), o.respond_to(:info)] end
       end
-    
-      @zeratul = User.new 'Zeratul', 'Dark Templar'
+
+      @zeratul = Person.new 'Zeratul', 'Dark Templar'
     end
     after{remove_constants :Person}
-    
+
     it_should_behave_like "object CRUD"
   end
-  
+
   describe 'embedded' do
-    before do 
+    before do
       class Player
         attr_accessor :missions
-        def == o; [self.class, self.missions] = [o.class, o.respond_to(:missions)] end
-        
+        def == o; [self.class, self.missions] == [o.class, o.respond_to(:missions)] end
+
         class Mission
-          def initialize name, stats; @name, @stats = name, stats end
+          def initialize name = nil, stats = nil; @name, @stats = name, stats end
           attr_accessor :name, :stats
-          def == o; [self.class, self.name, self.stats] = [o.class, o.respond_to(:name), o.respond_to(:stats)] end
-        end                
+          def == o; [self.class, self.name, self.stats] == [o.class, o.respond_to(:name), o.respond_to(:stats)] end
+        end
       end
-      
+
       @player = Player.new
       @player.missions = [
         Player::Mission.new('Wasteland',         {buildings: 5, units: 10}),
@@ -39,7 +39,7 @@ describe "Object CRUD" do
       ]
     end
     after{remove_constants :Player}
-    
+
     it_should_behave_like 'embedded object CRUD'
-  end    
+  end
 end

data/spec/object/spec_helper.rb

@@ -0,0 +1,3 @@
+require 'mongo_db/model'
+
+require 'driver/spec_helper'

data/spec/test.rb

@@ -1,5 +1,10 @@
-require 'spec_helper'
+require 'driver/spec_helper'
 
-db = Mongo::Connection.new("localhost").db("default_test")
-p db.class
-puts db.methods.sort
+describe 'Test' do
+  with_mongo
+
+  it do
+    class A; end
+    db.units.save a: A.new
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo_db
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-13 00:00:00.000000000Z
+date: 2011-08-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &366240 !ruby/object:Gem::Requirement
+  requirement: &2844710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *366240
+  version_requirements: *2844710
 description: 
 email: 
 executables: []
@@ -32,33 +32,33 @@ files:
 - readme.md
 - lib/mongo_db/driver/core/collection.rb
 - lib/mongo_db/driver/core/database.rb
-- lib/mongo_db/driver/core/hash_helper.rb
 - lib/mongo_db/driver/core.rb
-- lib/mongo_db/driver/more/collection.rb
+- lib/mongo_db/driver/more/collection_finders.rb
 - lib/mongo_db/driver/more.rb
 - lib/mongo_db/driver/spec.rb
 - lib/mongo_db/driver.rb
 - lib/mongo_db/gems.rb
+- lib/mongo_db/model/model_helper.rb
+- lib/mongo_db/model/model_serializer.rb
 - lib/mongo_db/model.rb
 - lib/mongo_db/support.rb
-- lib/old/advanced_finders.rb
-- lib/old/query.rb
-- lib/old/query_spec.rb
 - spec/driver/core/collection_spec.rb
 - spec/driver/core/crud_spec.rb
 - spec/driver/core/database_spec.rb
 - spec/driver/core/hash_helper_spec.rb
+- spec/driver/example_spec.rb
+- spec/driver/fixes_spec.rb
 - spec/driver/more/querying_spec.rb
 - spec/driver/spec_helper.rb
-- spec/driver_example_spec.rb
 - spec/migration/migration_spec.rb
-- spec/model/model/crud.rb
-- spec/model/model/query.rb
-- spec/model/object/callbacks.rb
-- spec/model/object/crud.rb
-- spec/model/object/crud_shared.rb
-- spec/model/object/validation.rb
-- spec/model/spec_helper.rb
+- spec/model/callbacks.rb
+- spec/model/example.rb
+- spec/model/model_crud.rb
+- spec/model/validation.rb
+- spec/object/crud_shared.rb
+- spec/object/example_spec.rb
+- spec/object/object_crud_spec.rb
+- spec/object/spec_helper.rb
 - spec/test.rb
 homepage: http://github.com/alexeypetrushin/mongo_db
 licenses: []

data/lib/mongo_db/driver/core/hash_helper.rb

@@ -1,67 +0,0 @@
-require 'set'
-require 'date'
-
-class Mongo::Ext::HashHelper
-  # SIMPLE_TYPES = [
-  #   String, Symbol, 
-  #   Numeric, 
-  #   Regexp, 
-  #   Array, 
-  #   TrueClass, FalseClass, 
-  #   Date, DateTime,
-  #   BSON::ObjectId
-  # ].to_set
-  
-  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
-
-  class << self
-    # symbolizing hashes
-    def symbolize o
-      convert o 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
-      convert 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
-      convert update do |k, v, result|
-        k = "$#{k.to_s[1..-1]}".to_sym if UPDATE_KEYWORDS.include?(k)
-        result[k] = v
-      end
-    end
-
-    # converts hashes (also works with nested & arrays)
-    def convert o, &block
-      if o.is_a? Hash
-        result = {}
-        o.each do |k, v|
-          v = convert v, &block
-          block.call k, v, result
-        end
-        result
-      elsif o.is_a? Array
-        o.collect{|v| convert v, &block}
-      else        
-        o
-      end
-    end
-  end
-end

data/lib/old/advanced_finders.rb

@@ -1,26 +0,0 @@
-before do
-  @zeratul =  {name: 'Zeratul',  stats: {attack: 85, life: 300, shield: 100}}
-  @tassadar = {name: 'Tassadar', stats: {attack: 20,  life: 80,  shield: 300}}
-  
-  db.units.save @zeratul
-  db.units.save @tassadar
-end
-
-
-
-
-
-
-
-
-
-
-it "selector" do
-  db.units.select{|u| 
-    u.stats.life < 100
-    u.name.exist
-    u.name.in 
-  }.first.should == @tassadar
-  
-  db.units.select{|u| }
-end

data/lib/old/query.rb

@@ -1,91 +0,0 @@
-class Mongo::Ext::Query  
-  class Dsl < BasicObject
-    class Statement < ::Array      
-      def add_to hash
-        operator, value = self[-2, -1]
-        path = self[0..-3]
-                
-        current = hash
-        path.each_with_index do |key, index|
-          if index == path.size - 1
-            raise "dupliate key :#{key}!" if current.include? key
-            current[key] = value
-          else
-            raise "dupliate key :#{key}!" if current.include?(key) and !current[key].is_a?(Hash)
-            current[key] ||= {}
-            current = current[key]
-          end
-        end
-        nil
-      end
-    end
-    
-    def initialize &block
-      @statements = [Statement.new]
-      block.call self
-      statements.pop if statements.last.empty?
-    end
-    
-    {
-      :== => :==,
-      :!= => :$ne,
-      :<  => :$lt,
-      :<= => :$lte,
-      :>  => :$gt,
-      :>= => :$gte,
-    }.each do |ruby, mongo|
-      define_method ruby do |arg|
-        emit mongo
-        emit arg, true
-      end
-    end
-    
-    def to_hash
-      h = {}
-      statements.each{|s| h.add_to h}
-      h
-    end
-      
-    protected
-      attr_reader :statements
-    
-      def emit statement = nil, terminate = false
-        statements.last << statement if statement
-        statements << Statement.new if terminate
-        nil
-      end
-      
-      def method_missing m, *args, &block
-        raise "invalid usage, there can be only one argument (#{args})!" if args.size > 1
-                
-        if args.empty?
-          emit m
-          self
-        else
-          emit m
-          emit args.first, true
-        end
-      end
-      
-      def p *args
-        ::Kernel.p *args
-      end
-  end
-  
-  def initialize collection, &block
-    @collection = collection
-    @hash_query = Dsl.new(&block).to_hash
-  end
-  
-  def first
-    collection.first to_hash
-  end
-  
-  def all &block
-    collection.first to_hash, &block
-  end
-  alias_method :each, :all
-  
-  protected
-    attr_reader :collection, :hash_query
-end

data/lib/old/query_spec.rb

@@ -1,77 +0,0 @@
-require 'driver/spec_helper'
-
-describe "Query" do  
-  dsl_class = Mongo::Ext::Query::Dsl
-  dsl_class.class_eval do
-    public :statements
-  end
-  
-  it "operators" do
-    value = :value
-    dsl_class.new do |o|
-      o.key ==     value
-      o.key !=     value
-      o.key <      value
-      o.key <=     value
-      o.key >      value
-      o.key >=     value      
-      o.key.all    value
-      o.key.exists true
-      o.key.mod    value
-      o.key.in     value
-      o.key.nin    value
-      o.key.size   value
-      o.key.type   value
-    end.statements.should == [
-      [:key, :==,     :value],
-      [:key, :$ne,    :value],
-      [:key, :$lt,    :value],
-      [:key, :$lte,   :value],
-      [:key, :$gt,    :value],
-      [:key, :$gte,   :value],
-      [:key, :all,    :value],
-      [:key, :exists, true],
-      [:key, :mod,    :value],
-      [:key, :in,     :value],
-      [:key, :nin,    :value],
-      [:key, :size,   :value],
-      [:key, :type,   :value]
-    ]
-  end
-  
-  it ":nor, :or, :and"
-  
-  describe "statement" do
-    def process_statement *args
-      s = Mongo::Ext::Query::Dsl::Statement.new
-      s.push *args
-      result = {}
-      s.add_to result
-      result
-    end
-    
-    it "basics", focus: true do
-      p process_statement(:age, :$gt, 34)
-    end
-  end
-  
-  # it "to_hash" do
-  #   dsl.new do |o|
-  #     # o.name == 'Jim'
-  #     o.age  >  34
-  #   end.to_hash.should == {
-  #     # name: 'Jim',
-  #     :$gt => {age:  34}
-  #   }
-  # end
-  # 
-  # it do
-  #   dsl.new do |unit|
-  #     unit.name == 'Zeratul'
-  #     unit.stats.life > 100
-  #     unit.stats.attack != 0
-  #   end.statement.should == {
-  #     name: 1
-  #   }
-  # end
-end

data/spec/model/spec_helper.rb

@@ -1 +0,0 @@
-require 'mongo_model'