cinatra 0.2.1 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/examples/sub_command.rb

@@ -0,0 +1,31 @@
+require 'cinatra'
+
+TODOS = []
+
+def show_todos
+  TODOS.each_with_index do |todo, index|
+    puts "#{index}: #{todo}"
+  end
+end
+
+command 'todo add' do |arg|
+  TODOS << arg
+  show_todos
+end
+
+command 'todo delete' do |arg|
+  TODOS.delete_at(arg.to_i)
+  show_todos
+end
+
+command 'todo list' do |arg|
+  show_todos
+end
+
+command 'todo clear' do |arg|
+  TODOS.clear
+end
+
+command 'exit' do
+  Cinatra.exit
+end

data/lib/cinatra.rb

@@ -4,11 +4,12 @@ require 'readline'
 class Cinatra
   include Singleton
 
-  def add_command(name, &block)
-    raise ArgumentError, "invalid command name: #{name}." unless /^\w+$/ =~ name.to_s
-    raise "command '#{name}' is already exists." if commands.key?(name.to_sym)
+  attr_accessor :exiting
 
-    commands[name.to_sym] = block
+  def add_command(name, &block)
+    name = self.class.normalize_as_command_name(name.to_s).to_sym
+    raise "command '#{name}' is already exists." if commands.key?(name)
+    commands[name] = block
   end
 
   def delete_command(name)
@@ -23,13 +24,19 @@ class Cinatra
     @commands ||= {}
   end
 
+  def command_names
+    commands.keys.map {|i| i.to_s }
+  end
+
   def call(line)
-    return unless /^\s*(\w+)\s+(.*?)\s*$/ =~ line
-    unless command = commands[$1.to_sym]
-      puts "Command `#{command}` not found!"
+    line = line.strip
+    return if line.empty?
+    command_name, command_arg = resolve_command_name_and_arg(line)
+    unless command_name
+      puts "Command not found!"
     else
       begin
-        command.call($2)
+        get_command(command_name).call(command_arg)
       rescue Exception => e
         puts e.message
       end
@@ -51,19 +58,46 @@ class Cinatra
       Cinatra.commands.keys.map {|i| i.to_s }.grep(/#{Regexp.quote(text)}/)
     end
 
-    while buf = Readline.readline('> ', true)
+    while !exiting && buf = Readline.readline('> ', true)
       call(buf)
     end
   end
 
+  def exit
+    self.exiting = true
+  end
+
+  def resolve_command_name_and_arg(line)
+    command_names.map {|i| i.split(' ')}.sort_by{|i| i.size}.reverse_each do |command|
+      if self.class.is_command_match_to_line?(command, line)
+        name = command.join(' ').to_sym
+        arg = line.split(' ', command.size + 1)[command.size]
+        return name, arg
+      end
+    end
+    return nil, nil
+  end
+
   class << self
-    [:add_command, :get_command, :delete_command, :commands, :start, :call].each do |method|
+    [
+      :add_command, :get_command, :delete_command,
+      :commands, :start, :call, :command_names,
+      :resolve_command_name_and_arg, :exit
+    ].each do |method|
       class_eval <<-DELIM
         def #{method}(*args, &block)
           instance.#{method}(*args, &block)
         end
       DELIM
     end
+
+    def normalize_as_command_name(name)
+      name.strip.gsub(/\s+/, ' ')
+    end
+
+    def is_command_match_to_line?(command, line)
+      line.split(' ')[0...command.size] == command
+    end
   end
 end
 

data/test/test_cinatra.rb

@@ -47,10 +47,69 @@ class TestCinatra < Test::Unit::TestCase
         Cinatra.call(' test_ foo bar ')
         $stdout = STDOUT
       end
+
+      should 'resolve command name' do
+        assert_equal [:test, nil],         Cinatra.resolve_command_name_and_arg('test')
+        assert_equal [:test, 'foo'],       Cinatra.resolve_command_name_and_arg('test foo')
+        assert_equal [:test, 'foo bar'],   Cinatra.resolve_command_name_and_arg('test foo bar')
+        assert_equal [:test, 'foo  bar'],  Cinatra.resolve_command_name_and_arg('test foo  bar')
+      end
+
+      context "add a command 'test foo'" do
+        setup do
+          @block_foo = lambda {}
+          Cinatra.add_command('test foo', &@block_foo)
+        end
+
+        should "call command 'test'" do
+          mock(@block).call('bar')
+          Cinatra.call('test bar')
+        end
+
+        should "call command 'test foo'" do
+          mock(@block).call.with_any_args.times(0)
+          mock(@block_foo).call(nil)
+          Cinatra.call('test foo')
+          mock(@block_foo).call('a b')
+          Cinatra.call('test foo a b')
+        end
+
+        context "add a command 'test foo bar'" do
+          setup do
+            @block_foo_bar = lambda {}
+            Cinatra.add_command('test foo bar', &@block_foo_bar)
+          end
+
+          should "call command 'test foo bar'" do
+            mock(@block).call.with_any_args.times(0)
+            mock(@block_foo).call.with_any_args.times(0)
+            mock(@block_foo_bar).call(nil)
+            Cinatra.call('test foo bar')
+            mock(@block_foo_bar).call('a b')
+            Cinatra.call('test foo bar a b')
+          end
+        end
+      end
+    end
+
+    should "check to match command to line" do
+      assert Cinatra.is_command_match_to_line?(['test'], 'test') == true
+      assert Cinatra.is_command_match_to_line?(['test'], ' test ') == true
+      assert Cinatra.is_command_match_to_line?(['test'], 'te st') == false
+      assert Cinatra.is_command_match_to_line?(['test'], 'tes') == false
+      assert Cinatra.is_command_match_to_line?(['test', 'foo'], 'test foo') == true
+      assert Cinatra.is_command_match_to_line?(['test', 'foo'], ' test  foo ') == true
+      assert Cinatra.is_command_match_to_line?(['test', 'bar'], ' test  foo ') == false
+      assert Cinatra.is_command_match_to_line?(['test', 'foo'], 'foo test') == false
+      assert Cinatra.is_command_match_to_line?(['test', 'foo', 'bar'], 'test foo bar') == true
     end
 
-    should "raise Error when spcify invalid name for command " do
-      assert_raise(ArgumentError) { Cinatra.add_command(' test') {} }
+    should "normalize as command name" do
+      assert_equal 'test', Cinatra.normalize_as_command_name('test')
+      assert_equal 'test', Cinatra.normalize_as_command_name(' test ')
+      assert_equal 'test foo', Cinatra.normalize_as_command_name('test foo')
+      assert_equal 'test foo', Cinatra.normalize_as_command_name(' test  foo ')
+      assert_equal '', Cinatra.normalize_as_command_name('')
     end
 
     should "raise Error when add commans with same name" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cinatra
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - jugyo
@@ -48,6 +48,7 @@ files:
 - Rakefile
 - VERSION
 - examples/sleep.rb
+- examples/sub_command.rb
 - lib/cinatra.rb
 - test/helper.rb
 - test/test_cinatra.rb
@@ -83,3 +84,4 @@ test_files:
 - test/helper.rb
 - test/test_cinatra.rb
 - examples/sleep.rb
+- examples/sub_command.rb