hirb 0.6.0 → 0.6.1

data/.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'mocha', '>= 0.9.8'
   s.add_development_dependency 'mocha-on-bacon', '>= 0.1.1'
   s.add_development_dependency 'bacon-bits'
-  s.files = Dir.glob(%w[{lib,test}/**/*.rb bin/* [A-Z]*.{txt,rdoc} ext/**/*.{rb,c} **/deps.rip]) + %w{Rakefile .gemspec}
+  s.files = Dir.glob(%w[{lib,test}/**/*.rb bin/* [A-Z]*.{txt,rdoc} ext/**/*.{rb,c} **/deps.rip]) + %w{Rakefile .gemspec .travis.yml}
   s.extra_rdoc_files = ["README.rdoc", "LICENSE.txt"]
   s.license = 'MIT'
 end

data/.travis.yml

@@ -0,0 +1,8 @@
+before_install: bundle init --gemspec=.gemspec
+script: bacon -q -Ilib -I. test/*_test.rb
+rvm:
+- 1.8.7
+- 1.9.2
+- 1.9.3
+- jruby
+- rbx

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 0.6.1
+* Fix for mongoid view
+* Fix tests on rubinius + jruby
+
 == 0.6.0
 * Add tab table
 * Tests pass in 1.9.3

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 and joshua for patches.
+* 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/util.rb

@@ -32,7 +32,7 @@ module Hirb
     # Examples:
     #    1-3,5-6 -> [1,2,3,5,6]
     #    *   -> all elements in array
-    #    ''  -> [] 
+    #    ''  -> []
     def choose_from_array(array, input, options={})
       options = {:splitter=>","}.merge(options)
       return array if input.strip == '*'

data/lib/hirb/version.rb

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

data/lib/hirb/views/mongo_db.rb

@@ -1,6 +1,9 @@
 module Hirb::Views::MongoDb #:nodoc:
   def mongoid__document_view(obj)
-    {:fields=>['_id'] + obj.class.fields.keys}
+    fields = obj.class.fields.keys
+    fields.delete('_id')
+    fields.unshift('_id')
+    {:fields=>fields}
   end
 
   def mongo_mapper__document_view(obj)
@@ -11,4 +14,4 @@ module Hirb::Views::MongoDb #:nodoc:
   alias_method :mongo_mapper__embedded_document_view, :mongo_mapper__document_view
 end
 
-Hirb::DynamicView.add Hirb::Views::MongoDb, :helper=>:auto_table
+Hirb::DynamicView.add Hirb::Views::MongoDb, :helper=>:auto_table

data/test/auto_table_test.rb

@@ -3,13 +3,16 @@ require File.join(File.dirname(__FILE__), 'test_helper')
 describe "auto table" do
   it "converts nonarrays to arrays and renders" do
     require 'set'
+    # rubinius sorts Set#to_a differently
+    arr = RUBY_DESCRIPTION.include?('rubinius') ? Set.new([1,2,3]).to_a : [1,2,3]
+
     expected_table = <<-TABLE.unindent
     +-------+
     | value |
     +-------+
-    | 1     |
-    | 2     |
-    | 3     |
+    | #{arr[0]}     |
+    | #{arr[1]}     |
+    | #{arr[2]}     |
     +-------+
     3 rows in set
     TABLE
@@ -27,4 +30,4 @@ describe "auto table" do
     TABLE
     Helpers::AutoTable.render({:a=>12345}).should == expected_table
   end
-end
+end

data/test/view_test.rb

@@ -4,7 +4,7 @@ describe "View" do
   def formatter_config
     View.formatter.config
   end
-  
+
   it "page_output pages when view is enabled" do
     Hirb.enable
     View.pager.stubs(:activated_by?).returns(true)
@@ -101,12 +101,22 @@ describe "View" do
 
   describe "resize" do
     def pager; View.pager; end
-    before { View.pager = nil; reset_config; Hirb.enable }
+    before do
+      View.pager = nil; reset_config; Hirb.enable
+    end
+
     after { Hirb.disable}
     it "changes width and height with stty" do
+      if RUBY_PLATFORM[/java/]
+        Util.expects(:command_exists?).with('tput').returns(false)
+      end
+      # stub tty? since running with rake sets
+      STDIN.stubs(:tty?).returns(true)
       Util.expects(:command_exists?).with('stty').returns(true)
       ENV['COLUMNS'] = ENV['LINES'] = nil # bypasses env usage
-      View.resize
+
+      capture_stderr { View.resize }
+
       pager.width.should.not == 10
       pager.height.should.not == 10
       reset_terminal_size
@@ -121,8 +131,11 @@ describe "View" do
 
     it "with no environment or stty still has valid width and height" do
       View.config[:width] = View.config[:height] = nil
-      Util.expects(:command_exists?).with('stty').returns(false)
+      unless RUBY_PLATFORM[/java/]
+        Util.expects(:command_exists?).with('stty').returns(false)
+      end
       ENV['COLUMNS'] = ENV['LINES'] = nil
+
       View.resize
       pager.width.is_a?(Integer).should == true
       pager.height.is_a?(Integer).should == true
@@ -150,13 +163,13 @@ describe "View" do
     View.render_method.expects(:call).with(string)
     View.capture_and_render { print string }
   end
-  
+
   it "state is toggled by toggle_pager" do
     previous_state = View.config[:pager]
     View.toggle_pager
     View.config[:pager].should == !previous_state
   end
-  
+
   it "state is toggled by toggle_formatter" do
     previous_state = View.config[:formatter]
     View.toggle_formatter

data/test/views_test.rb

@@ -10,4 +10,13 @@ describe "activerecord table" do
     pet = stub(:name=>'rufus', :age=>7, :attributes=>{'name'=>'rufus'}, :class=>stub(:column_names=>%w{age name}))
     Helpers::AutoTable.active_record__base_view(pet).should == {:fields=>[:name]}
   end
-end
+end
+
+describe "mongoid table" do
+  it "only has one _id" do
+    fields = {'_id' => 'x0f0x', 'name' => 'blah'}
+    mongoid_stub = stub(:class => stub(:fields => fields))
+    Helpers::AutoTable.mongoid__document_view(mongoid_stub).should ==
+      {:fields => fields.keys.sort}
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hirb
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-28 00:00:00.000000000 Z
+date: 2012-03-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &2152986240 !ruby/object:Gem::Requirement
+  requirement: &70230866543140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *2152986240
+  version_requirements: *70230866543140
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2152985720 !ruby/object:Gem::Requirement
+  requirement: &70230866542680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *2152985720
+  version_requirements: *70230866542680
 - !ruby/object:Gem::Dependency
   name: mocha-on-bacon
-  requirement: &2152985220 !ruby/object:Gem::Requirement
+  requirement: &70230866514280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.1
   type: :development
   prerelease: false
-  version_requirements: *2152985220
+  version_requirements: *70230866514280
 - !ruby/object:Gem::Dependency
   name: bacon-bits
-  requirement: &2152984840 !ruby/object:Gem::Requirement
+  requirement: &70230866513900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152984840
+  version_requirements: *70230866513900
 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
@@ -124,6 +124,7 @@ files:
 - test/deps.rip
 - Rakefile
 - .gemspec
+- .travis.yml
 homepage: http://tagaholic.me/hirb/
 licenses:
 - MIT
@@ -145,9 +146,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A mini view framework for console/irb that's easy to use, even while under
   its influence.
 test_files: []
+has_rdoc: