mongous 0.1.2 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f126c03248f80e7dd9c674ddff08879a994ecf36d8c443d0bb43694f6a6fd53
-  data.tar.gz: d9c694cfd344075ec4d744a71562281ba61dac5c3df011154df0b65cd443041e
+  metadata.gz: 3ac08d4dc3cd1b50de8ae75c4db5f63b9604abefa5890f046564d44619d75cf4
+  data.tar.gz: 446aae2fcd699ad4a27cc5f15790a00d84eaceff3e38ef4ded3b5aec425dcba4
 SHA512:
-  metadata.gz: 867d5753bac0b0a1bea9b82b4a650fcda7233465cc9e03529488e533464ec86a0d9e387afa220bdc019de07522af96e53e644fbbd92d9e5e465c69af47b9b15e
-  data.tar.gz: e0cf057b86df920b3e2f47c26c6fedb8bcbf2ccdb5232cebb3ba3b0fd02ee7b71c90274e0ac3a168d01c5d4cd396131ba5872e286c039b91103924e1bb752689
+  metadata.gz: ce0e4ff3b90f13ac1bdb328ecac4c8986120e780575dbb97a242638d2cfd2c11581963cc2141c2f09f3a184cdcef85420354f4a12d02eca890c66b1458c9ea8e
+  data.tar.gz: 6e78c1a620e8cdc974e9e60bca01f54b0127b225a7e1e0f567c7354ec7d43adf1cd2e3ffa72859f6805ffcacd8b3a198258763a4f14ab0f216b6f4d585d56e0d

data/README.adoc

@@ -30,7 +30,7 @@ Or install it yourself as:
 
 == Usage
 
-=== Simple description
+=== Simple declaration
 
 [source,ruby]
 ----
@@ -91,18 +91,16 @@ book = Book.new( title: "title 2", price: 2000, style: "A5" )
 book.save
 
 doc = { title: "title 3", price: 3000, style: "A6" }
-Book.create( doc )
+Book.create( **doc )
 ----
 
 === Search document
 
 [source,ruby]
 ----
-books = Book.all
-pp books
+pp books = Book.all
 
-book = Book.filter( title: "title 1" ).first
-p book
+p book = Book.filter( title: "title 1" ).first
 
 books = Book.filter( title: /title/ ).all
 books.each do |book|
@@ -116,6 +114,25 @@ end
 Book.filter( price: (1..2000), style: ["A4","A5"] ).each do |book|
   p book
 end
+
+filter1 = Book.filter( title: /title/ )
+filter2 = Book.filter( price: (1..2000) )
+filter3 = Book.filter( style: ["A4","A5"] )
+Book.not( filter1 ).each do |book|
+  p book
+end
+Book.and( filter1, filter2 ).each do |book|
+  p book
+end
+Book.or( filter1, filter3 ).each do |book|
+  p book
+end
+
+Book.find( { title: /title/ }, { projection: {_id: 0} } ).each do |book|
+  p book
+end
+
+pp Book.filter( title: /title/ )[0, 5].all
 ----
 
 === Update document
@@ -172,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

@@ -91,18 +91,16 @@ book = Book.new( title: "title 2", price: 2000, style: "A5" )
 book.save
 
 doc = { title: "title 3", price: 3000, style: "A6" }
-Book.create( doc )
+Book.create( **doc )
 ----
 
 === ドキュメント検索
 
 [source,ruby]
 ----
-books = Book.all
-pp books
+pp books = Book.all
 
-book = Book.filter( title: "title 1" ).first
-p book
+p book = Book.filter( title: "title 1" ).first
 
 books = Book.filter( title: /title/ ).all
 books.each do |book|
@@ -116,6 +114,25 @@ end
 Book.filter( price: (1..2000), style: ["A4","A5"] ).each do |book|
   p book
 end
+
+filter1 = Book.filter( title: /title/ )
+filter2 = Book.filter( price: (1..2000) )
+filter3 = Book.filter( style: ["A4","A5"] )
+Book.not( filter1 ).each do |book|
+  p book
+end
+Book.and( filter1, filter2 ).each do |book|
+  p book
+end
+Book.or( filter1, filter3 ).each do |book|
+  p book
+end
+
+Book.find( { title: /title/ }, { projection: {_id: 0} } ).each do |book|
+  p book
+end
+
+pp Book.filter( title: /title/ )[0, 5].all
 ----
 
 === ドキュメント更新
@@ -172,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/document.rb

@@ -7,9 +7,9 @@ module Mongous
       end
     end
 
-    def initialize( doc = nil, **hash )
+    def initialize( **doc )
       @doc  =  {}
-      (doc || hash).each do |label, value|
+      doc.each do |label, value|
         label  =  label.to_s
         @doc[label]  =  value
       end

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 )
@@ -91,28 +91,12 @@ module Mongous
       end
     end
 
