ib 0.1.2 → 0.1.3

data/README.md

@@ -47,17 +47,31 @@ extend your class with IB module
 class HelloController < UIViewController
   extend IB
 
-  attr_accessor :title
-
   # define ib outlet
-  ib_outlet :title, UILabel # IBOutlet UILabel * title;
-  ib_outlet :untyped_label  # IBOutlet id untyped_label;
+  outlet_accessor :title, UILabel # IBOutlet UILabel * title;
+  outlet_accessor :untyped_label  # IBOutlet id untyped_label;
 
-  def someAction
+  # define ib action
+  def someAction sender
   end
+end
+```
 
-  # define ib action
-  ib_action :someAction
+**NOTE:** If you include methods and attributes from module, you can use `ib_outlet` and `ib_action` to make them visible in designer
+
+```ruby
+module TouchLogger
+  def controlTouched sender
+    puts "touched"
+  end
+end
+
+class LogController < UIViewController
+  extend IB
+
+  include TouchLogger
+
+  ib_action :controlTouched
 end
 ```
 
@@ -78,19 +92,16 @@ The generated file:
 class HelloController < UIViewController
   extend IB
 
-  attr_accessor :data_source, :scroller, :htn_hello
+  attr_accessor :data_source
 
   ## ib outlets
-  ib_outlet :scroller, UIScrollView
-  ib_outlet :btn_hello
+  outlet_accessor :scroller, UIScrollView
+  outlet_accessor :btn_hello
 
   def say_hello(sender)
     # TODO Implement action here
   end
 
-  ## ib action
-  ib_action :say_hello
-
 end
 ```
 

data/ib.gemspec

@@ -4,7 +4,7 @@ require File.expand_path('../lib/ib/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Yury Korolev", "Francis Chong"]
   gem.email         = ["yury.korolev@gmail.com", "francis@ignition.hk"]
-  gem.description   = %q{Stupid rubymotion ib outlets support}
+  gem.description   = %q{Magic rubymotion ib outlets support}
   gem.summary       = %q{Small portion of love to interface builder with rubymotion}
   gem.homepage      = ""
 

data/lib/ib/outlets.rb

@@ -1,7 +1,10 @@
 module IB
   
   def ib_outlet name, type = "id"
-    # maybe call attr_accessor here?
+  end
+
+  def outlet_accessor name, type = "id"
+    attr_accessor name
   end
 
   def ib_action name

data/lib/ib/parser.rb

@@ -1,4 +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)]*)(#.*)?$/
+  ACTION_REGEX = Regexp.union METHOD_DEF_REGEX, METHOD_REF_REGEX
+
   def find_all(dir)
     all = {}
     Dir.glob("#{dir}/**/*.rb") do |file|
@@ -12,11 +18,10 @@ class IB::Parser
   def find(path)
     src = File.read(path)
     info = {class: find_class(src)}
-    
+
     return false if info[:class].length == 0
 
     info[:outlets] = find_outlets(src)
-
     info[:actions] = find_actions(src)
 
     info[:path] = path
@@ -25,18 +30,26 @@ class IB::Parser
   end
 
   def find_class src
-    src.scan /^\s*class\s+([a-zA-Z][_a-zA-Z0-9]+)\s*<\s*([a-zA-Z][_a-zA-Z0-9]+)/
+    src.scan CLASS_REGEX
   end
 
   def find_outlets src
     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"]
+    src.scan OUTLET_REGEX do |groups|
+      outlets << [groups[1], groups[3] || "id"]
     end
     outlets
   end
 
   def find_actions src
-    src.scan /^\s+ib_action\s+:([a-zA-Z][_a-zA-Z0-9]*)/
+    actions = []
+    src.scan ACTION_REGEX do |groups|
+      if groups[0] == "def"
+        actions << [groups[1]]
+      elsif groups[6] == "ib_action"
+        actions << [groups[7]]
+      end
+    end
+    actions.uniq
   end
 end

data/lib/ib/tasks.rb

@@ -1,7 +1,7 @@
 require 'rake'
 
 desc "Generates ui.xcodeproj and open it"
-task "design" do
+task :design do
   IB::Project.new.write
   system "open ui.xcodeproj"
 end

data/lib/ib/version.rb

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

data/spec/fixtures/custom_view.rb

@@ -6,6 +6,20 @@ class CustomView < UIView
 
   ib_outlet :untyped_label
 
+  outlet_accessor :yellowLabel
+
   ib_action :someAction
+
+  def anotherAction button
+  end
+
+  def actionWithComment sender # test
+  end
+
+  def actionWithBrackets(sender)
+  end
+
+  def notAction with, toArgs
+  end
   
 end

data/spec/generator_spec.rb

@@ -12,8 +12,12 @@ describe IB::Generator do
 @property IBOutlet UIGreenLabel * greenLabel;
 @property IBOutlet UILabel * redLabel;
 @property IBOutlet id untyped_label;
+@property IBOutlet id yellowLabel;
 
 -(IBAction) someAction:(id) sender;
+-(IBAction) anotherAction:(id) sender;
+-(IBAction) actionWithComment:(id) sender;
+-(IBAction) actionWithBrackets:(id) sender;
 
 @end
 

data/spec/parser_spec.rb

@@ -6,8 +6,8 @@ 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"]]
-    info[:actions].should == [["someAction"]]
+    info[:outlets].should == [["greenLabel", "UIGreenLabel"], ["redLabel", "UILabel"], ["untyped_label", "id"], ["yellowLabel", "id"]]
+    info[:actions].should == [["someAction"], ["anotherAction"], ["actionWithComment"], ["actionWithBrackets"]]
   end
 
   it "detects simple classes" do

data/template/controller.erb

@@ -1,15 +1,15 @@
 class <%= controller_name %> < <%= controller_type %>
   extend IB
 
-  attr_accessor <%= (options[:accessors] + options[:outlets].keys).collect{|acc| ":#{acc}"}.join(", ") %>
+  attr_accessor <%= options[:accessors].collect{|acc| ":#{acc}"}.join(", ") %>
 
 <% if options[:outlets].length > 0 %>
   ## ib outlets
 <% options[:outlets].each do |name, type| -%>
 <% if type.empty? || type == "id" -%>
-  ib_outlet :<%= name %>
+  outlet_accessor :<%= name %>
 <% else -%>
-  ib_outlet :<%= name %>, <%= type %>
+  outlet_accessor :<%= name %>, <%= type %>
 <% end -%>
 <% end -%>
 <% end -%>
@@ -21,10 +21,6 @@ class <%= controller_name %> < <%= controller_type %>
   end
 <% end -%>
 
-  ## 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.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-21 00:00:00.000000000 Z
+date: 2012-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -60,7 +60,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.0'
-description: Stupid rubymotion ib outlets support
+description: Magic rubymotion ib outlets support
 email:
 - yury.korolev@gmail.com
 - francis@ignition.hk
@@ -108,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3972118293195904556
+      hash: 4072317502199486980
 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: 3972118293195904556
+      hash: 4072317502199486980
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24