IOWA 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dfdb93365ca33a4dfe94d2959def585aced31f0ccc0fac2b6fe05c546fbe381
-  data.tar.gz: 0d767fb76519ef78f3a9878570e2bb9818546bca09484333deb52936c301f508
+  metadata.gz: 0b141f669a481dfeb33ff0df774e7c43785543f89a886a5e5aafb24f92ba0b7c
+  data.tar.gz: e5dbc337aaa57ad14fde1fdb208d34e6bc2772e40e2327b1f7596a7025b2b8a1
 SHA512:
-  metadata.gz: 8c91c9f21d776cdb9d9b96d35809e6f07f1b71edd10ba5d73d35dd6cc14de2271b6ad146e91e50e5b6e27401f3bec8d2ffd58d1df00f9dfaabb9257662801428
-  data.tar.gz: 92a70a1d8d4f82d1f3bfbd01b818764f799e675fc98b5d125db49daceac1e8f8e9ea0555af94fb520092c3b315a10b8485411db75f213bdde942760c8c01ef3b
+  metadata.gz: 07ac43222c7f56aa2a6027cc2068eadf5011192056d31977f794fa3b6ca44c944e7b1dba4afaf1fc5c22f9e10859297c0d5568529ea4dc3792a029976b8c5871
+  data.tar.gz: cdef478b9cf1469eb74dc8d6aa1643b15285e57edcbff31178b9071322530a2e8e168815983eacd3716731a01701f251d3fef49f107a8e560da3ff9c955bde28

data/components/Content/example/iowa/Content.html

@@ -1 +1 @@
-components/Content/example/iowa/../../Content.html
+../../Content.html

data/components/Content/example/iowa/Content.iwa

@@ -1 +1 @@
-components/Content/example/iowa/../../Content.iwa
+../../Content.iwa

data/iowa.gemspec

@@ -42,4 +42,8 @@ spec = Gem::Specification.new do |s|
     end
   end
   s.description = description[1..-1].join(" ")
+
+  s.add_runtime_dependency "eventmachine"
+  s.add_runtime_dependency "mail"
+  s.add_runtime_dependency "mime-types"
 end

data/src/iowa.rb

@@ -92,8 +92,8 @@ module Iowa
 					new_item = {}
 					next unless item.is_a?(::Hash)
 					item.each do |k,v|
-						k.sub!(/^\s+/,'')
-						v.sub!(/^\s+/,'')
+						k = k.sub(/^\s+/,'')
+						v = v.sub(/^\s+/,'')
 						c,m = v.split('.',2)
 						dd = Iowa::DispatchDestination.new(c,m)
 						if m = /^\/(.*)\//.match(k)
@@ -110,7 +110,7 @@ module Iowa
 					new_item = {}
 					next unless item.is_a?(::Hash)
 					item.each do |k,v|
-						k.sub!(/^\s+/,'')
+						k = k.sub(/^\s+/,'')
 						if v.is_a?(Array)
 							list = []
 							v.each {|x| list.push(Regexp.new(x.sub(/^\s+/,''),true))}

data/src/iowa/AcceptLanguage.rb

@@ -32,7 +32,7 @@ module Iowa
 			seq = []
 			alstring.split(C_comma).each do |spec|
 				language,qf = spec.split(QFRXP)
-				qf.sub!(/q=/,C_empty) if qf
+				qf = qf.sub(/q=/,C_empty) if qf
 				qf = C_1_0 unless qf.to_s != C_empty
 				seq << [language,qf.to_f]
 			end

data/src/iowa/Application.rb

@@ -711,7 +711,7 @@ module Iowa
     # Given a component name, finds the path to it.
 
     def pathForName(name)
-      name.gsub!(/Iowa::Application::ContentClasses::/,C_empty)
+      name = name.gsub(/Iowa::Application::ContentClasses::/,C_empty)
       return @pathNameCache[name] if @templateLTimes.has_key?(name) and (@templateLTimes[name] < Time.now)
       my_docroot = @docroot
       my_docroot << C_slash unless my_docroot[-1,1] == C_slash
@@ -733,7 +733,7 @@ module Iowa
     # Extract the code and bindings from the code data.
   
     def get_code_and_bindings(codedata)
-      codedata.sub!(/<\?(.*?)\?>/m, C_empty)
+      codedata = codedata.sub(/<\?(.*?)\?>/m, C_empty)
       bindings = ''
       bindings = $1.gsub(BindingCommentsRegexp,C_empty) if $1
       if m = /<%(.*?)%>/m.match(codedata)
@@ -767,13 +767,13 @@ module Iowa
         codedata = data.gsub(/\cM/,C_empty)
         unless /<%.*?%>/m.match(codedata)
           codedata,codefile_path = defaultScript(file)
-          codedata.gsub!(/\cM/,C_empty)
+          codedata = codedata.gsub(/\cM/,C_empty)
           code_text, bindings_text = *get_code_and_bindings(codedata)
         else
           codefile_path = file.path
-          codedata.sub!(/<%(.*?)%>/m, C_empty)
+          codedata = codedata.sub(/<%(.*?)%>/m, C_empty)
           code_text = $1
-          codedata.sub!(/<\?(.*?)\?>/m, C_empty)
+          codedata = codedata.sub(/<\?(.*?)\?>/m, C_empty)
           bindings_text = $1.gsub(BindingCommentsRegexp,C_empty) if $1
           data = codedata
         end
