oddb2xml 2.7.1 → 2.7.5

data/lib/oddb2xml/xml_definitions.rb

@@ -1,9 +1,9 @@
 # Definitions for the sax-machine parse to parse
 # Preparations.xml
 
-require 'sax-machine'
+require "sax-machine"
 
-Strip_For_Sax_Machine = '<?xml version="1.0" encoding="utf-8"?>'+"\n"
+STRIP_FOR_SAX_MACHINE = '<?xml version="1.0" encoding="utf-8"?>' + "\n"
 
 class PriceElement
   include SAXMachine
@@ -31,8 +31,8 @@ end
 
 class PricesElement
   include SAXMachine
-  element :ExFactoryPrice, :class => PriceElement
-  element :PublicPrice, :class => PriceElement
+  element :ExFactoryPrice, class: PriceElement
+  element :PublicPrice, class: PriceElement
 end
 
 class LimitationElement
@@ -50,7 +50,7 @@ end
 
 class LimitationsElement
   include SAXMachine
-  elements :Limitation, :class => LimitationElement
+  elements :Limitation, class: LimitationElement
 end
 
 class PointLimitationElement
@@ -63,7 +63,7 @@ end
 
 class PointLimitationsElement
   include SAXMachine
-  elements :PointLimitation, :class => PointLimitationElement
+  elements :PointLimitation, class: PointLimitationElement
 end
 
 class PackContent
@@ -79,14 +79,14 @@ class PackContent
   element :FlagModal
   element :BagDossierNo
   element :GTIN
-  element :Limitations, :class => LimitationsElement
-  element :PointLimitations, :class => PointLimitationsElement
-  element :Prices, :class => PricesElement
+  element :Limitations, class: LimitationsElement
+  element :PointLimitations, class: PointLimitationsElement
+  element :Prices, class: PricesElement
 end
 
 class PacksElement
   include SAXMachine
-  elements :Pack, :class => PackContent
+  elements :Pack, class: PackContent
 end
 
 class ItCodeContent
@@ -95,18 +95,18 @@ class ItCodeContent
   element :DescriptionDe
   element :DescriptionFr
   element :DescriptionIt
-  element :Limitations, :class => LimitationsElement
+  element :Limitations, class: LimitationsElement
 end
 
 class ItCodeEntry
   include SAXMachine
-  element :ItCode, :class => ItCodeContent
+  element :ItCode, class: ItCodeContent
 end
 
 # handling attributes as suggested by https://github.com/pauldix/sax-machine/issues/30
 class ItCodesElement
   include SAXMachine
-  elements :ItCode, :class => ItCodeContent
+  elements :ItCode, class: ItCodeContent
 end
 
 class SubstanceElement
@@ -118,7 +118,7 @@ end
 
 class SubstancesElement
   include SAXMachine
-  elements :Substance, :class => SubstanceElement
+  elements :Substance, class: SubstanceElement
 end
 
 class PreparationContent
@@ -127,7 +127,7 @@ class PreparationContent
   element :NameFr
   element :NameDe
   element :NameIt
-  element :Status, :class => StatusElement
+  element :Status, class: StatusElement
   element :Dummy
   element :DescriptionDe
   element :DescriptionFr
@@ -141,29 +141,28 @@ class PreparationContent
   element :CommentFr
   element :CommentIt
   element :VatInEXF
-  element :Limitations, :class => LimitationsElement
-  element :Substances, :class => SubstancesElement
-  element :Packs, :class => PacksElement
-  element :ItCodes, :class => ItCodesElement
+  element :Limitations, class: LimitationsElement
+  element :Substances, class: SubstancesElement
+  element :Packs, class: PacksElement
+  element :ItCodes, class: ItCodesElement
 end
 
 class PreparationEntry
   include SAXMachine
-  element :Preparation, :class => PreparationContent
+  element :Preparation, class: PreparationContent
 end
 
 class PreparationsContent
   include SAXMachine
   attribute :ReleaseDate
-  elements :Preparation, :class => PreparationContent
+  elements :Preparation, class: PreparationContent
 end
 
 class PreparationsEntry
   include SAXMachine
-  element :Preparations, :class => PreparationsContent
+  element :Preparations, class: PreparationsContent
 end
 
-
 class CompElement
   include SAXMachine
   element :NAME
@@ -181,20 +180,20 @@ class ItemContent
   element :DSCR
   element :ADDSCR
   element :ATC
-  element :COMP, :class => CompElement
+  element :COMP, class: CompElement
 end
 
 class PharmaContent
   include SAXMachine
   attribute :CREATION_DATETIME
-  elements :ITEM, :class => ItemContent
+  elements :ITEM, class: ItemContent
 end
 
 class PharmaEntry
   include SAXMachine
   element :CREATION_DATETIME
-  element :NONPHARMA, :as => :PHARMA, :class => PharmaContent
-  element :PHARMA, :class => PharmaContent
+  element :NONPHARMA, as: :PHARMA, class: PharmaContent
+  element :PHARMA, class: PharmaContent
 end
 
 class ItemContent
@@ -208,7 +207,7 @@ class ItemContent
   element :DSCR
   element :ADDSCR
   element :ATC
-  element :COMP, :class => CompElement
+  element :COMP, class: CompElement
 end
 
 class MedicalInformationContent
@@ -225,17 +224,17 @@ end
 
 class MedicalInformationEntry
   include SAXMachine
-  element :medicalInformation, :class => MedicalInformationContent
+  element :medicalInformation, class: MedicalInformationContent
 end
 
 class MedicalInformationsContent
   include SAXMachine
