Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rails upgrade 5 2 #30

Merged
merged 3 commits into from
Apr 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ source 'https://rubygems.org'

gemspec :development_group => :test

gem 'mongoid', '~> 5.0.0'
gem 'mongoid', '~> 6.4.2'

# gem 'cqm-models', '~> 0.8.4'
# gem 'cqm-models', '~> 1.0.2'
gem 'cqm-models', git: 'https://github.com/projecttacoma/cqm-models.git', branch: 'master'
# gem 'cqm-models', :path => '../cqm-models'

Expand All @@ -30,6 +30,5 @@ group :test do
gem 'minitest', '~> 5.3'
gem 'minitest-reporters'
gem 'awesome_print', :require => 'ap'
gem 'simplexml_parser', :git => 'https://github.com/projecttacoma/simplexml_parser.git', :branch => 'master'
gem 'vcr'
end
125 changes: 41 additions & 84 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,21 @@ GIT
specs:
cqm-models (1.0.2)

GIT
remote: https://github.com/projecttacoma/simplexml_parser.git
revision: 1e8429773abb3e297c03133ae202900f35a6f9ed
branch: master
specs:
simplexml_parser (1.0.1)
health-data-standards (~> 4.0)
tilt (~> 1.4)

PATH
remote: .
specs:
cqm-parsers (0.2.1)
activesupport (~> 4.2.0)
cqm-parsers (1.0.0)
activesupport (~> 5.0)
builder (~> 3.1)
erubis (~> 2.7.0)
highline (~> 1.7.0)
log4r (~> 1.1.10)
memoist (~> 0.9.1)
mongoid (~> 5.0.0)
mongoid-tree (~> 2.0.0)
mongoid (~> 6.4.2)
mongoid-tree (~> 2.1.1)
mustache
nokogiri (~> 1.8.5)
protected_attributes (~> 1.0.5)
protected_attributes_continued (~> 1.4.0)
rubyzip (~> 1.2.2)
typhoeus
uuid (~> 2.3.7)
Expand All @@ -37,23 +28,22 @@ PATH
GEM
remote: https://rubygems.org/
specs:
activemodel (4.2.10)
activesupport (= 4.2.10)
builder (~> 3.1)
activesupport (4.2.10)
i18n (~> 0.7)
activemodel (5.2.3)
activesupport (= 5.2.3)
activesupport (5.2.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.5.2)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
ansi (1.5.0)
ast (2.4.0)
awesome_print (1.8.0)
bson (4.3.0)
bson (4.4.2)
builder (3.2.3)
bundler-audit (0.6.0)
bundler (~> 1.2)
bundler-audit (0.6.1)
bundler (>= 1.2.0, < 3)
thor (~> 0.18)
byebug (6.0.2)
cane (2.3.0)
Expand All @@ -63,74 +53,50 @@ GEM
simplecov
url
coderay (1.1.2)
concurrent-ruby (1.0.5)
concurrent-ruby (1.1.5)
crack (0.4.3)
safe_yaml (~> 1.0.0)
docile (1.3.1)
domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0)
erubis (2.7.0)
ethon (0.11.0)
ethon (0.12.0)
ffi (>= 1.3.0)
factory_girl (4.1.0)
activesupport (>= 3.0.0)
ffi (1.9.25)
hashdiff (0.3.7)
health-data-standards (4.1.0)
activesupport (~> 4.2.0)
builder (~> 3.1)
erubis (~> 2.7.0)
highline (~> 1.7.0)
log4r (~> 1.1.10)
memoist (~> 0.9.1)
mongoid (~> 5.0.0)
mongoid-tree (~> 2.0.0)
nokogiri (~> 1.8.2)
protected_attributes (~> 1.0.5)
rest-client (~> 1.8.0)
rubyzip (~> 1.2.1)
uuid (~> 2.3.7)
zip-zip (~> 0.3)
ffi (1.10.0)
hashdiff (0.3.8)
highline (1.7.10)
http-cookie (1.0.3)
domain_name (~> 0.5)
i18n (0.9.5)
i18n (1.6.0)
concurrent-ruby (~> 1.0)
json (2.1.0)
json (2.2.0)
log4r (1.1.10)
log_switch (1.0.0)
macaddr (1.7.1)
systemu (~> 2.6.2)
memoist (0.9.3)
method_source (0.8.2)
mime-types (2.99.3)
mini_portile2 (2.3.0)
minitest (5.11.3)
minitest-reporters (1.3.5)
minitest-reporters (1.3.6)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
mongo (2.6.2)
bson (>= 4.3.0, < 5.0.0)
mongoid (5.0.2)
activemodel (~> 4.0)
mongo (~> 2.1)
origin (~> 2.1)
tzinfo (>= 0.3.37)
mongoid-tree (2.0.1)
mongoid (>= 4.0, < 6.0)
mongo (2.8.0)
bson (>= 4.4.2, < 5.0.0)
mongoid (6.4.2)
activemodel (>= 5.1, < 6.0.0)
mongo (>= 2.5.1, < 3.0.0)
mongoid-tree (2.1.1)
mongoid (>= 4.0, < 8)
mustache (1.1.0)
netrc (0.11.0)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
origin (2.3.1)
parallel (1.12.1)
parser (2.5.1.2)
parallel (1.17.0)
parser (2.6.2.0)
ast (~> 2.4.0)
powerpack (0.1.2)
protected_attributes (1.0.9)
activemodel (>= 4.0.1, < 5.0)
protected_attributes_continued (1.4.0)
activemodel (>= 5.0)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
Expand All @@ -139,11 +105,7 @@ GEM
pry (>= 0.9.10, < 0.11.0)
public_suffix (3.0.3)
rainbow (3.0.0)
rake (12.3.1)
rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rake (12.3.2)
rubocop (0.52.1)
parallel (~> 1.10)
parser (>= 2.4.0.2, < 3.0)
Expand All @@ -153,7 +115,7 @@ GEM
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.10.0)
rubyzip (1.2.2)
safe_yaml (1.0.4)
safe_yaml (1.0.5)
simplecov (0.16.1)
docile (~> 1.1)
json (>= 1.8, < 3)
Expand All @@ -165,26 +127,22 @@ GEM
log_switch (>= 0.3.0)
term-ansicolor (>= 1.0.5)
text-table (>= 1.2.2)
term-ansicolor (1.6.0)
term-ansicolor (1.7.1)
tins (~> 1.0)
text-table (1.2.4)
thor (0.20.0)
thor (0.20.3)
thread_safe (0.3.6)
tilt (1.4.1)
tins (1.16.3)
tins (1.20.2)
typhoeus (1.3.1)
ethon (>= 0.9.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.5)
unicode-display_width (1.4.0)
unicode-display_width (1.5.0)
url (0.3.2)
uuid (2.3.9)
macaddr (~> 1.0)
vcr (3.0.3)
webmock (3.4.2)
vcr (4.0.0)
webmock (3.5.1)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
Expand All @@ -205,13 +163,12 @@ DEPENDENCIES
factory_girl (~> 4.1.0)
minitest (~> 5.3)
minitest-reporters
mongoid (~> 5.0.0)
mongoid (~> 6.4.2)
pry
pry-nav
rake
rubocop (~> 0.52.1)
simplecov
simplexml_parser!
tailor (~> 1.1.2)
vcr
webmock
Expand Down
10 changes: 5 additions & 5 deletions cqm-parsers.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ Gem::Specification.new do |s|
s.authors = ["The MITRE Corporation"]
s.license = 'Apache-2.0'

