ib 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b752f7f0c21e08af52130f46871d317f331eddf
-  data.tar.gz: 852fbda61f72e63f5c149cf0781c882db013099c
+  metadata.gz: e02f312f8c0a9d30a2ddf6c53d3a9a05e51c68fc
+  data.tar.gz: 25824ab39b5b19c3ff47aa127d69d51fb132fae2
 SHA512:
-  metadata.gz: 3ec9c8ebd0f1f41db37f27da4cc3c97d697d01dc4f03415a7ad6df4d4b20aa7dcfa5d73dcff46628027b0d17cf00ef57c4af6c349f798bb61f198c5262e1bf61
-  data.tar.gz: 3d74f7834a96440c976d20e26bc7bb4d1655e8f824e9c8fd20fa1158981eb77b9cad6f801b5a6567f9cbf807467b897c032b79513125c5df705b4c8cec3f2ab7
+  metadata.gz: ca67898ee5dc3f76aa79b04c9e5a749a9cc63f9e3a785adc493b8f612310deae2ede172c3db74ca70f3ee361f65e03394f9a0fc64918791d336e531d219bf5b4
+  data.tar.gz: da6dc3102a28ee95a8d5f4c338a00d8ce260cd2f9ed154bbb417867cd1e05b5ad1ebef5a3b90b0eb55f06c58dae4782dd34839d4427960bc40facc7b8ec834de

data/lib/ib/generator/templates/Stubs.h.erb

@@ -11,7 +11,7 @@
 
 <% @files.each do |path, interfaces| %>
 <% interfaces.each do |interface| %>
-@interface <%= interface.sub_class + ": " + interface.super_class %>
+@interface <%= interface.sub_class + ": " + (interface.super_class.start_with?("PM::", "ProMotion::") ? "UIViewController" : interface.super_class) %>
 <% unless interface.outlets.empty? %><%= "\n"%><% end %>
 <% interface.outlets.each do |outlet| %>
 @property IBOutlet <%= outlet.formated_type %> <%= outlet.variable %>;

data/lib/ib/parser.rb

@@ -3,7 +3,8 @@ require 'ib/oc_interface'
 
 class IB::Parser
   NAME_REGEX = /[a-zA-Z][_a-zA-Z0-9]*/
-  CLASS_REGEX  = /^[ \t]*class[ \t]+(#{NAME_REGEX})([ \t]*<[ \t]*(#{NAME_REGEX}))?/
+  SUPERCLASS_REGEX = /(#{NAME_REGEX}):{0,2}(#{NAME_REGEX})/
+  CLASS_REGEX  = /^[ \t]*class[ \t]+(#{NAME_REGEX})([ \t]*<[ \t]*(#{SUPERCLASS_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_ARGUMENT_REGEX = /(#{NAME_REGEX})(?:[ \t]*=[^,#)]*)?/

data/lib/ib/version.rb

@@ -1,3 +1,3 @@
 module IB
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

data/spec/fixtures/common/complex_superclass.rb

@@ -0,0 +1,5 @@
+class HasComplexSuperClass < Complex::SuperClass
+end
+
+class HasLessComplexSuperClass < PM::Screen
+end

data/spec/fixtures/dependency_test/promotion_class.rb

@@ -0,0 +1,5 @@
+class PromotionScreen < PM::Screen
+end
+
+class PromotionMapScreen < PM::MapScreen
+end

data/spec/lib/ib/generator_spec.rb

@@ -22,6 +22,12 @@ describe IB::Generator do
 
 @end
 
+@interface HasComplexSuperClass: Complex::SuperClass
+@end
+
+@interface HasLessComplexSuperClass: UIViewController
+@end
+
 @interface CustomView: UIView
 
 @property IBOutlet UIGreenLabel * greenLabel;
@@ -75,6 +81,12 @@ OBJC
 
 @end
 
+@interface HasComplexSuperClass: Complex::SuperClass
+@end
+
+@interface HasLessComplexSuperClass: UIViewController
+@end
+
 @interface CustomView: UIView
 
 @property IBOutlet UIGreenLabel * greenLabel;
@@ -123,6 +135,12 @@ OBJC
 @implementation AppDelegate
 @end
 
+@implementation HasComplexSuperClass
+@end
+
+@implementation HasLessComplexSuperClass
+@end
+
 @implementation CustomView
 @end
 
@@ -159,6 +177,12 @@ OBJC
 @interface AppDelegate: UIResponder <UIApplicationDelegate>
 @end
 
+@interface PromotionScreen: UIViewController
+@end
+
+@interface PromotionMapScreen: UIViewController
+@end
+
 @interface SuperClass: UIViewController
 @end
 

data/spec/lib/ib/parser_spec.rb

@@ -29,13 +29,19 @@ describe IB::Parser do
     ]
   end
 
+  it "can parse complex superclasses" do
+    info = IB::Parser.new.find("spec/fixtures/common/complex_superclass.rb")
+    info.first[:class].should == [["HasComplexSuperClass", "Complex::SuperClass"]]
+    info.last[:class].should == [["HasLessComplexSuperClass", "PM::Screen"]]
+  end
+
   it "can output simple classes" do
     IB::Parser.new.find("spec/fixtures/common/simple_class.rb").length.should == 1
   end
 
   it "finds all infos" do
     infos = IB::Parser.new.find_all("spec/fixtures/dependency_test")
-    infos.values.each do |vals| 
+    infos.values.each do |vals|
       vals.each do |v|
         expect(v).to be_kind_of(IB::OCInterface)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ib
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Yury Korolev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-13 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -112,12 +112,14 @@ files:
 - lib/ib/tasks.rb
 - lib/ib/version.rb
 - spec/fixtures/common/app_delegate.rb
+- spec/fixtures/common/complex_superclass.rb
 - spec/fixtures/common/custom_view.rb
 - spec/fixtures/common/empty_view.rb
 - spec/fixtures/common/simple_class.rb
 - spec/fixtures/dependency_test/add_button.rb
 - spec/fixtures/dependency_test/app_delegate.rb
 - spec/fixtures/dependency_test/base_view.rb
+- spec/fixtures/dependency_test/promotion_class.rb
 - spec/fixtures/dependency_test/sub_class_1.rb
 - spec/fixtures/dependency_test/sub_class_2.rb
 - spec/fixtures/dependency_test/sub_view_1.rb
@@ -157,12 +159,14 @@ specification_version: 4
 summary: Small portion of love to interface builder with rubymotion
 test_files:
 - spec/fixtures/common/app_delegate.rb
+- spec/fixtures/common/complex_superclass.rb
 - spec/fixtures/common/custom_view.rb
 - spec/fixtures/common/empty_view.rb
 - spec/fixtures/common/simple_class.rb
 - spec/fixtures/dependency_test/add_button.rb
 - spec/fixtures/dependency_test/app_delegate.rb
 - spec/fixtures/dependency_test/base_view.rb
+- spec/fixtures/dependency_test/promotion_class.rb
 - spec/fixtures/dependency_test/sub_class_1.rb
 - spec/fixtures/dependency_test/sub_class_2.rb
 - spec/fixtures/dependency_test/sub_view_1.rb