-  elements :medicalInformation, :class => MedicalInformationContent
+  elements :medicalInformation, class: MedicalInformationContent
 end
 
 class MedicalInformationsEntry
   include SAXMachine
-  element :medicalInformations, :class => MedicalInformationsContent
+  element :medicalInformations, class: MedicalInformationsContent
 end
 
 class SwissRegItemContentContent
@@ -256,11 +255,11 @@ end
 class SwissRegArticleContent
   include SAXMachine
   attribute :CREATION_DATETIME
-  elements :ITEM, :class => SwissRegItemContentContent
+  elements :ITEM, class: SwissRegItemContentContent
 end
 
 class SwissRegArticleEntry
   include SAXMachine
   element :CREATION_DATETIME
-  element :ARTICLE, :class => SwissRegArticleContent
+  element :ARTICLE, class: SwissRegArticleContent
 end

data/lib/oddb2xml.rb

@@ -1,5 +1,5 @@
 require "oddb2xml/version"
-require 'oddb2xml/cli'
+require "oddb2xml/cli"
 
 module Oddb2xml
 end

data/oddb2xml.gemspec

@@ -1,52 +1,52 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'oddb2xml/version'
+require "oddb2xml/version"
 
 Gem::Specification.new do |spec|
-  spec.name        = "oddb2xml"
-  spec.version     = Oddb2xml::VERSION
-  spec.author      = "Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger"
-  spec.email       = "yasaka@ywesee.com, zdavatz@ywesee.com, ngiger@ywesee.com"
+  spec.name = "oddb2xml"
+  spec.version = Oddb2xml::VERSION
+  spec.author = "Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger"
+  spec.email = "yasaka@ywesee.com, zdavatz@ywesee.com, ngiger@ywesee.com"
   spec.description = "oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic."
-  spec.summary     = "oddb2xml creates xml files."
-  spec.homepage    = "https://github.com/zdavatz/oddb2xml"
-  spec.license       = "GPL-3.0"
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.summary = "oddb2xml creates xml files."
+  spec.homepage = "https://github.com/zdavatz/oddb2xml"
+  spec.license = "GPL-3.0"
+  spec.files = `git ls-files -z`.split("\x0")
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = ">= 2.2.0"
+  spec.required_ruby_version = ">= 2.5.0"
 
   # We fix the version of the spec to newer versions only in the third position
   # hoping that these version fix only security/severe bugs
   # Consulted the Gemfile.lock to get
-  spec.add_dependency 'rubyzip'#, '~> 1.1.3'
-  spec.add_dependency 'minitar'#, '~> 0.5.2'
-  spec.add_dependency 'mechanize'#, '~> 2.5.1'
-  spec.add_dependency 'nokogiri', '>= 1.8.2'
-  spec.add_dependency 'savon'#, '~> 2.11.0'
-  spec.add_dependency 'spreadsheet'#, '~> 1.0.0'
-  spec.add_dependency 'rubyXL', '~> 3.4.0'
-  spec.add_dependency 'sax-machine'#,  '~> 0.1.0'
-  spec.add_dependency 'parslet'#, '~> 1.7.0'
-  spec.add_dependency 'rubyntlm', '0.5.1'
-  spec.add_dependency 'multi_json'#, '>= 0.3.2'
-  spec.add_dependency 'httpi' #, '>= 2.4.1'
-  spec.add_dependency 'optimist'
-  spec.add_dependency 'xml-simple'
-  spec.add_dependency 'ox'
-  spec.add_dependency 'htmlentities'
-  spec.add_dependency 'webrick'
-  spec.add_dependency 'rexml'
+  spec.add_dependency "rubyzip" # , '~> 1.1.3'
+  spec.add_dependency "minitar" # , '~> 0.5.2'
+  spec.add_dependency "mechanize" # , '~> 2.5.1'
+  spec.add_dependency "nokogiri", ">= 1.8.2"
+  spec.add_dependency "savon" , '~> 2.12.0'
+  spec.add_dependency "spreadsheet" # , '~> 1.0.0'
+  spec.add_dependency "rubyXL", "~> 3.4.0"
+  spec.add_dependency "sax-machine" # ,  '~> 0.1.0'
+  spec.add_dependency "parslet" # , '~> 1.7.0'
+  spec.add_dependency "rubyntlm", "0.5.1"
+  spec.add_dependency "multi_json" # , '>= 0.3.2'
+  spec.add_dependency "httpi" # , '>= 2.4.1'
+  spec.add_dependency "optimist"
+  spec.add_dependency "xml-simple"
+  spec.add_dependency "ox"
+  spec.add_dependency "htmlentities"
+  spec.add_dependency "webrick"
+  spec.add_dependency "rexml"
+  spec.add_dependency "standardrb"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "webmock"
-  spec.add_development_dependency "rdoc"
+  spec.add_development_dependency "rdoc", "~> 6.3.3" # rdoc 6.4 depends on psych 4.0 which breaks savon!
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "timecop"
   spec.add_development_dependency "flexmock"
+  spec.add_development_dependency "psych", "< 4.0.0"
 end
-

data/shell.nix

@@ -0,0 +1,17 @@
+# See https://nixos.wiki/wiki/Packaging/Ruby
+# A small helper script to get a development version for oddb2xml under NixOS
+with import <nixpkgs> {};
+stdenv.mkDerivation {
+  name = "env";
+  buildInputs = [
+    ruby_3_0.devEnv
+    git
+    python
+    libpcap
+    libxml2
+    libxslt
+    pkg-config
+    bundix
+    gnumake
+  ];
+}