talk 2.2.7 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cccb79ea7fa1b5aff58e44804d7a6faf3e5f8e4
-  data.tar.gz: 17a38cc100e492b6e8a5d5c2c027ac015936a313
+  metadata.gz: 17af9791fad56df5e635906a3eebd9b2a0ac668b
+  data.tar.gz: fce31b459bb50cda0529202c6243621a1ffe1008
 SHA512:
-  metadata.gz: 222f47a4e9deed38fcd4379001361c95c1373d11bfd55c8d6dd8b2b447a15dab0c2385ca73dfa7e49a76dda395f8244a2b611aafc1677f8ddf2dcf7051a57fd4
-  data.tar.gz: 35fe8c0ed55b714d9d4ba9ca482d147de4c78d872f215977d3f5dac689c801e1856a4afba211d8d83406311e14cc85530915231c61def64eb1660788da6fc074
+  metadata.gz: fd168905d6edaae2941893cc76434f06bc38f63e08c942927b841cc10a79e28b606aca5a6cf5e95a68fc4185bba80053fe6b621ca7c1c9d049811603d309f0cd
+  data.tar.gz: 521827ceadf656d198a33840b4d7da62b344bf684d8afd9c228648ffb3beac736799f5d8cf0a06f7795c898b51afd4b05c2034b4c0eeb846278b260d7e9bcee5

data/bin/maketalk

@@ -10,7 +10,7 @@ require 'trollop'
 require 'pp'
 
 $opts = Trollop::options do
-  version "Talk #{Talk::VERSION} (c) 2013 Jonas Acres"
+  version "Talk 2.0 (c) 2013 Jonas Acres"
   banner <<-EOS
 Talk is a compile-to-source protocol specification language.
 
@@ -26,7 +26,6 @@ EOS
   opt :no, "Do not render specified tag type at any level", :type => :string, :multi => true
   opt :json, "Dump raw JSON to console"
   opt :upgrade, "Upgrade old-style protocols to new-style"
-  opt :version, "Show Talk version"
 end
 
 Trollop::die :omit, "cannot be combined with include" if $opts[:omit].length > 0 and $opts[:include].length > 0
@@ -114,6 +113,7 @@ end
 
 def upgrade_protocols(results)
 	methods = {}
+	return if results[:method].nil? || results[:method].empty?
 	results[:method].each { |method| methods[method[:name].to_sym] = method }
 	results[:protocol].each do |proto|
 		proto[:method].map! { |method| methods[method.to_sym] }

data/lib/context.rb

@@ -274,7 +274,8 @@ module Talk
 
       return v.to_val if @class_methods[v.class].include? :to_val
       return v.to_h if @class_methods[v.class].include? :to_h
-      return v.to_f if v.is_a? Fixnum or v.is_a? Float
+      return v.to_f if(v.is_a?(Fixnum) || v.is_a?(Float))
+      return v if (v == true || v == false)
 
       v.to_s
     end

data/lib/contexts/base.rb

@@ -1,5 +1,4 @@
 tag :class, :multi => true
-tag :method, :multi => true
 tag :enumeration, :multi => true
 tag :protocol, :multi => true
 tag :target, :multi => true

data/lib/contexts/method.rb

@@ -1,15 +1,12 @@
 # register :methods
 reference :response, :classes, :skip => ["none"]
 reference :request, :classes, :skip => ["none"]
-reference :followup, :classes, :skip => ["none"]
 
 property :name
 
 tag_description
-tag :response, :class => :string
 tag :request, :class => :string
-tag :followup, :class => :string
-tag :requirements, :class => :string
+tag :response, :class => :string
 tag :origin, :class => :string, :allowed => [ "client", "server", "both" ]
-
+tag :needs, :class => :string, :allowed => [ "nothing", "connection", "both" ]
 tag_end

data/lib/contexts/protocol.rb

@@ -3,6 +3,7 @@ register :protocols
 property :name
 
 tag_description
-tag :method, :class => :string, :required => true, :multi => true
+tag :scheme, :multi => true, :required => true
+tag :method, :required => true, :multi => true
 tag :source, :class => :string
 tag_end

data/lib/contexts/scheme.rb

@@ -0,0 +1,2 @@
+property :secure, :transform => lambda { |ctx,v| v=='secure' }
+property :name

