mongous 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf1d2cbfd528ed1a623833025cf965b5200a1f973ce1200609ae459e6167694f
-  data.tar.gz: 785aea052055755ec01bab88f47da0915371546d9c84f14a7876f968c79a5e3d
+  metadata.gz: 8b0a73aa23287619bdae717f683f04e266d582dca4a6d055b798cf32243c6566
+  data.tar.gz: 14e22dcbf25b3a0fa200023c9f770c549607060ddb03057b32c8c1ccee3b58c2
 SHA512:
-  metadata.gz: 706bcfdac572ee3864a70d47101a689142134f030f20c37123e33f64575bd046eea74a656bdce29487f93c441a4374d77b97e96989fd234940daaf81171ace19
-  data.tar.gz: e4c1f4dae468a78f376b2a89a612a7f419e39939b0b486451980857e24127e0420e2fb2dc13f8afe8a7e1cb6686a5c2c82ce3e1b6a7dc94609327f258a785d12
+  metadata.gz: b37766d78679cc2a6bee8bfe256da0a363344b6e349552f0491d5a0892fa1dfeb7cca90d4b2e326ac7687cdd2c3a0561fdfe9fca4ce71382029077d8c289e6de
+  data.tar.gz: b5e9fee3f8f9d4f34d5203b9b260559d8ee1ca86e659d85629ef9c1b700bcfcb450b7ffc0447b7f3fa8c4245634f2e968619f9ba451c9591016e13c07d23060f

data/README.adoc

@@ -38,7 +38,7 @@ Or install it yourself as:
 ----
 require  "mongous"
 
-Mongous.attach!  :Book
+Mongous.document!  :Book
 ----
 
 === Detail declaration
@@ -102,7 +102,8 @@ Book.create( **doc )
 ----
 pp books = Book.all
 
-p book = Book.where( title: "title 1" ).first
+p book = Book.where( title: /title/ ).first
+p book = Book.where( title: /title/ ).last
 
 books = Book.where( title: /title/ ).all
 books.each do |book|
@@ -198,7 +199,7 @@ Mongous.connect( hosts_or_uri = nil, **options )
 
 [source,ruby]
 ----
-Mongous.attach!( *names )
+Mongous.document!( *names, **options )
 ----
 
 * Result:
@@ -206,6 +207,8 @@ Mongous.attach!( *names )
 
 * Parameter:
   ** names:           Collection names. (String or Symbol)
+  ** options:         Options.
+    *** timestamp:    If true then add fields :created_at, :updated_at.
 
 === Include document functions into collection operate class.
 

data/README.ja.adoc

@@ -38,7 +38,7 @@ gem 'mongous'
 ----
 require  "mongous"
 
-Mongous.attach!  :Book
+Mongous.document!  :Book
 ----
 
 === 詳細な定義
@@ -102,7 +102,8 @@ Book.create( **doc )
 ----
 pp books = Book.all
 
-p book = Book.where( title: "title 1" ).first
+p book = Book.where( title: /title/ ).first
+p book = Book.where( title: /title/ ).last
 
 books = Book.where( title: /title/ ).all
 books.each do |book|
@@ -198,7 +199,7 @@ Mongous.connect( hosts_or_uri = nil, **options )
 
 [source,ruby]
 ----
-Mongous.attach!( *names )
+Mongous.document!( *names, **options )
 ----
 
 * Result:
@@ -206,6 +207,8 @@ Mongous.attach!( *names )
 
 * Parameter:
   ** names:           コレクション名. (String または Symbol)
+  ** options:         オプション
+    *** timestamp:    真のとき, フィールド :created_at, :updated_at を追加する.
 
 === コレクション操作クラスにドキュメントの機能を取り入れる.
 

data/lib/mongous/base.rb

@@ -50,7 +50,7 @@ module Mongous
       self.class_variable_set( :@@client, _client )
     end
 
-    def attach!( *names )
+    def document!( *names, **opts )
       raise  Mongous::Error, "missing argument."   if names.empty?
 
       names.each do |name|
@@ -72,13 +72,23 @@ module Mongous
           end
         end
 
-        Object.class_eval <<-CLASS
+        klass  =  Object.class_eval <<-CLASS
           class #{name}
             include Mongous::Document
           end
         CLASS
