dataMetaByteSer 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 998d9dae64a2fc1570164a16321daece8d9fcf87
-  data.tar.gz: f530f6555ab927b67f3ac903bf64455eca93ab0a
+  metadata.gz: 4ac6e0dbe32386d286c0b4d71a43b8b95e69a0b2
+  data.tar.gz: dd090b22b2dc22fc3959bbb477f1a725b2b6f7a4
 SHA512:
-  metadata.gz: a65bce5a7bd19c3979d3340ae94b8db47e9ca067f93e5df9ae5504b415f63cef0886725cea2ea97cfe2493cf490457c6b88ab3bb1475e72532c86e558333f92a
-  data.tar.gz: eef113b2c9a3b325eaec22f85f49d0b202720a6f493ad9499d0779dc85e4df451b0ea917464d4d31c88ab698211023daab1190c69f6d4044e58a0b5f15cc3ffc
+  metadata.gz: 7e47bc0ff4c61a4c5db7cffab3e42b4cf0d0a62515fb18793bf74f220a1c5f4bbec2affb0674d235c022c9e5fe91e9b5287e5129154ebc202c7e57b0d6e904de
+  data.tar.gz: 40d1ce4473189409bc5f9ad00afccd39634039c26323bf923ad0e0474a364abb69b8bfd35f01436745887bdff182552912211c7d0eae9cf6c1c629e086184362

data/History.md

@@ -1,5 +1,13 @@
 # `dataMetaByteSer` Release history:
 
+## `1.0.6` - `2018-05-13 Sun` by [`mub`](http://github.com/mub)
+* Update:
+    * Support for Enum serialization
+    
+## `1.0.5` - `2017-05-27 Sat` by [`mub`](http://github.com/mub)
+* Update:
+    * Altered the Read Switch generator code to keep existing files.
+    
 ## `1.0.4` - `2017-04-04 Tue` by [`mub`](http://github.com/mub)
 * Update:
     * Upgraded to the core version `1.0.6`

data/lib/dataMetaByteSer.rb

@@ -14,7 +14,7 @@ For command line details either check the new method's source or the README.rdoc
 =end
 module DataMetaByteSer
     # Current version
-    VERSION = '1.0.4'
+    VERSION = '1.0.6'
     include DataMetaDom, DataMetaDom::PojoLexer
 
 =begin rdoc
@@ -106,12 +106,11 @@ HDFS Reader and Writer the raw data type, the byte array.
 =end
     RAW_RW_METHODS = RwHolder.new(
             lambda { |ctx|
-                aggrNotSupported(ctx.fld, 'Raw Data') if ctx.fld.aggr
-                ctx.rw.call('readByteArray(in)')
+              ctx.fld.aggr ? ctx.rw.call("read#{aggrBaseName(aggrJavaFull(ctx.fld.aggr))}Enum(in, #{ctx.fld.dataType.type}.class)") : ctx.rw.call('readByteArray(in)')
             },
             lambda { |ctx|
                 aggrNotSupported(ctx.fld, 'Raw Data') if ctx.fld.aggr
-                "writeByteArray(out, val.#{ctx.valGetter})" }
+                ctx.fld.aggr ? "write#{aggrBaseName(aggrJavaFull(ctx.fld.aggr))}ZonedDateTime(out, val.#{ctx.valGetter})" : "writeByteArray(out, val.#{ctx.valGetter})" }
     )
 
 =begin rdoc
@@ -125,12 +124,10 @@ HDFS Reader and Writer the Java Enums.
 =end
     ENUM_RW_METHODS = RwHolder.new(
           lambda{|ctx|
-            aggrNotSupported(ctx.fld, 'Enums') if ctx.fld.aggr
-            "#{DataMetaDom.condenseType(ctx.fType.type, ctx.pckg)}.forOrd(readVInt(in))"
+            ctx.fld.aggr ? "read#{aggrBaseName(aggrJavaFull(ctx.fld.aggr))}Enum(in, #{ctx.fType.type}.class)" : "#{DataMetaDom.condenseType(ctx.fType.type, ctx.pckg)}.forOrd(readVInt(in))"
           },
           lambda { |ctx|
-            aggrNotSupported(ctx.fld, 'Enums') if ctx.fld.aggr
-            "writeVInt(out, val.#{ctx.valGetter}.ordinal())"
+            ctx.fld.aggr ? "write#{aggrBaseName(aggrJavaFull(ctx.fld.aggr))}Enum(out, val.#{ctx.valGetter})" : "writeVInt(out, val.#{ctx.valGetter}.ordinal())"
           }
     )
 
@@ -175,6 +172,7 @@ Read/write methods for the standard data types.
           NUMERIC => NUMERIC_RW_METHODS,
           URL => URL_RW_METHODS
     }
+
 # DataMeta DOM object renderer
     RECORD_RW_METHODS = RwHolder.new(
         lambda { |ctx|

data/lib/dataMetaByteSer/python.rb

@@ -29,11 +29,11 @@ Builds a class name for a InOutable.
     end
 
     def mapsNotSupported(fld)
-        raise ArgumentError, "Field #{fld.name}: maps are not currently supported on Hadoop layer"
+        raise ArgumentError, "Field #{fld.name}: maps are not currently supported for Byte Array format"
     end
 
     def aggrNotSupported(fld, forWhat)
-        raise ArgumentError, "Field #{fld.name}: aggregate types are not supported for #{forWhat} on Hadoop layer"
+        raise ArgumentError, "Field #{fld.name}: aggregate types are not supported for #{forWhat} for Byte Array format"
     end
 
 =begin rdoc

data/lib/dataMetaByteSer/ver_reads.rb

@@ -40,9 +40,19 @@ Generates Versioned Read switch that channels the read to the proper migration s
         javaClassName = "Read__Switch_v#{ver1.toVarName}_to_v#{ver2.toVarName}"
         destDir = File.join(outRoot, packagePath)
         FileUtils.mkdir_p destDir
-        IO::write(File.join(destDir, "#{javaClassName}.java"),
-                  ERB.new(IO.read(File.join(File.dirname(__FILE__), '../../tmpl/readSwitch.erb')),
-                          $SAFE, '%<>').result(binding), mode: 'wb')
+        javaDestFile = File.join(destDir, "#{javaClassName}.java")
+
+        skippedCount = 0
+        if File.file?(javaDestFile)
+            skippedCount += 1
+            $stderr.puts %<Read switch target "#{javaDestFile} present, therefore skipped">
+        else
+            IO::write(javaDestFile,
+                      ERB.new(IO.read(File.join(File.dirname(__FILE__), '../../tmpl/readSwitch.erb')),
+                              $SAFE, '%<>').result(binding), mode: 'wb')
+        end
+
+        $stderr.puts %<Read Switch targets skipped: #{skippedCount}> if skippedCount > 0
     end
     module_function :genVerReadSwitch
 end

data/tmpl/readSwitch.erb

@@ -29,7 +29,7 @@ public class <%=javaClassName%> {
         if(ver.equals(<%=vars.baseName%>.VERSION)) {
                 return <%=vars.baseName%>_InOutable.getInstance().read(in);
 <%
-  while vars.versCases.length > 1 # loop through the case statement - a version per each
+  while vars.versCases.length > 0 # loop through the case statement - a version per each
   vars.switchTargVer = vars.versCases.shift
   vars.brackets = ''
   caseObjName = flipVer(trgE.name, ver2.toVarName, vars.switchTargVer.toVarName)
@@ -38,7 +38,7 @@ public class <%=javaClassName%> {
 %>
        }
        else if(ver.equals(<%=caseObjName%>.VERSION)){<% vars.versMigr =  vers.clone.select{|v| v <= ver2}.sort{|x, y| y<=>x}%>
-                return <%  while vars.versMigr.length > 1 # migration steps loop nested in the case statement loop
+                return <%  while vars.versMigr.length > 0 # migration steps loop nested in the case statement loop
       vars.brackets << ')'
       vars.migrTargVer = vars.versMigr.shift # target version for migration loop
       vars.srcVer = vars.versMigr[0]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dataMetaByteSer
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors:
 - Michael Bergens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2018-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dataMetaDom
@@ -72,9 +72,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Hadoop libraries
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
-summary: DataMeta Byte Array Serializers Gen
+summary: DataMeta Byte Array Serializers Gem
 test_files:
 - test/test_dataMetaByteSer.rb