-    def create( doc = nil, **hash )
-      self.new( doc || hash ).save
+    def create( **doc )
+      self.new( **doc ).save
     end
 
-    def filter( **_filter )
-      Filter.new( self ).filter( _filter )
-    end
-
-    def first
-      Filter.new( self ).first
-    end
-
-    def all
-      Filter.new( self ).all
-    end
-
-    def each( &block )
-      Filter.new( self ).each( &block )
-    end
-
-    def delete
-      Filter.new( self ).delete
+    def find( conditios = {}, options = {} )
+      self.collection.find( conditios, options )
     end
 
     def field( label, *args, **opts, &block )

data/lib/mongous/filter.rb

@@ -1,4 +1,82 @@
 
+module Mongous
+  module Extention
+    def count
+      self.collection.find.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 filter( **conditions )
+      Filter.new( self ).filter( conditions )
+    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]})
+    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
+      end
+      Filter.new( self ).filter({"$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
+        when  Filter
+          filter.to_condition
+        else
+          raise  Mongous::Error, "Invalid args for #{self}.or. : #{filter}"
+        end
+      end
+      Filter.new( self ).filter({"$or" => conditions})
+    end
+  end
+end
+
 module Mongous
   class Filter
     def initialize( klass )
@@ -7,86 +85,104 @@ module Mongous
       @option  =  {}
     end
 
-    def filter( _filter )
+    def filter( conditions )
       hash  =  {}
-      _filter.each do |key, item|
-        case  item
-        when  Array
-          hash[key]  =  {"$in"=>item}
+      conditions.each do |key, item|
+        case  key
+        when  /\$(and|or|nor)/
+          hash[key]  =  item
 
-        when  Range
-          _begin_oper  =  "$gte"
-          _end_oper  =  item.exclude_end?  ?  "$lt"  :  "$lte"
+        else
+          case  item
+          when  Array
+            hash[key]  =  {"$in"=>item}
 
-          if      item.begin  &&   item.end
-            hash[key]  =  { _begin_oper => item.begin, _end_oper => item.end }
+          when  Range
+            _begin_oper  =  "$gte"
+            _end_oper  =  item.exclude_end?  ?  "$lt"  :  "$lte"
 
-          elsif  !item.begin  &&   item.end
-            hash[key]  =  { _end_oper => item.end }
+            if      item.begin  &&   item.end
+              hash[key]  =  { _begin_oper => item.begin, _end_oper => item.end }
 
-          elsif   item.begin  &&  !item.end
-            hash[key]  =  { _begin_oper => item.begin }
+            elsif  !item.begin  &&   item.end
+              hash[key]  =  { _end_oper => item.end }
 
-          else
-            raise  Mongous::Error, "invalid range. :  #{ item }"
+            elsif   item.begin  &&  !item.end
+              hash[key]  =  { _begin_oper => item.begin }
 
-          end
+            else
+              raise  Mongous::Error, "invalid range. :  #{ item }"
 
-        else
-          hash[key]  =  item
+            end
 
+          else
+            hash[key]  =  item
+
+          end
         end
       end
       @filter.merge!( hash )
       self.dup
     end
 
-    def option( _option )
-      self.option!( _option )
-      self.dup
+    def to_condition
+      @filter.dup
     end
 
-    def option!( _option )
+    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
@@ -100,14 +196,27 @@ 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
+      @klass.new( **doc )    if doc
     end
 
     def all
       do_find.map do |doc|
-        @klass.new( doc )
+        @klass.new( **doc )
       end
     end
 

data/lib/mongous/version.rb

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

data/mongous.gemspec

@@ -3,12 +3,13 @@ require_relative 'lib/mongous/version'
 Gem::Specification.new do |spec|
   spec.name          = "mongous"
   spec.version       = Mongous::VERSION
-  spec.authors       = ["ARIMA Yasuhiro"]
+  spec.authors       = ["arimay"]
   spec.email         = ["arima.yasuhiro@gmail.com"]
 
   spec.summary       = %q{ Mongo wrapper library. }
   spec.description   = %q{ Yet another lightweight mongo wrapper library. }
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
+  spec.homepage      = "https://github.com/arimay/mongous"
+  spec.license       = "MIT"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

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

@@ -8,11 +8,17 @@ class Book
 end
 
 
-book  =  Book.first
-p book
+p book  =  Book.first
+puts
+
+p count  =  Book.count
+puts
+
+pp books  =  Book.all
 puts
 
 Book.each do |book|
   p book
 end
+puts
 

data/sample/query_basic_2.rb

@@ -8,11 +8,17 @@ class Book
 end
 
 
-book  =  Book.filter( title: "title 1" ).first
-p book
+p book  =  Book.filter( title: /title/ ).first
+puts
+
+p count  =  Book.filter( title: /title/ ).count
+puts
+
+pp books  =  Book.filter( title: /title/ ).all
 puts
 
 Book.filter( title: /title/ ).each do |book|
   p book
 end
+puts
 

data/sample/query_basic_5.rb

@@ -18,22 +18,3 @@ Book.filter( page: (100...300) ).each do |book|
 end
 puts
 
-exit  if RUBY_VERSION < "2.6"
-
-Book.filter( page: (200..) ).each do |book|
-  p book
-end
-puts
-
-exit  if RUBY_VERSION < "2.7"
-
-Book.filter( page: (..200) ).each do |book|
-  p book
-end
-puts
-
-Book.filter( page: (...300) ).each do |book|
-  p book
-end
-puts
-

data/sample/query_basic_6.rb

@@ -0,0 +1,43 @@
+
+require "mongous"
+
+Mongous.connect!
+
+class Book
+  include  Mongous::Document
+end
+
+Book.new( title: "complex 1", author: "Alice", style: "A4", price: 1000, page: 100 ).save
+Book.new( title: "complex 2", author: "Bob",   style: "A5", price: 2000, page: 200 ).save
+Book.new( title: "complex 3", author: "Candy", style: "A6", price: 3000, page: 300 ).save
+
+filter1  =  Book.filter( title: /comp/ )
+filter2  =  Book.not( price: (2000...3000) )
+filter3  =  Book.and( filter1, filter2 ).select( _id: 0 )
+filter4  =  Book.or( filter1, filter2 ).select( _id: 0 )
+p filter1.to_condition
+p filter2.to_condition
+p filter3.to_condition
+p filter4.to_condition
+puts
+
+filter1.each do |book|
+  p book
+end
+puts
+
+filter2.each do |book|
+  p book
+end
+puts
+
+filter3.each do |book|
+  p book
+end
+puts
+
+filter4.each do |book|
+  p book
+end
+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
+

data/sample/query_super_1.rb

@@ -0,0 +1,32 @@
+
+require "mongous"
+
+Mongous.connect!
+
+class Book
+  include  Mongous::Document
+end
+
+
+p book  =  Book.find.first
+puts
+
+Book.find.each do |book|
+  p book
+end
+puts
+
+Book.find( title: /title/ ).each do |book|
+  p book
+end
+puts
+
+Book.find( {}, { projection: {_id: 0} } ).each do |book|
+  p book
+end
+puts
+
+Book.find( {title: /title/}, { projection: {_id: 0} } ).each do |book|
+  p book
+end
+

data/sample/save_basic_1.rb

@@ -9,10 +9,10 @@ end
 
 
 book  =  Book.new
-book.title  =  "title basic 2"
-book.author  =  "Bob"
-book.style  =  "A5"
-book.price  =  2000
-book.page  =  200
+book.title  =  "title basic 1"
+book.author  =  "Alice"
+book.style  =  "A4"
+book.price  =  1000
+book.page  =  100
 book.save
 

data/sample/save_basic_2.rb

@@ -8,6 +8,6 @@ class Book
 end
 
 
-book  =  Book.new( title: "title basic 1", author: "Alice", style: "A4", price: 1000, page: 100 )
+book  =  Book.new( title: "title basic 2", author: "Bob", style: "A5", price: 2000, page: 200 )
 book.save
 

data/sample/save_basic_3.rb

@@ -9,5 +9,5 @@ end
 
 
 doc  =  { title: "title basic 3", author: "Candy", style: "A6", price: 3000, page: 300 }
-Book.create( doc )
+Book.create( **doc )
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongous
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.8
 platform: ruby
 authors:
-- ARIMA Yasuhiro
+- arimay
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-30 00:00:00.000000000 Z
+date: 2020-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
@@ -97,13 +97,15 @@ files:
 - sample/query_basic_3.rb
 - 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
 - sample/query_limit_1.rb
 - sample/query_order_1.rb
 - sample/query_projection_1.rb
-- sample/query_raw_1.rb
+- sample/query_super_1.rb
 - sample/save_basic_1.rb
 - sample/save_basic_2.rb
 - sample/save_basic_3.rb
@@ -121,8 +123,9 @@ files:
 - sample/zap_basic_1.rb
 - sample/zap_basic_2.rb
 - sample/zap_basic_3.rb
-homepage: 
-licenses: []
+homepage: https://github.com/arimay/mongous
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -132,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/sample/query_raw_1.rb

@@ -1,33 +0,0 @@
-
-require "mongous"
-
-Mongous.connect!
-
-class Book
-  include  Mongous::Document
-end
-
-
-book  =  Book.collection.find.first
-p book
-puts
-
-Book.collection.find.each do |book|
-  p book
-end
-puts
-
-Book.collection.find( title: /title/ ).each do |book|
-  p book
-end
-puts
-
-Book.collection.find( {}, { projection: {_id: 0, title: 1, author: 1} } ).each do |book|
-  p book
-end
-puts
-
-Book.collection.find( {title: /title/}, { projection: {_id: 0, title: 1, author: 1} } ).each do |book|
-  p book
-end
-