mongous 0.1.8 → 0.2.0

data/lib/mongous/document.rb

@@ -26,33 +26,58 @@ module Mongous
       end
     end
 
-    def having?( value )
-      case  value
+    def having?( label )
+      case  label
       when  NilClass
         false
       when  String
-        !value.strip.empty?
+        !label.strip.empty?
       else
         true
       end
     end
 
+    def getvalue_or_callproc( value_or_proc )
+      case  value_or_proc
+      when  Proc
+        value_or_proc.call
+      else
+        value_or_proc
+      end
+    end
+
     def save
+      if  @doc["_id"].nil? || self.class.collection.find( { "_id"=> @doc["_id"] } ).count == 0
+        savemode  =  :create
+      else
+        savemode  =  :update
+      end
       self.class.fields.each do |label, field|
-        _must  =  field[:_args].include?(:must)
+        _must  =  field[:_attrs].include?(:must)
         if  @doc.has_key?(label)
           if  _must  &&  !having?( @doc[label] )
             raise  Mongous::Error, "must and not having field. : #{ label }"
           end
         else
-          if  block  =  field[:_block]
-            self[label]  =  block.call
+          if  default_value  =  getvalue_or_callproc( field[:default] )
+            self[label]  =  default_value
           elsif  _must
             raise  Mongous::Error, "must and unassigned field. : #{ label }"
           elsif  self.class.symbols[:strict]
             self[label]  =  nil
           end
         end
+
+        case  savemode
+        when  :create
+          if  create_value  =  getvalue_or_callproc( field[:create] )
+            self[label]  =  create_value
+          end
+        when  :update
+          if  update_value  =  getvalue_or_callproc( field[:update] )
+            self[label]  =  update_value
+          end
+        end
       end
 
       self.class.blocks.each do |call_from, block|
@@ -61,15 +86,13 @@ module Mongous
         end
       end
 
-      if  @doc["_id"]
-        _filter  =  { "_id"=> @doc["_id"] }
-        if  self.class.collection.find( _filter ).first
-          self.class.collection.update_one( _filter, { '$set' => @doc } )
-          return  self
-        end
+      case  savemode
+      when  :create
+        self.class.collection.insert_one( @doc )
+      when  :update
+        self.class.collection.update_one( { "_id"=> @doc["_id"] }, { '$set' => @doc } )
       end
 
-      self.class.collection.insert_one( @doc )
       self
     end
 
@@ -108,18 +131,18 @@ module Mongous
       return  @doc[label]  =  value    if field.nil?
 
       types  =  []
-      if  args  =  field[:_args]  ||  []
-        args.each do |arg|
-          if  arg.class == Class
-            types  <<  arg
-            args  -=  [arg]
+      if  attrs  =  field[:_attrs]  ||  []
+        attrs.each do |attr|
+          if  attr.class == Class
+            types  <<  attr
+            attrs  -=  [attr]
             break
           end
         end
       end
 
       if  !types.empty?
-        if  !(args & [:must, :not_null]).empty?
+        if  !(attrs & [:must, :not_null]).empty?
           if  !types.include?( value.class )
             raise  Mongous::Error, "invalid type. : #{ label } : #{ value.class }"
           end
@@ -129,7 +152,7 @@ module Mongous
           end
         end
       else
-        if  !(args & [:must, :not_null]).empty?
+        if  !(attrs & [:must, :not_null]).empty?
           if  [NilClass].include?( value.class )
             raise  Mongous::Error, "invalid type. : #{ label } : #{ value.class }"
           end
@@ -138,19 +161,19 @@ module Mongous
 
       @doc[label]  =  value
 
-      args.each do |arg|
-        case  arg
+      attrs.each do |attr|
+        case  attr
         when  Proc
-          if  !self.instance_eval( &arg )
+          if  !self.instance_eval( &attr )
             raise  Mongous::Error, "violation detected. : #{ label } : #{ value }"
           end
         when  Array
-          if  !arg.include?( value )
-            raise  Mongous::Error, "not include. : #{ label } :#{ value }"
+          if  !attr.include?( value )
+            raise  Mongous::Error, "not include. : #{ label } : #{ value }"
           end
         when  Range
-          if  !arg.cover?( value )
-            raise  Mongous::Error, "out of range. : #{ label } :#{ value }"
+          if  !attr.cover?( value )
+            raise  Mongous::Error, "out of range. : #{ label } : #{ value }"
           end
         end
       end

data/lib/mongous/extention.rb

@@ -60,34 +60,34 @@ module Mongous
     end
 
     def fields
-      if self.class_variable_defined?( :@@fields )
-        self.class_variable_get( :@@fields )
-      else
-        self.class_variable_set( :@@fields, {} )
-      end
+      self_class_variable( :@@fields, {} )
     end
 
     def symbols
-      if self.class_variable_defined?( :@@symbols )
-        self.class_variable_get( :@@symbols )
-      else
-        self.class_variable_set( :@@symbols, {} )
-      end
+      self_class_variable( :@@symbols, {} )
     end
 
     def blocks
-      if self.class_variable_defined?( :@@blocks )
-        self.class_variable_get( :@@blocks )
-      else
-        self.class_variable_set( :@@blocks, {} )
-      end
+      self_class_variable( :@@blocks, {} )
     end
 
     def indexes
-      if self.class_variable_defined?( :@@indexes )
-        self.class_variable_get( :@@indexes )
+      self_class_variable( :@@indexes, [] )
+    end
+
+    def filters
+      self_class_variable( :@@filters, {} )
+    end
+
+    def defaults
+      self_class_variable( :@@defaults, {} )
+    end
+
+    def self_class_variable( symbol, default )
+      if self.class_variable_defined?( symbol )
+        self.class_variable_get( symbol )
       else
-        self.class_variable_set( :@@indexes, [] )
+        self.class_variable_set( symbol, default )
       end
     end
 
@@ -99,38 +99,32 @@ module Mongous
       self.collection.find( conditios, options )
     end
 
-    def field( label, *args, **opts, &block )
+    def field( symbol, *attrs, **items )
       m  =  /(.*?):(\d+)/.match( caller()[0] )
       call_from  =  [ m[1], m[2] ].join(":")
 
-      args.each do |arg|
-        if klass  =  arg.class 
+      attrs.each do |attr|
+        if klass  =  attr.class 
           if ![Class, Range, Array, Proc, Symbol].include?(klass)
-            raise  Mongous::Error, "field error. :  #{arg} on #{ label } at #{ call_from }"
+            raise  Mongous::Error, "field args error. : #{ attr } on #{ symbol } at #{ call_from }"
           end
         end
       end
 
-      opts.each do |key, value|
-        case  key
-        when  :default
-          case  value
-          when  Proc, String, Numeric
-          else
-            raise  Mongous::Error, "field error. : #{key} on #{ label } at #{ call_from }"
-          end
-        end
+      items.each do |key, value|
+        next    if [:default, :create, :update].include?(key) && [Proc, String, Numeric].include?(value.class)
+
+        raise  Mongous::Error, "field opts error. : #{key} on #{ symbol } at #{ call_from }"
       end
 
-      opts[:_args]  =  args
-      opts[:_block]  =  block
-      fields[label.to_s]  =  opts
+      items[:_attrs]  =  attrs
+      fields[symbol.to_s]  =  items
     end
 
-    def verify( *syms, &block )
-      if !syms.empty?
-        syms.each do |sym|
-          symbols[sym]  =  true
+    def verify( *directives, &block )
+      if !directives.empty?
+        directives.each do |directive|
+          symbols[directive]  =  true
         end
       elsif block
         m  =  /(.*?):(\d+)/.match( caller()[0] )
@@ -139,13 +133,26 @@ module Mongous
       end
     end
 
-    def index( *syms, **opts )
-      opts[:background]  =  true    unless opts.has_key?(:background)
+    def index( *symbols, **options )
+      options[:background]  =  true    unless  options.has_key?(:background)
       keys  =  {}
