ib 0.1.3 → 0.1.4

data/README.md

@@ -48,8 +48,8 @@ class HelloController < UIViewController
   extend IB
 
   # define ib outlet
-  outlet_accessor :title, UILabel # IBOutlet UILabel * title;
-  outlet_accessor :untyped_label  # IBOutlet id untyped_label;
+  outlet :title, UILabel # IBOutlet UILabel * title;
+  outlet :untyped_label  # IBOutlet id untyped_label;
 
   # define ib action
   def someAction sender
@@ -95,8 +95,8 @@ class HelloController < UIViewController
   attr_accessor :data_source
 
   ## ib outlets
-  outlet_accessor :scroller, UIScrollView
-  outlet_accessor :btn_hello
+  outlet :scroller, UIScrollView
+  outlet :btn_hello
 
   def say_hello(sender)
     # TODO Implement action here

data/lib/ib/generator.rb

@@ -37,7 +37,9 @@ OBJC
 
 #{info[:outlets].map {|name, type| "@property IBOutlet #{generate_type(type)} #{name};" }.join("\n")}
 
-#{info[:actions].map {|action| "-(IBAction) #{action[0]}:(id) sender;" }.join("\n")}
+#{info[:outlet_collections].map {|name, type| "@property IBOutletCollection(#{type}) NSArray * #{name};" }.join("\n")}
+
+#{info[:actions].map {|action| "-(IBAction) #{generate_action(action)};" }.join("\n")}
 
 @end
 OBJC
@@ -57,4 +59,8 @@ OBJC
   def generate_type type
     type == "id" ? type : "#{type} *"
   end
-end
+
+  def generate_action action
+    action[1] ? "#{action[0]}:(id) #{action[1]}" : "#{action[0]}"
+  end
+end

data/lib/ib/outlets.rb

@@ -4,6 +4,23 @@ module IB
   end
 
   def outlet_accessor name, type = "id"
+    puts "Depricated: use `outlet` instead of `outlet_accessor`"
+    attr_accessor name
+  end
+
+  def outlet name, type = "id"
+    attr_accessor name
+  end
+
+  def ib_outlet_collection name, type = "id"
+  end
+
+  def outlet_collection_accessor name, type = "id"
+    puts "Depricated: use `outlet_collection` instead of `outlet_collection_accessor`"
+    attr_accessor name
+  end
+
+  def outlet_collection name, type = "id"
     attr_accessor name
   end
 

data/lib/ib/parser.rb

@@ -1,8 +1,10 @@
 class IB::Parser
