torm 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 661e5611a22d99946776683e385c4943f54cbee9b70b7f98783aed8b49bf814d
-  data.tar.gz: 348b20b819b88ee5cd44c9a034fab3fb8ddeca8582ab68b526e115a23d79d10e
+  metadata.gz: f1c93ee06d4f1dc8fbbd1d10d2e248edd4c3c77f10f1440a2f56c1bae183068a
+  data.tar.gz: e39bebc512d7df97ed2e818b629d0cdde0764da3a28f8607294d8c6b2d4e04b9
 SHA512:
-  metadata.gz: 01e7fd736289b7c90daea666c7dca8676d2995057b72a69ce442910c9ed7b1f7aef4e0b490a1919d267530425d4615b7c763e780c90ef51988b780e0bf18c94e
-  data.tar.gz: 1519eaff8223109adb778048607a2357cb6a87c99b38fbdad894a7099f4bb3cecae1c2ca5334382be0f4881a394bcb4d1bb49b70ee50cf02d772b93fde1c8845
+  metadata.gz: 842b9f9a5818c1d2dddb7c39703e3d4c44a792b17ecb366348ec8a74a654fc27a638c865a0b75f372e96da662f6da86fc396c6a1fe11f165ee083d74a0f06686
+  data.tar.gz: e8fedbdef0cfe257c5c8e11c676c9fef2e721f991958e8ca8e06a0e0d7bc1e49d204b6402fba86034fbb8954fe1dc4fca2a88989ca10061a73a89008eb1bb33e

data/Changelog.md

@@ -2,6 +2,13 @@
 
 ## Version 0.3.0 (dev)
 
+- Update minitest requirement from ~> 4.0 to ~> 5.12 (905e9f7)
+- Refactor: replace accessor with writer (24f4594)
+- Refactor: fixed minitest deprecation warnings (aa1c586)
+- Refactor: splat keyword args (ff7c160)
+- Change: Ruby 3.0 is supported (f28bcc1)
+- Fixed circular loading warning from minitest (8f4535b)
+
 ## Version 0.2.1
 
 This version was in "development" between 2014 and 2021.

data/lib/torm.rb

@@ -12,7 +12,7 @@ module Torm
   class << self
     include Tools
 
-    attr_accessor :instance, :default_rules_file
+    attr_writer :instance, :default_rules_file
 
     # @return [Torm::RulesEngine] Singleton RulesEngine
     def instance

data/lib/torm/rules_engine.rb

@@ -60,7 +60,7 @@ module Torm
 
       # @yield [Torm::RulesEngine::RulesVariationHelper]
       def conditions(**conditions)
-        engine = self.class.new(@engine, @name, @conditions.merge(conditions))
+        engine = self.class.new(@engine, @name, **@conditions.merge(conditions))
         yield engine
         nil
       end
@@ -128,7 +128,7 @@ module Torm
       data   = {
         policies: dump['policies'].map(&:to_sym),
       }
-      engine = new(data)
+      engine = new(**data)
       dump['rules'].each do |name, rules|
         rules.each do |rule|
           value      = rule['value']

data/lib/torm/version.rb

@@ -1,3 +1,3 @@
 module Torm
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/test/minitest_helper.rb

@@ -2,5 +2,4 @@ $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
 require 'torm'
 
-require 'minitest/spec'
 require 'minitest/autorun'

data/test/torm/rules_engine_test.rb

@@ -12,18 +12,18 @@ describe Torm::RulesEngine do
 
       it 'should pick the default without any conditions' do
         # This means it should *not* apply rules which only apply to conditions we don't have
-        engine.decide('show unsubscribe link').must_equal false
+        _(engine.decide('show unsubscribe link')).must_equal false
       end
 
       it 'should pick a specific rule over the default' do
-        engine.decide('show unsubscribe link', country: 'FR').must_equal true
+        _(engine.decide('show unsubscribe link', country: 'FR')).must_equal true
       end
 
       it 'should ignore conditions which do not match' do
-        engine.decide('show unsubscribe link', country: 'NL', happy: true, season: :summer).must_equal false
+        _(engine.decide('show unsubscribe link', country: 'NL', happy: true, season: :summer)).must_equal false
 
         engine.add_rule 'show unsubscribe link', true, :default, season: :summer
-        engine.decide('show unsubscribe link', country: 'NL', happy: true, season: :summer).must_equal true
+        _(engine.decide('show unsubscribe link', country: 'NL', happy: true, season: :summer)).must_equal true
       end
     end
 