+
+        if opts[:timestamp]
+          klass.class_eval do
+            field  :created_at, Time, create: proc{ Time.now }
+            field  :updated_at, Time, update: proc{ Time.now }
+            index  :created_at
+            index  :updated_at
+          end
+        end
       end
     end
+    alias  :attach!  :document!
  
     def client
       if not self.class_variable_defined?( :@@client )

data/lib/mongous/extention.rb

@@ -101,6 +101,10 @@ module Mongous
       self.new( **doc ).save
     end
 
+    def drop
+      self.collection.drop
+    end
+
     def find( conditios = {}, options = {} )
       self.collection.find( conditios, options )
     end

data/lib/mongous/filter.rb

@@ -5,11 +5,6 @@ module Mongous
       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 )
@@ -32,6 +27,22 @@ module Mongous
       Filter.new( self ).attach( collection_name )
     end
 
+    def []( nth_or_range, len = nil )
+      Filter.new( self )[ nth_or_range, len ]
+    end
+
+    def first
+      Filter.new( self ).first
+    end
+
+    def last
+      Filter.new( self ).last
+    end
+
+    def sort( *keys, **hash )
+      Filter.new( self ).sort( *keys, **hash )
+    end
+
     def select( *keys, **hash )
       Filter.new( self ).select( *keys, **hash )
     end
@@ -45,7 +56,7 @@ module Mongous
       raise  Mongous::Error, "Unset args for #{self}.not."    if filter.nil? && conditions.empty?
 
       condition  =  normalize( filter, conditions )
-      Filter.new( self ).where({"$nor" => [condition]})
+      Filter.new( self ).not( condition )
     end
 
     def and( *filters )
@@ -101,7 +112,7 @@ module Mongous
       w
     end
 
-    def where( conditions )
+    def build_condition( conditions )
       hash  =  {}
       conditions.each do |key, item|
         case  key
@@ -137,11 +148,23 @@ module Mongous
           end
         end
       end
+      hash
+    end
+
+    def where( conditions )
+      hash  =  build_condition( conditions )
       w  =  self.dup
       w.instance_variable_set( :@filter, @filter.merge( hash ) )
       w
     end
 
+    def not( conditions )
+      hash  =  build_condition( conditions )
+      w  =  self.dup
+      w.instance_variable_set( :@filter, @filter.merge( {"$nor" => [hash]} ) )
+      w
+    end
+
     def to_condition
       @filter.dup
     end
@@ -152,7 +175,7 @@ module Mongous
       w
     end
 
-    def projection( *keys, **hash )
+    def select( *keys, **hash )
       if not keys.empty?
         _projection  =  Hash[ keys.zip( Array.new(keys.length, 1) ) ]
       elsif not hash.empty?
@@ -164,7 +187,6 @@ module Mongous
       w.instance_variable_set( :@projection, _projection )
       w
     end
-    alias  :select  :projection
 
     def sort( *keys, **hash )
       if not keys.empty?
@@ -178,17 +200,20 @@ module Mongous
       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
+        if  len.is_a?(NilClass)
+          _limit  =  1
+        elsif  len.is_a?(Integer) && len == 0
+          _limit  =  nil
+        elsif  len.is_a?(Integer) && len > 0
           _limit  =  len
+        else
+          raise  Mongous::Error, "invalid len. :  #{ len }"
         end
 
       when  Range
@@ -247,7 +272,25 @@ module Mongous
     end
 
     def first
-      doc  =  exec_query.first
+      _filter  =  @filter
+      _option  =  @option.dup
+      _option[:projection]  =  @projection    if @projection
+      found  =  @klass.collection( @collection_name ).find( _filter, _option )
+      _order  =  @sort  ||  { _id: 1 }
+      doc  =  found.sort( _order ).first
+      @klass.new( **doc )    if doc
+    end
+
+    def last
+      _filter  =  @filter
+      _option  =  @option.dup
+      _option[:projection]  =  @projection    if @projection
+      found  =  @klass.collection( @collection_name ).find( _filter, _option )
+      _order  =  {}
+      ( @sort  ||  {_id: 1} ).each do |k,v|
+        _order[k]  =  - v
+      end
+      doc  =  found.sort( _order ).first
       @klass.new( **doc )    if doc
     end
 

