drain 0.3.0 → 0.7.0

data/test/test_meta.rb

@@ -49,17 +49,17 @@ describe DR::Meta do
 	# end
 
 	it "Can show all ancestors" do
-		DR::Meta.all_ancestors("foo").include?(String.singleton_class).must_equal(true)
+		_(DR::Meta.all_ancestors("foo").include?(String.singleton_class)).must_equal(true)
 	end
 
 	it "Can generate bound methods" do
 		m=DR::Meta.get_bound_method("foo", :bar) do |x|
 			self+x
 		end
-		m.call("bar").must_equal("foobar")
+		_(m.call("bar")).must_equal("foobar")
 	end
 
 	it "Can apply unbound methods" do
-		DR::Meta.apply(method: String.instance_method(:length), to: "foo").must_equal(3)
+		_(DR::Meta.apply(method: String.instance_method(:length), to: "foo")).must_equal(3)
 	end
 end

data/test/test_simple_keywords.rb

@@ -10,27 +10,27 @@ describe DR::SimpleKeywordsParser do
 	end
 
 	it "Can parse keywords" do
-		@parser.parse("FOO(ploum, plam)").must_equal 'FOO: ["ploum", "plam"]'
+		_(@parser.parse("FOO(ploum, plam)")).must_equal 'FOO: ["ploum", "plam"]'
 	end
 
 	it "Can preserver spaces" do
-		@parser.parse("FOO( ploum , plam  )", space: true).must_equal "FOO: [\" ploum \", \" plam  \"]"
+		_(@parser.parse("FOO( ploum , plam  )", space: true)).must_equal "FOO: [\" ploum \", \" plam  \"]"
 	end
 
 	it "Can change delimiters" do
-		@parser.parse("FOO[ ploum , plam  ]", delims: '[]').must_equal "FOO: [\"ploum\", \"plam\"]"
+		_(@parser.parse("FOO[ ploum , plam  ]", delims: '[]')).must_equal "FOO: [\"ploum\", \"plam\"]"
 	end
 
 	it "Can have a one caracter delimiter" do
-		@parser.parse("FOO! ploum , plam  !", delims: '!').must_equal "FOO: [\"ploum\", \"plam\"]"
+		_(@parser.parse("FOO! ploum , plam  !", delims: '!')).must_equal "FOO: [\"ploum\", \"plam\"]"
 	end
 
 	it "Can parse keywords inside keywords" do
-		@parser.parse("FOO(ploum, BAR( foo, bar ))").must_equal "FOO: [\"ploum\", \"BAR: [\\\"foo\\\"\", \"\\\"bar\\\"]\"]"
+		_(@parser.parse("FOO(ploum, BAR( foo, bar ))")).must_equal "FOO: [\"ploum\", \"BAR: [\\\"foo\\\"\", \"\\\"bar\\\"]\"]"
 	end
 
 	it "Can add a keyword" do
 		@parser.keyword("PLOUM") { |a,b| a.to_i+b.to_i}
-		@parser.parse("Hello PLOUM(2,3)").must_equal 'Hello 5'
+		_(@parser.parse("Hello PLOUM(2,3)")).must_equal 'Hello 5'
 	end
 end

data/test/test_simple_parser.rb

@@ -4,34 +4,34 @@ require 'dr/parse/simple_parser'
 describe DR::SimpleParser do
 	describe "parse_namevalue" do
 		it "parses a simple name value" do
-			DR::SimpleParser.parse_namevalue("foo:bar").must_equal([:foo,"bar"])
+			_(DR::SimpleParser.parse_namevalue("foo:bar")).must_equal([:foo,"bar"])
 		end
 		it "can let the name be a string" do
-			DR::SimpleParser.parse_namevalue("foo:bar",symbolize:false).must_equal(["foo","bar"])
+			_(DR::SimpleParser.parse_namevalue("foo:bar",symbolize:false)).must_equal(["foo","bar"])
 		end
 		it "only splits on the first ':'" do
-			DR::SimpleParser.parse_namevalue("foo:bar:baz").must_equal([:foo,"bar:baz"])
+			_(DR::SimpleParser.parse_namevalue("foo:bar:baz")).must_equal([:foo,"bar:baz"])
 		end
 		it "can change the separation" do
-			DR::SimpleParser.parse_namevalue("foo:bar!baz", sep: "!",symbolize:false).must_equal(["foo:bar","baz"])
+			_(DR::SimpleParser.parse_namevalue("foo:bar!baz", sep: "!",symbolize:false)).must_equal(["foo:bar","baz"])
 		end
 		it "can set a default" do
-			DR::SimpleParser.parse_namevalue("foo", default: 0).must_equal([:foo,0])
+			_(DR::SimpleParser.parse_namevalue("foo", default: 0)).must_equal([:foo,0])
 		end
 		it "If the default is true then support 'no-foo'" do
-			DR::SimpleParser.parse_namevalue("no-foo", default: true).must_equal([:foo,false])
+			_(DR::SimpleParser.parse_namevalue("no-foo", default: true)).must_equal([:foo,false])
 		end
 		it "can set the default to true" do
-			DR::SimpleParser.parse_namevalue("foo", default: true, symbolize:false).must_equal(["foo",true])
+			_(DR::SimpleParser.parse_namevalue("foo", default: true, symbolize:false)).must_equal(["foo",true])
 		end
 	end
 
 	describe "parse_strings" do
 		it "can parse several name values" do