@@ -37,19 +37,19 @@ describe Torm::RulesEngine do
         engine.add_rule 'FSK level', { maximum: 12 }, :law, country: 'TR'
 
         # Default
-        engine.decide('FSK level').must_equal({ maximum: 18 })
+        _(engine.decide('FSK level')).must_equal({ maximum: 18 })
         # Default
-        engine.decide('FSK level', country: 'NL').must_equal({ maximum: 18 })
+        _(engine.decide('FSK level', country: 'NL')).must_equal({ maximum: 18 })
         # CoC for DE
-        engine.decide('FSK level', country: 'DE').must_equal({ maximum: 16 })
+        _(engine.decide('FSK level', country: 'DE')).must_equal({ maximum: 16 })
         # ref=google
-        engine.decide('FSK level', country: 'NL', referrer: 'google').must_equal({ maximum: 16 })
+        _(engine.decide('FSK level', country: 'NL', referrer: 'google')).must_equal({ maximum: 16 })
 
         # should start with 12+ for TR, and not modify it to 16+ for ref=google
-        engine.decide('FSK level', country: 'TR', referrer: 'google').must_equal({ maximum: 12 })
+        _(engine.decide('FSK level', country: 'TR', referrer: 'google')).must_equal({ maximum: 12 })
 
         # should start with 16+ for FR, but tighten it to 12+ for ref=disney
-        engine.decide('FSK level', country: 'FR', referrer: 'disney').must_equal({ maximum: 12 })
+        _(engine.decide('FSK level', country: 'FR', referrer: 'disney')).must_equal({ maximum: 12 })
       end
 
       it 'should support minimum' do
@@ -60,15 +60,15 @@ describe Torm::RulesEngine do
 
 
         # Query individual FSK thresholds
-        engine.decide('FSK level').must_equal({ minimum: 1 })
-        engine.decide('FSK level', sexy: true).must_equal({ minimum: 12 })
-        engine.decide('FSK level', softcore: true).must_equal({ minimum: 16 })
-        engine.decide('FSK level', hardcore: true).must_equal({ minimum: 18 })
+        _(engine.decide('FSK level')).must_equal({ minimum: 1 })
+        _(engine.decide('FSK level', sexy: true)).must_equal({ minimum: 12 })
+        _(engine.decide('FSK level', softcore: true)).must_equal({ minimum: 16 })
+        _(engine.decide('FSK level', hardcore: true)).must_equal({ minimum: 18 })
 
         # Combine multiple FSK threshold
         #engine.verbose = true
-        engine.decide('FSK level', hardcore: true, sexy: true).must_equal({ minimum: 18 })
-        engine.decide('FSK level', softcore: true, sexy: true).must_equal({ minimum: 16 })
+        _(engine.decide('FSK level', hardcore: true, sexy: true)).must_equal({ minimum: 18 })
+        _(engine.decide('FSK level', softcore: true, sexy: true)).must_equal({ minimum: 16 })
       end
 
       it 'should combine minimum and maximum' do
@@ -83,12 +83,12 @@ describe Torm::RulesEngine do
         engine.add_rule 'FSK level', { minimum: 16 }, :default, softcore: true
         engine.add_rule 'FSK level', { minimum: 18 }, :default, hardcore: true
 
-        engine.decide('FSK level', country: 'NL').must_equal({ minimum: 1, maximum: 18 })
-        engine.decide('FSK level', country: 'FR').must_equal({ minimum: 1, maximum: 16 })
-        engine.decide('FSK level', country: 'FR', sexy: true).must_equal({ minimum: 12, maximum: 16 })
+        _(engine.decide('FSK level', country: 'NL')).must_equal({ minimum: 1, maximum: 18 })
+        _(engine.decide('FSK level', country: 'FR')).must_equal({ minimum: 1, maximum: 16 })
+        _(engine.decide('FSK level', country: 'FR', sexy: true)).must_equal({ minimum: 12, maximum: 16 })
 
         # Return nil because of conflicting requirements: softcore is 16+, TR is 12-
-        engine.decide('FSK level', country: 'TR', softcore: true).must_equal nil
+        assert_nil engine.decide('FSK level', country: 'TR', softcore: true)
       end
 
       it 'should allow range syntax' do
@@ -96,8 +96,8 @@ describe Torm::RulesEngine do
         engine.add_rule 'FSK level', { maximum: 16 }, :coc, country: 'FR'
         engine.add_rule 'FSK level', { minimum: 12 }, :default, sexy: true
 
