ruby_stix 0.0.2-java → 0.2.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 112ae61c03f537dfd3b01d0dffaeedd15ad82300
-  data.tar.gz: 695c4969f7eca8b727d458c77ae76597a8335782
+  metadata.gz: 6654f92dd53901b9543d13ea76cbc817e642ef41
+  data.tar.gz: 22144630e430838ed923a737a365a2a64cf75ee5
 SHA512:
-  metadata.gz: c1ad8b82de21c3ddc359aaf98d7b0ead9f06dbe34b795efd2934c4730b4d741d4c72cf7d7e4279503aa9594b2b21d4d4af1ba6a807c27bffb3d3fc0bfd31777a
-  data.tar.gz: 6a7731bf85bdd57817956d43c1c7e667643114fa245d39a6d6eb20e76670568ba7046d43fde478fa3875889d6e2e98c1c7f860931129167468ddb0689b1de1c2
+  metadata.gz: bf295cc3ae32825aef7755178ddaa50d02c45bf25484f61d608b2c468317182901dc6afdd5c397815efed951b18683b4f5dc5c21173a9447c6ad1f134b611f71
+  data.tar.gz: a3d506757be957d80dbed091121070537de11ade667ebd13d26ff91ded751e3e467576981f011b7a1b04613e0f403845dca3c049b3a7095957c7e44344a34738

data/lib/ruby_stix.rb

