mongous 0.3.0 → 0.4.0

data/lib/mongous/base.rb

@@ -81,11 +81,14 @@ module Mongous
     end
  
     def client
-      self.class_variable_get( :@@client )    rescue  nil
+      if not self.class_variable_defined?( :@@client )
+        connect!
+      end
+      self.class_variable_get( :@@client )
     end
 
     def client=( _client )
-      if  !_client.is_a?( ::Mongo::Client )
+      if not _client.is_a?( ::Mongo::Client )
         raise  Mongous::Error, "type invalid. :  #{ _client }"
       end
       self.class_variable_set( :@@client, _client )

data/lib/mongous/extention.rb

@@ -21,11 +21,11 @@ module Mongous
 
     def collection_name
       if self.class_variable_defined?( :@@collection_name )
-        self.class_variable_get( :@@collection_name )
-      else
-        _client_name  =  self.name
-        self.class_variable_set( :@@collection_name, _client_name )
+        value  =  self.class_variable_get( :@@collection_name )
+        return  value    if value
       end
+
+      self.class_variable_set( :@@collection_name, self.name )
     end
 
     def collection_name=( _collection_name )
@@ -35,14 +35,17 @@ module Mongous
       end
     end
 
-    def collection
-      if self.class_variable_defined?( :@@collection )
-        if  _collection  =  self.class_variable_get( :@@collection )
-          return  _collection
+    def collection( temp_collection_name = nil )
+      if  temp_collection_name.nil?
+        if self.class_variable_defined?( :@@collection )
+          if  _collection  =  self.class_variable_get( :@@collection )
+            return  _collection
+          end
         end
+        _collection_name  =  collection_name
+      else
+        _collection_name  =  temp_collection_name
       end
-
-      _collection_name  =  collection_name
       _client  =  client
 
       if  _client.database.collection_names.include?( _collection_name )
@@ -56,36 +59,39 @@ module Mongous
         _collection.indexes.create_one( keys, opts )    rescue  nil
       end
 
-      self.class_variable_set( :@@collection, _collection )
+      self.class_variable_set( :@@collection, _collection )    if temp_collection_name.nil?
+      _collection
     end
 
     def fields
-      self_class_variable( :@@fields, {} )
+      setup_class_variable( :@@fields, {} )
     end
 
     def symbols
-      self_class_variable( :@@symbols, {} )
+      setup_class_variable( :@@symbols, {} )
     end
 
     def blocks
-      self_class_variable( :@@blocks, {} )
+      setup_class_variable( :@@blocks, {} )
     end
 
     def indexes
-      self_class_variable( :@@indexes, [] )
+      setup_class_variable( :@@indexes, [] )
     end
 
     def filters
-      self_class_variable( :@@filters, {} )
+      setup_class_variable( :@@filters, {} )
     end
 
     def defaults
-      self_class_variable( :@@defaults, {} )
+      setup_class_variable( :@@defaults, {} )
     end
 
-    def self_class_variable( symbol, default )
+    def setup_class_variable( symbol, default = {}, &block )
       if self.class_variable_defined?( symbol )
         self.class_variable_get( symbol )
+      elsif block_given?
+        self.class_variable_set( symbol, block.call )
       else
         self.class_variable_set( symbol, default )
       end

data/lib/mongous/filter.rb

