mongous 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b0a73aa23287619bdae717f683f04e266d582dca4a6d055b798cf32243c6566
-  data.tar.gz: 14e22dcbf25b3a0fa200023c9f770c549607060ddb03057b32c8c1ccee3b58c2
+  metadata.gz: 6a7aef9ade90f7665f9152ca0fce4831c5f9ac3263bba36f1014b2f51d1596fb
+  data.tar.gz: 5b69a145e019b335bb49de2eec293fbe2109ada1d1702dcd58e27e7e918ff408
 SHA512:
-  metadata.gz: b37766d78679cc2a6bee8bfe256da0a363344b6e349552f0491d5a0892fa1dfeb7cca90d4b2e326ac7687cdd2c3a0561fdfe9fca4ce71382029077d8c289e6de
-  data.tar.gz: b5e9fee3f8f9d4f34d5203b9b260559d8ee1ca86e659d85629ef9c1b700bcfcb450b7ffc0447b7f3fa8c4245634f2e968619f9ba451c9591016e13c07d23060f
+  metadata.gz: 6d81649ab8678859734b621712493adde5d7d0056f532c4abcb0297894442acd1be905b60e725eb85070aa95a75f4c2353d9e54bcbb44fb20346afd398cc3448
+  data.tar.gz: 0e7001c64b912df122d67c1bd67cbc378b6e9974c24b1a94235348c8ed74cd1fa22d4c65eba2d14e7968387ae8ca22ae375ae46ece75faa039cd8d4936cf1bc3

data/.rubocop.yml

@@ -0,0 +1,73 @@
+
+AllCops:
+  Exclude:
+    - '.*'
+    - '*'
+    - '*.gemspec'
+    - 'Gemfile*'
+    - 'bin/**'
+    - 'exe/**'
+    - 'config/**/*'
+    - 'spec/**/*'
+    - 'tmp/**/*'
+    - 'vendor/**/*'
+  TargetRubyVersion: 2.7
+
+Layout/ExtraSpacing:
+  Enabled: false
+
+Layout/SpaceAroundOperators:
+  Enabled: false
+
+Layout/SpaceBeforeFirstArg:
+  Enabled: false
+
+Layout/SpaceInsideParens:
+  Enabled: false
+
+Layout/SpaceInsideArrayLiteralBrackets:
+  Enabled: false
+ 
+Layout/SpaceInsideRangeLiteral:
+  Enabled: false
+
+Layout/SpaceInsideReferenceBrackets:
+  Enabled: false
+
+Layout/SpaceInsideStringInterpolation:
+  Enabled: false
+
+Lint/AmbiguousBlockAssociation:
+  Enabled: false
+
+Lint/EmptyWhen:
+  Enabled: false
+
+Lint/ReturnInVoidContext:
+  Enabled: false
+
+Lint/UselessAssignment:
+  Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false
+
+Metrics/LineLength:
+  Enabled: false
+  Max: 120
+
+Metrics/MethodLength:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: true
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/NumericPredicate:
+  Enabled: false
+
+Style/StringLiterals:
+  Enabled: false
+

data/Rakefile

@@ -13,7 +13,7 @@ class Bundler::GemHelper
     dest_path  =  File.join(dir, "#{name}-#{version}.zip")
     cmnd  =  "git archive --format zip --prefix=#{name}/ HEAD > #{dest_path}"
 
-    out, code = sh_with_status( cmnd )
+    _, code = sh_with_status( cmnd )
     raise "Couldn't archive gem,"  unless  code == 0
 
     Bundler.ui.confirm "#{name} #{version} archived to #{dest_path}."
@@ -23,11 +23,11 @@ class Bundler::GemHelper
     ver  =  version.to_s
 
     cmnd  =  "git push origin  #{ver} "
-    out, code = sh_with_status( cmnd )
+    _, code = sh_with_status( cmnd )
     raise "Couldn't git push origin."  unless  code == 0
 
     cmnd  =  "git push "
-    out, code = sh_with_status( cmnd )
+    _, code = sh_with_status( cmnd )
     raise "Couldn't git push."         unless  code == 0
 
     Bundler.ui.confirm "Git Push #{ver}."
@@ -43,15 +43,15 @@ class Bundler::GemHelper
     end
 
     cmnd  =  "git add  #{version_pathname} "
-    out, code = sh_with_status( cmnd )
+    _, code = sh_with_status( cmnd )
     raise "Couldn't git add,"  unless  code == 0
 
     cmnd  =  "git commit -m  '#{new_version}' "
-    out, code = sh_with_status( cmnd )
+    _, code = sh_with_status( cmnd )
     raise "Couldn't git commit."  unless  code == 0
 
     cmnd  =  "git tag        #{new_version} "
-    out, code = sh_with_status( cmnd )
+    _, code = sh_with_status( cmnd )
     raise "Couldn't git tag."          unless  code == 0
 
     Bundler.ui.confirm "Update Tags to #{new_version}."
@@ -80,14 +80,14 @@ Bundler::GemHelper.new(Dir.pwd).instance_eval do
 
   desc "Update Version Minor"
   task 'minor' do
-    major, minor, tiny  =  version.to_s.split('.')
+    major, minor, _tiny  =  version.to_s.split('.')
     new_version  =  [major, minor.to_i + 1, 0].join('.')
     update_version( new_version )
   end
 
   desc "Update Version Major"
   task 'major' do
-    major, minor, tiny  =  version.to_s.split('.')
+    major, _minor, _tiny  =  version.to_s.split('.')
     new_version  =  [major.to_i + 1, 0, 0].join('.')
     update_version( new_version )
   end

data/lib/mongous/base.rb

@@ -11,7 +11,7 @@ module Mongous
     def connect( hosts_or_uri = nil, file: nil, mode: nil, loglevel: nil, **options )
       case  hosts_or_uri
       when  Array, String
-        ;
+        hosts_or_uri
 
       when  NilClass
         if file
@@ -46,8 +46,8 @@ module Mongous
     end
 
     def connect!( hosts_or_uri = nil, **options )
-      _client  =  connect( hosts_or_uri, **options )
-      self.class_variable_set( :@@client, _client )
+      client_  =  connect( hosts_or_uri, **options )
+      self.class_variable_set( :@@client, client_ )
     end
 
     def document!( *names, **opts )
@@ -56,6 +56,7 @@ module Mongous
       names.each do |name|
         case  name
         when  String
+          name
         when  Symbol
           name  =  name.to_s
         else
@@ -97,11 +98,11 @@ module Mongous
       self.class_variable_get( :@@client )
     end
 
-    def client=( _client )
-      if not _client.is_a?( ::Mongo::Client )
-        raise  Mongous::Error, "type invalid. :  #{ _client }"
+    def client=( new_client )
+      if not new_client.is_a?( ::Mongo::Client )
+        raise  Mongous::Error, "type invalid. :  #{ new_client }"
       end
-      self.class_variable_set( :@@client, _client )
+      self.class_variable_set( :@@client, new_client )
     end
 
     def loger

data/lib/mongous/document.rb

@@ -15,7 +15,7 @@ module Mongous
       end
     end
 
-    def method_missing( sym, *args, **opts, &block )
+    def method_missing( sym, *args, **_opts, &_block )
       m  =  /\A(\w+)([=])?\Z/.match( sym.to_s )
       if  args.size == 0 && m[2].nil?
         self[ m[1] ]
@@ -55,12 +55,12 @@ module Mongous
 
       self.class.fields.each do |label, field|
         default_value  =  getvalue_or_callproc( field[:default] )
-        _must  =  field[:_attrs].include?(:must)
+        must  =  field[:_attrs].include?(:must)
         if  @doc.has_key?(label)
           if  !having?( @doc[label] )
             if  default_value
               self[label]  =  default_value
-            elsif  _must
+            elsif  must
               raise  Mongous::Error, "must but unassigned field. : #{ label }"
             elsif  self.class.symbols[:strict]
               self[label]  =  nil
@@ -69,7 +69,7 @@ module Mongous
         else
           if  default_value
             self[label]  =  default_value
-          elsif  _must
+          elsif  must
             raise  Mongous::Error, "must but unassigned field. : #{ label }"
           elsif  self.class.symbols[:strict]
             self[label]  =  nil
@@ -78,11 +78,11 @@ module Mongous
 
         case  savemode
         when  :create
-          if  create_value  =  getvalue_or_callproc( field[:create] )
+          if ( create_value  =  getvalue_or_callproc( field[:create] ) )
             self[label]  =  create_value
           end
         when  :update
