hirb 0.6.1 → 0.6.2

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+== 0.6.2
+* Add * support to 1d/2d menus
+
 == 0.6.1
 * Fix for mongoid view
 * Fix tests on rubinius + jruby

data/README.rdoc

@@ -180,7 +180,7 @@ Table code from http://gist.github.com/72234 and {my console app's needs}[http:/
 == Credits
 * Chrononaut for vertical table helper.
 * janlelis for unicode table helper.
-* crafterm, spastorino, xaviershay, bogdan, asanghi, vwall and joshua for patches.
+* hsume2, crafterm, spastorino, xaviershay, bogdan, asanghi, vwall and joshua for patches.
 
 == Bugs/Issues
 Please report them {on github}[http://github.com/cldwalker/hirb/issues].

data/lib/hirb/menu.rb

@@ -9,7 +9,7 @@ module Hirb
     class Error < StandardError; end
 
     # Detects valid choices and optional field/column
-    CHOSEN_REGEXP = /^(\d([^:]+)?)(?::)?(\S+)?/
+    CHOSEN_REGEXP = /^(\d([^:]+)?|\*)(?::)?(\S+)?/
     CHOSEN_ARG = '%s'
     DIRECTIONS = "Specify individual choices (4,7), range of choices (1-3) or all choices (*)."
 
@@ -128,14 +128,16 @@ module Hirb
     end
 
     def map_tokens(tokens)
-      if return_cell_values?
-        @output[0].is_a?(Hash) ? tokens.map {|arr,f| arr.map {|e| e[f]} }.flatten :
+      values = if return_cell_values?
+        @output[0].is_a?(Hash) ?
+          tokens.map {|arr,f| arr.map {|e| e[f]} } :
           tokens.map {|arr,f|
             arr.map {|e| e.is_a?(Array) && f.is_a?(Integer) ? e[f] : e.send(f) }
-          }.flatten
+          }
       else
-        tokens.map {|e| e[0] }.flatten
+        tokens.map {|arr, f| arr[0] }
       end
+      values.flatten
     end
 
     def return_cell_values?
@@ -154,7 +156,10 @@ module Hirb
         @new_args << CHOSEN_ARG
         field = $3 ? unalias_field($3) : default_field ||
           raise(Error, "No default field/column found. Fields must be explicitly picked.")
-        [Util.choose_from_array(@output, word), field ]
+
+        token = Util.choose_from_array(@output, word)
+        token = [token] if word[/\*|-|\.\.|,/] && !return_cell_values?
+        [token, field]
       else
         @new_args << word
         nil

data/lib/hirb/util.rb

@@ -35,7 +35,7 @@ module Hirb
     #    ''  -> []
     def choose_from_array(array, input, options={})
       options = {:splitter=>","}.merge(options)
-      return array if input.strip == '*'
+      return array if input[/^\s*\*/]
       result = []
       input.split(options[:splitter]).each do |e|
         if e =~ /-|\.\./

data/lib/hirb/version.rb

@@ -1,3 +1,3 @@
 module Hirb
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

data/test/menu_test.rb

@@ -36,7 +36,7 @@ describe "Menu" do
     it "with block renders" do
       menu_input "1,2"
       expected_result = [1,2]
-      capture_stdout { 
+      capture_stdout {
         menu([1,2,3]) {|e| e.should == expected_result }.should == expected_result
       }
     end
@@ -177,6 +177,17 @@ describe "Menu" do
       two_d_menu(:action=>true, :two_d=>nil, :invoke=>[[{:a=>1, :bro=>2}]])
     end
 
+    it "with 1d invokes on range of choices" do
+      menu_input "p 1,2 1-2 1..2"
+      choices =  [{:a => 1, :bro => 2}, {:a => 3, :bro => 4}]
+      two_d_menu(:action=>true, :two_d=>nil, :invoke=>[Array.new(3, choices).flatten])
+    end
+
+    it "with 1d and all choices" do
+      menu_input "p *"
+      two_d_menu(:action=>true, :two_d => nil, :invoke=>[[{:a => 1, :bro => 2}, {:a => 3, :bro => 4}]])
+    end
+
     it "with non-choice arguments invokes" do
       menu_input "p arg1 1"
       two_d_menu :action=>true, :invoke=>['arg1', [1]]
@@ -192,6 +203,22 @@ describe "Menu" do
       capture_stderr { two_d_menu(:action=>true) }.should =~ /No rows chosen/
     end
 
+    it "with range of choices" do
+      menu_input "p 1,2:a 1-2:a 1..2:a"
+      choices =  [1,3]
+      two_d_menu(:action=>true, :invoke=>[Array.new(3, choices).flatten])
+    end
+
+    it "with multiple all choices" do
+      menu_input "p * * 2:bro"
+      two_d_menu(:action=>true, :invoke=>[[1,3,1,3,4]])
+    end
+
+    it "with all choices with field" do
+      menu_input "p *:bro"
+      two_d_menu(:action=>true, :invoke=>[[2, 4]])
+    end
+
     it "with no command given prints error" do
       menu_input "1"
       capture_stderr { two_d_menu(:action=>true) }.should =~ /No command given/
@@ -203,6 +230,12 @@ describe "Menu" do
         :invokes=>[[['some']]]
     end
 
+    it "with array menu items and all choices" do
+      menu_input "p 1 *"
+      two_d_menu :action=>true, :output=>[['some', 'choice'], ['and', 'another']],
+        :invokes=>[[['some', 'some', 'and']]]
+    end
+
     it "with multi_action option invokes" do
       menu_input "p 1 2:bro"
       two_d_menu(:action=>true, :multi_action=>true, :invokes=>[[1], [4]])
@@ -236,4 +269,4 @@ describe "Menu" do
       }.should =~ /Default.*required/
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hirb
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000Z
+date: 2012-03-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &70230866543140 !ruby/object:Gem::Requirement
+  requirement: &70183088619280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70230866543140
+  version_requirements: *70183088619280
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70230866542680 !ruby/object:Gem::Requirement
+  requirement: &70183088618780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *70230866542680
+  version_requirements: *70183088618780
 - !ruby/object:Gem::Dependency
   name: mocha-on-bacon
-  requirement: &70230866514280 !ruby/object:Gem::Requirement
+  requirement: &70183088617940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.1
   type: :development
   prerelease: false
-  version_requirements: *70230866514280
+  version_requirements: *70183088617940
 - !ruby/object:Gem::Dependency
   name: bacon-bits
-  requirement: &70230866513900 !ruby/object:Gem::Requirement
+  requirement: &70183088617440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70230866513900
+  version_requirements: *70183088617440
 description: Hirb provides a mini view framework for console applications and uses
   it to improve ripl(irb)'s default inspect output. Given an object or array of objects,
   hirb renders a view based on the object's class and/or ancestry. Hirb offers reusable