@@ -883,7 +883,7 @@ module Iowa
       my_docroot << C_slash unless my_docroot[-1,1] == C_slash
       my_docroot_minus_slash = my_docroot.sub(/\/$/,C_empty)
       filepath = file.path
-      filepath.sub!(/#{my_docroot}/,C_empty)
+      filepath = filepath.sub(/#{my_docroot}/,C_empty)
     
       path_parts = filepath.split(C_slash)
       # Knock the filename off of the array.
@@ -912,7 +912,7 @@ module Iowa
         mylog.info "Used basic scriptfile for #{file.path}"
       end
     
-      r.gsub!(/\[--CLASSNAME--\]/,name)
+      r = r.gsub(/\[--CLASSNAME--\]/,name)
       [r,df_found]
     end
 

data/src/iowa/Association.rb

@@ -56,8 +56,7 @@ module Iowa
   class FlexibleAssociation < Association
     def FlexibleAssociation.new(association)
       if association[0] == 123
-        association.sub!(/^\{/,C_empty)
-        association.sub!(/\}\s*$/,C_empty)
+        association = association.sub(/^\{/,C_empty).sub(/\}\s*$/,C_empty)
         LiteralAssociation.new(Proc.new {|*ns| ns = ns[0] || binding ; eval(association,ns)})
       else
         PathAssociation.new(association)

data/src/iowa/CSS.rb

@@ -478,7 +478,7 @@ module Iowa
 
 		def self.correct_for_css(t)
 			text = t.to_s
-			text.gsub!('_','-') unless text =~ /['"`]/
+			text = text.gsub('_','-') unless text =~ /['"`]/
 			#if text.index(' ')
 			#	text = "\"#{text}\""
 			#end

data/src/iowa/ImageSize.rb

@@ -140,8 +140,7 @@ class ImageSize
 	private(:measure_BMP)
 
 	def measure_PPM()
-		header = @img_data.read_o(1024)
-		header.gsub!(/^\#[^\n\r]*/m, "")
+		header = @img_data.read_o(1024).gsub(/^\#[^\n\r]*/m, "")
 		header =~ /^(P[1-6])\s+?(\d+)\s+?(\d+)/m
 		width = $2.to_i; height = $3.to_i
 		case $1

data/src/iowa/Lockfile.rb

@@ -362,7 +362,7 @@ unless defined? $__lockfile__
             else
               next
             end
-            host.gsub!(%r/^\.+|\.+$/,'')
+            host = host.gsub(%r/^\.+|\.+$/,'')
             quad = host.split %r/\./
             host = quad.first
             pat = %r/^\s*#{ host }/i

data/src/iowa/dispatchers/StandardDispatcher.rb

@@ -337,21 +337,21 @@ module Iowa
 						if @subtype
 							if @subsub
 								if @subtype == :sub
-									request.uri.sub!(@match,@subsub)
+                                                                  request.uri = request.uri.sub(@match,@subsub)
 								elsif @subtype == :gsub
-									request.uri.gsub!(@match,@subsub)
+                                                                  request.uri = request.uri.gsub(@match,@subsub)
 								end
 							elsif @subproc
 								if @subtype == :sub
-									request.uri.sub!(@match) {|*args| @subproc.call(request,*args)}
+                                                                  request.uri = request.uri.sub(@match) {|*args| @subproc.call(request,*args)}
 								elsif @subtype == :gsub
-									request.uri.gsub!(@match) {|*args| @subproc.call(request,*args)}
+                                                                  request.uri = request.uri.gsub(@match) {|*args| @subproc.call(request,*args)}
 								end
 							end
 						elsif @call
 							call_completed = false
 							if @call =~ /(?:::|^[A-Z][\w\d]*\.)/
-								@call.sub!(/^::/,'')
+								@call = @call.sub(/^::/,'')
 								if @call =~ /::/
 									parts = @call.split(/::/).reject {|p| p == ''}
 								else

data/src/iowa/version.rb

@@ -1,3 +1,3 @@
 module Iowa
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/src/mod_iowa.rb

@@ -24,8 +24,7 @@ module Apache
 			end
 
 			if @IowaMap and mapfile.to_s != ''
-				upuri = r.unparsed_uri
-				upuri.gsub!('\?.*$','') if upuri =~ /\?/
+				upuri = r.unparsed_uri.gsub('\?.*$','') if upuri =~ /\?/
 				m = URIRegex.match upuri
 				urlRoot = m[1]
 				urlRoot.chop! if m[2] unless urlRoot == '/'
@@ -89,8 +88,7 @@ module Apache
 				File.open(mapfile,'r') do |fh|
 					fh.each do |line|
 						next if line =~ /^\s*#/
-						line.chomp!
-						line.gsub!(/: .*$/,'')
+						line = line.chomp.gsub(/: .*$/,'')
 						map[line] = true
 					end
 				end

data/test/TC_IOWAFunctions/doc/Ajax1.html

@@ -1 +1 @@
-test/TC_IOWAFunctions/doc/../iowa/Ajax1.html
+../iowa/Ajax1.html

data/test/TC_IOWAFunctions/doc/Ajax1.iwa

@@ -1 +1 @@
-test/TC_IOWAFunctions/doc/../iowa/Ajax1.iwa
+../iowa/Ajax1.iwa

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: IOWA
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Kirk Haines
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-11 00:00:00.000000000 Z
-dependencies: []
+date: 2021-03-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mail
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email: wyhaines@gmail.com
 executables: []
@@ -545,8 +587,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: iowa
-rubygems_version: 2.7.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Internet Objects for Web Applications - A unique and capable framework for