rchoice 0.1.0 → 0.2.0

data/Gemfile.lock

@@ -13,7 +13,7 @@ GEM
     mharris_ext (1.5.0)
       facets
       fattr
-    rake (0.8.7)
+    rake (0.9.2.2)
     rcov (0.9.9)
     rr (1.0.2)
     rspec (2.3.0)

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/rchoice/choice.rb

@@ -0,0 +1,39 @@
+module RChoice
+  class Choice
+    include FromHash
+    attr_accessor :optional, :action_blk, :chooser
+    fattr(:options) { [] }
+    fattr(:option_presenter) do
+      lambda { |o| o.to_s }
+    end
+    fattr(:chosen_option) do
+      res = chooser.call(self)
+      raise OptionNotChosenError.new if !res && !optional
+      res
+    end
+    def execute!
+      return unless action_blk
+      chosen_option.execute!(&action_blk) if chosen_option
+    end
+    def make_option(obj,&b)
+      return obj if obj.kind_of?(Option)
+      obj = {:base_obj => obj} unless obj.kind_of?(Hash)
+      Option.new(obj)
+    end
+    def add_option(obj,&b)
+      self.options << make_option(obj,&b)
+    end
+    def options=(raw)
+      @options = raw.map { |r| make_option(r) }
+    end
+  end
+
+  class ProcChoice < Choice
+    def execute!
+      chosen_option.execute! if chosen_option
+    end
+    def make_option(name,&b)
+      ProcOption.new(:name => name, :blk => b)
+    end
+  end
+end

data/lib/rchoice/choosers/command_line_chooser.rb

@@ -0,0 +1,20 @@
+module RChoice
+  class CommandLineChooser
+    def call(choice)
+      print_line "Choose"
+      choice.options.each_with_index do |op,i|
+        print_line "#{i}. #{choice.option_presenter[op]}"
+      end
+      get_choice(choice)
+    end
+    def print_line(ln)
+      puts ln
+    end
+    def get_choice(choice)
+      choice.options[get_choice_num]
+    end
+    def get_choice_num
+      STDIN.gets.safe_to_i
+    end
+  end
+end

data/lib/rchoice/core_ext.rb

@@ -0,0 +1,31 @@
+class Array
+  def rand_el
+    i = rand(length)
+    self[i]
+  end
+end
+
+class Object
+  def blank?
+    to_s.strip == ''
+  end
+  def present?
+    !blank?
+  end
+end
+
+class String
+  def valid_number_format?
+    return false if blank?
+    return false unless self.strip =~ /^[0-9\.\-]+$/
+    true
+  end
+  def safe_to_i
+    raise "not valid number format #{self}" unless valid_number_format?
+    to_i
+  end
+  def safe_to_f
+    raise "not valid number format #{self}" unless valid_number_format?
+    to_f
+  end
+end

data/lib/rchoice/option.rb

@@ -0,0 +1,24 @@
+module RChoice
+  class Option
+    include FromHash
+    attr_accessor :base_obj
+    fattr(:execute_args) { [base_obj] }
+    def execute!(&b)
+      b.call(*execute_args)
+    end
+    def to_s
+      base_obj.to_s
+    end
+  end
+
+  class ProcOption < Option
+    include FromHash
+    attr_accessor :name, :blk
+    def execute!
+      blk.call
+    end
+    def to_s
+      name
+    end
+  end
+end

data/lib/rchoice.rb

@@ -0,0 +1,11 @@
+require 'mharris_ext'
+require 'andand'
+
+module RChoice
+  class OptionNotChosenError < Exception; end
+end
+
+d = File.expand_path(File.dirname(__FILE__))
+Dir["#{d}/rchoice/**/*.rb"].each do |f|
+  require f
+end

