zillabyte 0.0.13 → 0.0.14

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDBhOWNkOTE4OTQxNmI2ZTU2YWQ3ZmE2MGRiYjg0MGZiMWZjNWEyZA==
+    ODM4NzMwNTkxNjJmOTJiMjJhYmNhNDdkNjgxMmU1MmI2YzlmOWNmYw==
   data.tar.gz: !binary |-
-    NjRiY2ZlNmIzYzgwNzIyNjQ5OTY3MDRiY2M2MmRhNjZhZGYwY2YxMA==
+    MDNkZWM2M2JlOTE1MThhZmFhZTJiOTcxMzU4ZTgxNDVlYzc4ZjlmYw==
 SHA512:
   metadata.gz: !binary |-
-    NjljNmIxYjEwMTcyOWFhYzM0NGY0NmVhMzdkYWFkNzYyNjVmYzEyZjIzZDE4
-    NGZiOTQ2YzhjMjgzOWFhOWMxOTIwMzgzOGNiMDBhZWJjZGE1OTEyNTRkNTZi
-    NzllY2Q0YzZmM2U3NDUwNWMzN2ZiNzYzMjE4MDg5NDkyMGY2ZWU=
+    NGQzYjhmZWU1YWU1NTFjNWM3MjdlNzNjNTE5MjUzMWNiMmZjYzllODZkYzcz
+    YjgzZmU0NTg0YjRmMjU4OGI5YjY2ZTU2MWM1NTRlMDI2MjFmN2I1NGZmZjQx
+    NzAzZTAzYjM3MjM4YThjZDVlOWQ3ZjRjODBkYmMxYTQ4Yzk5ZDM=
   data.tar.gz: !binary |-
-    YmJmNzY3NDQwMDdlOTQ1OTgyMGU2MDE5ZmIwMDE4MGU3NmRjMTEzYmNmNzU4
-    YTdlYmIzMTdhZDY4MTVmNThhODlhNjRjMmJhNDhhOTc4ZTUzZjM0YTkxNmMw
-    ZGFmY2QyN2VhNzVkN2YxZjk2MDFlNzRkYzZkMGY0ZjJmNDAzNzM=
+    YmM3MmVlMGFiNzYyYmMyZjU0YWVkY2QyYzg1NzM1OTZhODA1M2IxOTlmY2E1
+    MDQzYjAwZGQ2MzRmNmE5OTVmN2E3NDhiNjNkYmNkMGMyNmVhMTg0ODk5MWYx
+    MGI0Mzc1MWI1YmEwMGNlYzlkNmM2YWJhMWIwMDJmY2NlN2I4OTY=

data/ruby/lib/zillabyte/harness/helper.rb

@@ -36,8 +36,9 @@ class Zillabyte::Harness::Helper
   def self.check_name(operation, name, names)
     ee = "Error in \"#{operation}\" at \"name\": \n\t "
 
-    if(!name.instance_of?(String) or name == "")
-      msg = "#{ee}\"Name\" must be a non-empty STRING at \"#{name}\". Flows and simple_functions must have names!"
+    # \w matchs [a-zA-Z0-9_]
+    if(!name.instance_of?(String) or (name =~ /^\w+$/).nil?)
+      msg = "#{ee}\"Name\" must be a non-empty STRING with only alphanumeric and underscore characters at \"#{name}\". Flows and simple_functions must have names!"
       Zillabyte::Harness::Helper.print_error(msg)
     end
     if(names[name] and names[name] != "new" and names[name] != "sink" and operation != "new" and operation != "sink")
@@ -74,8 +75,8 @@ class Zillabyte::Harness::Helper
         msg = "#{ee}Invalid format for \"emits\" in #{e}. #{pp}"
         Zillabyte::Harness::Helper.print_error(msg)
       end
-      if(!e[0].instance_of?(String) or e[0] == "")
-        msg = "#{ee}\"Emits\" #{nn} name must be a non-empty STRING in #{e}. #{pp}"
+      if(!e[0].instance_of?(String) or (e[0] =~ /^\w+$/).nil?)
+        msg = "#{ee}\"Emits\" #{nn} name must be a non-empty STRING with only alphanumeric and underscore characters in \"#{e}\". #{pp}"
         Zillabyte::Harness::Helper.print_error(msg)
       end
       if(current_op_streams[e[0]])
@@ -97,12 +98,16 @@ class Zillabyte::Harness::Helper
         Zillabyte::Harness::Helper.check_simple_function_emits(operation, e)
       else
         if(!e[1].instance_of?(Array))
-          msg = "#{ee}Field names must be an ARRAY of STRINGS in stream #{e[0]}. #{pp}"
+          msg = "#{ee}Field names must be an ARRAY of STRINGS in stream \"#{e[0]}\". #{pp}"
           Zillabyte::Harness::Helper.print_error(msg)
         end
         e[1].each do |f|
-          if(!f.instance_of?(String) or f == "")
-            msg = "#{ee}Field names must be non-empty STRINGS in stream #{e[0]}. #{pp}"
+          if(!f.instance_of?(String) or (f =~ /^\w+$/).nil?)
+            msg = "#{ee}Field names must be non-empty STRINGS with only alphanumeric and underscore characters in stream \"#{e[0]}\". #{pp}"
+            Zillabyte::Harness::Helper.print_error(msg)
+          end
+          if(f =~ /^v[0-9]+$/i or @@meta_names.member?(f.downcase))
+            msg = "#{ee}\"v[number]\", \"id\", \"confidence\", \"since\" and \"source\" are special names in Zillabyte. Please name your field something else. #{pp}"
             Zillabyte::Harness::Helper.print_error(msg)
           end
         end
