2019 standards update (#63)

* 2019 standards update entry point fix (#54) * fixed gem entry point file to be named properly * fix issue with loading api uploaded files (#55) * [Security] Bump nokogiri from 1.10.3 to 1.10.4 * Bump cqm-models version to 3.0.0
projecttacoma · Aug 26, 2019 · 173cea2 · 173cea2
1 parent 717f2e1
commit 173cea2
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 19 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -579,7 +579,7 @@ Naming/AccessorMethodName:
 # AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
 Naming/FileName:
   Exclude:
-    - 'lib/hqmf-parser.rb'
+    - 'lib/cqm-parsers.rb'
 
 Naming/MethodName:
   Exclude:

diff --git a/Gemfile b/Gemfile
@@ -4,8 +4,8 @@ gemspec :development_group => :test
 
 gem 'mongoid', '~> 5.0.0'
 
-# gem 'cqm-models', '~> 0.8.4'
-gem 'cqm-models', git: 'https://github.com/projecttacoma/cqm-models.git', branch: 'master'
+# gem 'cqm-models', '~> 3.0.0'
+# gem 'cqm-models', git: 'https://github.com/projecttacoma/cqm-models.git', branch: 'master'
 # gem 'cqm-models', :path => '../cqm-models'
 
 group :development, :test do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,16 +1,10 @@
-GIT
-  remote: https://github.com/projecttacoma/cqm-models.git
-  revision: d1ccbea6451f02fed3c5ef4e443a53bc6f29b000
-  branch: master
-  specs:
-    cqm-models (1.0.2)
-
 PATH
   remote: .
   specs:
     cqm-parsers (0.2.1)
       activesupport (~> 4.2.0)
       builder (~> 3.1)
+      cqm-models (~> 3.0.0)
       erubis (~> 2.7.0)
       highline (~> 1.7.0)
       log4r (~> 1.1.10)
@@ -55,6 +49,7 @@ GEM
       url
     coderay (1.1.2)
     concurrent-ruby (1.0.5)
+    cqm-models (3.0.0)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     docile (1.3.1)
@@ -63,16 +58,16 @@ GEM
       ffi (>= 1.3.0)
     factory_girl (4.1.0)
       activesupport (>= 3.0.0)
-    ffi (1.10.0)
+    ffi (1.11.1)
     hashdiff (0.3.7)
     highline (1.7.10)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
     log4r (1.1.10)
     log_switch (1.0.0)
-    macaddr (1.7.1)
-      systemu (~> 2.6.2)
+    macaddr (1.7.2)
+      systemu (~> 2.6.5)
     memoist (0.9.3)
     method_source (0.8.2)
     mini_portile2 (2.4.0)
@@ -92,7 +87,7 @@ GEM
     mongoid-tree (2.0.1)
       mongoid (>= 4.0, < 6.0)
     mustache (1.1.0)
-    nokogiri (1.10.3)
+    nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     origin (2.3.1)
     parallel (1.17.0)
@@ -118,7 +113,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.10.0)
-    rubyzip (1.2.2)
+    rubyzip (1.2.3)
     safe_yaml (1.0.4)
     simplecov (0.16.1)
       docile (~> 1.1)
@@ -162,7 +157,6 @@ DEPENDENCIES
   byebug (~> 6.0.2)
   cane (~> 2.3.0)
   codecov
-  cqm-models!
   cqm-parsers!
   factory_girl (~> 4.1.0)
   minitest (~> 5.3)

diff --git a/cqm-parsers.gemspec b/cqm-parsers.gemspec
@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
 
   s.version = '0.2.1'
 
+  s.add_dependency 'cqm-models', '~> 3.0.0'
   s.add_dependency 'mustache'
   s.add_dependency 'erubis', '~> 2.7.0'
   s.add_dependency 'mongoid', '~> 5.0.0'

diff --git a/lib/hqmf-parser.rb → lib/cqm-parsers.rb b/lib/hqmf-parser.rb → lib/cqm-parsers.rb
diff --git a/lib/measure-loader/mat_measure_files.rb b/lib/measure-loader/mat_measure_files.rb
@@ -53,7 +53,7 @@ class << self
 
       def unzip_measure_zip_into_hash(zip_file)
         folders = Hash.new { |h, k| h[k] = {files: []} }
-        Zip::File.open zip_file do |file|
+        Zip::File.open zip_file.path do |file|
           file.each do |f|
             pn = Pathname(f.name)
             next if '__MACOSX'.in? pn.each_filename  # ignore anything in a __MACOSX folder

diff --git a/lib/tasks/hqmf.rake b/lib/tasks/hqmf.rake
@@ -1,7 +1,7 @@
 require 'pathname'
 require 'fileutils'
 require 'json'
-require 'hqmf-parser'
+require 'cqm-parsers'
 
 namespace :hqmf do
 

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -16,7 +16,7 @@
 require 'typhoeus'
 
 PROJECT_ROOT = File.expand_path("../../", __FILE__)
-require_relative File.join(PROJECT_ROOT, 'lib', 'hqmf-parser')
+require_relative File.join(PROJECT_ROOT, 'lib', 'cqm-parsers')
 
 require 'minitest/autorun'
 require "minitest/reporters"