@@ -74,7 +74,8 @@ module StixRuby
   end
 
   IRREGULARS = {
-    Regexp.new("tt_ps") => "ttps"
+    Regexp.new("tt_ps") => "ttps",
+    Regexp.new("co_as") => "coas"
   }
 
   NAMESPACE_MAPPINGS = {

data/lib/ruby_stix/api/api_helper.rb

@@ -6,12 +6,16 @@ java_import 'javax.xml.datatype.DatatypeFactory'
 ActiveSupport::Inflector.inflections do |inflect|
   inflect.acronym 'TTP'
   inflect.acronym 'TTPs'
+  inflect.acronym 'COA'
+  inflect.acronym 'COAs'
 end
 
 class Java::OrgMitre::ApiHelper
 
   BLACKLIST = ["getClass", "hashCode", "equals", "toString", "notify", "notifyAll", "wait"]
-  
+
+  include StixRuby::Marshall
+
   def initialize(*args)
     # Every time we create an object, we try to annotate that object's class. If the class has been annotated already,
     # this does nothing.
@@ -69,7 +73,7 @@ class Java::OrgMitre::ApiHelper
 
     # If key/value pairs were passed, use them
     process_args(args).each do |key, value|
-      process_single_argument(key, value)
+      process_single_argument(key, value) unless key == '@@class'
     end
   end
 
@@ -80,7 +84,6 @@ class Java::OrgMitre::ApiHelper
     # If we respond to the Ruby setter, call it. This allows Ruby-style keyword argument names to be used
     elsif self.respond_to?("#{k}=")
       self.send("#{k}=", v)
-    # If the value is an array, we can handle it a little differently
     # Note that some array arguments might get caught by the setter
     elsif v.kind_of?(Array)
       # Find the Java method name even if we used a Ruby-style name. This is imperfect so may throw errors.
@@ -107,6 +110,10 @@ class Java::OrgMitre::ApiHelper
       "get#{k}"
     elsif self.respond_to?("get#{to_java_name(k)}")
       "get#{to_java_name(k)}"
+    elsif k == 'ttps'
+      "getTTPS"
+    elsif k == 'coas'
+      "getCOAS"
     else
       raise "Unable to find corresponding java method for #{k}"
     end
@@ -115,7 +122,7 @@ class Java::OrgMitre::ApiHelper
   # Finds the expected class for a list by parsing it out of the Java signature. This kind of blows but the way Java
   # implements generics (type erasure) means the JRuby code does not have access to the generic type.
   def find_generic_argument_for(k)
-    return eval(self.java_class.java_method(k).to_generic_string.match(/<(.+)>/)[1])
+    Java::JavaClass.for_name(self.java_class.java_method(k).to_generic_string.match(/<(.+)>/)[1]).ruby_class
   end
 
   # Convert a Ruby-style method name (lower snake) to a Java-style method name (camel)
@@ -126,7 +133,7 @@ class Java::OrgMitre::ApiHelper
 
   # Generate a random ID. Uses the ID namespace if it's been set.
   def generate_id!
-    self.id = StixRuby.generate_id(self.class.to_s.split('::').last.gsub('Type', '').downcase)
+    self.id = StixRuby.generate_id(self.class.name.split('::').last.gsub('Type', '').downcase)
   end
 
   # Theoretically method_missing might be used for more, but currently it just tries to catch "add_"
@@ -149,7 +156,7 @@ class Java::OrgMitre::ApiHelper
             # We already have an item in the list, so just add the new one
             intermediate = send(java_method_name)
             argument_type = intermediate.find_generic_argument_for(java_method_name)
-            intermediate.send(java_method_name).add(auto_create_object(argument_type, args.first))            
+            intermediate.send(java_method_name).add(auto_create_object(argument_type, args.first))
           end
         else
           super
@@ -157,6 +164,8 @@ class Java::OrgMitre::ApiHelper
       else
         super
       end
+    elsif respond_to?("is_#{method_name}")
+      send("is_#{method_name}")
     else
       super
     end
@@ -179,6 +188,7 @@ class Java::OrgMitre::ApiHelper
   end
 
   def self.annotate!
+    return if @annotated == true
     # Mark us as annotated
     @annotated = true
 
@@ -197,7 +207,7 @@ class Java::OrgMitre::ApiHelper
     # to handle arrays appropriately and call constructors automatically when necessary
     self.setter_methods.each do |method_name, java_method|
       # Find the type of the argument and the name of the method
-      argument_type = java_method.argument_types.first.ruby_class 
+      argument_type = java_method.argument_types.first.ruby_class
 
       # Do not annotate this method if it's already annotated or has a basic value constructor
       next if argument_type == Java::JavaLang::Object || self.annotated_method?(method_name)
@@ -227,7 +237,7 @@ class Java::OrgMitre::ApiHelper
           object = auto_create_object(argument_type, args.first)
 
           send(method_name + "Raw", object)
-        end          
+        end
       end
     end
   end
@@ -263,16 +273,27 @@ class Java::OrgMitre::ApiHelper
   end
 
   def auto_create_object(argument_type, arg)
-    if arg.kind_of?(argument_type)
+    subclass = arg.kind_of?(Hash) && arg.delete('@@class')
+
+    if arg.nil?
+      nil
+    elsif arg.kind_of?(argument_type)
       arg
-    elsif argument_type.respond_to?(:from_value)
-      argument_type.from_value(arg)
+    elsif argument_type.respond_to?(:from_value) && (arg.kind_of?(String) || arg.keys == ['@@class', 'value'])
+      argument_type.from_value(arg.kind_of?(String) ? arg : arg['value'])
     # Handle an array argument
     # JAXB dates are really F'd up, so autoconvert them
     elsif argument_type == javax.xml.datatype.XMLGregorianCalendar
       calendar = java.util.GregorianCalendar.new
-      calendar.setTime(arg.to_java)
-      DatatypeFactory.newInstance.newXMLGregorianCalendar(calendar)
+      if arg.kind_of?(String)
+        arg = Time.parse(arg)
+        calendar.setTime(arg.to_java)
+        DatatypeFactory.newInstance.newXMLGregorianCalendar(calendar)
+      else
+        nil
+      end
+    elsif subclass
+      subclass.constantize.new(arg)
     else
       argument_type.new(arg)
     end
@@ -304,4 +325,4 @@ class Java::OrgMitre::ApiHelper
   def annotate_class!
     self.class.annotate! unless annotated?
   end
-end
+end

data/lib/ruby_stix/api/stix_type.rb

@@ -1,6 +1,4 @@
 class Java::OrgMitreStixCore::STIXType
-  include StixRuby::Marshall
-
   def add_observable(observable)
     self.observables ||= org.mitre.cybox.core.ObservablesType.new(:cybox_major_version => '2', :cybox_minor_version => '1')
     self.observables.add_observable(observable)
@@ -50,7 +48,7 @@ class Java::OrgMitreStixCore::STIXType
   end
 
   def process_args(args)
-    args[:version] ||= "1.0.1"
+    args[:version] ||= "1.1.1"
     args
   end
 end

data/lib/ruby_stix/version.rb

@@ -1,3 +1,3 @@
 module StixRuby
-  VERSION = "0.0.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_stix
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.2.0
 platform: java
 authors:
 - John Wunder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-08-24 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri