ib 0.2.5 → 0.2.6

data/README.md

@@ -125,6 +125,12 @@ Here is [sample app](https://github.com/yury/ibsample)
 
 **Note** : this app is build for iOS 6.0
 
+# Another Sample app
+
+Here is [another sample app](https://github.com/hqmq/whereami)
+
+You can play around with it in the same way as the Sample app above. This sample uses a single xib file rather than a storyboard.
+
 ## Contributing
 
 1. Fork it

data/lib/ib/generator.rb

@@ -35,7 +35,7 @@ OBJC
     files.map do |path, infos|
       infos.each do |info|
         output << <<-OBJC
-@interface #{info[:class][0][0]} : #{info[:class][0][1]}
+@interface #{info[:class][0][0]}#{info[:class][0][1] ? ": #{info[:class][0][1]}" : ""}
 
 #{info[:outlets].map {|name, type| "@property IBOutlet #{generate_type(type)} #{name};" }.join("\n")}
 

data/lib/ib/parser.rb

@@ -1,6 +1,6 @@
 class IB::Parser
   NAME_REGEX = /[a-zA-Z][_a-zA-Z0-9]*/
-  CLASS_REGEX  = /^[ \t]*class[ \t]+(#{NAME_REGEX})[ \t]*<[ \t]*(#{NAME_REGEX})/
+  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})/
@@ -9,8 +9,12 @@ class IB::Parser
 
   def find_all(dir_or_files)
     all = {}
-    files = dir_or_files
-    files = Dir.glob("#{dir_or_files}/**/*.rb").to_a if dir_or_files.class == String
+    files = case dir_or_files
+    when Array
+      dir_or_files.flatten
+    else
+      Dir.glob("#{dir_or_files.to_s}/**/*.rb").to_a
+    end
     
     files.each do |file|
       infos = find(file)
@@ -43,6 +47,13 @@ class IB::Parser
 
       info[:path] = path
 
+      # skip empty classes
+      if info[:outlets].empty? &&
+        info[:outlet_collections].empty? &&
+        info[:actions].empty? && info[:class][0][1].nil?
+        next
+      end
+
       infos << info
     end
 
@@ -50,7 +61,9 @@ class IB::Parser
   end
 
   def find_class src
-    src.scan CLASS_REGEX
+    src.scan(CLASS_REGEX).map do |groups|
+      [groups[0], groups[2]]
+    end
   end
 
   def find_outlets src

data/lib/ib/version.rb

@@ -1,3 +1,3 @@
 module IB
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/spec/fixtures/app_delegate.rb

@@ -0,0 +1,7 @@
+class AppDelegate
+  extend IB
+
+  outlet :window, UIWindow
+  outlet :navigationController, UINavigationController
+
+end

data/spec/generator_spec.rb

@@ -7,7 +7,19 @@ describe IB::Generator do
     files = IB::Parser.new.find_all("spec/fixtures")
     stubs = IB::Generator.new.generate_objc(files)
     stubs.should == <<-OBJC
-@interface CustomView : UIView
+@interface AppDelegate
+
+@property IBOutlet UIWindow * window;
+@property IBOutlet UINavigationController * navigationController;
+
+
+
+
+
+@end
+
+
+@interface CustomView: UIView
 
 @property IBOutlet UIGreenLabel * greenLabel;
 @property IBOutlet UILabel * redLabel;
@@ -28,7 +40,7 @@ describe IB::Generator do
 @end
 
 
-@interface EmptyView : UIView
+@interface EmptyView: UIView
 
 
 
@@ -39,7 +51,7 @@ describe IB::Generator do
 @end
 
 
-@interface AnotherView : EmptyView
+@interface AnotherView: EmptyView
 
 
 

metadata

@@ -2,7 +2,7 @@
 name: ib
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Yury Korolev
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -84,6 +84,7 @@ files:
 - lib/ib/project.rb
 - lib/ib/tasks.rb
 - lib/ib/version.rb
+- spec/fixtures/app_delegate.rb
 - spec/fixtures/custom_view.rb
 - spec/fixtures/empty_view.rb
 - spec/fixtures/simple_class.rb
@@ -106,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      hash: 2426120223194462333
+      hash: -4290769984599407242
       segments:
       - 0
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -115,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      hash: 2426120223194462333
+      hash: -4290769984599407242
       segments:
       - 0
 requirements: []
@@ -125,6 +126,7 @@ signing_key:
 specification_version: 3
 summary: Small portion of love to interface builder with rubymotion
 test_files:
+- spec/fixtures/app_delegate.rb
 - spec/fixtures/custom_view.rb
 - spec/fixtures/empty_view.rb
 - spec/fixtures/simple_class.rb