moss_ruby 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7501061523c707fa401f9a21744c3b9689b61eed
-  data.tar.gz: 0480f03c83f40c227e96897bbd26cf5b6a7a0b11
+  metadata.gz: ede898a27039418a249e377bbefcb25b31dfc8c5
+  data.tar.gz: ff6da3353d78254d07b39bdb28a1cc3f976e7f49
 SHA512:
-  metadata.gz: 100549f657224335d56c6f2752cb65ea6cde75aa5fff8d7b498fdace12a5bbf1aff8ce20c3d3ce9033a1869bf9920f12bbb6cda72ae2e64a8af4215799f6ee24
-  data.tar.gz: 91cd8e2fe59e97351d1a27bbb56e115336facfc24de4cb872589ba65a338e55c54688ca9f5f1e8ec5ccb4b82d44b08b265410ec6942e47084a261bad2dcaf6e5
+  metadata.gz: 2e44f5f1cefa7a02abf4935da2101ee1ca2d3e53875b4f8cfdb902cfbc6d8994f43562b47b2ff856ad23561e9134536030c87d3f5aa3785a64b92f26f021a9df
+  data.tar.gz: d1d3173ace55411467830c4b9f0bd560e96e0d6928b0ab8efc8cb67c5b18a750fdd5018e29defccd3ac39f067793ba4e2d3a6610f632d948490acd741ccae9a1

data/lib/moss_ruby.rb

@@ -61,15 +61,13 @@ class MossRuby
 	end
 
 	def upload_file (moss_server, file, id = 0)
-		filename = file.strip.tap do |name|
-			name.gsub! /[^\w\-\/.]/, '_'
-		end
+		filename = file.strip.encode('UTF-8', invalid: :replace, undef: :replace, replace: '').gsub /[^\w\-\/.]/, '_'
 
-		content = IO.read(filename)
+		content = IO.read(file)
 		size = content.bytes.length
 
-		if size > 0 
-			moss_server.write "file #{id} #{@options[:language]} #{size} #{file}\n"
+		if size > 0
+			moss_server.write "file #{id} #{@options[:language]} #{size} #{filename}\n"
 			moss_server.write content
 		end
 	end
@@ -77,7 +75,7 @@ class MossRuby
 	def check(files_dict, callback=nil)
 		# Chech that the files_dict contains valid filenames
 		files_dict[:base_files].each do |file_search|
-			if Dir.glob(file_search, File::FNM_CASEFOLD).length == 0
+			if Dir.glob(file_search).length == 0
 				raise "Unable to locate base file(s) matching #{file_search}"
 			end
 		end
@@ -87,7 +85,7 @@ class MossRuby
 		end
 
 		files_dict[:files].each do |file_search|
-			if Dir.glob(file_search, File::FNM_CASEFOLD).length == 0
+			if Dir.glob(file_search).length == 0
 				raise "Unable to locate base file(s) matching #{file_search}"
 			end
 		end
@@ -118,7 +116,7 @@ class MossRuby
 			processing = files_dict[:base_files]
 			processing.each do |file_search|
 				callback.call(" - Sending base files #{count} of #{processing.count} - #{file_search}") unless callback.nil?
-				files = Dir.glob(file_search, File::FNM_CASEFOLD)
+				files = Dir.glob(file_search)
 				file_count = 1
 				files.each do |file|
 					callback.call("   - Base file #{file_count} of #{files.count} - #{file}") unless callback.nil?
@@ -133,7 +131,7 @@ class MossRuby
 			processing = files_dict[:files]
 			processing.each do |file_search|
 				callback.call(" - Sending files #{count} of #{processing.count} - #{file_search}") unless callback.nil?
-				files = Dir.glob(file_search, File::FNM_CASEFOLD)
+				files = Dir.glob(file_search)
 				file_count = 1
 				files.each do |file|
 					callback.call("   - File #{idx} = #{file_count} of #{files.count} - #{file}") unless callback.nil?
@@ -190,22 +188,22 @@ class MossRuby
 
 				data[0] = read_data match_file[0]
 				data[1] = read_data match_file[1]
-				
+
 				callback.call(" - adding #{match} result") unless callback.nil?
-				result << [ 
+				result << [
 					{
-						filename: 	data[0][:filename], 
+						filename: 	data[0][:filename],
 						html:  		strip_a("<PRE>#{data[0][:html]}</PRE>"),
 						pct:  		Integer(top[:pct0]),
 						url: 		match_url,
 						part_url: 	"#{uri}/match#{id}-0.html"
 					},
 					{
-						filename: 	data[1][:filename], 
+						filename: 	data[1][:filename],
 						html:  		strip_a("<PRE>#{data[1][:html]}</PRE>"),
 						pct:  		Integer(top[:pct1]),
 						url: 		match_url,
-						part_url: 	"#{uri}/match#{id}-1.html"			
+						part_url: 	"#{uri}/match#{id}-1.html"
 					}
 				]
 			end
@@ -225,7 +223,7 @@ class MossRuby
 			page = open("#{uri}").read().encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '?')
 			regex = /<TR><TD><A HREF=".*?match(?<match_id>\d+).html">.*\((?<pct0>\d+)%\)<\/A>\n.*?<TD><A.*?((?<pct0>\d+)%\))/i
 			# puts "scanning page"
-			page.scan(regex).each do | match | 
+			page.scan(regex).each do | match |
 				id, pct0, pct1 = match
 				# puts "#{id}, #{pct0}, #{pct1}"
 				if Integer(pct0) >= min_pct || Integer(pct1) >= min_pct
@@ -251,4 +249,4 @@ class MossRuby
 		regex = /<TH>(?<filename0>\S+)\s\((?<pct0>\d+)%\).*<TH>(?<filename1>\S+)\s\((?<pct1>\d+)%\)/xm
 		top_file.match(regex)
 	end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moss_ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Andrew Cain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies: []
 description: Moss-ruby is an unofficial ruby gem for the Moss system for Detecting
   Software Plagiarism (http://theory.stanford.edu/~aiken/moss/)