s.version = '0.2.1'
s.version = '1.0.0'

s.add_dependency 'mustache'
s.add_dependency 'erubis', '~> 2.7.0'
s.add_dependency 'mongoid', '~> 5.0.0'
s.add_dependency 'mongoid-tree', '~> 2.0.0'
s.add_dependency 'activesupport', '~> 4.2.0'
s.add_dependency 'mongoid', '~> 6.4.2'
s.add_dependency 'mongoid-tree', '~> 2.1.1'
s.add_dependency 'activesupport', '~> 5.0'

s.add_dependency 'protected_attributes', '~> 1.0.5'
s.add_dependency 'protected_attributes_continued', '~> 1.4.0'
s.add_dependency 'uuid', '~> 2.3.7'
s.add_dependency 'builder', '~> 3.1'
s.add_dependency 'nokogiri', '~> 1.8.5'
Expand Down
17 changes: 0 additions & 17 deletions test/fixtures/hqmf/simplexml/CMS100v4_SimpleXML.xml

This file was deleted.

14 changes: 0 additions & 14 deletions test/fixtures/hqmf/simplexml/CMS102v4_SimpleXML.xml

This file was deleted.

17 changes: 0 additions & 17 deletions test/fixtures/hqmf/simplexml/CMS104v4_SimpleXML.xml

This file was deleted.

19 changes: 0 additions & 19 deletions test/fixtures/hqmf/simplexml/CMS105v4_SimpleXML.xml

This file was deleted.

16 changes: 0 additions & 16 deletions test/fixtures/hqmf/simplexml/CMS107v4_SimpleXML.xml

This file was deleted.

33 changes: 0 additions & 33 deletions test/fixtures/hqmf/simplexml/CMS108v4_SimpleXML.xml

This file was deleted.

20 changes: 0 additions & 20 deletions test/fixtures/hqmf/simplexml/CMS109v4_SimpleXML.xml

This file was deleted.

19 changes: 0 additions & 19 deletions test/fixtures/hqmf/simplexml/CMS110v4_SimpleXML.xml

This file was deleted.

16 changes: 0 additions & 16 deletions test/fixtures/hqmf/simplexml/CMS111v4_SimpleXML.xml

This file was deleted.

15 changes: 0 additions & 15 deletions test/fixtures/hqmf/simplexml/CMS113v4_SimpleXML.xml

This file was deleted.

13 changes: 0 additions & 13 deletions test/fixtures/hqmf/simplexml/CMS114v4_SimpleXML.xml

This file was deleted.

Loading