-          if  update_value  =  getvalue_or_callproc( field[:update] )
+          if ( update_value  =  getvalue_or_callproc( field[:update] ) )
             self[label]  =  update_value
           end
         end
@@ -107,8 +107,8 @@ module Mongous
       @doc.dup
     end
 
-    def to_json
-      @doc.to_json
+    def to_json( **opts )
+      ::JSON.generate( @doc, **opts )
     end
 
     def []( label )
@@ -144,10 +144,13 @@ module Mongous
       end
 
       field  =  self.class.fields[label]
-      return  @doc[label]  =  value    if field.nil?
+      if field.nil?
+        @doc[label]  =  value
+        return
+      end
 
       types  =  []
-      if  attrs  =  field[:_attrs]  ||  []
+      if ( attrs  =  field[:_attrs]  ||  [] )
         attrs.each do |attr|
           if  attr.class == Class
             types  <<  attr

data/lib/mongous/extention.rb

@@ -5,18 +5,18 @@ module Mongous
       if self.class_variable_defined?( :@@client )
         self.class_variable_get( :@@client )
       else
-        _client  =  Mongous.client
-        self.class_variable_set( :@@client, _client )
+        new_client  =  Mongous.client
+        self.class_variable_set( :@@client, new_client )
       end
     end
 
-    def client=( _client )
-      m  =  /(.*?):(\d+)/.match( caller()[0] )
-      call_from  =  [ m[1], m[2] ].join(":")
-      if  !_client.is_a?( Mongo::Client )
-        raise  Mongous::Error, "type invalid. :  #{ _client }"
+    def client=( new_client )
+      if  !new_client.is_a?( Mongo::Client )
+        m  =  /(.*?):(\d+)/.match( caller()[0] )
+        call_from  =  [ m[1], m[2] ].join(":")
+        raise  Mongous::Error, "type invalid. :  #{ new_client } at #{ call_from }"
       end
-      self.class_variable_set( :@@client, _client )
+      self.class_variable_set( :@@client, new_client )
     end
 
     def collection_name
@@ -28,8 +28,8 @@ module Mongous
       self.class_variable_set( :@@collection_name, self.name )
     end
 
-    def collection_name=( _collection_name )
-      self.class_variable_set( :@@collection_name, _collection_name )
+    def collection_name=( new_collection_name )
+      self.class_variable_set( :@@collection_name, new_collection_name )
       if self.class_variable_defined?( :@@collection )
         self.remove_class_variable( :@@collection )
       end
@@ -38,29 +38,29 @@ module Mongous
     def collection( temp_collection_name = nil )
       if  temp_collection_name.nil?
         if self.class_variable_defined?( :@@collection )
-          if  _collection  =  self.class_variable_get( :@@collection )
-            return  _collection
+          if ( new_collection  =  self.class_variable_get( :@@collection ) )
+            return  new_collection
           end
         end
-        _collection_name  =  collection_name
+        new_collection_name  =  collection_name
       else
-        _collection_name  =  temp_collection_name
+        new_collection_name  =  temp_collection_name
       end
-      _client  =  client
+      new_client  =  client
 
-      if  _client.database.collection_names.include?( _collection_name )
-        _collection  =  _client[ _collection_name ]
+      if  new_client.database.collection_names.include?( new_collection_name )
+        new_collection  =  new_client[ new_collection_name ]
       else
-        _collection  =  _client[ _collection_name ]
-        _collection.create
+        new_collection  =  new_client[ new_collection_name ]
+        new_collection.create
       end
 
       indexes.each do |keys, opts|
-        _collection.indexes.create_one( keys, opts )    rescue  nil
+        new_collection.indexes.create_one( keys, opts )    rescue  nil
       end
 
-      self.class_variable_set( :@@collection, _collection )    if temp_collection_name.nil?
-      _collection
+      self.class_variable_set( :@@collection, new_collection )    if temp_collection_name.nil?
+      new_collection
     end
 
     def fields
@@ -114,7 +114,7 @@ module Mongous
       call_from  =  [ m[1], m[2] ].join(":")
 
       attrs.each do |attr|
-        if klass  =  attr.class 
+        if ( klass  =  attr.class )
           if ![Class, Range, Array, Regexp, Proc, Symbol].include?(klass)
             raise  Mongous::Error, "'field' arguments error. : #{ attr } on #{ symbol } at #{ call_from }"
           end

data/lib/mongous/filter.rb