data/lib/languages/js/js.rb

@@ -42,12 +42,10 @@ def class_line(cls)
   out << "// " + cls[:name]
 
   fields = {}
-  unless cls[:field].nil? then
-    cls[:field].each do |field|
-      mapped = mapped_name(cls[:name], field[:name], :field)
-      fields[mapped] = {typeStack:field[:type]}
-      fields[mapped][:canonicalName] = field[:name] unless mapped == field[:name]
-    end
+  cls[:field].each do |field|
+    mapped = mapped_name(cls[:name], field[:name], :field)
+    fields[mapped] = {typeStack:field[:type]}
+    fields[mapped][:canonicalName] = field[:name] unless mapped == field[:name]
   end
 
   out << "TalkObject.addClass('#{cls[:name]}', #{fields.to_json}, '#{truncated_name(superclass(cls))}');"

data/lib/languages/js/templates/talk.js.erb

@@ -142,11 +142,6 @@ TalkObject.prototype.__validateInteger = function(key, param, unsigned, size)
   var def = this.__definition[key];
 
   // Validate number
-    if(typeof(param) == 'string')
-    {
-      if(param.match(new RegExp("^(0x)?[0-9]+$"))) param = parseInt(param);
-    }
-
     if(typeof(param) != 'number') 
     {
       var errMsg = "Expected " + key + " to be a number";
@@ -231,10 +226,6 @@ TalkObject.prototype.__validateInteger = function(key, param, unsigned, size)
 TalkObject.prototype.__validateReal = function(key, param) 
 {
   var def = this.__definition[key];
-  if(typeof(param) == 'string')
-  {
-    if(param.match(new RegExp("^[0-9]+(\.[0-9]+)?$"))) param = parseFloat(param);
-  }
   if(typeof(param) != 'number') return "Expected numeric value for " + key;
   if(def.minValue !== undefined && def.minValue !== null && param < def.minValue) 
   {

data/lib/languages/objc/objc.rb

@@ -1,6 +1,6 @@
 def make_source
   @prefix = common_class_prefix if meta(:namespace) == "true"
-  master_files = [ "TalkClasses.h", "TalkClassesForward.h", "TalkConstants.h", "TalkObjectList.h"]
+  master_files = [ "TalkClasses.h", "TalkClassesForward.h", "TalkConstants.h", "TalkObjectList.h", "TalkDefinition+Autogenerated.m" ]
   master_files.each { |template| generate_template(template) }
 
   @base[:class].each do |cls|
@@ -81,10 +81,14 @@ def assist_line(field)
   "@[#{stringified.join(",")}]"
 end
 
+def protocol_constant_name(name)
+  name = (name.split("/").map { |x| x[0].upcase + x[1..-1] }).join("")
+  "kProto#{name}"
+end
+
 def protocol_method_name(p_name, m_name)
-  p_name = p_name[0].upcase + p_name[1..-1]
   m_name = m_name[0].upcase + m_name[1..-1]
-  "kProto#{p_name}Method#{m_name}"
+  "#{protocol_constant_name(p_name)}Method#{m_name}"
 end
 
 def class_field_maps(cls)
@@ -138,3 +142,11 @@ def field_definition(cls, field)
   end
   "#{objc_type} #{mapped_name(cls, field, :field)}"
 end
+
+def safe_escape(str)
+  str.gsub("\\", "\\\\\\").gsub("\"", "\\\"")
+end
+
+def talk_definition
+  @base
+end

data/lib/languages/objc/templates/TalkConstants.h.erb

@@ -25,6 +25,7 @@ enum <%= truncated_name(enumeration[:name]) %>
 
 // @protocol <%= protocol[:name] %>
 <%= comment_block(protocol) %>
+#define <%= protocol_constant_name(protocol[:name]) %> @"<%= protocol[:name] %>"
 
 <% protocol[:method].each do |method| %>
 <%= comment_block(method) %>

data/lib/languages/objc/templates/TalkDefinition+Autogenerated.m.erb

@@ -0,0 +1,10 @@
+#import "TalkDefinition.h"
+
+@implementation TalkDefinition (Automap)
+
++(NSString *) talkJson
+{
+  return @"<%= safe_escape(talk_definition.to_json) %>";
+}
+
+@end

data/lib/talk.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/ruby
 
-require 'version.rb'
 require 'parser'
 require 'languages/language.rb'
+

data/talk.gemspec

@@ -1,14 +1,10 @@
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'version'
-
 Gem::Specification.new do |s|
   s.name        = 'talk'
   s.executables << 'maketalk'
-  s.version     = Talk::VERSION
+  s.version     = '2.3.0'
   s.date        = '2014-06-12'
   s.summary     = "Compile-to-source protocol contract specification language"
-  s.description = "A lightweight language for specifying protocol contracts. Compiles to source in Java, CSharp, Javascript, ObjC and Ruby."
+  s.description = "A lightweight language for specifying protocol contracts. Compiles to source in Java, Javascript, ObjC and Ruby."
   s.authors     = ["Jonas Acres"]
   s.email       = 'jonas@becuddle.com'
   s.homepage    = 'http://github.com/jonasacres/talk'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: talk
 version: !ruby/object:Gem::Version
-  version: 2.2.7
+  version: 2.3.0
 platform: ruby
 authors:
 - Jonas Acres
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.12.1
 description: A lightweight language for specifying protocol contracts. Compiles to
-  source in Java, CSharp, Javascript, ObjC and Ruby.
+  source in Java, Javascript, ObjC and Ruby.
 email: jonas@becuddle.com
 executables:
 - maketalk
@@ -96,14 +96,10 @@ files:
 - lib/contexts/numeric.rb
 - lib/contexts/protocol.rb
 - lib/contexts/reference.rb
+- lib/contexts/scheme.rb
 - lib/contexts/string.rb
 - lib/contexts/target.rb
 - lib/contexts/term.rb
-- lib/languages/cs/cs.rb
-- lib/languages/cs/templates/TalkProtocol.cs.erb
-- lib/languages/cs/templates/class.cs.erb
-- lib/languages/cs/templates/enumeration.cs.erb
-- lib/languages/cs/templates/glossary.cs.erb
 - lib/languages/java/java.rb
 - lib/languages/java/templates/TalkProtocol.java.erb
 - lib/languages/java/templates/class.java.erb
@@ -116,6 +112,7 @@ files:
 - lib/languages/objc/templates/TalkClasses.h.erb
 - lib/languages/objc/templates/TalkClassesForward.h.erb
 - lib/languages/objc/templates/TalkConstants.h.erb
+- lib/languages/objc/templates/TalkDefinition+Autogenerated.m.erb
 - lib/languages/objc/templates/TalkObjectList.h.erb
 - lib/languages/objc/templates/class.h.erb
 - lib/languages/objc/templates/class.m.erb
@@ -123,7 +120,6 @@ files:
 - lib/parser.rb
 - lib/registry.rb
 - lib/talk.rb
-- lib/version.rb
 - talk.gemspec
 homepage: http://github.com/jonasacres/talk
 licenses:

data/lib/languages/cs/cs.rb

@@ -1,183 +0,0 @@
-require 'set'
-
-def make_source
-  types = [ :class, :enumeration, :glossary]
-  types.each do |type|
-    @base[type].each do |current|
-      @current = current
-      @current[:field] ||= [] if type == :class
-      generate_template(filename_for_entity(@current), type.to_s+".cs.erb")
-    end
-  end
-  @base[:protocol].each do |current|
-    @current = current
-    generate_template("com/acres4/common/protocol/#{current[:name]}.cs", "TalkProtocol.cs.erb")
-  end
-end
-
-def filename_for_entity(name)
-  name = name[:name] if name.is_a? Hash
-  name.gsub(".", "/") + ".cs"
-end
-
-def autogenerated_warning
-  <<-AUTOGEN_DONE
-/* Autogenerated from Talk
-** Please do not edit this file directly. Instead, modify the underlying .talk files. */
-  AUTOGEN_DONE
-end
-
-def definition_reference(tag)
-  "@talkFile #{tag[:__meta][:file]}:#{tag[:__meta][:line]}"
-end
-
-def rootclass
-  @target[:rootclass] || "io.usetalk.TalkObject"
-end
-
-def superclass(cls)
-  cls[:inherits] || rootclass
-end
-
-def class_package(cls)
-  cls[:name].split(".")[0..-2].join(".")
-end
-
-def list_references_for_class(cls)
-  references = Set.new
-  cls[:field].each do |field|
-    unless is_primitive?(field[:type].first) then
-      references.add( class_package( class_named(field[:type][0], @base[:class]) ))
-    end
-  end
-
-  references.add("System.Collections.Generic") if class_has_map(cls)
-  references.to_a
-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| "using #{name};"}).join("\n")
-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))
-  lines.push(indent + " */")
-
-  lines.join("\n")
-end
-
-def field_datatype_rec(field, stack)
-  return field_datatype_basic(field, stack.last) if stack.length == 1
-  t = stack.last
-
-  r = field_datatype_rec(field, stack[0 .. -2])
-  if is_array? t then
-    "#{r}[]"
-  elsif is_dict? t then
-    "Dictionary<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"
-    "int"
-  when "long"
-    "long"
-  when "double"
-    "double"
-  else
-    field
-  end
-end
-
-def field_datatype_basic(field, type)
-  if is_primitive? type then
-    case type
-    when "string"
-      "string"
-    when "real"
-      "double"
-    when "bool"
-      "bool"
-    when "object"
-      "object"
-    when "talkobject"
-      rootclass
-    when "int8"
-      "sbyte"
-    when "uint8"
-      "byte"
-    when "int16"
-      "short"
-    when "uint16"
-      "ushort"
-    when "int32"
-      "int"
-    when "uint32"
-      "uint"
-    when "int64"
-      "long"
-    when "uint64"
-      "ulong"
-    end
-  else
-    truncated_name type
-  end
-end
-
-def field_datatype(field)
-  field_datatype_rec(field, field[:type])
-end
-
-def field_variable(cls,field)
-  lines = []
-  lines.push comment_block(field, 2)
-  lines.push "\t\tpublic #{field_datatype(field)} #{mapped_name(cls, field, :field)} { get; set; }"
-  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(cls, field)
-  lines = []
-  lines.push "\t\t/**"
-  lines.push "\t\t#{wrap_text_to_width(field[:description])}"
-  lines.push "\t\t#{field[:deprecated] if field.has_key? :deprecated}"
-  lines.push "\t\t#{definition_reference(field)}"
-  lines.push "\t\t@param #{field[:name]} #{field[:description]}"
-  lines.push "\t\t*/"
-  lines.push "\t\tpublic void #{setter_name(field)}(#{field_datatype(field)} #{mapped_name(cls, field,:field)}) {"
-  lines.push "\t\t\tthis.#{mapped_name(cls, field, :field)} = #{mapped_name(cls, field, :field)};"
-  lines.push "\t\t}"
-  lines.push "\t\tpublic #{field_datatype(field)} #{getter_name(field)}() {"
-  lines.push "\t\t\treturn this.#{mapped_name(cls, field, :field)};"
-  lines.push "\t\t}"
-  lines.join "\n"
-end

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

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

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