-			DR::SimpleParser.parse_string("foo:bar,ploum:plim")[:values].must_equal({foo: "bar", ploum: "plim"})
+			_(DR::SimpleParser.parse_string("foo:bar,ploum:plim")[:values]).must_equal({foo: "bar", ploum: "plim"})
 		end
 		it "can handle options" do
-			DR::SimpleParser.parse_string("name1:value1!option1=ploum!option2=plam!option3,name2:value2!!globalopt1=foo,globalopt2=bar").must_equal({
+			_(DR::SimpleParser.parse_string("name1:value1!option1=ploum!option2=plam!option3,name2:value2!!globalopt1=foo,globalopt2=bar")).must_equal({
 			values: {name1: "value1", name2: "value2"},
 			local_opts: {name1: {option1:"ploum",option2:"plam",option3:true}, name2: {}},
 			global_opts: {globalopt1: "foo", globalopt2: "bar"},

data/test/test_time_parse.rb

@@ -0,0 +1,43 @@
+require 'helper'
+require 'dr/parse/time_parse'
+
+describe DR::TimeParse do
+	before do
+		@tz=ENV['TZ']
+		ENV['TZ']='GMT'
+		class << Time
+			alias _original_now now
+			def now
+				Time.new(2000)
+			end
+		end
+	end
+	after do
+		ENV['TZ']=@tz
+		class << Time
+			alias now _original_now
+		end
+	end
+
+	it "Can parse a range" do
+		_(DR::TimeParse.parse("+100..tomorrow")).must_equal(
+			Time.parse("2000-01-01 00:01:40")..Time.parse("2000-01-02 12:00:00")
+		)
+		_(DR::TimeParse.parse("now..in seven days")).must_equal(
+			Time.parse("2000-01-01 00:00:00")..Time.parse("2000-01-08 00:00:00")
+		)
+	end
+
+	it "Can parse a date" do
+		_(DR::TimeParse.parse("today")).must_equal(Time.parse("2000-01-01-12:00:00"))
+	end
+
+	it "Can put a date in a range" do
+		_(DR::TimeParse.parse("today", range: true)).must_equal(
+			Time.parse("2000-01-01-00:00:00")..Time.parse("2000-01-02-00:00:00")
+		)
+	end
+end
+
+#with active_support: DR::TimeParse.parse("-3 years 2 minutes")
+#=> 2011-08-22 20:01:34 +0200

data/test/test_uri.rb

@@ -0,0 +1,35 @@
+require 'helper'
+require 'dr/base/uri'
+
+describe DR::URI::Wrapper do
+	before do
+		@uri=DR::URI::Wrapper.new(DR::URI::Escape.escape("http://ploum:secret@plam:443/foo bar"))
+	end
+	it "Wraps an uri element" do
+		_(@uri.scheme).must_equal "http"
+	end
+	it "Auto escapes attribute" do
+		_(@uri.path).must_equal "/foo bar"
+	end
+	it "Auto escape setting elements" do
+		@uri.user="ploum plam"
+		_(@uri.user).must_equal "ploum plam"
+	end
+	it "Can convert to a hash" do
+		_(@uri.to_h[:user]).must_equal("ploum")
+	end
+	it "Can convert to json" do
+		require 'json'
+		_(@uri.to_json).must_equal("{\"uri\":\"http://ploum:secret@plam:443/foo%20bar\",\"scheme\":\"http\",\"userinfo\":\"ploum:secret\",\"host\":\"plam\",\"port\":443,\"path\":\"/foo bar\",\"user\":\"ploum\",\"password\":\"secret\"}")
+	end
+	it "Can remove password" do
+		_(@uri.to_public).must_equal("http://ploum@plam:443/foo%20bar")
+	end
+	it "Can be merged" do
+		_(@uri.soft_merge("foo://plim@").to_s).must_equal("foo://plim:secret@plam:443/foo%20bar")
+	end
+	it "Can be reverse merged" do
+		_(DR::URI::Wrapper.parse("//user@server").reverse_merge(@uri).to_s).must_equal("http://user:secret@server:443/foo%20bar")
+	end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drain
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Damien Robert
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-09-07 00:00:00.000000000 Z
+date: 2020-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -28,47 +28,47 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10'
 - !ruby/object:Gem::Dependency
-  name: rubygems-tasks
+  name: chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: chronic_duration
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.10'
 description: 'Drain is a small set of libraries that I use in my other gems.
 
-'
+  '
 email: Damien.Olivier.Robert+gems@gmail.com
 executables: []
 extensions: []
@@ -77,6 +77,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
+- ".bundle/config"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".travis.yml"
 - ".yardopts"
@@ -91,6 +93,7 @@ files:
 - lib/dr/base.rb
 - lib/dr/base/bool.rb
 - lib/dr/base/converter.rb
+- lib/dr/base/delegate.rb
 - lib/dr/base/encoding.rb
 - lib/dr/base/eruby.rb
 - lib/dr/base/functional.rb
@@ -120,12 +123,14 @@ files:
 - test/test_meta.rb
 - test/test_simple_keywords.rb
 - test/test_simple_parser.rb
+- test/test_time_parse.rb
+- test/test_uri.rb
 homepage: https://github.com/DamienRobert/drain#readme
 licenses:
 - MIT
 metadata:
   yard.run: yri
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -140,9 +145,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Use a drain for a dryer ruby!
 test_files: []