@@ -78,18 +78,18 @@ module Mongous
     end
 
     def normalize( filter, conditions )
-      condition  =  case  filter
+      case  filter
       when  Filter
         filter.to_condition
       when  Symbol
-        case  _filter  =  filters[filter]
+        case  ( new_filter  =  filters[filter] )
         when  Filter
-          _filter.to_condition
+          new_filter.to_condition
         when  Hash
-          _filter
+          new_filter
         end
       when  NilClass
-        Filter.new( self ).where( **conditions ).to_condition
+        Filter.new( self ).where( conditions ).to_condition
       else
         caller_method  =  /`(.*?)'/.match( caller()[0] )[1]
         raise  Mongous::Error, "Invalid args for #{self}.#{ caller_method }. : #{filter}, #{conditions}"
@@ -125,17 +125,17 @@ module Mongous
             hash[key]  =  {"$in"=>item}
 
           when  Range
-            _begin_oper  =  "$gte"
-            _end_oper  =  item.exclude_end?  ?  "$lt"  :  "$lte"
+            begin_oper  =  "$gte"
+            end_oper  =  item.exclude_end?  ?  "$lt"  :  "$lte"
 
             if      item.begin  &&   item.end
-              hash[key]  =  { _begin_oper => item.begin, _end_oper => item.end }
+              hash[key]  =  { begin_oper => item.begin, end_oper => item.end }
 
             elsif  !item.begin  &&   item.end
-              hash[key]  =  { _end_oper => item.end }
+              hash[key]  =  { end_oper => item.end }
 
             elsif   item.begin  &&  !item.end
-              hash[key]  =  { _begin_oper => item.begin }
+              hash[key]  =  { begin_oper => item.begin }
 
             else
               raise  Mongous::Error, "invalid range. :  #{ item }"
@@ -151,14 +151,14 @@ module Mongous
       hash
     end
 
-    def where( conditions )
+    def where( conditions = {} )
       hash  =  build_condition( conditions )
       w  =  self.dup
       w.instance_variable_set( :@filter, @filter.merge( hash ) )
       w
     end
 
-    def not( conditions )
+    def not( conditions = {} )
       hash  =  build_condition( conditions )
       w  =  self.dup
       w.instance_variable_set( :@filter, @filter.merge( {"$nor" => [hash]} ) )
@@ -169,49 +169,49 @@ module Mongous
       @filter.dup
     end
 
-    def option( _option )
+    def option( new_option )
       w  =  self.dup
-      w.instance_variable_set( :@option, @option.merge( _option ) )
+      w.instance_variable_set( :@option, @option.merge( new_option ) )
       w
     end
 
     def select( *keys, **hash )
       if not keys.empty?
-        _projection  =  Hash[ keys.zip( Array.new(keys.length, 1) ) ]
+        new_projection  =  Hash[ keys.zip( Array.new(keys.length, 1) ) ]
       elsif not hash.empty?
-        _projection  =  hash
+        new_projection  =  hash
       else
-        _projection  =  nil
+        new_projection  =  nil
       end
       w  =  self.dup
-      w.instance_variable_set( :@projection, _projection )
+      w.instance_variable_set( :@projection, new_projection )
       w
     end
 
     def sort( *keys, **hash )
       if not keys.empty?
-        _sort  =  Hash[ keys.zip( Array.new( keys.length, 1 ) ) ]
+        new_sort  =  Hash[ keys.zip( Array.new( keys.length, 1 ) ) ]
       elsif not hash.empty?
-        _sort  =  hash
+        new_sort  =  hash
       else
-        _sort  =  nil
+        new_sort  =  nil
       end
       w  =  self.dup
-      w.instance_variable_set( :@sort, _sort )
+      w.instance_variable_set( :@sort, new_sort )
       w
     end
 
     def []( nth_or_range, len = nil )
       case  nth_or_range
       when  Integer
-        _skip  =  nth_or_range
+        new_skip  =  nth_or_range
 
         if  len.is_a?(NilClass)
-          _limit  =  1
+          new_limit  =  1
         elsif  len.is_a?(Integer) && len == 0
-          _limit  =  nil
+          new_limit  =  nil
         elsif  len.is_a?(Integer) && len > 0
-          _limit  =  len
+          new_limit  =  len
         else
           raise  Mongous::Error, "invalid len. :  #{ len }"
         end
@@ -224,8 +224,8 @@ module Mongous
         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
+        new_skip  =  from
+        new_limit  =  to - from + 1
 
       else
         raise  Mongous::Error, "invalid class. :  #{ nth_or_range }"
@@ -233,16 +233,16 @@ module Mongous
       end
 
       w  =  self.dup
-      w.instance_variable_set( :@skip, _skip )
-      w.instance_variable_set( :@limit, _limit )
+      w.instance_variable_set( :@skip, new_skip )
+      w.instance_variable_set( :@limit, new_limit )
       w
     end
 
     def exec_query
-      _filter  =  @filter
-      _option  =  @option.dup
-      _option[:projection]  =  @projection    if @projection
-      found  =  @klass.collection( @collection_name ).find( _filter, _option )
+      new_filter  =  @filter
+      new_option  =  @option.dup
+      new_option[:projection]  =  @projection    if @projection
+      found  =  @klass.collection( @collection_name ).find( new_filter, new_option )
       found  =  found.sort( @sort )    if  @sort
       found  =  found.skip( @skip )    if  @skip
       found  =  found.limit( @limit )    if  @limit
@@ -253,44 +253,44 @@ module Mongous
       found  =  @klass.collection.find( @filter )
       found  =  found.skip( @skip )    if  @skip
       found  =  found.limit( @limit )    if  @limit
-      _count  =  found.count_documents
+      new_count  =  found.count_documents
       if  @skip
-        if  @skip > _count
+        if  @skip > new_count
           0
         elsif  @limit
-          [_count - @skip, @limit].min
+          [new_count - @skip, @limit].min
         else
-          _count - @skip
+          new_count - @skip
         end
       else
         if  @limit
-          [_count, @limit].min
+          [new_count, @limit].min
         else
-          _count
+          new_count
         end
       end
     end
 
     def first
-      _filter  =  @filter
-      _option  =  @option.dup
-      _option[:projection]  =  @projection    if @projection
-      found  =  @klass.collection( @collection_name ).find( _filter, _option )
-      _order  =  @sort  ||  { _id: 1 }
-      doc  =  found.sort( _order ).first
+      new_filter  =  @filter
+      new_option  =  @option.dup
+      new_option[:projection]  =  @projection    if @projection
+      found  =  @klass.collection( @collection_name ).find( new_filter, new_option )
+      new_order  =  @sort  ||  { _id: 1 }
+      doc  =  found.sort( new_order ).first
       @klass.new( **doc )    if doc
     end
 
     def last
-      _filter  =  @filter
-      _option  =  @option.dup
-      _option[:projection]  =  @projection    if @projection
-      found  =  @klass.collection( @collection_name ).find( _filter, _option )
-      _order  =  {}
+      new_filter  =  @filter
+      new_option  =  @option.dup
+      new_option[:projection]  =  @projection    if @projection
+      found  =  @klass.collection( @collection_name ).find( new_filter, new_option )
+      new_order  =  {}
       ( @sort  ||  {_id: 1} ).each do |k,v|
-        _order[k]  =  - v
+        new_order[k]  =  - v
       end
-      doc  =  found.sort( _order ).first
+      doc  =  found.sort( new_order ).first
       @klass.new( **doc )    if doc
     end
 

data/lib/mongous/version.rb

@@ -1,3 +1,3 @@
 module Mongous
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/mongous.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "mongo", "~> 2.13"
+  spec.add_runtime_dependency "mongo"
 
-  spec.add_development_dependency "rake", "~> 12.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 end

data/sample/save_detail_3.rb

@@ -7,7 +7,7 @@ class Book
   field  :title,                :must
   field  :author
   field  :publisher
-  field  :style,                %w[hardcover, softcover, paperback]
+  field  :style,                %w[hardcover softcover paperback]
   field  :size,                 /[AB]\d/
   field  :price,      Integer,  (0..1_000_000)
   field  :page,       Integer,  proc{ page > 0 }

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: mongous
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - arimay
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-16 00:00:00.000000000 Z
+date: 2021-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 description: " Yet another mongo wrapper library. "
 email:
 - arima.yasuhiro@gmail.com
@@ -61,6 +61,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - README.adoc
@@ -135,7 +136,7 @@ homepage: https://github.com/arimay/mongous
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -150,8 +151,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Mongo wrapper library.
 test_files: []