jaxb2ruby 0.0.1-java → 0.1.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dc40239981acd3661e8242ccb2902b59ab764bf7
-  data.tar.gz: af343089fe56230f70396608b57bb5c7165b11a1
+SHA256:
+  metadata.gz: bb1fd551dd00e0f11c5af79ffa5958ee4b6116b68bcc56cd0781a11a08190bd7
+  data.tar.gz: 5c02c7b905a35092f6814195bdaf117437bdd35ceeb6c242d0938204fbdfd480
 SHA512:
-  metadata.gz: 8bf71fe0df5b94ea3efe7ecd84dc076ada465b339dc20b1c3911ff6144e824329c621df25af4bfb54ca720f7d048aeb636e12eed8356bb52253b9c1bfe7d4efd
-  data.tar.gz: b8b1c81d1c8896ff50a33f85e9df9213f265bbdff09e837bd556b1c8bed16ddf9b1e03190bc283c5ea0af9b4c3134faa562232827a186821b904d50afcd2c31a
+  metadata.gz: 4954e1af4ca3527efec5a9d6318587c0af5be537144d69dcda5286127c0749a0747b6cb96a7be7f89c3acf1b0c579c41b35770966a2160d1ab8b4f628ea1c5a4
+  data.tar.gz: '058c2bbe3b10b62e74e8e3649161d880ccd6764451cd9428797b8e8fc675491bcbe85a569f21ab9e7f14a9441dd89a567cc4d8781245729c59949af194136643'

data/bin/jaxb2ruby

@@ -32,6 +32,10 @@ options = {}
 parser = OptionParser.new do |opts|
   opts.banner = "usage: #{File.basename($0)} [options] schema"
 
+  opts.on("-b", "--binding=FILE", "specify external bindings files (xjb). Each FILE must have its own -b.") do |opt|
+    (options[:bindings] ||= []).push(opt)
+  end
+
   opts.on("-c", "--classes=MAP1[,MAP2,...]", Array, "XML Schema type to Ruby class mappings", "MAP can be a string in the form type=class or a YAML file of type/class pairs") do |typemap|
     options[:typemap] = mapping_option(typemap)
   end
@@ -69,6 +73,10 @@ parser = OptionParser.new do |opts|
   opts.on("-w", "--wsdl", "Treat the schema as a WSDL", "Automatically set if the schema has a `.wsdl' extension") do
     options[:wsdl] = true
   end
+
+  opts.on("-x", "--xjc=PATH", "Path to the XJC executable to use; defaults to xjc") do |path|
+    options[:xjc] = path
+  end
 end
 
 parser.parse!
@@ -85,6 +93,5 @@ begin
     File.open(File.join(outdir, klass.path), "w") { |io| io.puts template.build(klass) }
   end
 rescue => e
-  puts e.backtrace.join("\n")
   abort "class generation failed: #{e}"
 end

data/lib/jaxb2ruby/classes.rb

@@ -168,11 +168,6 @@ module JAXB2Ruby
     # Paths for all of this class's dependencies, for passing to +require+.
     #
     def requires
-      # p @element
-      # p @module
-      #     @dependencies.each { |e| p e }
-      # p "-" * 20
-
       @requires ||= @dependencies.map { |e| make_path(e.split(RUBY_PKG_SEP)) }.sort.uniq
     end
 

data/lib/jaxb2ruby/converter.rb

@@ -16,7 +16,7 @@ module JAXB2Ruby
 
     def initialize(schema, options = {})
       raise ArgumentError, "cannot access schema: #{schema}" unless File.file?(schema) and File.readable?(schema)
-      @xjc = XJC.new(schema, :wsdl => !!options[:wsdl], :jvm => options[:jvm])
+      @xjc = XJC.new(schema, :xjc => options[:xjc], :wsdl => !!options[:wsdl], :jvm => options[:jvm], bindings: options[:bindings])
 
       @namespace = options[:namespace] || {}
       raise ArgumentError, "namespace mapping must be a Hash" unless @namespace.is_a?(Hash)
@@ -72,7 +72,7 @@ module JAXB2Ruby
     end
 
     def find_namespace(klass)
-      annot = klass.annotation(javax.xml.bind.annotation.XmlRootElement.java_class) || klass.annotation(javax.xml.bind.annotation.XmlType.java_class)
+      annot = klass.get_annotation(javax.xml.bind.annotation.XmlRootElement.java_class) || klass.get_annotation(javax.xml.bind.annotation.XmlType.java_class)
       return unless annot
 
       # if klass is an inner class the namespace will be on the outter class (enclosing_class).
@@ -83,7 +83,7 @@ module JAXB2Ruby
 
     def translate_type(klass)
       # Won't work for extract_class() as it expects an instance but this should be split anyways
-      return "Object" if klass.java_kind_of?(java.lang.reflect.WildcardType)
+      return "Object" if klass.kind_of?(java.lang.reflect.WildcardType)
 
       type = @typemap.java2ruby(klass.name)
       return type if type
@@ -107,12 +107,12 @@ module JAXB2Ruby
         resolved_type = []
         type = field.generic_type
 
-        if type.java_kind_of?(java.lang.reflect.ParameterizedType)
+        if type.kind_of?(java.lang.reflect.ParameterizedType)
           type = type.actual_type_arguments.first
 
-          if type.java_kind_of?(java.lang.reflect.ParameterizedType)
+          if type.kind_of?(java.lang.reflect.ParameterizedType)
             resolved_type << translate_type(type.actual_type_arguments.first)
