ib 0.1.0 → 0.1.1

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+ui.xcodeproj

data/README.md

@@ -50,7 +50,8 @@ class HelloController < UIViewController
   attr_accessor :title
 
   # define ib outlet
-  ib_outlet :title, UILabel
+  ib_outlet :title, UILabel # IBOutlet UILabel * title;
+  ib_outlet :untyped_label  # IBOutlet id untyped_label;
 
   def someAction
   end
@@ -65,7 +66,7 @@ Generate controller with folllowing command:
 
 ```
 ib c Hello UIViewController \
-  --outlets scroller:UIScrollView btn_hello:UIButton \
+  --outlets scroller:UIScrollView btn_hello: \
   --actions say_hello \
   --accessors data_source
 ```
@@ -77,19 +78,17 @@ The generated file:
 class HelloController < UIViewController
   extend IB
 
-  ## define accessors
   attr_accessor :data_source, :scroller, :htn_hello
 
-  ## define ib outlets
+  ## ib outlets
   ib_outlet :scroller, UIScrollView
-  ib_outlet :btn_hello, UIButton
+  ib_outlet :btn_hello
 
-  ## define actions
   def say_hello(sender)
     # TODO Implement action here
   end
 
-  ## define ib action 
+  ## ib action
   ib_action :say_hello
 
 end

data/lib/ib/generator.rb

@@ -35,7 +35,7 @@ OBJC
 <<-OBJC
 @interface #{info[:class][0][0]} : #{info[:class][0][1]}
 
-#{info[:outlets].map {|name, type| "@property IBOutlet #{type} * #{name};" }.join("\n")}
+#{info[:outlets].map {|name, type| "@property IBOutlet #{generate_type(type)} #{name};" }.join("\n")}
 
 #{info[:actions].map {|action| "-(IBAction) #{action[0]}:(id) sender;" }.join("\n")}
 
@@ -53,4 +53,8 @@ OBJC
 OBJC
     end.join("\n" * 2)
   end
+
+  def generate_type type
+    type == "id" ? type : "#{type} *"
+  end
 end

data/lib/ib/parser.rb

@@ -29,7 +29,11 @@ class IB::Parser
   end
 
   def find_outlets src
-    src.scan /^\s+ib_outlet\s+:([a-zA-Z][_a-zA-Z0-9]*)\s*?,\s*['"]?([a-zA-Z][_a-zA-Z0-9]+)/
+    outlets = []
+    src.scan /^\s+ib_outlet\s+:([a-zA-Z][_a-zA-Z0-9]*)\s*?(,\s*['"]?([a-zA-Z][_a-zA-Z0-9]+))?/ do |groups|
+      outlets << [groups[0], groups[2] || "id"]
+    end
+    outlets
   end
 
   def find_actions src

data/lib/ib/version.rb

@@ -1,3 +1,3 @@
 module IB
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/fixtures/custom_view.rb

@@ -4,6 +4,8 @@ class CustomView < UIView
   ib_outlet :greenLabel,  UIGreenLabel
   ib_outlet :redLabel, "UILabel"
 
+  ib_outlet :untyped_label
+
   ib_action :someAction
   
 end

data/spec/fixtures/simple_class.rb

@@ -1,2 +1,3 @@
 class SimpleClass
+
 end

data/spec/generator_spec.rb

@@ -11,6 +11,7 @@ describe IB::Generator do
 
 @property IBOutlet UIGreenLabel * greenLabel;
 @property IBOutlet UILabel * redLabel;
+@property IBOutlet id untyped_label;
 
 -(IBAction) someAction:(id) sender;
 

data/spec/parser_spec.rb

@@ -6,7 +6,7 @@ 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"]]
+    info[:outlets].should == [["greenLabel", "UIGreenLabel"], ["redLabel", "UILabel"], ["untyped_label", "id"]]
     info[:actions].should == [["someAction"]]
   end
 

data/template/controller.erb

@@ -1,24 +1,30 @@
 class <%= controller_name %> < <%= controller_type %>
   extend IB
 
-  ## define accessors
   attr_accessor <%= (options[:accessors] + options[:outlets].keys).collect{|acc| ":#{acc}"}.join(", ") %>
 
-  ## define ib outlets
+<% if options[:outlets].length > 0 %>
+  ## ib outlets
 <% options[:outlets].each do |name, type| -%>
+<% if type.empty? || type == "id" -%>
+  ib_outlet :<%= name %>
+<% else -%>
   ib_outlet :<%= name %>, <%= type %>
 <% end -%>
+<% end -%>
+<% end -%>
+<% if options[:actions].length > 0 %>
 
-  ## define actions
 <% options[:actions].each do |action| -%>
   def <%= action %>(sender)
     # TODO Implement action here
   end
 <% end -%>
 
-  ## define ib action 
+  ## ib actions
 <% options[:actions].each do |action| -%>
   ib_action :<%= action %>
 <% end -%>
+<% end -%>
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ib
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-15 00:00:00.000000000 Z
+date: 2012-07-18 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: 1976209642130019168
+      hash: -1108691186505808116
 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: 1976209642130019168
+      hash: -1108691186505808116
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24