drain 0.3.0 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c577f08df5d0dd378a335824250d97008d3eb24896d101ecc1ed51a2281a1f0
-  data.tar.gz: f35b4fd99afb4870ddb44991b776ef8e5621739d7d83d7ba4d9ae851b2713df1
+  metadata.gz: 879680e62956b55119d14b0c5c334c1836c26b8922db6eaf12539c21fd1ccd76
+  data.tar.gz: 00134a0c8b8cb4e79aa8e2be089244864e46084c338917890caed1ae1e9abfc7
 SHA512:
-  metadata.gz: a889f20d3499a98ddc6da50f8cc14201881cf695271b250730ebc26024e657f2af2f7764f5e078979029559dd1dea3745a60a9df9c40ae8d5fc64f7903948a1e
-  data.tar.gz: 1a95a1661230282f9339258e1b6a241bd4fe2e503fbb9f43ea20c220e220a093903356cd8e78fd36e62899189b919a5a4ee50a3261951fdfde1bceebb91cbae1
+  metadata.gz: 5a9f6e1b457a54666f1fc2441d2104322811fc8c87f1857079092fdea94c1d819aadd63ee839b6a55c1ecb2c90a4260f53b3f6c3ecfd9e98a017a85c698e2107
+  data.tar.gz: c01a56879bf4e5558f461ad5c1a35582db768d6d62421cb62142061774a3bfbf8e8c3460fbdee6c0c26b816d7effd864b1cd0ab3be01bf3b541b4d2e6dc093bd

data/Rakefile

@@ -1,15 +1,5 @@
 require 'rake'
 
-begin
-  require 'rubygems/tasks'
-  Gem::Tasks.new(sign: {checksum: true, pgp: true}, 
-    scm: {status: true}) do |tasks|
-  tasks.console.command = 'pry'
-end
-rescue LoadError => e
-  warn e.message
-end
-
 require 'rake/testtask'
 Rake::TestTask.new do |test|
   test.libs << 'test'
@@ -27,3 +17,10 @@ rescue LoadError => e
 end
 task :doc => :yard
 
+begin
+  require 'dr/rake_gems'
+  Gem::MyTasks.new
+rescue LoadError => e
+  warn e.message
+end
+

data/lib/dr/base/delegate.rb

@@ -0,0 +1,28 @@
+module DR
+	module Delegator
+		extend self
+		def delegate_h(klass, var)
+			require 'forwardable'
+			# put in a Module so that they are easier to distinguish from the
+			# 'real' functions
+			m=Module.new do
+				extend(Forwardable)
+				methods=[:[], :[]=, :any?, :assoc, :clear, :compact, :compact!, :delete, :delete_if, :dig, :each, :each_key, :each_pair, :each_value, :empty?, :fetch, :fetch_values, :has_key?, :has_value?, :include?, :index, :invert, :keep_if, :key, :key?, :keys, :length, :member?, :merge, :merge!, :rassoc, :reject, :reject!, :select, :select!, :shift, :size, :slice, :store, :to_a, :to_h, :to_s, :transform_keys, :transform_keys!, :transform_values, :transform_values!, :update, :value?, :values, :values_at]
+				include(Enumerable)
+				def_delegators var, *methods
+			end
+			klass.include(m)
+		end
+
+		def access_methods(klass, var, *methods)
+			methods.each do |k|
+				klass.define_method k do
+					instance_variable_get(var)[k]
+				end
+				klass.defined_method :"#{k}=" do |*args|
+					instance_variable_get(var).send(:[]=, k, *args)
+				end
+			end
+		end
+	end
+end

data/lib/dr/base/graph.rb

@@ -7,7 +7,7 @@ module DR
 		attr_reader :graph
 		attr_accessor :name, :attributes, :parents, :children
 		def initialize(name, attributes: {}, graph: nil)
-			@name = name.to_s
+			@name = name
 			@children = []
 			@parents = []
 			@attributes = attributes
@@ -78,7 +78,7 @@ module DR
 
 		STEP = 4
 		def to_s(show_attr: true)
-			@name + (show_attr && ! attributes.empty? ? " #{attributes}" : "")
+			@name.to_s + (show_attr && ! attributes.empty? ? " #{attributes}" : "")
 		end
 		def inspect
 			"#{self.class}: #{to_s(show_attr: true)}"+(graph.nil? ? "" : " (#{graph})")
@@ -107,10 +107,12 @@ module DR
 	class Graph
 		attr_accessor :nodes
 		include Enumerable
+		# note: passing a graph won't work
 		def initialize(*nodes, attributes: {}, infos: nil)
 			@nodes=[]
 			# a node can be a Hash or a Node
-			build(*nodes, attributes: {}, infos: infos)
+			# so nodes really is a list of subgraphs
+			build(*nodes, attributes: attributes, infos: infos)
 		end
 		def each(&b)
 			@nodes.each(&b)
@@ -123,6 +125,10 @@ module DR
 		def to_a
 			return @nodes
 		end
+		def names
+			@nodes.map(&:name)
+		end
+
 		def to_hash(methods: [:children,:parents,:attributes], compact: true, recursive: true)
 			require 'dr/base/converter'
 			Converter.to_hash(@nodes, methods: methods, recursive: recursive, compact: compact)
@@ -142,7 +148,7 @@ module DR
 			h=to_hash(methods: [:children])
 			Hash[h.map {|k,v| [k.name, v.map(&:name)]}]
 		end
-		alias to_children to_h
+		#alias to_children to_h
 
 		def to_children
 			require 'dr/base/converter'
@@ -150,8 +156,11 @@ module DR
 		end
 
 		def inspect
-			"#{self.class}: #{map {|x| x.to_s}}"
+			"#{self.class}: #{map {|x| x.to_s(show_attr: false)}}"
 		end
+		# def to_s
+		# 	"#{self.class}: #{map {|x| x.to_s(show_attr: false)}}"
+		# end
 
 		#construct a node (without edges)
 		def new_node(node,**attributes)

data/lib/dr/base/uri.rb

@@ -96,7 +96,9 @@ module DR
 		end
 
 		def to_json(_state = nil)
-			to_h.to_json
+			h=to_h
+			h[:uri]=h[:uri].to_s #h[:uri] is a URIWrapper, so convert it to string so json does not convert it again
+			h.to_json
 		end
 
 		def to_public

data/lib/dr/base/utils.rb

@@ -1,7 +1,7 @@
 module DR
 	module Utils
 		extend self
-		def pretty_print(string, format: nil, pretty: false)
+		def pretty_print(string, format: nil, pretty: nil)
 			case format.to_s
 			when "json"
 				require 'json'
@@ -10,14 +10,23 @@ module DR
 				require "yaml"
 				return pretty_print(string.to_yaml, pretty: pretty)
 			end
-			if pretty.to_s=="color"
+			pretty = "color" if pretty == nil or pretty == true #default
+			case pretty.to_s
+			when "ap"
 				begin
 					require 'ap'
 					ap string
 				rescue LoadError,NameError
-					pretty_print(string,pretty:true)
+					pretty_print(string,pretty: :pp)
 				end
-			elsif pretty
+			when "color", "pp_color"
+				begin
+					require 'pry'
+					Pry::ColorPrinter.pp string
+				rescue LoadError,NameError
+					pretty_print(string,pretty: :pp)
+				end
+			when "pp"
 				require 'pp'
 				pp string
 			else
@@ -49,4 +58,22 @@ module DR
 			end
 		end
 	end
+
+	# Include this to get less output from pp
+	module PPHelper
+		# less verbose for pretty_print
+		def pretty_print(pp)
+			info = respond_to?(:to_pp) ? to_pp : to_s
+			pp.object_address_group(self) { pp.text " "+info }
+		end
+
+		#since we hide the pp value of self, allow to inspect it
+		def export
+			r={}
+			instance_variables.sort.each do |var|
+				r[var]=instance_variable_get(var)
+			end
+			r
+		end
+	end
 end

data/lib/dr/parse/simple_keywords.rb

@@ -20,7 +20,7 @@ module DR
 			edelim= delims[1] || bdelim
 			keywords=@keywords.keys
 			keywords_r="(?:"+keywords.map {|k| "(?:"+k+")"}.join("|")+")"
