mongous 0.1.4 → 0.2.1

data/lib/mongous/version.rb

@@ -1,3 +1,3 @@
 module Mongous
-  VERSION = "0.1.4"
+  VERSION = "0.2.1"
 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/declare_compact_1.rb

@@ -9,10 +9,11 @@ end
 
 
 book  =  Book.new
-book.title       =  "title compact"
-book.author      =  "foobar"
+book.title       =  "declare compact"
+book.author      =  "Alice"
 book.publisher   =  nil
-book.style       =  "A4"
+book.style       =  "hardcover"
+book.size        =  "A4"
 book.price       =  100
 book.page        =  100
 # book.publish_at  =  nil # (default)

data/sample/declare_label_1.rb

@@ -10,6 +10,7 @@ class Book
   field  :author
   field  :publisher
   field  :style
+  field  :size
   field  :price
   field  :page
   field  :publish_at
@@ -21,10 +22,11 @@ end
 
 
 book  =  Book.new
-book.title       =  "title label"
-book.author      =  "foobar"
+book.title       =  "declare label"
+book.author      =  "Bob"
 book.publisher   =  nil
-book.style       =  "A5"
+book.style       =  "softcover"
+book.size        =  "A5"
 book.price       =  200
 book.page        =  200
 # book.publish_at  =  nil  # (default)

data/sample/declare_ndex_1.rb

@@ -10,6 +10,7 @@ class Book
   field  :author
   field  :publisher
   field  :style
+  field  :size
   field  :price
   field  :page
   field  :publish_at
@@ -23,10 +24,11 @@ end
 
 
 book  =  Book.new
-book.title       =  "title strict"
-book.author      =  "foobar"
+book.title       =  "declare index 1"
+book.author      =  "Candy"
 book.publisher   =  nil
-book.style       =  "A6"
+book.style       =  "paperback"
+book.size        =  "A6"
 book.price       =  300
 book.page        =  300
 # book.publish_at  =  nil  # (default)

data/sample/declare_ndex_2.rb

@@ -10,6 +10,7 @@ class Book
   field  :author
   field  :publisher
   field  :style
+  field  :size
   field  :price
   field  :page
   field  :publish_at
@@ -23,10 +24,11 @@ end
 
 
 book  =  Book.new
-book.title       =  "title strict"
-book.author      =  "foobar"
+book.title       =  "declare index 2"
+book.author      =  "Candy"
 book.publisher   =  nil
-book.style       =  "A6"
+book.style       =  "paperback"
+book.size        =  "A6"
 book.price       =  300
 book.page        =  300
 # book.publish_at  =  nil  # (default)

data/sample/declare_strict_1.rb

@@ -9,12 +9,14 @@ class Book
   field  :title,        String,  :must
   field  :author,       String
   field  :publisher,    String
-  field  :style,        String,  %w[A4 A5 A6]
+  field  :style,        String,  %w[hardcover softcover paperback]
+  field  :size,         String,  /[AB]\d/
   field  :price,        Integer, (0..1_000_000)
   field  :page,         Integer, proc{ page % 4 == 0 }
-  field  :publish_at,   Date,    &proc{ Date.today }
   field  :isbn,         String,  proc{ isbn? }
-  field  :lang,         String,  &proc{ "ja" }
+  field  :lang,         String,  default: "en"
+  field  :created_at,   Time,    create: proc{ Time.now }
+  field  :updated_at,   Time,    update: proc{ Time.now }
 
   verify :strict
   verify { having?( title ) }
@@ -23,21 +25,23 @@ class Book
   end
 
   def isbn?
-    isbn&.gsub(/\D*/, '')&.size == 13
+    isbn.gsub(/\D*/, '').size == 13
   end
 end
 
 
 book  =  Book.new
-book.title       =  "title strict"
-book.author      =  "foobar"
+book.title       =  "declare strict"
+book.author      =  "David"
 book.publisher   =  nil
