dataMetaDom 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5a34ddc40e94ae5a9075a76cd8896a3b3781b76
-  data.tar.gz: 80d035936a0991579930f19b6bf4f8262f81c7fe
+  metadata.gz: 2578257bdf5a67a2a4c25cfec42f5229900f07d6
+  data.tar.gz: e2c063e1d81b3e4eba2738559f23400857d5a0e6
 SHA512:
-  metadata.gz: 529782409a1e9957fba291b94318f96c7bea71f11415340039900be2a7d22d7e80761d4bfef5b5166e1b987d6dde4c5b9ea17e5e1579a9fc8194126b4508e53b
-  data.tar.gz: 571cb5dddc02d545731ef0ada7ea573ee033682816a13dc3122dd117229c7ba2b44a357a0e918a8c30c7661b3e71afbdcf487c904d086964c60130e33daef5c2
+  metadata.gz: 924717e61de5af7360386aebfc6146224217bb63f73f5d4f1300bf45a9e4dcfee84eebc8a474d40b3f0b903568ef2545dce306ad46042e23dc0689251e836c0f
+  data.tar.gz: 0362a4721f67d263a3de838470a438fd6d1c4d7ef066f5666d837d14f807e92058108da778d35c1057d0820e359d0b1e63a70e0e16a75fbc2f4b86a698a820b3

data/lib/dataMetaDom.rb

@@ -25,7 +25,7 @@ For command line details either check the new method's source or the README.rdoc
 module DataMetaDom
 
 # Current version
-VERSION = '1.0.0'
+VERSION = '1.0.1'
 
 =begin rdoc
 Quick and dirty turning a Windows path into a path of the platform on which this script is running.

data/lib/dataMetaDom/enum.rb

@@ -22,8 +22,8 @@ Attempts to consume/parse an enum from the given source on the given model, retu
   * src - an instance of SourceFile
 =end
     def self.consumed?(model, src)
-        src.line =~ /^\s*#{ENUM}\s+(\w+)$/ ? model.addEnum(Enum.new(combineNsBase(
-             nsAdjustment(src.namespace, model.options, src), $1)).parse(src)) : nil
+        src.line =~ /^\s*#{ENUM}\s+(\w+)$/ ? model.addEnum(Enum.new(DataMetaDom.combineNsBase(
+             DataMetaDom.nsAdjustment(src.namespace, model.options, src), $1)).parse(src)) : nil
     end
 
 =begin rdoc

data/lib/dataMetaDom/field.rb

@@ -129,7 +129,7 @@ Parses this field from the given source.
            @trgType = DataType.parse(source, trgSpec)
            unless STANDARD_TYPES.member?(@trgType.type)
                ns, base = DataMetaDom.splitNameSpace(@trgType.type)
-               newNs = nsAdjustment(ns, model.options, source)
+               newNs = DataMetaDom.nsAdjustment(ns, model.options, source)
                newNsVer = "#{newNs}.#{base}".to_sym
                @trgType.type = newNsVer # adjust the type for the map target type too
            end

data/lib/dataMetaDom/pojo.rb

@@ -197,7 +197,7 @@ Maximum size of a Mapping (Map), rather aribtrary choice, not backed by any big
                 k = rawType.to_sym
                 srcType = PRIMS_TO_WRAP.has_key?(k) ? PRIMS_TO_WRAP[k] : rawType
                 typeRenderer = JAVA_TYPES[trg.type]
-                rawTrg = typeRenderer ? typeRenderer.call(trg) : condenseType(trg.type, javaPackage)
+                rawTrg = typeRenderer ? typeRenderer.call(trg) : DataMetaDom.condenseType(trg.type, javaPackage)
                 k = rawTrg.to_sym
                 trgType = PRIMS_TO_WRAP.has_key?(k) ? PRIMS_TO_WRAP[k] : rawTrg
                 "Map<#{srcType}, #{trgType}>"
@@ -449,7 +449,7 @@ FIELD_JAVADOC
 # Unaggregated Java type
     def unaggrJavaType(dt, javaPackage)
         typeRenderer = JAVA_TYPES[dt.type]
-        typeRenderer ? typeRenderer.call(dt) : condenseType(dt.type, javaPackage)
+        typeRenderer ? typeRenderer.call(dt) : DataMetaDom.condenseType(dt.type, javaPackage)
     end
 
 # aggregated Java type
@@ -478,7 +478,7 @@ All aggregation specifics are hhandled elsewhere (see genDataMetaSame)
                 # the name of the DataMetaSame implementor of the Field's type, assuming it is available during compile time
                 ftLsClassBase = "#{ftClassBase}#{suffix}"
                 # import the class if it belogns to a different package
-                imports << "#{combineNsBase(ftNs, ftLsClassBase)}" unless javaPackage == ftNs
+                imports << "#{DataMetaDom.combineNsBase(ftNs, ftLsClassBase)}" unless javaPackage == ftNs
                 %Q<#{ftLsClassBase}.I.isSame(#{one}, #{another})>
 
             when (f.isRequired && PRIMITIVABLE_TYPES.member?(dt.type)) || (enumType && enumType.kind_of?(DataMetaDom::Enum))

data/lib/dataMetaDom/record.rb

@@ -102,7 +102,8 @@ Attempts to consume the instance from the given source, returns it if successful
   * +src+ - an instance of SourceFile
 =end
     def self.consumed?(model, src)
-        src.line =~ /^\s*#{BITSET}\s+(\w+)\s+.+$/ ? model.addEnum(BitSet.new(combineNsBase(DataMetaDom.nsAdjustment(src.namespace, model.options, src), $1)).parse(src)) : nil
+        src.line =~ /^\s*#{BITSET}\s+(\w+)\s+.+$/ ? model.addEnum(BitSet.new(DataMetaDom.combineNsBase(
+                DataMetaDom.nsAdjustment(src.namespace, model.options, src), $1)).parse(src)) : nil
     end
 
 =begin rdoc
@@ -136,7 +137,8 @@ Attempts to consume the instance from the given source, returns it if successful
   * +src+ - an instance of SourceFile
 =end
     def self.consumed?(model, src)
-        src.line =~ /^\s*#{MAPPING}\s+(\w+)\s+.+$/ ? model.addEnum(Mappings.new(combineNsBase(DataMetaDom.nsAdjustment(src.namespace, model.options, src), $1)).parse(src)) : nil
+        src.line =~ /^\s*#{MAPPING}\s+(\w+)\s+.+$/ ? model.addEnum(Mappings.new(DataMetaDom.combineNsBase(
+                DataMetaDom.nsAdjustment(src.namespace, model.options, src), $1)).parse(src)) : nil
     end
 
 =begin rdoc

data/lib/dataMetaDom/util.rb

@@ -274,6 +274,6 @@ Python, for consistency.
 =end
     def setterName(f); "set#{DataMetaXtra::Str.capFirst(f.name.to_s)}" end
 
-    module_function :setterName, :getterName
+    module_function :setterName, :getterName, :condenseType
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dataMetaDom
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Michael Bergens