-  CLASS_REGEX  = /^\s*class\s+([a-zA-Z][_a-zA-Z0-9]+)\s*<\s*([a-zA-Z][_a-zA-Z0-9]+)/
-  OUTLET_REGEX = /^\s+(ib_outlet|outlet_accessor)\s+:([a-zA-Z][_a-zA-Z0-9]*)\s*?(,\s*['"]?([a-zA-Z][_a-zA-Z0-9]+))?/
-  METHOD_REF_REGEX = /^\s+(ib_action)\s+:([a-zA-Z][_a-zA-Z0-9]*)/
-  METHOD_DEF_REGEX = /^\s+(def)\s+([a-zA-Z][_a-zA-Z0-9]*)([\s(]+)([a-zA-Z][_a-zA-Z0-9]*)([\s)]*)(#.*)?$/
+  NAME_REGEX = /[a-zA-Z][_a-zA-Z0-9]*/
+  CLASS_REGEX  = /^[ \t]*class[ \t]+(#{NAME_REGEX})[ \t]*<[ \t]*(#{NAME_REGEX})/
+  OUTLET_REGEX = /^[ \t]+(ib_)?outlet(_accessor)?[ \t]+:(#{NAME_REGEX})[ \t]*?(,[ \t]*['"]?(#{NAME_REGEX}))?/
+  OUTLET_COLLECTION_REGEX = /^[ \t]+(ib_)?outlet_collection(_accessor)?[ \t]+:(#{NAME_REGEX})[ \t]*?(,[ \t]*['"]?(#{NAME_REGEX}))?/
+  METHOD_REF_REGEX = /^[ \t]+(ib_action)[ \t]:(#{NAME_REGEX})/
+  METHOD_DEF_REGEX = /^[ \t]+(def)[ \t](#{NAME_REGEX})([ \t(]+)?(#{NAME_REGEX})?([ \t)]*)(#.*)?$/
   ACTION_REGEX = Regexp.union METHOD_DEF_REGEX, METHOD_REF_REGEX
 
   def find_all(dir)
@@ -22,6 +24,7 @@ class IB::Parser
     return false if info[:class].length == 0
 
     info[:outlets] = find_outlets(src)
+    info[:outlet_collections] = find_outlet_collections(src)
     info[:actions] = find_actions(src)
 
     info[:path] = path
@@ -34,22 +37,26 @@ class IB::Parser
   end
 
   def find_outlets src
-    outlets = []
-    src.scan OUTLET_REGEX do |groups|
-      outlets << [groups[1], groups[3] || "id"]
+    src.scan(OUTLET_REGEX).map do |groups|
+      [groups[2], groups[4] || "id"]
+    end
+  end
+
+  def find_outlet_collections src
+    src.scan(OUTLET_COLLECTION_REGEX).map do |groups|
+      [groups[2], groups[4] || "id"]
     end
-    outlets
   end
 
   def find_actions src
-    actions = []
-    src.scan ACTION_REGEX do |groups|
+    src.scan(ACTION_REGEX).map do |groups|
       if groups[0] == "def"
-        actions << [groups[1]]
+        [groups[1], groups[3]]
       elsif groups[6] == "ib_action"
-        actions << [groups[7]]
+        [groups[7], 'sender']
+      else
+        nil
       end
-    end
-    actions.uniq
+    end.compact.uniq {|action| action[0]}
   end
-end
+end

data/lib/ib/version.rb

@@ -1,3 +1,3 @@
 module IB
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/fixtures/custom_view.rb

@@ -6,7 +6,14 @@ class CustomView < UIView
 
   ib_outlet :untyped_label
 
-  outlet_accessor :yellowLabel
+  outlet :yellowLabel
+
+  ib_outlet_collection :greenLabelCollection,  UIGreenLabel
+  ib_outlet_collection :redLabelCollection, "UILabel"
+
+  ib_outlet_collection :untyped_label_collection
+
+  outlet_collection :yellowLabelCollection
 
   ib_action :someAction
 
@@ -21,5 +28,8 @@ class CustomView < UIView
 
   def notAction with, toArgs
   end
-  
-end
+
+  def actionWithoutArgs
+  end
+
+end

data/spec/generator_spec.rb

@@ -14,10 +14,16 @@ describe IB::Generator do
 @property IBOutlet id untyped_label;
 @property IBOutlet id yellowLabel;
 
+@property IBOutletCollection(UIGreenLabel) NSArray * greenLabelCollection;
+@property IBOutletCollection(UILabel) NSArray * redLabelCollection;
+@property IBOutletCollection(id) NSArray * untyped_label_collection;
+@property IBOutletCollection(id) NSArray * yellowLabelCollection;
+
 -(IBAction) someAction:(id) sender;
--(IBAction) anotherAction:(id) sender;
+-(IBAction) anotherAction:(id) button;
 -(IBAction) actionWithComment:(id) sender;
 -(IBAction) actionWithBrackets:(id) sender;
+-(IBAction) actionWithoutArgs;
 
 @end
 
@@ -28,7 +34,9 @@ describe IB::Generator do
 
 
 
+
+
 @end
 OBJC
   end
-end
+end

data/spec/parser_spec.rb

@@ -6,8 +6,25 @@ describe IB::Parser do
   it "finds outlets and actions" do
     info = IB::Parser.new.find("spec/fixtures/custom_view.rb")
     info[:class].should == [["CustomView", "UIView"]]
-    info[:outlets].should == [["greenLabel", "UIGreenLabel"], ["redLabel", "UILabel"], ["untyped_label", "id"], ["yellowLabel", "id"]]
-    info[:actions].should == [["someAction"], ["anotherAction"], ["actionWithComment"], ["actionWithBrackets"]]
+    info[:outlets].should == [
+      ["greenLabel",    "UIGreenLabel"],
+      ["redLabel",      "UILabel"],
+      ["untyped_label", "id"],
+      ["yellowLabel",   "id"]
+    ]
+    info[:outlet_collections].should == [
+      ["greenLabelCollection",     "UIGreenLabel"],
+      ["redLabelCollection",       "UILabel"],
+      ["untyped_label_collection", "id"],
+      ["yellowLabelCollection",    "id"]
+    ]
+    info[:actions].should == [
+      ["someAction",         "sender"],
+      ["anotherAction",      "button"],
+      ["actionWithComment",  "sender"],
+      ["actionWithBrackets", "sender"],
+      ["actionWithoutArgs",  nil]
+    ]
   end
 
   it "detects simple classes" do
@@ -17,4 +34,4 @@ describe IB::Parser do
   it "finds all infos" do
     puts IB::Parser.new.find_all("spec/fixtures").inspect
   end
-end
+end

data/template/controller.erb

@@ -7,9 +7,9 @@ class <%= controller_name %> < <%= controller_type %>
   ## ib outlets
 <% options[:outlets].each do |name, type| -%>
 <% if type.empty? || type == "id" -%>
-  outlet_accessor :<%= name %>
+  outlet :<%= name %>
 <% else -%>
-  outlet_accessor :<%= name %>, <%= type %>
+  outlet :<%= name %>, <%= type %>
 <% end -%>
 <% end -%>
 <% end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ib
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2012-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -108,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4072317502199486980
+      hash: 1512499769767831646
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4072317502199486980
+      hash: 1512499769767831646
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24