-book.style       =  "A6"
-book.price       =  300
-book.page        =  300
-# book.publish_at  =  nil  # (default)
+book.style       =  "paperback"
+book.size        =  "A7"
+book.price       =  400
+book.page        =  400
 book.isbn        =  "978-3-16-148410-0"
 # book.lang        =  nil  # (default)
+# book.created_at  =  nil  # (create)
+# book.updated_at  =  nil  # (update)
 book.save
 
 

data/sample/declare_strict_2.rb

@@ -9,12 +9,14 @@ class Book
   field  :title,        String,  :must
   field  :author,       String
   field  :publisher,    String,  :must
-  field  :style,        String,  %w[A4 A5 A6]
+  field  :style,        String,  %w[hardcover softcover paperback]
+  field  :size,         String,  /[AB]\d/
   field  :price,        Integer, (0..1_000_000)
   field  :page,         Integer, proc{ page % 4 == 0 }
-  field  :publish_at,   Date,    &proc{ Date.today }
   field  :isbn,         String,  proc{ isbn? }
-  field  :lang,         String,  &proc{ "ja" }
+  field  :lang,         String,  default: "en"
+  field  :created_at,   Time,    create: proc{ Time.now }
+  field  :updated_at,   Time,    update: proc{ Time.now }
 
   verify :strict
 

data/sample/multi_collection_2.rb

@@ -0,0 +1,63 @@
+
+require "mongous"
+
+Mongous.connect!
+
+class Book1
+  include  Mongous::Document
+end
+
+class Book2
+  include  Mongous::Document
+
+  field  :title
+  field  :author
+  field  :publisher
+  field  :style
+  field  :size
+  field  :price
+  field  :page
+  field  :isbn
+  field  :lang
+  field  :created_at
+  field  :updated_at
+
+  verify :strict
+end
+
+class Book3
+  include  Mongous::Document
+
+  field  :title,                 :must
+  field  :author
+  field  :publisher,    String,  :must
+  field  :style,        String,  %w[hardcover softcover paperback]
+  field  :size,         String,  /[AB]\d/
+  field  :price,        Integer, (0..1_000_000)
+  field  :page,         Integer, proc{ page > 0 }
+  field  :isbn,                  proc{ isbn? }
+  field  :lang,         String,  default: "en"
+  field  :created_at,   Time,    create: proc{ Time.now }
+  field  :updated_at,   Time,    update: proc{ Time.now }
+
+  verify :strict
+  verify { having?( title ) }
+  verify do
+    having?( author ) | having?( publisher )
+  end
+
+  def isbn?
+    isbn.gsub(/[\D]*/, '').size == 13
+  end
+end
+
+
+pp Book1.fields
+puts
+
+pp Book2.fields
+puts
+
+pp Book3.fields
+puts
+

data/sample/query_basic_1.rb

@@ -7,10 +7,12 @@ class Book
   include  Mongous::Document
 end
 
-
 p book  =  Book.first
 puts
 
+p count  =  Book.count
+puts
+
 pp books  =  Book.all
 puts
 

data/sample/query_basic_2.rb

@@ -7,14 +7,16 @@ class Book
   include  Mongous::Document
 end
 
+p book  =  Book.where( title: /title/ ).first
+puts
 
-p book  =  Book.filter( title: /title/ ).first
+p count  =  Book.where( title: /title/ ).count
 puts
 
-pp books  =  Book.filter( title: /title/ ).all
+pp books  =  Book.where( title: /title/ ).all
 puts
 
-Book.filter( title: /title/ ).each do |book|
+Book.where( title: /title/ ).each do |book|
   p book
 end
 puts

data/sample/query_basic_3.rb

@@ -7,13 +7,12 @@ class Book
   include  Mongous::Document
 end
 
-
-Book.filter.option( projection: {_id: 0, title: 1, author: 1} ).each do |book|
+Book.where.option( projection: {_id: 0, title: 1, author: 1} ).each do |book|
   p book
 end
 puts
 