@@ -1,230 +1,273 @@
-
-module Mongous
-  module Extention
-    def count
-#     self.collection.find.count
-      self.collection.estimated_document_count
-    end
-
-    def first
-      doc  =  self.collection.find.first
-      self.new( **doc )    if doc
-    end
-
-    def all
-      self.collection.find.map do |doc|
-        self.new( **doc )
-      end
-    end
-
-    def each( &block )
-      all.each( &block )
-    end
-
-    def delete
-      self.collection.delete_many({})
-    end
-
-    def where( filter = nil, **conditions )
-      condition  =  normalize( filter, conditions )
-      Filter.new( self ).where( condition )
-    end
-
-    def not( filter = nil, **conditions )
-      raise  Mongous::Error, "Unset args for #{self}.not."    if filter.nil? && conditions.empty?
-
-      condition  =  normalize( filter, conditions )
-      Filter.new( self ).where({"$nor" => [condition]})
-    end
-
-    def and( *filters )
-      raise  Mongous::Error, "Unset args for #{self}.and."    if filters.empty?
-
-      conditions  =  filters.map do |filter|
-        normalize( filter, {} )
-      end
-      Filter.new( self ).where({"$and" => conditions})
-    end
-
-    def or( *filters )
-      raise  Mongous::Error, "Unset args for #{self}.or."    if filters.empty?
-
-      conditions  =  filters.map do |filter|
-        normalize( filter, {} )
-      end
-      Filter.new( self ).where({"$or" => conditions})
-    end
-
-    def normalize( filter, conditions )
-      condition  =  case  filter
-      when  Filter
-        filter.to_condition
-      when  Symbol
-        case  _filter  =  filters[filter]
-        when  Filter
-          _filter.to_condition
-        when  Hash
-          _filter
-        end
-      when  NilClass
-        Filter.new( self ).where( **conditions ).to_condition
-      else
-        caller_method  =  /`(.*?)'/.match( caller()[0] )[1]
-        raise  Mongous::Error, "Invalid args for #{self}.#{ caller_method }. : #{filter}, #{conditions}"
-      end
-    end
-  end
-end
-
-module Mongous
-  class Filter
-    def initialize( klass )
-      @klass  =  klass
-      @filter  =  {}
-      @option  =  {}
-    end
-
-    def where( conditions )
-      hash  =  {}
-      conditions.each do |key, item|
-        case  key
-        when  /\$(and|or|nor)/
-          hash[key]  =  item
-
-        else
-          case  item
-          when  Array
-            hash[key]  =  {"$in"=>item}
-
-          when  Range
-            _begin_oper  =  "$gte"
-            _end_oper  =  item.exclude_end?  ?  "$lt"  :  "$lte"
-
-            if      item.begin  &&   item.end
-              hash[key]  =  { _begin_oper => item.begin, _end_oper => item.end }
-
-            elsif  !item.begin  &&   item.end
-              hash[key]  =  { _end_oper => item.end }
-
-            elsif   item.begin  &&  !item.end
-              hash[key]  =  { _begin_oper => item.begin }
-
-            else
-              raise  Mongous::Error, "invalid range. :  #{ item }"
-
-            end
-
-          else
-            hash[key]  =  item
-
-          end
-        end
-      end
-      @filter.merge!( hash )
-      self.dup
-    end
-
-    def to_condition
-      @filter.dup
-    end
-
-    def option( _option )
-      @option.merge!( _option )
-      self.dup
-    end
-
-    def projection( _projection )
-      @projection  =  _projection
-      self.dup
-    end
-    alias  :select  :projection
-
-    def sort( _sort )
-      @sort  =  _sort
-      self.dup
-    end
-    alias  :order  :sort
-
-    def []( nth_or_range, len = nil )
-      case  nth_or_range
-      when  Integer
-        @skip  =  nth_or_range
-
-        if  len
-          raise  Mongous::Error, "invalid len. :  #{ len }"    if  !len.is_a? Integer || len <= 0
-          @limit  =  len
-        end
-
-      when  Range
-        from  =  nth_or_range.begin
-        raise  Mongous::Error, "invalid range. :  #{ nth_or_range }"    unless  from.is_a? Integer
-
-        to    =  nth_or_range.end
-        raise  Mongous::Error, "invalid range. :  #{ nth_or_range }"    unless  to.is_a? Integer
-
-        to  -=  1    if nth_or_range.exclude_end?
-        @skip  =  from
-        @limit  =  to - from + 1
-
-      else
-        raise  Mongous::Error, "invalid class. :  #{ nth_or_range }"
-
-      end
-
-      self.dup
-    end
-
-    def do_find
-      _filter  =  @filter
-      _option  =  @option.dup
-      _option[:projection]  =  @projection    if @projection
-      found  =  @klass.collection.find( _filter, _option )
-      found  =  found.sort( @sort )    if  @sort
-      found  =  found.skip( @skip )    if  @skip
-      found  =  found.limit( @limit )    if  @limit
-      found
-    end
-
-    def count
-      found  =  @klass.collection.find( @filter )
-      found  =  found.skip( @skip )    if  @skip
-      found  =  found.limit( @limit )    if  @limit
-      _count  =  found.count_documents
-      if  @skip
-        if  @skip > _count
-          0
-        elsif  @limit
-          [_count - @skip, @limit].min
-        else
-          _count - @skip
-        end
-      else
-        if  @limit
-          [_count, @limit].min
-        else
-          _count
-        end
-      end
-    end
-
-    def first
-      doc  =  do_find.first
-      @klass.new( **doc )    if doc
-    end
-
-    def all
-      do_find.map do |doc|
-        @klass.new( **doc )
-      end
-    end
-
-    def each( &block )
-      all.each( &block )
-    end
-
-    def delete
-      @klass.collection.delete_many( @filter )
-    end
-  end
-end
-
+
+module Mongous
+  module Extention
+    def count
+      self.collection.estimated_document_count
+    end
+
+    def first
+      doc  =  self.collection.find.first
+      self.new( **doc )    if doc
+    end
+
+    def all
+      self.collection.find.map do |doc|
+        self.new( **doc )
+      end
+    end
+
+    def each( &block )
+      all.each( &block )
+    end
+
+    def map( &block )
+      all.map( &block )
+    end
+
+    def delete
+      self.collection.delete_many({})
+    end
+
+    def attach( collection_name )
+      Filter.new( self ).attach( collection_name )
+    end
+
+    def select( *keys, **hash )
+      Filter.new( self ).select( *keys, **hash )
+    end
+
+    def where( filter = nil, **conditions )
+      condition  =  normalize( filter, conditions )
+      Filter.new( self ).where( condition )
+    end
+
+    def not( filter = nil, **conditions )
+      raise  Mongous::Error, "Unset args for #{self}.not."    if filter.nil? && conditions.empty?
+
+      condition  =  normalize( filter, conditions )
+      Filter.new( self ).where({"$nor" => [condition]})
+    end
+
+    def and( *filters )
+      raise  Mongous::Error, "Unset args for #{self}.and."    if filters.empty?
+
+      conditions  =  filters.map do |filter|
+        normalize( filter, {} )
+      end
+      Filter.new( self ).where({"$and" => conditions})
+    end
+
+    def or( *filters )
+      raise  Mongous::Error, "Unset args for #{self}.or."    if filters.empty?
+
+      conditions  =  filters.map do |filter|
+        normalize( filter, {} )
+      end
+      Filter.new( self ).where({"$or" => conditions})
+    end
+
+    def normalize( filter, conditions )
+      condition  =  case  filter
+      when  Filter
+        filter.to_condition
+      when  Symbol
+        case  _filter  =  filters[filter]
+        when  Filter
+          _filter.to_condition
+        when  Hash
+          _filter
+        end
+      when  NilClass
+        Filter.new( self ).where( **conditions ).to_condition
+      else
+        caller_method  =  /`(.*?)'/.match( caller()[0] )[1]
+        raise  Mongous::Error, "Invalid args for #{self}.#{ caller_method }. : #{filter}, #{conditions}"
+      end
+    end
+  end
+end
+
+module Mongous
+  class Filter
+    def initialize( klass )
+      @klass  =  klass
+      @filter  =  {}
+      @option  =  {}
+    end
+
+    def attach( collection_name )
+      w  =  self.dup
+      w.instance_variable_set( :@collection_name, collection_name.to_s )
+      w
+    end
+
+    def where( conditions )
+      hash  =  {}
+      conditions.each do |key, item|
+        case  key
+        when  /\$(and|or|nor)/
+          hash[key]  =  item
+
+        else
+          case  item
+          when  Array
+            hash[key]  =  {"$in"=>item}
+
+          when  Range
+            _begin_oper  =  "$gte"
+            _end_oper  =  item.exclude_end?  ?  "$lt"  :  "$lte"
+
+            if      item.begin  &&   item.end
+              hash[key]  =  { _begin_oper => item.begin, _end_oper => item.end }
+
+            elsif  !item.begin  &&   item.end
+              hash[key]  =  { _end_oper => item.end }
+
+            elsif   item.begin  &&  !item.end
+              hash[key]  =  { _begin_oper => item.begin }
+
+            else
+              raise  Mongous::Error, "invalid range. :  #{ item }"
+
+            end
+
+          else
+            hash[key]  =  item
+
+          end
+        end
+      end
+      w  =  self.dup
+      w.instance_variable_set( :@filter, @filter.merge( hash ) )
+      w
+    end
+
+    def to_condition
+      @filter.dup
+    end
+
+    def option( _option )
+      w  =  self.dup
+      w.instance_variable_set( :@option, @option.merge( _option ) )
+      w
+    end
+
+    def projection( *keys, **hash )
+      if not keys.empty?
+        _projection  =  Hash[ keys.zip( Array.new(keys.length, 1) ) ]
+      elsif not hash.empty?
+        _projection  =  hash
+      else
+        _projection  =  nil
+      end
+      w  =  self.dup
+      w.instance_variable_set( :@projection, _projection )
+      w
+    end
+    alias  :select  :projection
+
+    def sort( *keys, **hash )
+      if not keys.empty?
+        _sort  =  Hash[ keys.zip( Array.new( keys.length, 1 ) ) ]
+      elsif not hash.empty?
+        _sort  =  hash
+      else
+        _sort  =  nil
+      end
+      w  =  self.dup
+      w.instance_variable_set( :@sort, _sort )
+      w
+    end
+    alias  :order  :sort
+
+    def []( nth_or_range, len = nil )
+      case  nth_or_range
+      when  Integer
+        _skip  =  nth_or_range
+        _limit  =  nil
+
+        if  len
+          raise  Mongous::Error, "invalid len. :  #{ len }"    if  !len.is_a? Integer || len <= 0
+          _limit  =  len
+        end
+
+      when  Range
+        from  =  nth_or_range.begin
+        raise  Mongous::Error, "invalid range. :  #{ nth_or_range }"    unless  from.is_a? Integer
+
+        to    =  nth_or_range.end
+        raise  Mongous::Error, "invalid range. :  #{ nth_or_range }"    unless  to.is_a? Integer
+
+        to  -=  1    if nth_or_range.exclude_end?
+        _skip  =  from
+        _limit  =  to - from + 1
+
+      else
+        raise  Mongous::Error, "invalid class. :  #{ nth_or_range }"
+
+      end
+
+      w  =  self.dup
+      w.instance_variable_set( :@skip, _skip )
+      w.instance_variable_set( :@limit, _limit )
+      w
+    end
+
+    def exec_query
+      _filter  =  @filter
+      _option  =  @option.dup
+      _option[:projection]  =  @projection    if @projection
+      found  =  @klass.collection( @collection_name ).find( _filter, _option )
+      found  =  found.sort( @sort )    if  @sort
+      found  =  found.skip( @skip )    if  @skip
+      found  =  found.limit( @limit )    if  @limit
+      found
+    end
+
+    def count
+      found  =  @klass.collection.find( @filter )
+      found  =  found.skip( @skip )    if  @skip
+      found  =  found.limit( @limit )    if  @limit
+      _count  =  found.count_documents
+      if  @skip
+        if  @skip > _count
+          0
+        elsif  @limit
+          [_count - @skip, @limit].min
+        else
+          _count - @skip
+        end
+      else
+        if  @limit
+          [_count, @limit].min
+        else
+          _count
+        end
+      end
+    end
+
+    def first
+      doc  =  exec_query.first
+      @klass.new( **doc )    if doc
+    end
+
+    def all
+      exec_query.map do |doc|
+        @klass.new( **doc )
+      end
+    end
+
+    def each( &block )
+      all.each( &block )
+    end
+
+    def map( &block )
+      all.map( &block )
+    end
+
+    def delete
+      @klass.collection.delete_many( @filter )
+    end
+  end
+end
+