motion-util 0.1.4 → 0.1.6

data/README.md

@@ -12,7 +12,7 @@ Installation
 Usage
 ===
 
-Generate class file.  
+### Generate class file.  
 
         motion-util generate model Foo  
         motion-util generate controller Foo  
@@ -26,7 +26,7 @@ Generate class file.
         motion-util g model Foo  
         motion-util generation model Foo  
 
-Generate Objective-C header file for Interface Builder.
+### Generate Objective-C header file for Interface Builder.
   
        motion-util ib_header
 
@@ -34,7 +34,8 @@ Generate Objective-C header file for Interface Builder.
         motion-util ibh  
 
         
-        Your ruby motion class:
+Your ruby motion class:  
+
 <pre>
 # app_delegate.rb
 class AppDelegate
@@ -47,19 +48,24 @@ class AppDelegate
     @window.makeKeyAndVisible
     true
   end
+  
+  def showDialog sender    # IBAction
+  end
+
 end
 </pre>
 
-        @type_info is a marker to describe a class by Objective-C.  
-        If it's not specified it will be id type.
-
-        After execute 'motion-util ibh', AppDelegate.h was generated in tmp/header directory like this.
+@type_info is a marker to describe a class by Objective-C.  
+If it's not specified it will be id type.  
+  
+After execution 'motion-util ibh', AppDelegate.h was generated in tmp/header directory like this.  
 
 <pre>
 // AppDelegate.h
 @interface AppDelegate : NSObject
 @property (strong, nonatomic) IBOutlet UIWindow *window;
 @property (strong, nonatomic) IBOutlet UIViewController *controller;
+- (IBAction)showDialog:(id)sender;
 @end
 </pre>
 

data/lib/motion-util/command/generator.rb

@@ -38,13 +38,13 @@ module Motion
       
       def context
         c = File.read File.join(@template_dir, "class", file_type + ".rb")
-        c.gsub! /#\{class_name\}/, class_name
+        c.gsub! /#\{class_name\}/, objc_class_name
         c
       end
 
       def spec_context
         c = File.read File.join(@template_dir, "spec", "spec.rb")
-        c.gsub! /#\{class_name\}/, class_name
+        c.gsub! /#\{class_name\}/, objc_class_name
         c.gsub! /#\{camelized_file_type\}/, camelized_file_type
         c
       end
@@ -103,6 +103,10 @@ module Motion
         @class_name
       end
       
+      def objc_class_name
+        class_name.split('_').collect{|e| e.capitalize}.join
+      end
+      
       def camelized_file_type
         case file_type
         when "general", "model"

data/lib/motion-util/command/ib_header.rb

@@ -22,7 +22,7 @@ module Motion
     
     class IbHeader
     
-      attr_reader :class_name, :super_name, :properties
+      attr_reader :class_name, :super_name, :properties, :actions
       
       def source= source
         @source = source
@@ -32,6 +32,7 @@ module Motion
       def context
         lines = []
         lines << "@interface #{@class_name} : #{@super_name || 'NSObject'}"
+        
         properties.each do |k, v|
           if v[:readonly]
             lines << "@property (strong, nonatomic, readonly) IBOutlet #{type_name_of v[:type]}#{k};"
@@ -39,6 +40,11 @@ module Motion
             lines << "@property (strong, nonatomic) IBOutlet #{type_name_of v[:type]}#{k};"
           end
         end
+        
+        actions.each do |a|
+          lines << "- (IBAction)#{a[0]}:(id)#{a[1]};"
+        end
+        
         lines << "@end"
         lines << ""
         lines.join "\n"
@@ -59,14 +65,24 @@ module Motion
         @super_name = $3
         
         @properties = {}
+        @actions = []
         @source.split("\n").each do |l|
