ib 0.2.7 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14673dfc0d5e8858596f53d44641d0f8f5f96288
-  data.tar.gz: f30e7bfbf818a0feb2824be4d1abc549d5788440
+  metadata.gz: 3e294dc4222e7afc58e33850727fdfe7c8196fbc
+  data.tar.gz: f478bc0484d46085a22c95f7d62902af044faf9f
 SHA512:
-  metadata.gz: b81eb553fe779a211923770eda002fbfaaf9be509e54ed89da0f388e4765dbb995f616c4048e87f81949f56fdf0a726a88ed544e6808e6ca469a0673f335924e
-  data.tar.gz: 8dc6b1fb2d55b2c9eeec9bc5746191fc79344026f3fb1d4fa582e001e5a99f5b8bb4e61a8d46210f301b0d26dd6eab41d8c8802940e7502180e942654c1cbf24
+  metadata.gz: 58437fdd08f5a13cebcaee22f160f776a58970490e7a12c80705f65998189b2286a76e6073481e48ece01001f6f79fbc21fff46aef3b8396fedbf34eb0f3f084
+  data.tar.gz: e19cf4f40b619f307f619edcd5961594a0c8c4a52c39081b3eb2f231fe30b7c673cdae521fd47d976b063b0ac4be410b4fdeceddd1f9349542ed40b5740a5077

data/README.md

@@ -2,7 +2,7 @@
 
 rubymotion interface builder support (yes, with outlets)
 
-[![SpellHub](http://spellhub.com/projects/status/7)](http://spellhub.com/projects/project/7)
+<a href='http://spellhub.com/projects/project/7'><img src="http://spellhub.com/projects/status/7" height="18"></a>
 
 [**Change Log**](https://github.com/yury/ib/wiki/Change-Log)
 

data/lib/ib/generator.rb

@@ -71,6 +71,6 @@ OBJC
   end
 
   def generate_action action
-    action[1] ? "#{action[0]}:(id) #{action[1]}" : "#{action[0]}"
+    action[1] ? "#{action[0]}:(#{action[2] ? "#{action[2]}*" : 'id'}) #{action[1]}" : "#{action[0]}"
   end
 end

data/lib/ib/outlets.rb

@@ -14,7 +14,7 @@ module IB
     attr_accessor name
   end
 
-  def ib_action name
+  def ib_action name, type = "id"
   end
 
 end

data/lib/ib/parser.rb

@@ -3,10 +3,13 @@ class IB::Parser
   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)]*)(#.*)?$/
+  METHOD_ARGUMENT_REGEX = /(#{NAME_REGEX})(?:[ \t]*=[^,#)]*)?/
+  METHOD_REF_REGEX = /^[ \t]+(ib_action)[ \t]:(#{NAME_REGEX})[ \t]*?(,[ \t]*['"]?(#{NAME_REGEX}))?/
+  METHOD_DEF_REGEX = /^[ \t]+(def)[ \t]#{METHOD_ARGUMENT_REGEX}([ \t(]+)?#{METHOD_ARGUMENT_REGEX}?([ \t)]*)(#.*)?$/
   ACTION_REGEX = Regexp.union METHOD_DEF_REGEX, METHOD_REF_REGEX
 
+  p METHOD_DEF_REGEX
+
   def find_all(dir_or_files)
     all = {}
     files = case dir_or_files
@@ -81,9 +84,9 @@ class IB::Parser
   def find_actions src
     src.scan(ACTION_REGEX).map do |groups|
       if groups[0] == "def"
-        [groups[1], groups[3]]
+        [groups[1], groups[3], nil]
       elsif groups[6] == "ib_action"
-        [groups[7], 'sender']
+        [groups[7], 'sender', groups[9]]
       else
         nil
       end

data/lib/ib/version.rb

@@ -1,3 +1,3 @@
 module IB
-  VERSION = "0.2.7"
+  VERSION = "0.2.9"
 end

data/spec/fixtures/custom_view.rb

@@ -16,6 +16,7 @@ class CustomView < UIView
   outlet_collection :yellowLabelCollection
 
   ib_action :someAction
+  ib_action :segueAction, UIStoryboardSegue
 
   def anotherAction button
   end
@@ -32,4 +33,7 @@ class CustomView < UIView
   def actionWithoutArgs
   end
 
+  def actionWithDefaultedArgs(sender = nil) #comment
+  end
+
 end

data/spec/generator_spec.rb

@@ -32,10 +32,12 @@ describe IB::Generator do
 @property IBOutletCollection(id) NSArray * yellowLabelCollection;
 
 -(IBAction) someAction:(id) sender;
+-(IBAction) segueAction:(UIStoryboardSegue*) sender;
 -(IBAction) anotherAction:(id) button;
 -(IBAction) actionWithComment:(id) sender;
 -(IBAction) actionWithBrackets:(id) sender;
 -(IBAction) actionWithoutArgs;
+-(IBAction) actionWithDefaultedArgs:(id) sender;
 
 @end
 

data/spec/parser_spec.rb

@@ -19,11 +19,13 @@ describe IB::Parser do
       ["yellowLabelCollection",    "id"]
     ]
     info[:actions].should == [
-      ["someAction",         "sender"],
-      ["anotherAction",      "button"],
-      ["actionWithComment",  "sender"],
-      ["actionWithBrackets", "sender"],
-      ["actionWithoutArgs",  nil]
+      ["someAction",              "sender", nil],
+      ["segueAction",             "sender", "UIStoryboardSegue"],
+      ["anotherAction",           "button", nil],
+      ["actionWithComment",       "sender", nil],
+      ["actionWithBrackets",      "sender", nil],
+      ["actionWithoutArgs",       nil,      nil],
+      ["actionWithDefaultedArgs", "sender", nil]
     ]
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ib
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.9
 platform: ruby
 authors:
 - Yury Korolev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Small portion of love to interface builder with rubymotion