manveru-innate 2009.04.08 → 2009.04.18

data/spec/innate/helper/render.rb

@@ -65,19 +65,6 @@ class SpecHelperRenderView
   end
 end
 
-class SpecHelperRenderTemplate
-  Innate.node '/render_template'
-
-  def relative
-    render_template('spec/innate/helper/view/num.xhtml', :n => 42)
-  end
-
-  def absolute
-    path = File.join(File.dirname(__FILE__), 'view/num.xhtml')
-    render_template(path, :n => 42)
-  end
-end
-
 class SpecHelperRenderMisc
   Innate.node '/misc'
   map_views '/'
@@ -89,7 +76,7 @@ end
 
 describe Innate::Helper::Render do
   describe '#render_full' do
-    behaves_like :mock, :session
+    behaves_like :mock
 
     it 'renders a full action' do
       get('/render_full/standard').body.should == 'foo: []'
@@ -107,10 +94,8 @@ describe Innate::Helper::Render do
     # value in the session that we can get afterwards.
 
     it 'renders full action inside a session' do
-      session do |mock|
-        mock.get('/render_full/set_session/user/manveru')
-        mock.get('/render_full/with_session').body.should == '"manveru"'
-      end
+      get('/render_full/set_session/user/manveru')
+      get('/render_full/with_session').body.should == '"manveru"'
     end
   end
 
@@ -134,15 +119,6 @@ describe Innate::Helper::Render do
     end
   end
 
-  describe '#render_template' do
-    behaves_like :mock
-
-    it 'renders action with the given template file' do
-      get('/render_template/relative').body.should == '42'
-      get('/render_template/absolute').body.should == '42'
-    end
-  end
-
   describe 'misc functionality' do
     behaves_like :mock
 

data/spec/innate/session.rb

@@ -29,27 +29,26 @@ class SpecSession
 end
 
 describe Innate::Session do
-  behaves_like :session
+  behaves_like :mock
 
   should 'initiate session as needed' do
-    session do |mock|
-      response = mock.get('/')
-      response.body.should == 'No session here'
-      response['Set-Cookie'].should == nil
+    get '/'
+    last_response.body.should == 'No session here'
+    last_response['Set-Cookie'].should == nil
 
-      mock.get('/init').body.should == '0'
+    get('/init')
+    last_response.body.should == '0'
 
-      1.upto(10) do |n|
-        mock.get('/increment').body.should == n.to_s
-      end
+    1.upto(10) do |n|
+      get('/increment').body.should == n.to_s
+    end
 
-      mock.get('/reset')
-      mock.get('/view').body.should == ''
-      mock.get('/init').body.should == '0'
+    get('/reset')
+    get('/view').body.should == ''
+    get('/init').body.should == '0'
 
-      -1.downto(-10) do |n|
-        mock.get('/decrement').body.should == n.to_s
-      end
+    -1.downto(-10) do |n|
+      get('/decrement').body.should == n.to_s
     end
   end
 end

data/tasks/install_dependencies.rake

@@ -1,6 +1,4 @@
-desc 'install dependencies'
+desc 'install dependencies from gemspec'
 task :install_dependencies => [:gem_installer] do
-  GemInstaller.new do
-    setup_gemspec(GEMSPEC)
-  end
+  GemInstaller.new{ setup_gemspec(GEMSPEC) }
 end

data/tasks/release.rake

@@ -1,12 +1,51 @@
-desc 'publish to github'
-task :release => [:reversion, :gemspec] do
-  name, version = GEMSPEC.name, GEMSPEC.version
+namespace :release do
+  task :all => [:release_github, :release_rubyforge]
 
-  sh("git add MANIFEST CHANGELOG #{name}.gemspec lib/#{name}/version.rb")
+  desc 'Display instructions to release on github'
+  task :github => [:reversion, :gemspec] do
+    name, version = GEMSPEC.name, GEMSPEC.version
 
