talk 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47ce5983a7162f33cd2b2ede78b20d5e2a456047
-  data.tar.gz: afe02ff186a9e44749bc746147521b7af2537205
+  metadata.gz: f1f1b965faec105c8139b2c31c25093ad3f7a07d
+  data.tar.gz: 65ad8dfa35eca34ccf71e9348760e42fb68cd639
 SHA512:
-  metadata.gz: bc2872575d0307819fa67a7ad2cb498a09ed87c5fa199d2c33f2cc49a42a2f7f6a9879f83f4c4057e5a5eb5292897cd682cf833c2a3b6892a756e5be9407484e
-  data.tar.gz: 76ad99b4fdbc1efe914eb12ac0ecc8bc1a1586656181ec1396d75ad0982d5191e2adf6ee67bdfcc5a1553f1f7c8b187a07edcaa01db79257584aa185e0b8dea1
+  metadata.gz: 09583344d986efe5ff4d06b71c54dabcbee808d27586dd623a79d5c1451ce3e4f4e967a7096286fdbc7f9df77fe47e6e718359b402509b11cadf7191a5df8831
+  data.tar.gz: e4501266f0041de42d2c9b4556a04a98645318b850b68d2c9cc031413d5f4fb0bc838ad1a749430d86c006c8bdafa387c81055fa1564c37dcdc273f48449ab1b

data/lib/languages/java/java.rb

@@ -9,6 +9,10 @@ def make_source
       generate_template(filename_for_entity(@current), type.to_s+".java.erb")
     end
   end
+  @base[:protocol].each do |current|
+    @current = current
+    generate_template("com/acres4/common/protocol/#{current[:name]}.java", "TalkProtocol.java.erb")
+  end
 end
 
 def filename_for_entity(name)
@@ -43,13 +47,31 @@ def list_references_for_class(cls)
   references = Set.new
   cls[:field].each do |field|
     unless is_primitive?(field[:type].first) then
-      references.add(field[:type])
+      references.add(class_named(field[:type][0], @base[:class])[:name])
     end
   end
 
+  references.add("java.math.BigDecimal") if class_has_bigdec(cls)
+  references.add("java.util.Map") if class_has_map(cls)
   references.to_a
 end
 
+def class_has_bigdec(cls)
+  cls[:field].each do |f|
+    return true if f[:type][0] == "uint64"
+  end
+
+  false
+end
+
+def class_has_map(cls)
+  cls[:field].each do |f|
+    return true if f[:type].include? "{}"
+  end
+
+  false
+end
+
 def import_classes
   (list_references_for_class(@current).map { |name| "import #{name};"}).join("\n")
 end
@@ -57,7 +79,7 @@ end
 def comment_block(tag, indent_level=0)
   lines = []
   indent = "\t" * indent_level
-  lines.push(indent + "/*!")
+  lines.push(indent + "/**")
   lines.push(wrap_text_to_width(tag[:description], 80, indent + " *  ")) unless tag[:description].nil?
   lines.push(indent + " *  ")
   lines.push(indent + " *  " + definition_reference(tag))
@@ -80,14 +102,31 @@ def field_datatype_rec(field, stack)
 
   r = field_datatype_rec(field, stack[0 .. -2])
   if is_array? t then
-    "[]"
+    "#{r}[]"
   elsif is_dict? t then
-    "Map<String, #{r}>"
+    "Map<String, #{convert_field_for_map(r)}>"
   else
     nil
   end
 end
 
+def convert_field_for_map(field)
+  case field
+  when "byte"
+    "Byte"
+  when "short"
+    "Short"
+  when "int"
+    "Integer"
+  when "long"
+    "Long"
+  when "double"
+    "Double"
+  else
+    field
+  end
+end
+
 def field_datatype_basic(field, type)
   if is_primitive? type then
     case type
@@ -100,22 +139,23 @@ def field_datatype_basic(field, type)
     when "object"
       "Object"
     when "talkobject"
-      "TalkObject"
-    else
-      size = integer_size(type)
-      size *= 2 if is_unsigned? type # java has no unsigned type; just use the next size up
-      case 
-      when 8
-        "byte"
-      when 16
-        "short"
-      when 32
-        "int"
-      when 64
-        "long"
-      when 128
-        "BigDecimal"
-      end
+      rootclass
+    when "int8"
+      "byte"
+    when "uint8"
+      "short"
+    when "int16"
+      "short"
+    when "uint16"
+      "int"
+    when "int32"
+      "int"
+    when "uint32"
+      "long"
+    when "int64"
+      "long"
+    when "uint64"
+      "BigDecimal"
     end
   else
     truncated_name type
@@ -133,13 +173,33 @@ def field_variable(field)
   lines.join("\n")
 end
 
+def setter_name(field)
+  "set#{field[:name].sub(/^(\w)/) {|s| s.capitalize}}"
+end
+
+def getter_name(field)
+  "get#{field[:name].sub(/^(\w)/) {|s| s.capitalize}}"
+end
+
 def field_accessors(field)
-  lines.push wrap_text(field[:description], " *  ", 1)
-  lines.push field[:deprecated] if field.has_key? :deprecated
-  lines.push definition_reference(field)
-  lines.push " * @param #{field[:name]} #{field[:description]}"
+  lines = []
+  lines.push "\t/**"
+  lines.push "\t#{wrap_text_to_width(field[:description])}"
+  lines.push "\t#{field[:deprecated] if field.has_key? :deprecated}"
+  lines.push "\t#{definition_reference(field)}"
+  lines.push "\t@param #{field[:name]} #{field[:description]}"
+  lines.push "\t*/"
   lines.push "\tpublic void #{setter_name(field)}(#{field_datatype(field)} #{field[:name]}) {"
-  lines.push "\t\tthis.#{field[:name]} = #{field[:name]}"
+  lines.push "\t\tthis.#{field[:name]} = #{field[:name]};"
+  lines.push "\t}"
+  lines.push "\t/**"
+  lines.push "\t#{wrap_text_to_width(field[:description])}"
+  lines.push "\t#{field[:deprecated] if field.has_key? :deprecated}"
+  lines.push "\t#{definition_reference(field)}"
+  lines.push "\t@return #{field[:name]} #{field[:description]}"
+  lines.push "\t*/"
+  lines.push "\tpublic #{field_datatype(field)} #{getter_name(field)}() {"
+  lines.push "\t\treturn this.#{field[:name]};"
   lines.push "\t}"
   lines.join "\n"
 end

data/lib/languages/java/templates/TalkProtocol.java.erb

@@ -0,0 +1,10 @@
+<%= autogenerated_warning %>
+package com.acres4.common.protocol;
+public class <%= truncated_name(@current[:name]) %> {
+<% @current[:method].each do |method| %>
+    /**
+    <%= method[:description] %>
+    */
+    public static final String <%= method[:name].sub(/^(\w)/) {|s| s.capitalize} %> = "<%= method[:name] %>";
+<% end %>
+}

data/lib/languages/java/templates/class.java.erb

@@ -5,17 +5,16 @@ package <%= class_package(@current) %>;
 <%= comment_block(@current) %>
 public class <%= truncated_name(@current) %> extends <%= superclass(@current) %>
 {
-<%= detail_comment_block(@current) %>
     /**
      *  <%= truncated_name @current %> - Default Constructor 
-     * 
      */
      public <%= truncated_name @current %>() {}
 <%= 
     (@current[:field].map do |f|
         field_variable(f)
     end).join("\n")
-
+%>
+<%=
     (@current[:field].map do |f|
         field_accessors(f)
     end).join("\n")

data/lib/languages/java/templates/enumeration.java.erb

@@ -3,8 +3,8 @@ package <%= class_package(@current) %>;
 
 <%= comment_block(@current) %>
 public class <%= truncated_name(@current) %> extends <%= rootclass %>
-{<% @current[:field].each do |field| %>
-    // <%= field[:description] %>
-    @TalkDescription(description = "<%= field[:description] %>")
-    public final static int <%= field[:name] %> = <%= field[:value] %>;
-<%= end %>}
+{<% @current[:constant].each do |field| %>
+    /** <%= field[:description] %> */
+    @TalkDescription(description = <%= (field[:description] ? field[:description].inspect : "\"nil\"") %>)
+    public final static int <%= field[:name] %> = <%= field[:value].to_i %>;
+<% end %>}

data/lib/languages/java/templates/glossary.java.erb

@@ -3,6 +3,6 @@ package <%= class_package(@current) %>;
 
 <%= comment_block(@current) %>
 public class <%= truncated_name(@current) %>
-{<%= @current[:field].each do |field| %>
+{<% @current[:term].each do |field| %>
   public final static String <%= field[:name] %> = "<%= field[:value] %>";<% end %>
 }

data/lib/languages/language.rb

@@ -13,6 +13,35 @@ def is_primitive?(type)
   primitives.include? type
 end
 
+def rootclass
+  @target[:rootclass] || "TalkObject"
+end
+
+def superclass(cls)
+  cls[:inherits] || rootclass
+end
+
+def is_native?(type)
+  type != "talkobject" and is_primitive?(type)
+end
+
+def is_array?(type)
+  type == "[]"
+end
+
+def is_dict?(type)
+  type == "{}"
+end
+
+def class_named(name, classes)
+  name_elements = name.split(".")
+  classes.each do |defn|
+    return defn if defn[:name].end_with?(name)
+  end
+
+  nil
+end
+
 module Talk
   class Language
     attr_reader :supported_languages

data/lib/languages/objc/objc.rb

@@ -59,26 +59,6 @@ def definition_reference(tag)
   "@talkFile #{tag[:__meta][:file]}:#{tag[:__meta][:line]}"
 end
 
-def rootclass
-  @target[:rootclass] || "TalkObject"
-end
-
-def superclass(cls)
-  cls[:inherits] || rootclass
-end
-
-def is_native?(type)
-  type != "talkobject" and is_primitive?(type)
-end
-
-def is_array?(type)
-  type == "[]"
-end
-
-def is_dict?(type)
-  type == "{}"
-end
-
 def mapped_name(container_name, object_name, type, name_key=:name)
   object_name = object_name[:name] if object_name.is_a? Hash
   container_name = container_name[:name] if container_name.is_a? Hash

data/talk.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name        = 'talk'
   s.executables << 'talk'
-  s.version     = '2.0.4'
-  s.date        = '2014-05-16'
+  s.version     = '2.0.5'
+  s.date        = '2014-05-30'
   s.summary     = "Compile-to-source protocol contract specification language"
   s.description = "A lightweight language for specifying protocol contracts. Compiles to source in Java, Javascript, ObjC and Ruby."
   s.authors     = ["Jonas Acres"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: talk
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Jonas Acres
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-16 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies: []
 description: A lightweight language for specifying protocol contracts. Compiles to
   source in Java, Javascript, ObjC and Ruby.
@@ -58,6 +58,7 @@ files:
 - lib/contexts/target.rb
 - lib/contexts/term.rb
 - lib/languages/java/java.rb
+- lib/languages/java/templates/TalkProtocol.java.erb
 - lib/languages/java/templates/class.java.erb
 - lib/languages/java/templates/enumeration.java.erb
 - lib/languages/java/templates/glossary.java.erb