-			reg = %r{(?<kw>#{keywords_r})(?<re>#{'\\'+bdelim}(?:(?>[^#{'\\'+bdelim}#{'\\'+edelim}]+)|\g<re>)*#{'\\'+edelim})}
+			reg = %r{(?<kw>#{keywords_r})(?<re>#{'\\'+bdelim}(?:(?>[^#{'\\'+bdelim}#{edelim == bdelim ? '' : '\\'+edelim}]+)|\g<re>)*#{'\\'+edelim})}
 			if (m=reg.match(msg))
 				arg=m[:re][1...m[:re].length-1]
 				arg=parse(arg, **opts)

data/lib/dr/parse/time_parse.rb

@@ -1,6 +1,6 @@
 require 'chronic'
 require 'chronic_duration'
-require 'active_support/time'
+# require 'active_support/time'
 
 module DR
 	module TimeParse
@@ -8,17 +8,17 @@ module DR
 		def time_to_day_range(t)
 			return Chronic.parse(t.to_date, guess:false)
 		end
-		def parse(s, opt={})
+		def parse(s, **opt)
 			return s if Date===s or Time===s
 
-			if !opt[:norange] && s=~/(.*)\.\.(.*)/
-				first=$1
-				second=$2
+			!opt[:norange] and s.match(/(.*)\.\.(.*)/) do |m|
+				first=m[1]
+				second=m[2]
 				opt[:norange]=true
 				return Chronic::Span.new(self.parse(first, opt),self.parse(second,opt))
 			end
 
-			if not s.present?
+			if s.match(/\A[[:space:]]*\z/) # blank
 				t=Time.now
 			elsif s[0] =~ /[+-]/
 				#if s=+3.years-1.minutes
@@ -53,19 +53,25 @@ module DR
 
 	end
 end
-#Examples:
-#DR::TimeParse.parse("+100..tomorrow")
-#first: +100, second: tomorrow
-#=> 2014-08-22 11:20:31 +0200..2014-08-23 12:00:00 +0200
-#[74] pry(main)> DR::TimeParse.parse("now..in seven days")
-#first: now, second: in seven days
-#=> 2014-08-22 11:20:25 +0200..2014-08-29 11:20:25 +0200
-#[75] pry(main)> DR::TimeParse.parse("today")
-#=> 2014-08-22 17:30:00 +0200
-#[76] pry(main)> DR::TimeParse.parse("today",range: true)
-#=> 2014-08-22 11:00:00 +0200..2014-08-23 00:00:00 +0200
-#[181] pry(main)> DR::TimeParse.parse("-3 years 2 minutes")
-#-94672920
-#=> 2011-08-22 20:01:34 +0200
-#[182] pry(main)> DR::TimeParse.parse("+3.years+2.days")
-#=> 2017-08-24 14:04:08 +0200
+
+=begin Examples:
+
+DR::TimeParse.parse("+100..tomorrow") #first: +100, second: tomorrow
+=> 2014-08-22 11:20:31 +0200..2014-08-23 12:00:00 +0200
+
+DR::TimeParse.parse("now..in seven days") #first: now, second: in seven days
+=> 2014-08-22 11:20:25 +0200..2014-08-29 11:20:25 +0200
+
+DR::TimeParse.parse("today")
+=> 2014-08-22 17:30:00 +0200
+
+DR::TimeParse.parse("today",range: true)
+=> 2014-08-22 11:00:00 +0200..2014-08-23 00:00:00 +0200
+
+DR::TimeParse.parse("-3 years 2 minutes") #-94672920
+=> 2011-08-22 20:01:34 +0200
+
+require 'active_support/time'
+DR::TimeParse.parse("+3.years+2.days")
+=> 2017-08-24 14:04:08 +0200
+=end

data/lib/dr/ruby_ext/core_modules.rb

@@ -2,9 +2,9 @@ module DR
 	module CoreExt
 		#[Hash, Array].each {|m| m.include(Enumerable)} #to reinclude
 		module Enumerable
-			#Ex: [1,2,3,4].filter({odd: [1,3], default: :even})
+			#Ex: [1,2,3,4].classify({odd: [1,3], default: :even})
 			#=> {:odd=>[1, 3], :even=>[2, 4]}
-			def filter(h)
+			def classify(h)
 				invh=h.inverse
 				default=h[:default]
 				r={}
@@ -36,7 +36,7 @@ module DR
 
 			# Same as +deep_merge+, but modifies +self+.
 			def deep_merge!(other_hash, append: :auto, &block)
-				return unless other_hash
+				return self unless other_hash
 				other_hash.each_pair do |k,v|
 					tv = self[k]
 					case
@@ -301,6 +301,8 @@ module DR
 	end
 
 	module CoreRef
+		# warning, this only works for methods that don't need to call other
+		# refined methods
 		CoreExt.constants.select {|c| const_get("::#{c}").is_a?(Class)}.each do |c|
 			refine const_get("::#{c}") do
 				include CoreExt.const_get(c)

data/lib/dr/version.rb

@@ -1,4 +1,4 @@
 module DR
   # drain version
-  VERSION = "0.3.0"
+  VERSION = "0.4"
 end

data/test/test_core_ext.rb

@@ -10,8 +10,8 @@ module TestCoreExt
 	require 'dr/ruby_ext/core_ext'
 	describe DR::CoreExt do
 		describe Enumerable do
-			it "Can filter enumerable" do
-				[1,2,3,4].filter({odd: [1,3], default: :even}).must_equal({:odd=>[1, 3], :even=>[2, 4]})
+			it "Can classify enumerable" do
+				[1,2,3,4].classify({odd: [1,3], default: :even}).must_equal({:odd=>[1, 3], :even=>[2, 4]})
 			end
 		end
 

data/test/test_date_parse.rb

@@ -3,9 +3,13 @@ require 'dr/parse/date_parse'
 
 describe DR::DateRange do
 	before do
+		@tz=ENV['TZ']
 		ENV['TZ']='GMT'
 		@daterange=DR::DateRange.parse("2014-01-02 -> 2014-01-03, 2014-01-05, 2014-02 -> :now")
 	end
+	after do
+		ENV['TZ']=@tz
+	end
 
 	it "Can parse dates" do
 		@daterange.d.must_equal [["2014-01-02", "2014-01-03"], ["2014-01-05"], ["2014-02", :now]]

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::URIWrapper do
+	before do
+		@uri=DR::URIWrapper.new(URI.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::URIWrapper.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.4'
 platform: ruby
 authors:
 - Damien Robert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-07 00:00:00.000000000 Z
+date: 2019-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -68,7 +68,7 @@ dependencies:
         version: '0.8'
 description: 'Drain is a small set of libraries that I use in my other gems.
 
-'
+  '
 email: Damien.Olivier.Robert+gems@gmail.com
 executables: []
 extensions: []
@@ -91,6 +91,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,6 +121,8 @@ 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
@@ -140,8 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Use a drain for a dryer ruby!