-      syms.each do |sym|
-        keys[sym]  =  1
+      symbols.each do |symbol|
+        keys[symbol]  =  1
+      end
+      indexes.push  <<  [keys, options]
+    end
+
+    def filter( symbol, filter_or_condition )
+      case  filter_or_condition
+      when  Filter
+        filters[symbol]  =  filter_or_condition.to_condition
+      when  Hash
+        filters[symbol]  =  filter_or_condition
+      else
+        m  =  /(.*?):(\d+)/.match( caller()[0] )
+        call_from  =  [ m[1], m[2] ].join(":")
+        raise  Mongous::Error, "filter error. : #{symbol}, #{filter_or_condition} at #{ call_from }"
       end
-      indexes.push  <<  [keys, opts]
     end
   end
 end

data/lib/mongous/filter.rb

@@ -24,55 +24,53 @@ module Mongous
       self.collection.delete_many({})
     end
 
-    def filter( **conditions )
-      Filter.new( self ).filter( conditions )
+    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?
 
-      filter  ||=  conditions
-      condition  =  case filter
-      when  Hash
-        Filter.new( self ).filter( filter ).to_condition
-      when  Filter
-        filter.to_condition
-      else
-        raise  Mongous::Error, "Invalid args for #{self}.not. : #{filter}"
-      end
-      Filter.new( self ).filter({"$nor" => [condition]})
+      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|
-        case  filter
-        when  Hash
-          filter
-        when  Filter
-          filter.to_condition
-        else
-          raise  Mongous::Error, "Invalid args for #{self}.and. : #{filter}"
-        end
+        normalize( filter, {} )
       end
-      Filter.new( self ).filter({"$and" => conditions})
+      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|
-        case  filter
-        when  Hash
-          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
-        else
-          raise  Mongous::Error, "Invalid args for #{self}.or. : #{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
-      Filter.new( self ).filter({"$or" => conditions})
     end
   end
 end
@@ -85,7 +83,7 @@ module Mongous
       @option  =  {}
     end
 
-    def filter( conditions )
+    def where( conditions )
       hash  =  {}
       conditions.each do |key, item|
         case  key
@@ -146,25 +144,15 @@ module Mongous
     end
     alias  :order  :sort
 
-    def skip( _skip )
-      @skip  =  _skip
-      self.dup
-    end
-    alias  :offset  :skip
-
-    def limit( _limit )
-      @limit  =  _limit
-      self.dup
-    end
-
-    def []( nth_or_range, len = 1 )
+    def []( nth_or_range, len = nil )
       case  nth_or_range
       when  Integer
-        raise  Mongous::Error, "invalid nth. :  #{ nth_or_range }"    if  len < 0
         @skip  =  nth_or_range
 
-        raise  Mongous::Error, "invalid len. :  #{ len }"    if  !len.is_a? Integer || len <= 0
-        @limit  =  len
+        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
@@ -198,14 +186,20 @@ module Mongous
 
     def count
       _count  =  do_find.count
-      if  @skip  &&  @limit
-        [_count - @skip, @limit].min
-      elsif  @skip.nil?  &&  @limit
-        [_count, @limit].min
-      elsif  @skip  &&  @limit.nil?
-        [_count - @skip, 0].max
+      if  @skip
+        if  @skip > _count
+          0
+        elsif  @limit
+          [_count - @skip, @limit].min
+        else
+          _count - @skip
+        end
       else
-        _count
+        if  @limit
+          [_count, @limit].min
+        else
+          _count
+        end
       end
     end
 

data/lib/mongous/version.rb

@@ -1,3 +1,3 @@
 module Mongous
-  VERSION = "0.1.8"
+  VERSION = "0.2.0"
 end

data/sample/declare_compact_1.rb

@@ -9,7 +9,7 @@ end
 
 
 book  =  Book.new
-book.title       =  "title compact"
+book.title       =  "declare compact"
 book.author      =  "foobar"
 book.publisher   =  nil
 book.style       =  "A4"

data/sample/declare_label_1.rb

@@ -21,7 +21,7 @@ end
 
 
 book  =  Book.new
-book.title       =  "title label"
+book.title       =  "declare label"
 book.author      =  "foobar"
 book.publisher   =  nil
 book.style       =  "A5"