data/lib/mongous/version.rb

@@ -1,3 +1,3 @@
 module Mongous
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/sample/connect_auto_0.rb

@@ -1,7 +1,7 @@
 
 require "mongous"
 
-Mongous.attach!  :Book
+Mongous.document!  :Book
 
 Book.each do |book|
   p book

data/sample/declare_compact_1.rb

@@ -1,8 +1,6 @@
 
 require "mongous"
 
-Mongous.connect!
-
 class Book
   include  Mongous::Document
 end

data/sample/declare_compact_2.rb

@@ -0,0 +1,38 @@
+
+require "mongous"
+
+Mongous.document!  :Book1
+
+book  =  Book1.new
+book.title       =  "book1"
+book.save
+
+book  =  Book1.where( title: "book1" ).first
+book.author      =  "alice"
+book.save
+
+Book1.each do |book|
+  pp book
+end
+puts
+
+Book1.drop
+
+
+Mongous.document!  :Book2, timestamp: true
+
+book  =  Book2.new
+book.title       =  "book2"
+book.save
+
+book  =  Book2.where( title: "book2" ).first
+book.author      =  "bob"
+book.save
+
+Book2.each do |book|
+  pp book
+end
+puts
+
+Book2.drop
+

data/sample/declare_label_1.rb

@@ -1,8 +1,6 @@
 
 require  "mongous"
 
-Mongous.connect!
-
 class Book
   include  Mongous::Document
 

data/sample/declare_ndex_1.rb

@@ -1,8 +1,6 @@
 
 require  "mongous"
 
-Mongous.connect!
-
 class Book
   include  Mongous::Document
 

data/sample/declare_ndex_2.rb

@@ -1,8 +1,6 @@
 
 require  "mongous"
 
-Mongous.connect!
-
 class Book
   include  Mongous::Document
 

data/sample/declare_strict_1.rb

@@ -1,8 +1,6 @@
 
 require  "mongous"
 
-Mongous.connect!
-
 class Book
   include  Mongous::Document
 

data/sample/declare_strict_2.rb

@@ -1,8 +1,6 @@
 
 require  "mongous"
 
-Mongous.connect!
-
 class Book
   include  Mongous::Document
 

data/sample/multi_collection_1.rb

@@ -1,8 +1,6 @@
 
 require "mongous"
 
-Mongous.connect!
-
 class Book1
   include  Mongous::Document
 end

data/sample/multi_collection_2.rb

@@ -1,8 +1,6 @@
 
 require "mongous"
 
-Mongous.connect!
-
 class Book1
   include  Mongous::Document
 end

data/sample/multi_collection_3.rb

@@ -1,24 +1,22 @@
 
 require "mongous"
 
-Mongous.connect!
-
-Mongous.attach!  :Book1
-Mongous.attach!  :Book2
-Mongous.attach!  :Book3
+Mongous.document!  :Book1
+Mongous.document!  :Book2
+Mongous.document!  :Book3
 
 pp Book1.collection
 pp Book2.collection
 pp Book3.collection
 
-Mongous.attach!  :Book1
-Mongous.attach!  :Book2, :Book3
+Mongous.document!  :Book1
+Mongous.document!  :Book2, :Book3
 
 pp Book1.collection
 pp Book2.collection
 pp Book3.collection
 
-Mongous.attach!  :Book1, :Book2, :Book3
+Mongous.document!  :Book1, :Book2, :Book3
 
 pp Book1.collection
 pp Book2.collection

data/sample/query_basic_1.rb

@@ -1,21 +1,27 @@
 
 require "mongous"
 
-Mongous.connect!
-
 class Book
   include  Mongous::Document
 end
 
+p "book  =  Book.first"
 p book  =  Book.first
 puts
 
+p "book  =  Book.last"
+p book  =  Book.last
+puts
+
+p "count  =  Book.count"
 p count  =  Book.count
 puts
 
+p "books  =  Book.all"
 pp books  =  Book.all
 puts
 
+p "Book.each do |book|"
 Book.each do |book|
   p book
 end