-Book.filter( title: /title/ ).option( projection: {_id: 0, title: 1} ).each do |book|
+Book.where( title: /title/ ).option( projection: {_id: 0, title: 1} ).each do |book|
   p book
 end
 

data/sample/query_basic_4.rb

@@ -7,18 +7,17 @@ class Book
   include  Mongous::Document
 end
 
-
-Book.filter( style: %w[A4 A5 A6] ).each do |book|
+Book.where( size: %w[A4 A5 A6] ).each do |book|
   p book
 end
 puts
 
-Book.filter( style: %w[A4 A5]).each do |book|
+Book.where( size: %w[A4 A5]).each do |book|
   p book
 end
 puts
 
-Book.filter( style: %w[A5] ).each do |book|
+Book.where( size: %w[A5] ).each do |book|
   p book
 end
 puts

data/sample/query_basic_5.rb

@@ -7,13 +7,12 @@ class Book
   include  Mongous::Document
 end
 
-
-Book.filter( page: (100..300) ).each do |book|
+Book.where( page: (100..300) ).each do |book|
   p book
 end
 puts
 
-Book.filter( page: (100...300) ).each do |book|
+Book.where( page: (100...300) ).each do |book|
   p book
 end
 puts

data/sample/query_detail_1.rb

@@ -10,6 +10,7 @@ class Book
   field  :author
   field  :publisher
   field  :style
+  field  :size
   field  :price
   field  :page
   field  :publish_at

data/sample/query_detail_2.rb

@@ -10,6 +10,7 @@ class Book
   field  :author
   field  :publisher
   field  :style
+  field  :size
   field  :price,      Integer
   field  :page,       Integer
   field  :publish_at, Date

data/sample/query_detail_3.rb

@@ -9,12 +9,14 @@ class Book
   field  :title,                :must
   field  :author
   field  :publisher
-  field  :style,                %w[ A4 A5 A6 ]
+  field  :style,                %w[hardcover softcover paperback]
+  field  :size,                 /[AB]\d/
   field  :price,      Integer,  (0..1_000_000)
   field  :page,       Integer,  proc{ page > 0 }
-  field  :publish_at, Date,     &proc{ Date.today }
   field  :isbn,                 proc{ isbn? }
-  field  :lang,                 &proc{ "ja" }
+  field  :lang,                 default: "en"
+  field  :created_at, Time,     create: proc{ Time.now }
+  field  :updated_at, Time,     update: proc{ Time.now }
 
   verify :strict
 

data/sample/{query_basic_6.rb → query_filter_1.rb}

@@ -7,12 +7,15 @@ 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
+(1..3).each do |n|
+  unless  Book.where( title: "complex #{n}" ).first
+    Book.create( title: "complex #{n}", author: (0x40 + n).chr, size: "A#{n + 3}", price: n * 1000, page: n * 100 )
+  end
+end
+puts
 
-filter1  =  Book.filter( title: /comp/ )
-filter2  =  Book.not( author: /Candy/ )
+filter1  =  Book.where( 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

data/sample/query_filter_2.rb

@@ -0,0 +1,50 @@
+
+require "mongous"
+
+Mongous.connect!
+
+class Book
+  include  Mongous::Document
+
+  filter  :title1, { title: /filter/ }
+  filter  :price1, { price: (2000..3000) }
+  filter  :page1,  where( size: %w[A3 A4] )
+end
+
+(1..5).each do |n|
+  unless  Book.where( title: "filter #{n}" ).first
+    Book.create( title: "filter #{n}", author: (0x40 + n).chr, size: "A#{n + 3}", price: n * 1000, page: n * 100 )
+  end
+end
+puts
+
+filter1  =  Book.where( :price1 )
+filter2  =  Book.not( :page1 )
+filter3  =  Book.and( :title1, filter1, filter2 ).select( _id: 0 )
+filter4  =  Book.and( :title1, 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
+