ib 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bc54b5ee7ce7f642da32df4c2b1ac5e75027f27
-  data.tar.gz: 799141026ac9fddaf7cc11aea5d461c046a59d09
+  metadata.gz: 1e9c82fc607ab9a37e14ad18ebf69c2fecc0e256
+  data.tar.gz: 153e219a271e45ee4a78fe841c57b6bb82d62c0f
 SHA512:
-  metadata.gz: 0a8a179a75c03d3494e677002d2098a015e8794fc4cdaedbbc917e526e2bcea832863a3bda9a0e68e482bb8abfddc7dfc9fbb0ffde19ec86b36884a9c724e624
-  data.tar.gz: 3be4c0577bc661b93c8677f97898a94d3d5801101fa279a8d43a60f4c774adc551bbf10647cfbe89892eaed34644410433743ab4ccd93e95a0c3bf3c423eb3fd
+  metadata.gz: 84f6f138dc29230e26161f3ca09439fd6936520ceae59e8e672890db37415c18b50ed2d69dae2a5b47d6641ab71304e66d355da176e035d52835ebaf6ea6b58c
+  data.tar.gz: 323138c6ef452527eb72c2f7260f0e844f1b5953aed1da529f9a2d8e19e2916e7ff70e542721794ef13e7263a5835bcc4dd2a0f4d328ba08fcb58c62b9cf3f8f

data/ib.gemspec

@@ -15,8 +15,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = IB::VERSION
 
-  gem.add_dependency "xcodeproj", ">= 0.11.0"
+  gem.add_dependency "xcodeproj", ">= 0.11.1"
   gem.add_dependency "thor", ">= 0.15.4"
+  gem.add_dependency "tilt", ">= 1.4.1"
 
   gem.add_development_dependency "rspec", ">= 2.0"
   gem.add_development_dependency "rake"

data/lib/ib/generator.rb

@@ -1,76 +1,35 @@
+require 'erb'
+require 'tilt/erb'
+require 'ib/generator/rendering_helper'
+
 class IB::Generator
+  def initialize motion_template_type
+    # NOTE: motion_template_type equal to Motion::Project::App.template
+    #       but, this class use its value for judging build platform.
+    @build_platform = motion_template_type 
+  end
+
+  def absolute_template_path path
+    File.expand_path(File.join(File.dirname(__FILE__), path))
+  end
+
+  def render_stub_file path, files
+    template = Tilt::ERBTemplate.new(absolute_template_path(path), { :trim => '<>' })
+    template.render(RenderingHelper.new(@build_platform, files))
+  end
+
   def write files, dest
     files = IB::Parser.new.find_all(files)
-
+    
     FileUtils.mkpath dest
 
     File.open("#{dest}/Stubs.h", 'w') do |f|
-      f.write <<-OBJC
-// Generated by IB v#{IB::VERSION} gem. Do not edit it manually
-// Run `rake ib:open` to refresh
-
-#import <Foundation/Foundation.h>
-#import <CoreData/CoreData.h>
-#import <UIKit/UIKit.h>
-
-#{generate_objc(files)}
-OBJC
+      f.write render_stub_file('generator/templates/Stubs.h.erb', files)
     end
 
     File.open("#{dest}/Stubs.m", 'w') do |f|
-      f.write <<-OBJC
-// Generated by IB v#{IB::VERSION} gem. Do not edit it manually
-// Run `rake ib:open` to refresh
-
-#import "Stubs.h"
-
-#{generate_objc_impl(files)}
-OBJC
+      f.write render_stub_file('generator/templates/Stubs.m.erb', files)
     end
-
   end
 
-  def generate_objc files
-    output = ""
-    files.map do |path, infos|
-      infos.each do |info|
-        output << <<-OBJC
-@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")}
-
-#{info[:outlet_collections].map {|name, type| "@property IBOutletCollection(#{type}) NSArray * #{name};" }.join("\n")}
-
-#{info[:actions].map {|action| "-(IBAction) #{generate_action(action)};" }.join("\n")}
-
-@end
-OBJC
-        output << "\n\n"
-      end
-    end
-    output
-  end
-
-  def generate_objc_impl files
-    output = ""
-    files.map do |path, infos|
-      infos.each do |info|
-        output << <<-OBJC
-@implementation #{info[:class][0][0]}
-
-@end
-OBJC
-        output << "\n\n"
-      end
-    end
-    output
-  end
-
-  def generate_type type
-    type == "id" ? type : "#{type} *"
-  end
-
-  def generate_action action
-    action[1] ? "#{action[0]}:(#{action[2] ? "#{action[2]}*" : 'id'}) #{action[1]}" : "#{action[0]}"
-  end
 end

data/lib/ib/generator/rendering_helper.rb

@@ -0,0 +1,32 @@
+module IB
+  class Generator
+    class RenderingHelper
+
+      def initialize(build_platform, files)
+        @build_platform = build_platform
+        @files = files
+      end
+
+      def ib_version
+        IB::VERSION
+      end
+
+      def ios_project?
+        @build_platform == :ios
+      end
+
+      def osx_project?
+        @build_platform == :osx
+      end
+
+      def generate_type type
+        type == "id" ? type : "#{type} *"
+      end
+
+      def generate_action action
+        action[1] ? "#{action[0]}:(#{action[2] ? "#{action[2]}*" : 'id'}) #{action[1]}" : "#{action[0]}"
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+// Generated by IB v<%= ib_version %> gem. Do not edit it manually
+// Run `rake ib:open` to refresh
+
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+<% if ios_project? %>
+#import <UIKit/UIKit.h>
+<% elsif osx_project? %>
+#import <Cocoa/Cocoa.h>
+<% end %>
+
+<% @files.map do |path, infos| %>
+<% infos.each do |info| %>
+@interface <%= info[:class][0][0] + (info[:class][0][1] ? ": #{info[:class][0][1]}" : "")%>
+<% unless info[:outlets].empty? %><%= "\n"%><% end %>
+<% info[:outlets].map do |name, type| %>
+@property IBOutlet <%= generate_type(type)%> <%= name %>;
+<% end %>
+<% unless info[:outlets].empty? %><%= "\n"%><% end %>
+<% info[:outlet_collections].map do|name, type| %>
+@property IBOutletCollection(<%= type %>) NSArray * <%= name %>;
+<% end %>
+<% unless info[:outlet_collections].empty? %><%= "\n"%><% end %>
+<% info[:actions].map do |action| %>
+-(IBAction) <%= generate_action(action) %>;
+<% end %>
+<% unless info[:actions].empty? %><%= "\n"%><% end %>
+@end
+
+<% end; end %>

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

@@ -0,0 +1,11 @@
+// Generated by IB v<%= ib_version %> gem. Do not edit it manually
+// Run `rake ib:open` to refresh
+
+#import "Stubs.h"
+
+<% @files.map do |path, infos| %>
+<% infos.each do |info| %>
+@implementation <%= info[:class][0][0] %>
+@end
+
+<% end; end; %>

data/lib/ib/project.rb

@@ -31,7 +31,8 @@ class IB::Project
     pods      = project.new_group("Pods")
     pods.path = pods_headers_path
 
-    IB::Generator.new.write(Motion::Project::App.config.files, ib_project)
+    generator = IB::Generator.new(detect_platform)
+    generator.write(Motion::Project::App.config.files, ib_project)
 
     support.new_file "ib.xcodeproj/Stubs.h"
     file = support.new_file "ib.xcodeproj/Stubs.m"

data/lib/ib/version.rb

@@ -1,3 +1,3 @@
 module IB
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

data/spec/generator_spec.rb

@@ -3,22 +3,25 @@ require "spec_helper"
 require "ib/generator"
 
 describe IB::Generator do
-  it "generates stubs" do
+  it "generates stubs header with ios platform" do
     files = IB::Parser.new.find_all("spec/fixtures")
-    stubs = IB::Generator.new.generate_objc(files)
+    stubs = IB::Generator.new(:ios).render_stub_file('generator/templates/Stubs.h.erb', files)
+
     stubs.should == <<-OBJC
+// Generated by IB v#{IB::VERSION} gem. Do not edit it manually
+// Run `rake ib:open` to refresh
+
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+#import <UIKit/UIKit.h>
+
 @interface AppDelegate
 
 @property IBOutlet UIWindow * window;
 @property IBOutlet UINavigationController * navigationController;
 
-
-
-
-
 @end
 
-
 @interface CustomView: UIView
 
 @property IBOutlet UIGreenLabel * greenLabel;
@@ -41,28 +44,86 @@ describe IB::Generator do
 
 @end
 
-
 @interface EmptyView: UIView
+@end
+
+@interface AnotherView: EmptyView
+@end
 
+OBJC
+  end
+
+  it "generates stubs header with osx platform" do
+    files = IB::Parser.new.find_all("spec/fixtures")
+    stubs = IB::Generator.new(:osx).render_stub_file('generator/templates/Stubs.h.erb', files)
+
+    stubs.should == <<-OBJC
+// Generated by IB v#{IB::VERSION} gem. Do not edit it manually
+// Run `rake ib:open` to refresh
+
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+#import <Cocoa/Cocoa.h>
 
+@interface AppDelegate
+
+@property IBOutlet UIWindow * window;
+@property IBOutlet UINavigationController * navigationController;
+
+@end
 
+@interface CustomView: UIView
 
+@property IBOutlet UIGreenLabel * greenLabel;
+@property IBOutlet UILabel * redLabel;
+@property IBOutlet id untyped_label;
+@property IBOutlet id yellowLabel;
 
+@property IBOutletCollection(UIGreenLabel) NSArray * greenLabelCollection;
+@property IBOutletCollection(UILabel) NSArray * redLabelCollection;
+@property IBOutletCollection(id) NSArray * untyped_label_collection;
+@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
 
+@interface EmptyView: UIView
+@end
 
 @interface AnotherView: EmptyView
+@end
 
+OBJC
+  end
 
+  it "generates stubs implement" do
+    files = IB::Parser.new.find_all("spec/fixtures")
+    stubs = IB::Generator.new(:ios).render_stub_file('generator/templates/Stubs.m.erb', files)
 
+    stubs.should == <<-OBJC
+// Generated by IB v#{IB::VERSION} gem. Do not edit it manually
+// Run `rake ib:open` to refresh
 
+#import "Stubs.h"
 
+@implementation AppDelegate
+@end
 
+@implementation CustomView
+@end
 
+@implementation EmptyView
 @end
 
+@implementation AnotherView
+@end
 
 OBJC
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ib
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Yury Korolev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-27 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -39,6 +39,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.15.4
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +100,9 @@ files:
 - ib.gemspec
 - lib/ib.rb
 - lib/ib/generator.rb
+- lib/ib/generator/rendering_helper.rb
+- lib/ib/generator/templates/Stubs.h.erb
+- lib/ib/generator/templates/Stubs.m.erb
 - lib/ib/outlets.rb
 - lib/ib/parser.rb
 - lib/ib/project.rb