bq_coaster 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93e8bfd289547d0ead44a5d5f70558fbf5bfee9a
-  data.tar.gz: 6fb3ce3da647d07e3de0dd2cb989914aecd0e31f
+  metadata.gz: bc8e218c3392df6af21003391fb7f2b4915475bb
+  data.tar.gz: 05047d7b0b51392b77a5620b50baf6801d0e414e
 SHA512:
-  metadata.gz: 21a70ff50d50f2b5c4f9de5aaad4d4619df2cc01875df40101191d49d0e1b72757c328074b6f1ecdf976e9046e0df7a6d19c6030dd2609384a02dcedd2d5b143
-  data.tar.gz: 9c84a9d70a5505bc39281700b17c5565b8edfe9d7bf2ca16437720ec9ca5687625a480690f59e0c677487c55426f73a81d9315ca422f8b5b64f808fd7181c5ec
+  metadata.gz: 5be3bc584d8f50e9edb655b3063a78cc4c783c28bea9671aacb8d849468c2ab7b0495127c62a1bf534f5d121db8686bce04e0a201329fbf1d0e0233132d30d61
+  data.tar.gz: cb819d95339d4385d4ca34cd872f8c96f6eb431a9949c7f01ee8690d8ae27bc4376bb989c3a2e73f03837ecee40b9f44ad26f64ee2cf9d961725435b7f21e3af

data/lib/bq_coaster/generators/dataflow_converter/context.rb

@@ -18,7 +18,7 @@ module BqCoaster
         end
 
         def field_name(name)
-          "#{prefix}.#{name}".sub(/src\./, "").gsub(/\./, "_")
+          "#{prefix}.#{name}".sub(/src\./, "").tr(".", "_")
         end
 
         def nested?(definition)
@@ -39,6 +39,17 @@ module BqCoaster
           ).render
         end
 
+        def string?(definition)
+          return false if nested?(definition)
+          return true if definition.nil?
+          if definition.key?(:_original_type)
+            definition._original_type == "String"
+          else
+            return true unless definition.key?(:_type)
+            definition._type.casecmp("string").zero?
+          end
+        end
+
         def value(name, definition)
           if definition&.key?(:_convert)
             definition._convert % ["#{prefix}.#{name}"]

data/lib/bq_coaster/generators/dataflow_converter/converter.erb

@@ -1,5 +1,5 @@
 <%- definitions.each do |name, definition| %>
-if (<%= prefix %>.<%= name %> != null) {
+if (<%= prefix %>.<%= name %> != null<%= string?(definition) ? " && !#{prefix}.#{name}.equals(\"<null>\")" : "" %>) {
     <%- if nested?(definition) %>
 <%= render_converter(name, definition) %>
     <%- else %>

data/lib/bq_coaster/version.rb

@@ -1,3 +1,3 @@
 module BqCoaster
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bq_coaster
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - nownabe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-04 00:00:00.000000000 Z
+date: 2017-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis