middleman-xmlvalidator 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 657c043b6cccfb08a4d56357544082d7d1283bdb
-  data.tar.gz: 81aa7f5fe1f411b0e3874d08baa8fbdab9c7e8d4
+  metadata.gz: 7d22efc2ef768b664d5f318981965a54bf5c2a61
+  data.tar.gz: 7ae3edf7bbc7291043d4563e2e2ffce6ab5ffadc
 SHA512:
-  metadata.gz: b4658ebc46f7a275320010f24b298aac5a18604d797cb6d3a07cc95224fea898d50d5cbafa8a8b3cd856fbe725daff36cec8d17b564c2b04e1613c69ab23ae1f
-  data.tar.gz: a72cb0703089ac03f6a1a17a3dc4c0e11cac11dab3e3b9d204a20783c5b9bb27fd9f7f4fbc46d623acf7eb0d488c8c94fb40d9915c2ba2a33bc13af853662916
+  metadata.gz: 9c3351ad0bfff4375eac482ebbcdfbce8bdc0ad9735691b654940cd47c724cfdc9d580bbfc764bfc7541dfb594a28d0b0b77fddd8c2ed4ec843680783230e660
+  data.tar.gz: f97c0caf1e7dc370b2ab42cd94ccd3f6514ede9f8b18304a739812bfd9b236b0ef1dff7b0eb5858284ca3928e41c867d961b261bc738f0ff56eb5154d6be368b

data/lib/middleman/xmlvalidator/extension.rb

@@ -6,41 +6,33 @@ module Middleman
 
 				app.after_build do |builder|
 					puts "", "Validating with NokoGiri", ""
-					p Xmlvalidator.files_to_validate
-
-					Xmlvalidator.files_to_validate.each do |full_path|
-						file_name = full_path.split('/').last
-						validator_file = file_name.gsub(/\.\w*/, '.xsd')
-						validator_filepath = File.join(File.dirname(__FILE__), '/schema/' + validator_file)
-						validator = File.exists?(validator_filepath) ? validator_file : (file_name.end_with?('.rss') ? "RSSSchema.xsd" : "XMLSchema.xsd")
-
-						puts "  validating".blue + "  #{full_path}....." + (Xmlvalidator.valid(full_path, validator) == true ? "COMPLETE".green : "ERRORS FOUND".red)
-						Xmlvalidator.validate(full_path, validator).each do |error|
-							puts "     " + error.message
-						end
+
+					Dir.glob("build/**/*.{xml,rss}").each do |full_path|
+						Xmlvalidator.validate_file(full_path)
 					end
 
 					puts "", "Validation with NokoGiri " + "Complete".green, ""
 				end
 			end
 
-			def files_to_validate
-				Dir.glob("build/**/*.{xml,rss}")
-			end
-
 			alias :included :registered
 		end
 
-		def self.validate(document_path, schema_path)
-			schema = Nokogiri::XML::Schema(File.read(File.join(File.dirname(File.expand_path(__FILE__)), "./schema/" + schema_path)))
-			document = Nokogiri::XML(File.read(document_path))
-			schema.validate(document)
+		def self.validate_file(file_path)
+			file_name = file_path.split('/').last
+			validator_file = file_name.gsub(/\.\w*/, '.xsd')
+			schema_path = File.join(File.dirname(__FILE__), '/schema/')
+			schema_path += File.exists?(schema_path + validator_file) ? validator_file : (file_name.end_with?('.rss') ? "RSSSchema.xsd" : "XMLSchema.xsd")
+
+			errors = Xmlvalidator.validate(file_path, schema_path)
+			puts "  validating".blue + "  #{file_path}....." + (errors.size == 0 ? "COMPLETE".green : "ERRORS FOUND".red)
+			errors.each { |error| puts "     " + error.message }
 		end
 
-		def self.valid(document_path, schema_path)
-			schema = Nokogiri::XML::Schema(File.read(File.join(File.dirname(File.expand_path(__FILE__)), "./schema/" + schema_path)))
+		def self.validate(document_path, schema_path)
+			schema = Nokogiri::XML::Schema(File.read(schema_path))			
 			document = Nokogiri::XML(File.read(document_path))
-			schema.valid?(document)
+			schema.validate(document)
 		end
 
 	end

data/lib/middleman/xmlvalidator/version.rb

@@ -1,6 +1,6 @@
 module Middleman
   module Xmlvalidator
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
     PACKAGE = "middleman-xmlvalidator"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-xmlvalidator
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - briananders
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler