ib 0.2.2 → 0.2.3

data/lib/ib/generator.rb

@@ -31,8 +31,10 @@ OBJC
   end
 
   def generate_objc files
-    src = files.map do |path, info|
-<<-OBJC
+    output = ""
+    files.map do |path, infos|
+      infos.each do |info|
+        output << <<-OBJC
 @interface #{info[:class][0][0]} : #{info[:class][0][1]}
 
 #{info[:outlets].map {|name, type| "@property IBOutlet #{generate_type(type)} #{name};" }.join("\n")}
@@ -43,7 +45,10 @@ OBJC
 
 @end
 OBJC
-    end.join("\n" * 2)
+        output << "\n\n"
+      end
+    end
+    output
   end
 
   def generate_objc_impl files

data/lib/ib/parser.rb

@@ -13,8 +13,9 @@ class IB::Parser
     files = Dir.glob("#{dir_or_files}/**/*.rb").to_a if dir_or_files.class == String
     
     files.each do |file|
-      if info = find(file)
-        all[file] = info
+      infos = find(file)
+      if infos.length > 0
+        all[file] = infos
       end
     end
     all
@@ -22,17 +23,30 @@ class IB::Parser
 
   def find(path)
     src = File.read(path)
-    info = {class: find_class(src)}
+    offsets = []
+    src.scan CLASS_REGEX do |b|
+      offsets << $~.offset(0)
+    end
+
+    return [] if offsets.length == 0
+    infos = []
+    pairs = offsets.map {|o| o[0]}
 
-    return false if info[:class].length == 0
+    pairs << src.length
+    (pairs.length - 1).times do |i|
+      s = src[pairs[i], pairs[i+1]]
+      info = {class: find_class(s)}
 
-    info[:outlets] = find_outlets(src)
-    info[:outlet_collections] = find_outlet_collections(src)
-    info[:actions] = find_actions(src)
+      info[:outlets] = find_outlets(s)
+      info[:outlet_collections] = find_outlet_collections(s)
+      info[:actions] = find_actions(s)
 
-    info[:path] = path
+      info[:path] = path
+
+      infos << info
+    end
 
-    info
+    infos
   end
 
   def find_class src

data/lib/ib/version.rb

@@ -1,3 +1,3 @@
 module IB
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/fixtures/empty_view.rb

@@ -1,2 +1,5 @@
 class EmptyView < UIView
+end
+
+class AnotherView < EmptyView
 end

data/spec/generator_spec.rb

@@ -37,6 +37,19 @@ describe IB::Generator do
 
 
 @end
+
+
+@interface AnotherView : EmptyView
+
+
+
+
+
+
+
+@end
+
+
 OBJC
   end
 end

data/spec/parser_spec.rb

@@ -4,7 +4,7 @@ require "ib/parser"
 
 describe IB::Parser do
   it "finds outlets and actions" do
-    info = IB::Parser.new.find("spec/fixtures/custom_view.rb")
+    info = IB::Parser.new.find("spec/fixtures/custom_view.rb").first
     info[:class].should == [["CustomView", "UIView"]]
     info[:outlets].should == [
       ["greenLabel",    "UIGreenLabel"],
@@ -28,7 +28,7 @@ describe IB::Parser do
   end
 
   it "detects simple classes" do
-    IB::Parser.new.find("spec/fixtures/simple_class.rb").should == false
+    IB::Parser.new.find("spec/fixtures/simple_class.rb").length.should == 0
   end
 
   it "finds all infos" do

metadata

@@ -2,7 +2,7 @@
 name: ib
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Yury Korolev
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-01 00:00:00.000000000 Z
+date: 2012-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -107,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2351586432581253994
+      hash: 3876131364109550006
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2351586432581253994
+      hash: 3876131364109550006
   none: false
 requirements: []
 rubyforge_project: