mongous 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f126c03248f80e7dd9c674ddff08879a994ecf36d8c443d0bb43694f6a6fd53
-  data.tar.gz: d9c694cfd344075ec4d744a71562281ba61dac5c3df011154df0b65cd443041e
+  metadata.gz: de69281ec1896f88f5b8d5c7c30654a12559cf3a7c97ea7d58cd2fde6e8579fd
+  data.tar.gz: 8db5720698450a5f9fcbf912fab5611d800588e02bfea09141c9bf23a1c0a088
 SHA512:
-  metadata.gz: 867d5753bac0b0a1bea9b82b4a650fcda7233465cc9e03529488e533464ec86a0d9e387afa220bdc019de07522af96e53e644fbbd92d9e5e465c69af47b9b15e
-  data.tar.gz: e0cf057b86df920b3e2f47c26c6fedb8bcbf2ccdb5232cebb3ba3b0fd02ee7b71c90274e0ac3a168d01c5d4cd396131ba5872e286c039b91103924e1bb752689
+  metadata.gz: 90d5962f8140f085afc07e9b9c9380a6c38aca825dd977d5ee6a1e8d1042ad39514a6185eb9fed38f9a370e794dea2b8c99b5d99adb661dfc0e9306806084bdd
+  data.tar.gz: 9c22f0d55962fce5fead46e9d4e0c27d89fb4b87ca268cef9c123c8737d9b5ae8987748d158a3b39d3acf1c21175729005ebce917fdc0d9118c2fc1dd19623d1

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

@@ -91,28 +91,8 @@ module Mongous
       end
     end
 
-    def create( doc = nil, **hash )
-      self.new( doc || hash ).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 create( **doc )
+      self.new( **doc ).save
     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
@@ -102,12 +186,12 @@ module Mongous
 
     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.3"
 end

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/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.3
 platform: ruby
 authors:
 - ARIMA Yasuhiro
 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
@@ -97,6 +97,7 @@ 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