-        engine.decide('FSK level', country: 'NL').must_equal({ minimum: 1, maximum: 18 })
-        engine.decide('FSK level', country: 'FR', sexy: true).must_equal({ minimum: 12, maximum: 16 })
+        _(engine.decide('FSK level', country: 'NL')).must_equal({ minimum: 1, maximum: 18 })
+        _(engine.decide('FSK level', country: 'FR', sexy: true)).must_equal({ minimum: 12, maximum: 16 })
       end
     end
 
@@ -158,9 +158,9 @@ describe Torm::RulesEngine do
           ]
         }
       }
-      engine.as_hash.must_equal rule_hash
+      _(engine.as_hash).must_equal rule_hash
 
-      engine.to_json.must_equal MultiJson.dump(engine.as_hash)
+      _(engine.to_json).must_equal MultiJson.dump(engine.as_hash)
     end
   end
 
@@ -170,14 +170,14 @@ describe Torm::RulesEngine do
       engine.add_rule 'FSK level', { maximum: 16 }, :coc, country: 'FR'
       engine.add_rule 'FSK level', { minimum: 12 }, :default, sexy: true
 
-      engine.decide('FSK level', country: 'NL').must_equal({ minimum: 1, maximum: 18 })
-      engine.decide('FSK level', country: 'FR', sexy: true).must_equal({ minimum: 12, maximum: 16 })
+      _(engine.decide('FSK level', country: 'NL')).must_equal({ minimum: 1, maximum: 18 })
+      _(engine.decide('FSK level', country: 'FR', sexy: true)).must_equal({ minimum: 12, maximum: 16 })
 
       engine2 = Torm::RulesEngine.from_json(engine.to_json)
-      engine2.as_hash.must_equal engine.as_hash
+      _(engine2.as_hash).must_equal engine.as_hash
 
-      engine2.decide('FSK level', country: 'NL').must_equal({ minimum: 1, maximum: 18 })
-      engine2.decide('FSK level', country: 'FR', sexy: true).must_equal({ minimum: 12, maximum: 16 })
+      _(engine2.decide('FSK level', country: 'NL')).must_equal({ minimum: 1, maximum: 18 })
+      _(engine2.decide('FSK level', country: 'FR', sexy: true)).must_equal({ minimum: 12, maximum: 16 })
     end
   end
 end

data/test/torm/tools_test.rb

@@ -16,13 +16,13 @@ describe Torm::Tools do
     it 'should save data to a file' do
       Torm.atomic_save(tmp_file, 'test')
       assert File.exist?(tmp_file)
-      File.read(tmp_file).must_equal 'test'
+      _(File.read(tmp_file)).must_equal 'test'
     end
   end
 
   describe '#symbolize_keys' do
     it 'should convert string keys to symbols' do
-      Torm.symbolize_keys({ 'a' => 'b', :c => :d }).must_equal({ a: 'b', c: :d })
+      _(Torm.symbolize_keys({ 'a' => 'b', :c => :d })).must_equal({ a: 'b', c: :d })
     end
   end
 
@@ -32,10 +32,10 @@ describe Torm::Tools do
         foo: 1,
         baz: 3
       }
-      Torm.slice(hash, :foo, :bar).must_equal({ foo: 1 })
+      _(Torm.slice(hash, :foo, :bar)).must_equal({ foo: 1 })
 
       # Ensure we did not modify the original Hash
-      hash[:baz].must_equal 3
+      _(hash[:baz]).must_equal 3
     end
   end
 end

data/torm.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths         = ['lib']
 
   # Ruby 2.1 introduces required named keywords
-  spec.required_ruby_version = '~> 2.1'
+  spec.required_ruby_version = '>= 2.1', '< 4.0'
 
   # MultiJson follow Semantic Versioning, so any 1.x should work.
   spec.add_dependency 'multi_json', '~> 1.0'
@@ -27,5 +27,5 @@ Gem::Specification.new do |spec|
   # Defaults from generating the gemspec
   spec.add_development_dependency 'bundler', '>= 1.7', '< 3.0'
   spec.add_development_dependency 'rake', '~> 12.3'
-  spec.add_development_dependency 'minitest', '~> 4.0'
+  spec.add_development_dependency 'minitest', '~> 5.12'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: torm
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Wes Oldenbeuving
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.12'
 description: Rules engine. Named after the Forgotten Realms god of Law.
 email:
 - narnach@gmail.com
@@ -106,16 +106,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.1'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Ruby rules engine