motion-util 0.1.2 → 0.1.3

data/.gitignore

@@ -3,4 +3,6 @@
 Gemfile.lock
 pkg/*
 .DS_Store
-*.xcworkspace
+*.xcworkspace
+.rvmrc
+tmp

data/README.md

@@ -6,23 +6,32 @@ Convenient command set for Ruby Motion.
 Installation
 ===
 
->gem install motion-util
+        gem install motion-util
 
 
 Usage
 ===
 
->motion-util generate model Foo  
->motion-util generate controller Foo  
->motion-util generate view Foo  
->motion-util generate view_controller Foo  
->motion-util generate table_view_controller Foo  
->motion-util generate navigation_controller Foo  
->motion-util generate tab_bar_controller Foo  
-
-You can also describe like this:  
->motion-util g model Foo  
->motion-util generation model Foo  
+Generate class file.  
+
+        motion-util generate model Foo  
+        motion-util generate controller Foo  
+        motion-util generate view Foo  
+        motion-util generate view_controller Foo  
+        motion-util generate table_view_controller Foo  
+        motion-util generate navigation_controller Foo  
+        motion-util generate tab_bar_controller Foo  
+
+        You can also describe like this:  
+        motion-util g model Foo  
+        motion-util generation model Foo  
+
+Generate Objective-C header file for Interface Builder.  
+
+       motion-util ib_header
+
+        You can also describe like this:  
+        motion-util ibh  
 
 Licence
 ===

data/lib/motion-util.rb

@@ -5,3 +5,4 @@ require "fileutils"
 require "motion-util/version"
 require "motion-util/util"
 require "motion-util/command/generator"
+require "motion-util/command/ib_header"

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

@@ -0,0 +1,95 @@
+# -*- coding: utf-8 -*-
+module Motion
+  module Util
+
+    class IbHeaderGenerator
+      def run
+        project_dir = Dir.pwd
+        dst_dir = File.join project_dir, "tmp", "header"
+        FileUtils.mkdir_p dst_dir
+        Dir.glob("app/**/*.rb") do |f|
+          ib = IbHeader.new
+          ib.source = File.read(f)
+          dst_name = ib.dst_name_of f
+          dst = File.join(dst_dir, dst_name)
+          FileUtils.mkdir_p File.dirname(dst)
+          File.open(dst, "w") do |f|
+            f.write(ib.context)
+          end
+        end
+      end
+    end
+    
+    class IbHeader
+    
+      attr_reader :class_name, :super_name, :properties
+      
+      def source= source
+        @source = source
+        parse
+      end
+      
+      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};"
+          else
+            lines << "@property (strong, nonatomic) IBOutlet #{type_name_of v[:type]}#{k};"
+          end
+        end
+        lines << "@end"
+        lines << ""
+        lines.join "\n"
+      end
+      
+      def dst_name_of path
+        a = path.split("/")
+        a.pop
+        a << "#{class_name}.h"
+        a.join("/")
+      end
+      
+      private
+      
+      def parse
+        /class\s+(\w+)\s*(<\s*(\w+))?/ =~ @source
+        @class_name = $1
+        @super_name = $3
+        
+        @properties = {}
+        @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
+        end
+      end
+      
+      def type_of t
+        case t
+        when nil, "id"
+          "id"
+        when "String"
+          "NSString *"
+        when "Hash"
+          "NSDictionary *"
+        else
+          "#{t} *"
+        end
+      end
+      
+      def type_name_of type
+        type == "id" ? "id " : type
+      end
+      
+    end
+    
+  end
+end
+
+    

data/lib/motion-util/util.rb

@@ -14,9 +14,13 @@ module Motion
         def usage
           <<-EOF
 Usage:
-motion-util: command [options]
+motion-util: command [subcommand] [options]
 
-Usage:
+command:
+  generate    Generate class and spec files.
+              You can use g or generator instead of generate.
+  ib_header   Generate Objective-C header files for Interface Builder.
+              You can use ibh instead of ib_header.
 
           EOF
         end
@@ -30,6 +34,8 @@ Usage:
         case ARGV[0]
         when "generate", "generator", "g"
           cmd = Generator.new
+        when "ib_header", "ibh"
+          cmd = IbHeaderGenerator.new
         end
         if cmd
           cmd.run

data/lib/motion-util/version.rb

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

data/test/test_generator.rb

@@ -142,7 +142,7 @@ end
 describe Foo do
 
   it "should be successful" do
-    true.should be_true
+    true.should == true
   end
 
 end

data/test/test_ib_header.rb

@@ -0,0 +1,79 @@
+# -*- coding: utf-8 -*-
+require 'test-unit'
+require 'motion-util'
+
+include Motion::Util
+
+class TestIbHeader < Test::Unit::TestCase
+
+  def setup
+    ARGV.replace %w(ib_header)
+    @ib = IbHeader.new
+  end
+  
+  
+  # --- parse class/super
+  test "class_name should be 'Foo' with 'class Foo'" do
+    @ib.source = "class Foo"
+    assert_equal ["Foo", nil], [@ib.class_name, @ib.super_name]
+  end
+  
+  test "names should be ['Foo', 'Bar'] with 'class Foo < Bar'" do
+    @ib.source = "class Foo < Bar"
+    assert_equal %w(Foo Bar), [@ib.class_name, @ib.super_name]
+  end
+  
+  test "names should be ['Foo', 'Bar'] with 'class Foo < Bar '" do
+    @ib.source = "class Foo < Bar"
+    assert_equal %w(Foo Bar), [@ib.class_name, @ib.super_name]
+  end
+  
+  test "names should be ['Foo', 'Bar'] with 'class Foo<Bar'" do
+    @ib.source = "class Foo < Bar"
+    assert_equal %w(Foo Bar), [@ib.class_name, @ib.super_name]
+  end
+  
+  
+  # --- parse properties
+  test "parse properties" do
+    @ib.source = "attr_accessor :foo, :bar"
+    assert_equal( { foo: { type: "id" }, bar: { type: "id"} }, @ib.properties )
+  end
+  
+  test "parse readonly properties" do
+    @ib.source = "attr_reader :foo, :bar"
+    assert_equal( { foo: { type: "id", readonly: true }, bar: { type: "id", readonly: true} }, @ib.properties )
+  end
+  
+  test "parse property with tyep_info string" do
+    @ib.source = "attr_accessor :foo, :bar # @type_info String"
+    assert_equal( { foo: { type: "NSString *" }, bar: { type: "NSString *"} }, @ib.properties )
+  end
+  
+  test "context" do
+    @ib.source = <<-EOF
+class Foo
+  attr_accessor :foo # no type
+  attr_accessor :bar # @type_info UILabel
+  attr_reader :hoge # @type_info UIView
+end
+    EOF
+    
+    expected = <<-EOF
+@interface Foo : NSObject
+@property (strong, nonatomic) IBOutlet id foo;
+@property (strong, nonatomic) IBOutlet UILabel *bar;
+@property (strong, nonatomic, readonly) IBOutlet UIView *hoge;
+@end
+    EOF
+    
+    assert_equal expected, @ib.context
+  end
+  
+  test "dst_name_of" do
+    @ib.source = "class AppDelegate"
+    assert_equal "app/AppDelegate.h", @ib.dst_name_of("app/app_delegate.rb")
+  end
+  
+
+end

data/test/test_ib_header_generator.rb

@@ -0,0 +1,31 @@
+class TestIbHeaderGenerator < Test::Unit::TestCase
+
+  def setup
+    @original_dir = File.expand_path Dir.pwd
+    dst_dir = File.join @original_dir, "tmp"
+    FileUtils.mkdir_p dst_dir
+    Dir.chdir dst_dir
+    `motion create sample`
+    Dir.chdir "sample"
+    IbHeaderGenerator.new.run
+  end
+
+  def teardown
+    Dir.chdir @original_dir
+    FileUtils.rm_rf File.join "tmp", "sample"
+  end
+  
+  test "AppDelegate.h should be generated" do
+    assert File.exist?("tmp/header/app/AppDelegate.h")
+  end
+  
+  test "AppDelegate.h's context should be" do
+    expected = <<-EOF
+@interface AppDelegate : NSObject
+@end
+    EOF
+
+    assert_equal expected, File.read("tmp/header/app/AppDelegate.h")
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-util
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-19 00:00:00.000000000 Z
+date: 2012-06-22 00:00:00.000000000 Z
 dependencies: []
 description: It generate class and spec files.
 email:
@@ -27,6 +27,7 @@ files:
 - bin/motion-util
 - lib/motion-util.rb
 - lib/motion-util/command/generator.rb
+- lib/motion-util/command/ib_header.rb
 - lib/motion-util/util.rb
 - lib/motion-util/version.rb
 - motion-util.gemspec
@@ -40,6 +41,8 @@ files:
 - template/class/view_controller.rb
 - template/spec/spec.rb
 - test/test_generator.rb
+- test/test_ib_header.rb
+- test/test_ib_header_generator.rb
 homepage: https://github.com/katsuyoshi/motion-util
 licenses: []
 post_install_message: 
@@ -66,3 +69,5 @@ specification_version: 3
 summary: Convenient command set for Ruby Motion.
 test_files:
 - test/test_generator.rb
+- test/test_ib_header.rb
+- test/test_ib_header_generator.rb