ruby3mf 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c07802f6add8f14b33c46f785b5f066e1692c2c
-  data.tar.gz: ba1d5f3974d247a8f6423f1f01b67e3bea44da7d
+  metadata.gz: 2103e190da26beb2e01fb74ce4faf7443085ca3a
+  data.tar.gz: 21b7a9b19a9ebcf65661481138afdbb7b27c2c8e
 SHA512:
-  metadata.gz: 446d4161c036b8a0790154e0a4e7b00ab178053c3c83fca9a3e37f6965f57d9da585ef40bc8e2f68c1ccb4b9a805e4b945b934caa9517a9b960f1ef0d2f53a38
-  data.tar.gz: 183521c53e13d532943030fdad6b30cff5f5b3e49e4dd6c226bf369a6f3065be3893ee0e6b00fac06ecbc7cea35ac5ff87df41998c743b003ad6994d0b2d5eae
+  metadata.gz: 7d91f2e9ec52ea81032401064895e83ea4bd7c6d17b93af515a02f5d4aa7c66143e578b1736f50c206e73efd866ec1848483b08341577742d3452569c6c17399
+  data.tar.gz: d69275d9af624eb6f612569259cea989098acfa4b32e96a4be20c2cc097c6c3de39921f2f2752b85f7bb54b582916e8706ea17cda0068f705df33624cde6c024

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 .idea
+/spec/ruby3mf-testfiles/

data/lib/ruby3mf/document.rb

@@ -22,6 +22,7 @@ class Document
     begin
       Log3mf.context "examining zip" do |l|
         begin
+          Zip.warn_invalid_date = false
           Zip::File.open(input_file) do |zip_file|
 
             # puts "Zip contents:"

data/lib/ruby3mf/log3mf.rb

@@ -68,21 +68,27 @@ class Log3mf
   end
 
   def log(severity, message, options={})
-    add_to_ledger(caller[1], severity, message, options[:page]) if [:error, :fatal_error].include?(severity)
-
     @log_list << ["#{@context_stack.join("/")}", severity, message, options] unless severity==:debug && ENV['LOGDEBUG'].nil?
     #puts "[#{@context_stack.join("/")}] #{severity.to_s.upcase} #{message}"
     raise FatalError if severity == :fatal_error
   end
 
   def count_entries(*levels)
-    @log_list.select { |i| levels.include? i[1] }.count
+    entries(*levels).count
   end
 
   def self.count_entries(*l)
     Log3mf.instance.count_entries(*l)
   end
 
+  def entries(*levels)
+    @log_list.select { |i| levels.include? i[1] }
+  end
+
+  def self.entries(*l)
+    Log3mf.instance.entries(*l)
+  end
+
   def spec_link(page)
     "http://3mf.io/wp-content/uploads/2016/03/3MFcoreSpec_1.1.pdf#page=#{page}"
   end
@@ -121,42 +127,5 @@ class Log3mf
   def self.to_pp
     Log3mf.instance.to_pp
   end
-
-  def reconcile_ledger
-    expected_errors = CSV.read("spec/expected_errors.csv")
-
-    {expected_errors_not_found: expected_errors - @ledger,
-    unexpected_errors: @ledger - expected_errors }
-  end
-
-  def expected_error_messages_for_testcase(filename)
-    expected_errors = CSV.read("spec/expected_errors.csv")
-    relevant_errors = expected_errors.select { |error| filename.split("/").last.include? error.first }
-    relevant_errors.map { |error| {severity: error[2], csv_safe_msg: error[3], page: error[4] } }
-  end
-
-  def csv_safe_transform(s)
-    s.gsub(",", "_").gsub("\n", " ").gsub("\"", "_")
-  end
-
-  private
-  def add_to_ledger(location, severity, message, page)
-    caller_file=location.split(":").first.split("3mf_validator").last
-
-    csv_safe_msg = csv_safe_transform(message)
-    page ||= -1
-
-    entry = [@context_stack.first, caller_file, severity.to_s, csv_safe_msg, page.to_s]
-    unless @ledger.include? entry
-      @ledger << entry
-      archive_error(entry) if ENV['SAVEERRORS']!=nil
-    end
-  end
-
-  def archive_error(entry)
-    File.open("tmp_expected_errors.csv", 'a') do |file|
-        file.puts entry.join(",")
-    end
-  end
 end
 

data/lib/ruby3mf/version.rb

@@ -1,3 +1,3 @@
 module Ruby3mf
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/ruby3mf.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Mike Whitmarsh, Jeff Porter, and William Hertling"]
   spec.email         = ["mwhit@hp.com", "jeff.porter@hp.com", "william.hertling@hp.com"]
 
-  spec.summary       = %q{Read, write and validate 3MF files with native Ruby}
-  spec.description   = %q{Read, write and validate 3MF files with native Ruby easily.}
+  spec.summary       = %q{Read, write and validate 3MF files with Ruby}
+  spec.description   = %q{Read, write and validate 3MF files with Ruby easily.}
   spec.homepage      = "https://github.com/IPGPTP/ruby3mf"
   spec.license       = "MIT"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby3mf
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Mike Whitmarsh, Jeff Porter, and William Hertling
@@ -94,7 +94,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Read, write and validate 3MF files with native Ruby easily.
+description: Read, write and validate 3MF files with Ruby easily.
 email:
 - mwhit@hp.com
 - jeff.porter@hp.com
@@ -148,5 +148,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Read, write and validate 3MF files with native Ruby
+summary: Read, write and validate 3MF files with Ruby
 test_files: []