tux 0.2.0 → 0.3.0

data/.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'ripl-rack', '>= 0.2.0'
   s.add_dependency 'ripl-multi_line', '>= 0.2.4'
   s.add_dependency 'sinatra', '>= 1.2.1'
+  s.add_development_dependency 'bacon', '>= 1.1.0'
+  s.add_development_dependency 'bacon-bits', '>= 0.1.0'
   s.files = Dir.glob(%w[{lib,test}/**/*.rb bin/* [A-Z]*.{txt,rdoc} ext/**/*.{rb,c} **/deps.rip]) + %w{Rakefile .gemspec}
   s.extra_rdoc_files = ["README.rdoc", "LICENSE.txt"]
   s.license = 'MIT'

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+== 0.3.0
+* Add tests
+* Fix 1.9 settings bug
+* Fix routes params
+* Fix failing settings
+
 == 0.2.0
 * Add -c option
 * Add better ripl-rack integration

data/README.rdoc

@@ -111,6 +111,3 @@ Tux also comes with commands to give you a good overview of your app
 Since tux is a {ripl shell}[http://github.com/cldwalker/ripl], tux is highly configurable. You can
 create tux commands in the format tux-COMMAND and enhance your shell by adding ripl plugins to
 ~/.riplrc. Read {ripl's readme}[http://github.com/cldwalker/ripl#readme] for more.
-
-== TODO
-* Tests

data/lib/tux/commands.rb

@@ -4,16 +4,18 @@ module Tux
 
     def routes
       Tux.app_class.routes.inject([]) {|arr, (k,v)|
-        arr += v.map {|e|
-          [k, (str = e[0].inspect[%r{/\^(.*)\$/}, 1]) ? str.tr('\\', '') : e[0]]
+        arr += v.map {|regex,params,*|
+          path = params.empty? ? regex.inspect :
+            params.inject(regex.inspect) {|s,e| s.sub(/\([^()]+\)/, ":#{e}") }
+          [k, (str = path[%r{/\^(.*)\$/}, 1]) ? str.tr('\\', '') : path]
         }
       }
     end
 
     def settings
-      meths = (class << Tux.app_class; self; end).instance_methods(false).
+      meths = (Tux.app_class.methods(false) + Sinatra::Base.methods(false)).
         sort.map(&:to_s).select {|e| e[/=$/] }.map {|e| e[0..-2] } - SETTINGS
-      meths.map {|meth| [meth, Tux.app_class.send(meth)] }
+      meths.map {|meth| [meth, (Tux.app_class.send(meth) rescue $!.inspect)] }
     end
 
     def app

data/lib/tux/version.rb

@@ -1,3 +1,3 @@
 module Tux
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/test/commands_test.rb

@@ -0,0 +1,46 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+describe Tux::Commands do
+  def ripl
+    @ripl ||= Object.new.extend(Tux::Commands)
+  end
+
+  describe "#app" do
+    it "is an instance of the sinatra app" do
+      ripl.app.class.should == Tux.app_class
+    end
+
+    it "can call a helper method" do
+      ripl.app.moo('man').should == 'moo-man'
+    end
+
+    it "can call render methods" do
+      ripl.app.respond_to?(:erb, true).should == true
+      ripl.app.respond_to?(:render, true).should == true
+    end
+  end
+
+  describe "#settings" do
+    it "retrieves default setting" do
+      ripl.settings.assoc('absolute_redirects')[1].should == true
+    end
+
+    it "retrieves app-specific setting" do
+      ripl.settings.assoc('root')[1].should == 'dir'
+    end
+
+    it "retrieves failing setting" do
+      ripl.settings.assoc('ka')[1].should =~ /boom/
+    end
+  end
+
+  describe "#routes" do
+    it "retrieves string path" do
+      ripl.routes.assoc('GET')[1].should == '/'
+    end
+
+    it "retrieves path with params" do
+      ripl.routes.assoc('POST')[1].should == "/:id/:format"
+    end
+  end
+end

data/test/deps.rip

@@ -0,0 +1,2 @@
+bacon >=1.1.0
+bacon-bits >=0.1.0

data/test/test_helper.rb

@@ -0,0 +1,19 @@
+require 'bacon'
+require 'bacon/bits'
+require 'tux'
+require 'sinatra/base'
+
+class TestApp < Sinatra::Base
+  helpers do
+    def moo(str)
+      "moo-#{str}"
+    end
+  end
+
+  set :root, 'dir'
+  set :ka, lambda { raise 'boom' }
+
+  get '/' do end
+
+  post '/:id/:format' do end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tux
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Gabriel Horner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-05 00:00:00 -04:00
+date: 2011-04-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,6 +82,38 @@ dependencies:
         version: 1.2.1
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: bacon
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: bacon-bits
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 1
+        - 0
+        version: 0.1.0
+  type: :development
+  version_requirements: *id006
 description: Tux dresses up sinatra in a shell. Use it to interact with your helpers, view rendering and your app's response objects. Tux also gives you commands to view your app's routes and settings.
 email: gabriel.horner@gmail.com
 executables: 
@@ -97,11 +129,14 @@ files:
 - lib/tux/runner.rb
 - lib/tux/version.rb
 - lib/tux.rb
+- test/commands_test.rb
+- test/test_helper.rb
 - bin/tux
 - LICENSE.txt
 - CHANGELOG.rdoc
 - README.rdoc
 - deps.rip
+- test/deps.rip
 - Rakefile
 - .gemspec
 has_rdoc: true