@@ -1,10 +0,0 @@
-<%= autogenerated_warning %>
-<%= import_classes %>
-namespace <%= class_package(@current) %>
-{
-	<%= comment_block(@current,1) %>
-	public class <%= truncated_name(@current) %> :  <%= superclass(@current) %>
-	{
-		<%= (@current[:field].map do |f| field_variable(truncated_name(@current),f) end).join("\n") %>
-	}
-}

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

@@ -1,11 +0,0 @@
-<%= autogenerated_warning %>
-namespace <%= class_package(@current) %>
-{
-	<%= comment_block(@current) %>
-	public class <%= truncated_name(@current) %> :  <%= rootclass %>
-	{<% @current[:constant].each do |field| %>
-    	/** <%= field[:description] %> */
-    	public const int <%= field[:name] %> = <%= field[:value].to_i %>;
-	<% end %>
-	}
-}

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

@@ -1,10 +0,0 @@
-<%= autogenerated_warning %>
-namespace <%= class_package(@current) %>
-{
-	<%= comment_block(@current) %>
-	public class <%= truncated_name(@current) %>
-	{
-		<% @current[:term].each do |field| %>
-  		public const string <%= field[:name] %> = "<%= field[:value] %>";<% end %>
-	}
-}

data/lib/version.rb

@@ -1,3 +0,0 @@
-module Talk
-  VERSION = "2.2.7"
-end