-          /(attr_accessor|attr_reader)\s+([A-Za-z0-9:, ]+)(#\s*(@type_info\s+(\w+)?)?)?/ =~ l
-          type = type_of $5
-          $2.split(",").each do |p|
-            p = eval(p.strip)
-            @properties[p] = { type:type }
-            @properties[p].merge!(readonly:true) if $1 == "attr_reader"
-          end if $2
+          
+          case l
+          
+          # property
+          when /(attr_accessor|attr_reader)\s+([A-Za-z0-9:, ]+)(#\s*(@type_info\s+(\w+)?)?)?/
+            type = type_of $5
+            $2.split(",").each do |p|
+              p = eval(p.strip)
+              @properties[p] = { type:type }
+              @properties[p].merge!(readonly:true) if $1 == "attr_reader"
+            end if $2
+          
+          # action
+          when /def\s+(.+)\s+(.+)\s+#\s*IBAction/
+            actions << [$1, $2]
+          end
         end
       end
       

data/lib/motion-util/version.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 module Motion
   module Util
-    VERSION = "0.1.4"
+    VERSION = "0.1.6"
   end
 end

data/template/class/navigation_controller.rb

@@ -19,16 +19,40 @@ class #{class_name}NavigationController < UINavigationController
   end
 =end
 
+=begin
+  def viewDidAppear animated
+    super
+  end
+=end
+
 =begin  
   def viewWillDisappear animated
     super
   end
 =end
   
+=begin
+  def viewDidDisappear animated
+    super
+  end
+=end
+
 =begin
   def shouldAutorotateToInterfaceOrientation interfaceOrientation
     interfaceOrientation == UIInterfaceOrientationPortrait
   end
 =end
 
+=begin
+  def shouldAutorotate
+    true
+  end
+=end
+
+=begin
+  def supportedInterfaceOrientations
+    UIInterfaceOrientationMaskPortrait
+  end
+=end
+
 end

data/template/class/tab_bar_controller.rb

@@ -19,17 +19,40 @@ class #{class_name}TabBarController < UITabBarController
   end
 =end
 
+=begin
+  def viewDidAppear animated
+    super
+  end
+=end
+
 =begin  
   def viewWillDisappear animated
     super
   end
 =end
   
+=begin
+  def viewDidDisappear animated
+    super
+  end
+=end
+
 =begin
   def shouldAutorotateToInterfaceOrientation interfaceOrientation
     interfaceOrientation == UIInterfaceOrientationPortrait
   end
 =end
 
+=begin
+  def shouldAutorotate
+    true
+  end
+=end
+
+=begin
+  def supportedInterfaceOrientations
+    UIInterfaceOrientationMaskPortrait
+  end
+=end
 
 end

data/template/class/table_view_controller.rb

@@ -27,18 +27,42 @@ class #{class_name}TableViewController < UITableViewController
   end
 =end
 
+=begin
+  def viewDidAppear animated
+    super
+  end
+=end
+
 =begin  
   def viewWillDisappear animated
     super
   end
 =end
   
+=begin
+  def viewDidDisappear animated
+    super
+  end
+=end
+
 =begin
   def shouldAutorotateToInterfaceOrientation interfaceOrientation
     interfaceOrientation == UIInterfaceOrientationPortrait
   end
 =end
 
+=begin
+  def shouldAutorotate
+    true
+  end
+=end
+
+=begin
+  def supportedInterfaceOrientations
+    UIInterfaceOrientationMaskPortrait
+  end
+=end
+
 
 =begin
   def numberOfSectionsInTableView tableView
@@ -52,21 +76,50 @@ class #{class_name}TableViewController < UITableViewController
   end
 =end
 
+=begin
+  def tableView tableView, titleForHeaderInSection:section
+    nil
+  end
+=end  
+
 =begin
   CellIdentifier = "Cell"
   def tableView tableView, cellForRowAtIndexPath:indexPath
-    cell = tableView.dequeueReusableCellWithIdentifier CellIdentifier
-    cell ||= UITableViewCell.alloc.initWithStyle UITableViewCellStyleDefault, reuseIdentifier:CellIdentifier
+    cell = tableView.dequeueReusableCellWithIdentifier CellIdentifier, forIndexPath:indexPath
     cell.textLabel.text = "Ruby Motion"
     cell
   end
 =end
 
+=begine
+  def tableView tableView, didSelectRowAtIndexPath:indexPath
+    tableView.deselectRowAtIndexPath indexPath, animated:true
+  end
+=end
+
 =begin
   def tableView tableView, canEditRowAtIndexPath:indexPath
     true
   end
 =end
+
+=begine
+  def tableView tableView, editingStyleForRowAtIndexPath:indexPath
+    UITableViewCellEditingStyleDelete
+  end
+=end
+
+=begin
+  def tableView tableView, canMoveRowAtIndexPath:indexPath
+    true
+  end
+=end
+
+=begin
+  def tableView tableView, moveRowAtIndexPath:fromIndexPath, toIndexPath:toIndexPath
+    toIndexPath
+  end
+=end
   
 =begin
   def tableView tableView, commitEditingStyle:editingStyle, forRowAtIndexPath:indexPath
@@ -79,15 +132,4 @@ class #{class_name}TableViewController < UITableViewController
   end
 =end
   
-=begin
-  def tableView tableView, moveRowAtIndexPath:fromIndexPath, toIndexPath:toIndexPath
-  end
-=end
-  
-=begin
-  def tableView tableView, canMoveRowAtIndexPath:indexPath
-    true
-  end
-=end
-
 end

data/template/class/view_controller.rb

@@ -26,16 +26,40 @@ class #{class_name}ViewController < UIViewController
   end
 =end
 
+=begin
+  def viewDidAppear animated
+    super
+  end
+=end
+
 =begin  
   def viewWillDisappear animated
     super
   end
 =end
   
+=begin
+  def viewDidDisappear animated
+    super
+  end
+=end
+
 =begin
   def shouldAutorotateToInterfaceOrientation interfaceOrientation
     interfaceOrientation == UIInterfaceOrientationPortrait
   end
 =end
 
+=begin
+  def shouldAutorotate
+    true
+  end
+=end
+
+=begin
+  def supportedInterfaceOrientations
+    UIInterfaceOrientationMaskPortrait
+  end
+=end
+
 end

data/test/test_generator.rb

@@ -4,6 +4,12 @@ require 'motion-util'
 
 
 include Motion::Util
+class Generator
+  def get_objc_class_name
+    objc_class_name
+  end
+end
+
 
 class TestGenerate < Test::Unit::TestCase
 
@@ -167,6 +173,10 @@ end
     EOF
     assert_equal expected, @generator.spec_context
   end
-  
+
+  test "check objc class name" do
+    ARGV.replace %w(generate model foo_bar)
+    assert_equal "FooBar", @generator.get_objc_class_name
+  end
 end
 

data/test/test_ib_header.rb

@@ -56,6 +56,8 @@ class Foo
   attr_accessor :foo # no type
   attr_accessor :bar # @type_info UILabel
   attr_reader :hoge # @type_info UIView
+  def action sender # IBAction
+  end
 end
     EOF
     
@@ -64,6 +66,7 @@ end
 @property (strong, nonatomic) IBOutlet id foo;
 @property (strong, nonatomic) IBOutlet UILabel *bar;
 @property (strong, nonatomic, readonly) IBOutlet UIView *hoge;
+- (IBAction)action:(id)sender;
 @end
     EOF
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-util
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000 Z
+date: 2014-01-07 00:00:00.000000000 Z
 dependencies: []
 description: It generate class and spec files.
 email:
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: motion-util
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Convenient command set for Ruby Motion.