-          # elsif type.java_kind_of?(java.lang.reflect.WildcardType)
+          # elsif type.kind_of?(java.lang.reflect.WildcardType)
           #   type.get_upper_bounds.each do |lower|
           #   end
           #   type.get_lower_bounds.each do |upper|
@@ -149,7 +149,6 @@ module JAXB2Ruby
         # If a node's type isn't predefined, it must be an XML mapped class
         dependencies << node.type if !@typemap.schema_ruby_types.include?(node.type)
       end
-      #p "-" * 20
 
       RubyClass.new(type, element, dependencies, superclass)
     end
@@ -196,7 +195,6 @@ module JAXB2Ruby
 
     # Create an element from a Java class, turning its fields into elements and attributes
     def extract_element(klass)
-      #p klass
       options = extract_elements_nodes(klass)
 
       if annot = klass.get_annotation(javax.xml.bind.annotation.XmlRootElement.java_class)
@@ -204,9 +202,6 @@ module JAXB2Ruby
         options[:root] = true
       end
 
-
-
-
       if name.blank?
         annot = klass.get_annotation(javax.xml.bind.annotation.XmlType.java_class)
         name  = annot.name
@@ -220,14 +215,7 @@ module JAXB2Ruby
       # element.elements.sort_by! { |e| annot.prop_order.index }
       options[:namespace] = extract_namespace(annot)
 
-      #p "name2 #{name}"
-      #p options
-      e=Element.new(name, options)
-      #p e.name
-      #p e.local_name
-      #p e.namespace
-      #p "-" * 20
-      e
+      Element.new(name, options)
     end
 
     def valid_class?(klass)

data/lib/jaxb2ruby/template.rb

@@ -4,8 +4,7 @@ module JAXB2Ruby
   class Template  # :nodoc:
     HEADING=<<HEAD
 #
-# Auto-generated by jaxb2ruby v<%= VERSION %> on <%= Time.now %>
-# https://github.com/sshaw/jaxb2ruby
+# Auto-generated by jaxb2ruby https://github.com/sshaw/jaxb2ruby
 #
 HEAD
 
@@ -20,7 +19,7 @@ HEAD
     def initialize(name = nil)
       # If it's not a named template assume it's a path
       path = PATHS[name] || name || DEFAULT
-      @__erb = ERB.new(HEADING + File.read(path), nil, "<>%-")
+      @__erb = ERB.new(HEADING + File.read(path), nil, "-")
     rescue => e
       raise Error, "cannot load class template: #{e}"
     end

data/lib/jaxb2ruby/version.rb

@@ -1,3 +1,3 @@
 module JAXB2Ruby
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/lib/jaxb2ruby/xjc.rb

@@ -32,9 +32,11 @@ module JAXB2Ruby
 
     def xjc
       options = @schema.end_with?(".wsdl") || @options[:wsdl] ? "-wsdl " : ""
-      options << "-extension -npa -d :sources :schema -b :config"
+      bindings = (@options[:bindings] || []).map { |binding| "-b #{binding}"}.join(" ")
+      options << "-extension -npa -d :sources :schema -b :config #{bindings}"
       options << @options[:jvm].map { |opt| " -J#{opt}" }.join(" ") if @options[:jvm]
-      line = Cocaine::CommandLine.new("xjc", options)
+
+      line = Cocaine::CommandLine.new(@options[:xjc] || "xjc", options)
       line.run(:schema => @schema, :sources => @sources, :config => CONFIG)
     rescue Cocaine::ExitStatusError => e
       raise Error, "xjc execution failed: #{e}"

data/spec/converter_spec.rb

@@ -2,6 +2,29 @@ require "spec_helper"
 require "jaxb2ruby/type_util"
 
 describe JAXB2Ruby::Converter do
+  it "errors when there elements with names causing a collision" do
+    assert_raises do
+      convert("conflict")
+    end
+  end
+
+  it "optionally accepts xjb files for binding" do
+    path = File.expand_path("../fixtures/conflict_binding.xjb", __FILE__)
+    hash = class_hash(convert("conflict", bindings: [path]))
+
+    _(hash["A"]).must_be_instance_of(JAXB2Ruby::RubyClass)
+    element_a = hash['A'].element.children.first
+    _(element_a).must_be_instance_of(JAXB2Ruby::Element)
+    _(element_a.accessor).must_equal('value')
+    _(element_a.type).must_equal('String')
+
+    _(hash["B"]).must_be_instance_of(JAXB2Ruby::RubyClass)
+    element_b = hash['B'].element.children.first
+    _(element_b).must_be_instance_of(JAXB2Ruby::Element)
+    _(element_b.accessor).must_equal('value')
+    _(element_b.type).must_equal('Float')
+  end
+
   it "creates ruby classes" do
     classes = convert("address")
     classes.size.must_equal(2)

metadata

@@ -1,57 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: jaxb2ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: java
 authors:
 - Skye Shaw
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2023-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   name: activesupport
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.5.8
   name: cocaine
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.5.8
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   name: rake
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 description: |2
       jaxb2ruby generates Java XML mappings via xjc, reads the resulting annotations, and passes the
       extracted info to an ERB template. This allows one to automatically map an XML schema to pure
@@ -87,27 +93,26 @@ licenses:
 metadata: {}
 post_install_message:
 rdoc_options:
-- -m
+- "-m"
 - README.rd
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - <
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.5
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Generate pure Ruby classes from an XML schema using JAXB and JRuby
 test_files:
-- spec/converter_spec.rb
 - spec/spec_helper.rb
+- spec/converter_spec.rb
 - spec/template_spec.rb