mongous 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '099aa151de9cf50a6c25b861ad877eafc6e16972f12f463181d735d8fb4ae71f'
-  data.tar.gz: b41e34b02325dcb2933ec9e195452d5e2a027ee375d56cb0fe44a2144b275928
+  metadata.gz: 3ac08d4dc3cd1b50de8ae75c4db5f63b9604abefa5890f046564d44619d75cf4
+  data.tar.gz: 446aae2fcd699ad4a27cc5f15790a00d84eaceff3e38ef4ded3b5aec425dcba4
 SHA512:
-  metadata.gz: a058325e628afba439934ea18e82a2cbc80e4053c00aff7c7ca3326da6be2b588a37361152c359e4ed558f375ab2c7bc1e77f6fe8968a62bdc432733298fc660
-  data.tar.gz: 8bc4c0bdef2be7e1c4bad582a5c0dc28f167fb0f99a7a74b800793b84c19db68a5a20564d8f7a6d6d41d210c78c78670bdd63ef12aec20f2375c56bb83237120
+  metadata.gz: ce0e4ff3b90f13ac1bdb328ecac4c8986120e780575dbb97a242638d2cfd2c11581963cc2141c2f09f3a184cdcef85420354f4a12d02eca890c66b1458c9ea8e
+  data.tar.gz: 6e78c1a620e8cdc974e9e60bca01f54b0127b225a7e1e0f567c7354ec7d43adf1cd2e3ffa72859f6805ffcacd8b3a198258763a4f14ab0f216b6f4d585d56e0d

data/README.adoc

@@ -128,9 +128,11 @@ Book.or( filter1, filter3 ).each do |book|
   p book
 end
 
-Book.find( {}, { projection: {_id: 0} } ).each do |book|
+Book.find( { title: /title/ }, { projection: {_id: 0} } ).each do |book|
   p book
 end
+
+pp Book.filter( title: /title/ )[0, 5].all
 ----
 
 === Update document
@@ -187,6 +189,19 @@ Mongous.connect( hosts_or_uri = nil, **opts )
 include Mongous::Document
 ----
 
+=== Bind another database.
+
+[source,ruby]
+----
+set_client( client )
+----
+
+* Result:
+  ** nil.
+
+* Parameter:
+  ** client:          Mongo::Client instance.
+
 === Declare document structure.
 
 [source,ruby]

data/README.ja.adoc

@@ -128,9 +128,11 @@ Book.or( filter1, filter3 ).each do |book|
   p book
 end
 
-Book.find( {}, { projection: {_id: 0} } ).each do |book|
+Book.find( { title: /title/ }, { projection: {_id: 0} } ).each do |book|
   p book
 end
+
+pp Book.filter( title: /title/ )[0, 5].all
 ----
 
 === ドキュメント更新
@@ -187,6 +189,19 @@ Mongous.connect( hosts_or_uri = nil, **opts )
 include Mongous::Document
 ----
 
+=== 別のデータベースを割り当てる.
+
+[source,ruby]
+----
+set_client( client )
+----
+
+* Result:
+  ** nil.
+
+* Parameter:
+  ** client:          Mongo::Client instance.
+
 === ドキュメントの要素を定義する.
 
 [source,ruby]

data/lib/mongous/extention.rb

@@ -10,7 +10,7 @@ module Mongous
       end
     end
 
-    def set_client( _client )
+    def client=( _client )
       m  =  /(.*?):(\d+)/.match( caller()[0] )
       call_from  =  [ m[1], m[2] ].join(":")
       if  !_client.is_a?( Mongo::Client )
@@ -28,7 +28,7 @@ module Mongous
       end
     end
 
-    def set_collection_name( _collection_name )
+    def collection_name=( _collection_name )
       self.class_variable_set( :@@collection_name, _collection_name )
       if self.class_variable_defined?( :@@collection )
         self.remove_class_variable( :@@collection )

data/lib/mongous/filter.rb

@@ -1,6 +1,10 @@
 
 module Mongous
   module Extention
+    def count
+      self.collection.find.count
+    end
+
     def first
       doc  =  self.collection.find.first
       self.new( **doc )    if doc
@@ -126,51 +130,59 @@ module Mongous
     end
 
     def option( _option )
-      self.option!( _option )
-      self.dup
-    end
-
-    def option!( _option )
       @option.merge!( _option )
+      self.dup
     end
 
     def projection( _projection )
-      self.projection!( _projection )
+      @projection  =  _projection
       self.dup
     end
     alias  :select  :projection
 
-    def projection!( _projection )
-      @projection  =  _projection
-    end
-
     def sort( _sort )
-      self.sort!( _sort )
+      @sort  =  _sort
       self.dup
     end
     alias  :order  :sort
 
-    def sort!( _sort )
-      @sort  =  _sort
-    end
-
     def skip( _skip )
-      self.skip!( _skip )
+      @skip  =  _skip
       self.dup
     end
     alias  :offset  :skip
 
-    def skip!( _skip )
-      @skip  =  _skip
-    end
-
     def limit( _limit )
-      self.limit!( _limit )
+      @limit  =  _limit
       self.dup
     end
 
-    def limit!( _limit )
-      @limit  =  _limit
+    def []( nth_or_range, len = 1 )
+      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
+
+      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
@@ -184,6 +196,19 @@ module Mongous
       found
     end
 
+    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
+      else
+        _count
+      end
+    end
+
     def first
       doc  =  do_find.first
       @klass.new( **doc )    if doc

data/lib/mongous/version.rb

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

data/sample/connect_auto_2.rb

@@ -5,7 +5,8 @@ $client  =  Mongous.connect
 
 class Book
   include  Mongous::Document
-  set_client  $client
+  self.client  =  $client
+  self.collection_name  =  "Book"
 end
 
 

data/sample/connect_default_2.rb

@@ -5,7 +5,8 @@ $client  =  Mongous.connect( ["localhost:27017"], database: "test" )
 
 class Book
   include  Mongous::Document
-  set_client  $client
+  self.client  =  $client
+  self.collection_name  =  "Book"
 end
 
 

data/sample/connect_environ_2.rb

@@ -5,7 +5,8 @@ $client  =  Mongous.connect( ENV["MONGOLAB_URI"] || "mongodb://localhost:27017/t
 
 class Book
   include  Mongous::Document
-  set_client  $client
+  self.client  =  $client
+  self.collection_name  =  "Book"
 end
 
 

data/sample/connect_loadfile_2.rb

@@ -6,7 +6,8 @@ $client  =  Mongous.connect( file: filepath, mode: ENV["RACK_ENV"] || "developme
 
 class Book
   include  Mongous::Document
-  set_client  $client
+  self.client  =  $client
+  self.collection_name  =  "Book"
 end
 
 

data/sample/query_basic_1.rb

@@ -11,6 +11,9 @@ end
 p book  =  Book.first
 puts
 
+p count  =  Book.count
+puts
+
 pp books  =  Book.all
 puts
 

data/sample/query_basic_2.rb

@@ -11,6 +11,9 @@ end
 p book  =  Book.filter( title: /title/ ).first
 puts
 
+p count  =  Book.filter( title: /title/ ).count
+puts
+
 pp books  =  Book.filter( title: /title/ ).all
 puts
 

data/sample/query_basic_7.rb

@@ -0,0 +1,38 @@
+
+require "mongous"
+
+Mongous.connect!
+
+class Book
+  include  Mongous::Document
+end
+
+
+p count  =  Book.filter.count
+puts
+
+p count  =  Book.filter[0..4].count
+puts
+
+p count  =  Book.filter[0...4].count
+puts
+
+p count  =  Book.filter[0, 4].count
+puts
+
+p count  =  Book.filter[20,10].count
+puts
+
+pp books  =  Book.filter[0, 2].all
+puts
+
+filter  =  Book.filter( title: /title/ )
+filter[0, 4].each do |book|
+  p book
+end
+puts
+filter[4, 4].each do |book|
+  p book
+end
+puts
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongous
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - arimay
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-04 00:00:00.000000000 Z
+date: 2020-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
@@ -98,6 +98,7 @@ files:
 - sample/query_basic_4.rb
 - sample/query_basic_5.rb
 - sample/query_basic_6.rb
+- sample/query_basic_7.rb
 - sample/query_detail_1.rb
 - sample/query_detail_2.rb
 - sample/query_detail_3.rb