@@ -131,10 +136,6 @@ class Zillabyte::Harness::Helper
       msg = "#{ee}\"Consumes\" must be specified since a preceding \"each\", \"spout\" or \"aggregate\" emitted multiple streams. #{pp}"
       Zillabyte::Harness::Helper.print_error(msg)
     end
-    if(!consumes.instance_of?(String) or consumes == "")
-      msg = "#{ee}\"Consumes\" must be a non-empty STRING at #{consumes}. #{pp}"
-      Zillabyte::Harness::Helper.print_error(msg)
-    end
     if(!streams[consumes])
       msg = "#{ee}The stream \"#{consumes}\" specified in \"consumes\" does not exist! #{pp}"
       Zillabyte::Harness::Helper.print_error(msg)
@@ -227,8 +228,12 @@ class Zillabyte::Harness::Helper
       pp = @@_print_check_simple_function_emits
     end
 
-    if(!cname.instance_of?(String) or cname == "")
-      msg = "#{ee}Field names must be non-empty STRINGS in relation \"#{relation_name}\". #{pp}"
+    if(!cname.instance_of?(String) or (cname =~ /^\w+$/).nil?)
+      msg = "#{ee}Field names must be non-empty STRINGS with only alphanumeric and underscore characters in relation \"#{relation_name}\". #{pp}"
+      Zillabyte::Harness::Helper.print_error(msg)
+    end
+    if(cname =~ /^v[0-9]+$/i or @@meta_names.member?(cname.downcase))
+      msg = "#{ee}\"v[number]\", \"id\", \"confidence\", \"since\" and \"source\" are special names in Zillabyte. Please name your field something else. #{pp}"
       Zillabyte::Harness::Helper.print_error(msg)
     end
     if(!ctype.instance_of?(Symbol))
@@ -305,12 +310,13 @@ class Zillabyte::Harness::Helper
 \"Emits\" Syntax:
  - \"Emits\" must be a non-empty ARRAY.
  - Each element of \"emits\" must be an ARRAY of length = 2.
-     * The first element should be the unique stream name defined as a non-empty STRING.
+     * The first element should be the unique stream name defined as a non-empty STRING with only alphanumeric and underscore characters.
      * The second element should be an ARRAY of field names for that stream.
      e.g.
  \t emits = [ [ \"stream_1\", [ \"field_11\", \"field_12\", ... ] ],
  \t           [ \"stream_2\", [ \"field_21\", \"field_22\", ... ] ] ] .
- - Stream and field names must all be non-empty STRINGS."
+ - Stream and field names must all be non-empty STRINGS with only alphanumeric and underscore characters.
+ - Field names cannot be \"v[number]\", \"id\", \"confidence\", \"since\" or \"source\" which are reserved Zillabyte names."
 
   @@_print_check_group_by = "\n
 \"Group_by\" Syntax:
@@ -322,11 +328,12 @@ consumed by the aggregation function."
 \"Emits\" Syntax:
  - \"Emits\" must be a non-empty ARRAY.
  - Each element of \"emits\" must be an ARRAY of length = 2.
-     * The first element should be the unique relation name defined as a non-empty STRING.
+     * The first element should be the unique relation name defined as a non-empty STRING with only alphanumeric and underscore characters.
      * The second element should be an ARRAY of HASHES with field names and data types for that relation. e.g.
  \t emits = [ [ \"relation_1\", [ {\"field_11\" => \"type_11\"}, {\"field_12\" => \"type_12\"}, ... ] ],
  \t           [ \"relation_2\", [ {\"field_21\" => \"type_21\"}, {\"field_22\" => \"type_22\"}, ... ] ] ] .
- - Relation and field names must all be non-empty STRINGS.
+ - Relation and field names must all be non-empty STRINGS with only alphanumeric and underscore characters.
+ - Field names cannot be \"v[number]\", \"id\", \"confidence\", \"since\" or \"source\" which are reserved Zillabyte names.
  - Field types must be SYMBOLS. The following types are allowed :string, :integer, :float, :double, and :boolean."
 
   @@_print_check_sink = "\n
@@ -345,8 +352,9 @@ consumed by the aggregation function."
  \t \t h.column \"field_1\" :type_1
  \t \t h.column \"field_2\" :type_2 ...
  \t end
- - \"Sink\" relation \"name\" must be specified as a non-empty STRING!
- - Field names must be non-empty STRINGS.
+ - \"Sink\" relation \"name\" must be specified as a non-empty STRING with only alphanumeric and underscore characters!
+ - Field names must be non-empty STRINGS with only alphanumeric or underscore characters.
+ - Field names cannot be \"v[number]\", \"id\", \"confidence\", \"since\" or \"source\" which are reserved Zillabyte names.
  - Field types must be SYMBOLS. The following types are allowed :string, :integer, :float, :double, and :boolean.
  - If there are multiple streams, \"consumes\" must be specified for each sink as a non-empty STRING!
      * \"Consumes\" is the name of a stream emitted by an \"each\" or a \"spout\" which the \"sink\" should save as a table.
@@ -378,4 +386,5 @@ consumed by the aggregation function."
  - If there are multiple streams, \"consumes\" must be specified as a non-empty STRING!
      * \"Consumes\" is the name of a stream emitted by a preceding \"each\", \"spout\" or \"aggregate\" which the current \"aggregate\" operates on."
 
+  @@meta_names=["id", "confidence", "since", "source"]
 end

data/ruby/lib/zillabyte/version.rb

@@ -1,3 +1,3 @@
 module Zillabyte
-  VERSION = "0.0.13" unless defined?(VERSION)
+  VERSION = "0.0.14" unless defined?(VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zillabyte
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - zillabyte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake