mongous 0.1.0 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95182d94474fd128deef15317dc1131c44d3eee27e920f1cfca3030cc387a3dc
-  data.tar.gz: 2f11edcd8442be189916eadd722e131c2b63a70030285f42bc7347937351ab66
+  metadata.gz: 6616ba889ba858cb82f877ba24bb755ec8e205aa9b8c70738864ce855d5ebb52
+  data.tar.gz: d733c6a2bcaeec6725f51f2e7638f8fd9cd99c7decfe568fcf0b80ee98cd3ebb
 SHA512:
-  metadata.gz: 337bd873fe2ac4323cd1fd3606a32058f669ffe9aaf8ac6f0778b37959d771d47a79b0a54739f2864d525c6283868f96676a1980631e56bd8e962b4f967d7298
-  data.tar.gz: 4881ebeeb6e17ccbcfab55ba050485974225a76790f9ccc19a06192c3c179669d5b6aadb3f955f9e2cd673bd2fee8b8562c1713b58418ac898f3c5d1cdfaf972
+  metadata.gz: 7ae43077eadf5806fe60e766050a58dfb926de35ebe50f7af0e2f7a37b3b9675112cdd3a80ca95837c93513b0286154caab863f125b3f33d0e4958ed14b6237a
+  data.tar.gz: 2e21b03862a403e6839ca2c6e569879c06e3c6f3f5e6fb63409ee6799a0257443a8e2c6612bf4a35956aa4cd931f108c2c3640c8a71c8749fa90b8913b7ac98d

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,23 @@ 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( {}, { projection: {_id: 0} } ).each do |book|
+  p book
+end
 ----
 
 === Update document
@@ -155,7 +170,6 @@ Mongous.connect!( hosts_or_uri = nil, **opts )
     *** database:     Database name. (default: "test")
     *** *             Other optional arguments for Mongo::Client.new.
 
-  ** label:           Field label symbol.
 === Connect database.
 
 [source,ruby]
@@ -164,7 +178,7 @@ Mongous.connect( hosts_or_uri = nil, **opts )
 ----
 
 * Result:
-  ** Mongous::Client.
+  ** Mongo::Client.
 
 === Include document functions.
 

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,23 @@ 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( {}, { projection: {_id: 0} } ).each do |book|
+  p book
+end
 ----
 
 === ドキュメント更新
@@ -163,7 +178,7 @@ Mongous.connect( hosts_or_uri = nil, **opts )
 ----
 
 * Result:
-  ** Mongous::Client.
+  ** Mongo::Client.
 
 === ドキュメントの機能を取り入れる.
 

data/lib/mongous/extention.rb

@@ -95,24 +95,8 @@ module Mongous
       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,78 @@
 
+module Mongous
+  module Extention
+    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
+      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,40 +81,50 @@ 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 to_condition
+      @filter.dup
+    end
+
     def option( _option )
       self.option!( _option )
       self.dup

data/lib/mongous/version.rb

@@ -1,3 +1,3 @@
 module Mongous
-  VERSION = "0.1.0"
+  VERSION = "0.1.5"
 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{ Yet another mongo wrapper library. }
-  spec.description   = %q{ It depends only on mongodb and bson, except for the built-in and standard attachment libraries. }
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
+  spec.summary       = %q{ Mongo wrapper library. }
+  spec.description   = %q{ Yet another lightweight mongo wrapper library. }
+  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/query_basic_1.rb

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

data/sample/query_basic_2.rb

@@ -8,11 +8,14 @@ class Book
 end
 
 
-book  =  Book.filter( title: "title 1" ).first
-p book
+p book  =  Book.filter( title: /title/ ).first
+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( author: /Candy/ )
+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_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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongous
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.5
 platform: ruby
 authors:
-- ARIMA Yasuhiro
+- arimay
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-30 00:00:00.000000000 Z
+date: 2020-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
@@ -52,8 +52,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: " It depends only on mongodb and bson, except for the built-in and standard
-  attachment libraries. "
+description: " Yet another lightweight mongo wrapper library. "
 email:
 - arima.yasuhiro@gmail.com
 executables: []
@@ -98,13 +97,14 @@ files:
 - sample/query_basic_3.rb
 - sample/query_basic_4.rb
 - sample/query_basic_5.rb
+- sample/query_basic_6.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
@@ -122,8 +122,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: []
@@ -133,7 +134,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -143,5 +144,5 @@ requirements: []
 rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
-summary: Yet another mongo wrapper library.
+summary: Mongo wrapper library.
 test_files: []

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
-