talk 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 606cb2bb6a2dc72d6f6db89867297d026f578bdd
-  data.tar.gz: 1db8eb90789c6d80da7a463190a216b839c6c544
+  metadata.gz: 963aee9e434631bd8d20cd86f11645b6478425e9
+  data.tar.gz: 364d02b88f3a18aa97c40001314140453b34f00d
 SHA512:
-  metadata.gz: eb356dbd149a96bb2b1d0a9aaa5fa5e4c5a09f1a94d046e7d92663bbf1b9ecb11ab2b1e5ae96b8ef550c3037ea8b01c88b63a97ba1a94f45a6343477cc40578f
-  data.tar.gz: 5d065ce7e1ccca753206de6ab57ad9d535d1142b14b76acfc6300d08c9dc38aee3b6823c1b2ceab4e7dd181539114a1ec82db56d0641968860729360950080dd
+  metadata.gz: 9bd86f190ae3dc6863b78620bd484ef63b78f7481569c04ea8ecac4c895eb5dbf6728c460affb2a55d506d747be72181b235662ac5367a1bc4ee2593f10f24c9
+  data.tar.gz: e526a3c98a908f0c3dc9c638ebf9bc51084a933fc9edb0ad91ecf08d7ccb4e1dc86fc0540cd4167f94005b3182b88600e546b638131234e0e0ca68ca18038fa2

data/bin/maketalk

@@ -10,7 +10,7 @@ require 'trollop'
 require 'pp'
 
 $opts = Trollop::options do
-  version "Talk 2.0 (c) 2013 Jonas Acres"
+  version "Talk #{Talk::VERSION} (c) 2013 Jonas Acres"
   banner <<-EOS
 Talk is a compile-to-source protocol specification language.
 
@@ -26,6 +26,7 @@ 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

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

@@ -142,6 +142,11 @@ 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";
@@ -226,6 +231,10 @@ 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/talk.rb

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

data/lib/version.rb

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

data/talk.gemspec

@@ -1,7 +1,11 @@
+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     = '2.2.3'
+  s.version     = Talk::VERSION
   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, Javascript, ObjC and Ruby."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: talk
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Jonas Acres
@@ -118,6 +118,7 @@ files:
 - lib/parser.rb
 - lib/registry.rb
 - lib/talk.rb
+- lib/version.rb
 - talk.gemspec
 homepage: http://github.com/jonasacres/talk
 licenses: