talk 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a843b0b7332c8a0077104150b582af27057b0e90
-  data.tar.gz: 55c4d50a067310de4052c24c992d804473aee9de
+  metadata.gz: 47ce5983a7162f33cd2b2ede78b20d5e2a456047
+  data.tar.gz: afe02ff186a9e44749bc746147521b7af2537205
 SHA512:
-  metadata.gz: 89d037e1022295cfd10e42d18cc01829a768a274668de3e9d3208f72e927f51649f4ede8db08f966cb93c7a2d72cd8c24b231def50423c33746d66a7e5455301
-  data.tar.gz: 179538eace67644bcf51c62b4896f6ed01e718882c8f1577e0ecfaf58d26315c0f2453e6284f64a3a4448c246a68d0113138f42759037eec505bcad33e5b1436
+  metadata.gz: bc2872575d0307819fa67a7ad2cb498a09ed87c5fa199d2c33f2cc49a42a2f7f6a9879f83f4c4057e5a5eb5292897cd682cf833c2a3b6892a756e5be9407484e
+  data.tar.gz: 76ad99b4fdbc1efe914eb12ac0ecc8bc1a1586656181ec1396d75ad0982d5191e2adf6ee67bdfcc5a1553f1f7c8b187a07edcaa01db79257584aa185e0b8dea1

data/lib/languages/objc/objc.rb

@@ -110,7 +110,14 @@ def assist_line(field)
     end
   end
 
-  elements.join(".")
+  stringified = elements.map { |e| "@\"#{e}\"" }
+  "@[#{stringified.join(",")}]"
+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}"
 end
 
 def class_field_maps(cls)

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

@@ -20,3 +20,16 @@ enum <%= truncated_name(enumeration[:name]) %>
 };
 
 <% end # enumeration %>
+
+<% @base[:protocol].each do |protocol| %>
+
+// @protocol <%= protocol[:name] %>
+<%= comment_block(protocol) %>
+
+<% protocol[:method].each do |method| %>
+<%= comment_block(method) %>
+#define <%= protocol_method_name(protocol[:name], method[:name]) %> @"<%= method[:name] %>"
+
+<% end %>
+
+<% end # protocol %>

data/lib/languages/objc/templates/class.m.erb

@@ -29,17 +29,20 @@
 <% end %>
 
 <% unless (@current_class[:field].reject { |f| assist_line(f).nil? }).length == 0 then %>
--(NSString *) containerStructureForLocalKey: (NSString *) localKey
-{<%
-  @current_class[:field].each do |field|
-    assist = assist_line(field)
-    unless assist.nil? %>
-  if([localKey isEqualToString:@"<%= mapped_name(@current_class, field[:name], :field) %>"]) return @"<%= assist %>";
-    <%
-    end
-  end
-  %>
-  return [super containerStructureForLocalKey:localKey];
+-(NSDictionary *) containerStructure
+{
+  NSDictionary *local = @{
+<%
+    @current_class[:field].each do |field|
+      assist = assist_line(field)
+      next if assist.nil?
+%>    @"<%= mapped_name(@current_class, field[:name], :field) %>": <%= assist %>,
+<%  end %>
+  };
+
+  NSMutableDictionary *merged = [[super containerStructure] mutableCopy];
+  [merged addEntriesFromDictionary:local];
+  return merged;
 }
 <% end %>
 +(NSString *) fullyQualifiedClassName

data/talk.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name        = 'talk'
   s.executables << 'talk'
-  s.version     = '2.0.3'
-  s.date        = '2014-05-15'
+  s.version     = '2.0.4'
+  s.date        = '2014-05-16'
   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.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Jonas Acres
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies: []
 description: A lightweight language for specifying protocol contracts. Compiles to
   source in Java, Javascript, ObjC and Ruby.