data/rchoice.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rchoice}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Harris"]
-  s.date = %q{2011-12-02}
+  s.date = %q{2011-12-14}
   s.description = %q{choice}
   s.email = %q{mharris717@gmail.com}
   s.extra_rdoc_files = [
@@ -25,7 +25,11 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
-    "lib/choice.rb",
+    "lib/rchoice.rb",
+    "lib/rchoice/choice.rb",
+    "lib/rchoice/choosers/command_line_chooser.rb",
+    "lib/rchoice/core_ext.rb",
+    "lib/rchoice/option.rb",
     "rchoice.gemspec",
     "spec/choice_spec.rb",
     "spec/spec_helper.rb"

data/spec/choice_spec.rb

@@ -1,11 +1,34 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "Choice" do
-  it 'smoke' do
-    2.should == 2
+describe 'ProcChoice' do
+  before do
+    @results = []
+    @choice = RChoice::ProcChoice.new
+    @choice.add_option(:a) { @results << :a }
+    @choice.add_option(:b) { @results << :b }
+  end
+  describe 'choosing first' do
+    before do
+      @choice.chooser = lambda { |c| c.options.first }
+    end
+    it 'should execute first action' do
+      @choice.execute!
+      @results.should == [:a]
+    end
   end
+end
+
+describe 'loading options' do
   before do
-    @choice = Choice::Choice.new
+    @choice = RChoice::Choice.new(:options => [3,7])
+  end
+  it 'should load options' do
+    @choice.options.first.class.should == RChoice::Option
+  end
+end
+describe "Choice" do
+  before do
+    @choice = RChoice::Choice.new
     @choice.add_option 3
     @choice.add_option 7
   end
@@ -28,12 +51,12 @@ describe "Choice" do
       @choice.chosen_option.should be_nil
     end
     it 'should error if optional is false' do
-      lambda { @choice.chosen_option }.should raise_error(Choice::OptionNotChosenError)
+      lambda { @choice.chosen_option }.should raise_error(RChoice::OptionNotChosenError)
     end
 
     describe 'cl chooser' do
       before do
-        chooser = Choice::CommandLineChooser.new
+        chooser = RChoice::CommandLineChooser.new
         stub(chooser).get_choice_num { 1 }
         stub(chooser).print_line(anything) { }
         @choice.chooser = chooser
@@ -56,3 +79,30 @@ describe "Choice" do
     end
   end
 end
+
+describe 'core' do
+  it 'should parse 0' do
+    '0'.safe_to_i.should == 0
+    ' 0 '.safe_to_i.should == 0
+  end
+  it 'should parse 1' do
+    '1'.safe_to_i.should == 1
+    ' 1 '.safe_to_i.should == 1
+  end
+  it 'should parse -1' do
+    '-1'.safe_to_i.should == -1
+    ' -1 '.safe_to_i.should == -1
+  end
+  it 'should not parse blank' do
+    lambda { ''.safe_to_i }.should raise_error
+    lambda { '   '.safe_to_i }.should raise_error
+  end
+  it 'should not parse junk' do
+    lambda { ' ab'.safe_to_i }.should raise_error
+    lambda { 'a4'.safe_to_i }.should raise_error
+  end
+  it 'should parse -1.5' do
+    '-1.5'.safe_to_i.should == -1
+    ' -1.5 '.safe_to_i.should == -1
+  end
+end

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'rr'
 #require 'choice'
-require File.dirname(__FILE__) + "/../lib/choice"
+require File.dirname(__FILE__) + "/../lib/rchoice"
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rchoice
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-02 00:00:00.000000000 -05:00
+date: 2011-12-14 00:00:00.000000000 -05:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mharris_ext
-  requirement: &14521524 !ruby/object:Gem::Requirement
+  requirement: &15690072 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14521524
+  version_requirements: *15690072
 - !ruby/object:Gem::Dependency
   name: andand
-  requirement: &14520648 !ruby/object:Gem::Requirement
+  requirement: &15689724 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14520648
+  version_requirements: *15689724
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14485716 !ruby/object:Gem::Requirement
+  requirement: &15689184 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *14485716
+  version_requirements: *15689184
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &14484972 !ruby/object:Gem::Requirement
+  requirement: &15688704 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *14484972
+  version_requirements: *15688704
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &14484444 !ruby/object:Gem::Requirement
+  requirement: &15688152 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *14484444
+  version_requirements: *15688152
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &14483868 !ruby/object:Gem::Requirement
+  requirement: &15644580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14483868
+  version_requirements: *15644580
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &14483160 !ruby/object:Gem::Requirement
+  requirement: &15643872 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,7 +88,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14483160
+  version_requirements: *15643872
 description: choice
 email: mharris717@gmail.com
 executables: []
@@ -105,7 +105,11 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- lib/choice.rb
+- lib/rchoice.rb
+- lib/rchoice/choice.rb
+- lib/rchoice/choosers/command_line_chooser.rb
+- lib/rchoice/core_ext.rb
+- lib/rchoice/option.rb
 - rchoice.gemspec
 - spec/choice_spec.rb
 - spec/spec_helper.rb
@@ -125,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -306794161
+      hash: -547180143
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/choice.rb

@@ -1,61 +0,0 @@
-require 'mharris_ext'
-require 'andand'
-
-class Array
-  def rand_el
-    i = rand(length)
-    self[i]
-  end
-end
-
-module Choice
-  class OptionNotChosenError < Exception; end
-  class Choice
-    include FromHash
-    attr_accessor :optional, :action_blk, :chooser
-    fattr(:options) { [] }
-    fattr(:option_presenter) do
-      lambda { |o| o.to_s }
-    end
-    fattr(:chosen_option) do
-      res = chooser.call(self)
-      raise OptionNotChosenError.new if !res && !optional
-      res
-    end
-    def execute!
-      return unless action_blk
-      chosen_option.execute!(&action_blk) if chosen_option
-    end
-    def add_option(obj)
-      self.options << Option.new(:base_obj => obj)
-    end
-  end
-
-  class Option
-    include FromHash
-    attr_accessor :base_obj
-    fattr(:execute_args) { [base_obj] }
-    def execute!(&b)
-      b.call(*execute_args)
-    end
-  end
-
-  class CommandLineChooser
-    def call(choice)
-      print_line "Choose"
-      choice.options.each_with_index do |op,i|
-        print_line "#{i}. #{op.base_obj.to_s}"
-      end
-      get_choice(choice)
-    end
-    def print_line(ln)
-      puts ln
-    end
-    def get_choice(choice)
-      choice.options[get_choice_num]
-    end
-    def get_choice_num
-      STDIN.gets.to_i
-    end
-  end
-end