-  puts "I added the relevant files, you can now run:", ''
-  puts "git commit -m 'Version #{version}'"
-  puts "git tag -a -m '#{version}' '#{version}'"
-  puts "git push"
-  puts
+    puts <<INSTRUCTIONS
+First add the relevant files:
+
+git add MANIFEST CHANGELOG #{name}.gemspec lib/#{name}/version.rb
+
+Then commit them, tag the commit, and push:
+
+git commit -m 'Version #{version}'
+git tag -a -m '#{version}' '#{version}'
+git push
+
+INSTRUCTIONS
+
+  end
+
+  # TODO: Not tested
+  desc 'Display instructions to release on rubyforge'
+  task :rubyforge => [:reversion, :gemspec, :package] do
+    name, version = GEMSPEC.name, GEMSPEC.version
+
+    puts <<INSTRUCTIONS
+To publish to rubyforge do following:
+
+rubyforge login
+rubyforge add_release #{name} '#{version}' pkg/#{name}-#{version}.gem
+
+After you have done these steps, see:
+
+rake release:rubyforge_archives
+
+INSTRUCTIONS
+  end
+
+  desc 'Display instructions to add archives after release:rubyforge'
+  task :rubyforge_archives do
+    puts "Adding archives for distro packagers is:", ""
+
+    Dir["pkg/#{name}-#{version}.{gz,zip}"].each do |file|
+      puts "rubyforge add_file #{name} #{name} '#{version}' '#{file}'"
+    end
+
+    puts
+  end
 end

data/tasks/setup.rake

@@ -0,0 +1,28 @@
+# Currently, Innate is not usable without Rack from the master branch head.
+# Also, our specs now depend on the latest rack-test.
+#
+# In order to make setup simpler for folks, I'll put up some gemspecs on github
+# and use their automatic building to provide development versions of these
+# libraries as gems for easier deployment.
+#
+# Once the libraries are officially released in a usable state I'll switch
+# dependencies to the official ones again.
+#
+# Please note that this makes running in environments that enforce their own
+# Rack (like jruby-rack) still quite difficult, but should allow for easier
+# development.
+#
+# Please be patient.
+
+desc 'install dependencies'
+task :setup do
+  GemInstaller.new do
+    gem 'bacon', '>= 1.0'
+    gem 'json', '~> 1.1.3'
+
+    gem 'manveru-rack-test', '> 0.1.0', :lib => 'rack-test'
+    gem 'manveru-rack', '>= 0.9.9', :lib => 'rack'
+
+    setup
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: manveru-innate
 version: !ruby/object:Gem::Version 
-  version: 2009.04.08
+  version: 2009.04.18
 platform: ruby
 authors: 
 - Michael 'manveru' Fellinger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-08 00:00:00 -07:00
+date: 2009-04-18 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -28,10 +28,10 @@ files:
 - README.md
 - Rakefile
 - example/app/retro_games.rb
-- example/app/todo/layout/default.erb
+- example/app/todo/layout/default.xhtml
 - example/app/todo/spec/todo.rb
 - example/app/todo/start.rb
-- example/app/todo/view/index.erb
+- example/app/todo/view/index.xhtml
 - example/app/whywiki_erb/layout/wiki.html.erb
 - example/app/whywiki_erb/spec/wiki.rb
 - example/app/whywiki_erb/start.rb
@@ -54,8 +54,6 @@ files:
 - lib/innate/cache/marshal.rb
 - lib/innate/cache/memory.rb
 - lib/innate/cache/yaml.rb
-- lib/innate/core_compatibility/basic_object.rb
-- lib/innate/core_compatibility/string.rb
 - lib/innate/current.rb
 - lib/innate/dynamap.rb
 - lib/innate/helper.rb
@@ -92,8 +90,10 @@ files:
 - lib/innate/view/erb.rb
 - lib/innate/view/etanni.rb
 - lib/innate/view/none.rb
+- spec/example/app/retro_games.rb
 - spec/example/hello.rb
 - spec/example/link.rb
+- spec/example/provides.rb
 - spec/example/session.rb
 - spec/helper.rb
 - spec/innate/action/layout.rb
@@ -148,6 +148,7 @@ files:
 - tasks/rcov.rake
 - tasks/release.rake
 - tasks/reversion.rake
+- tasks/setup.rake
 has_rdoc: true
 homepage: http://github.com/manveru/innate
 post_install_message: 
@@ -172,7 +173,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Powerful web-framework wrapper for Rack.
 test_files: []
 

data/lib/innate/core_compatibility/basic_object.rb

@@ -1,10 +0,0 @@
-# We define BasicObject for compatibility with 1.9 if it isn't there yet.
-class BasicObject
-  # Remove all but these methods
-  # NOTE: __id__ is not there in 1.9, but would give a warning in 1.8
-  KEEP = %w[== equal? ! != instance_eval instance_exec __send__ __id__]
-
-  (instance_methods - KEEP).each do |im|
-    undef_method(im)
-  end
-end unless defined?(BasicObject)

data/lib/innate/core_compatibility/string.rb

@@ -1,3 +0,0 @@
-class String # Dirty hack, but Rack needs it?
-  alias each each_line unless 'String'.respond_to?(:each)
-end