manveru-innate 2009.03.24 → 2009.04

data/spec/innate/helper/render.rb

@@ -0,0 +1,133 @@
+require 'spec/helper'
+
+class SpecHelperRenderFull
+  Innate.node '/render_full'
+
+  def foo
+    "foo: %p" % [request.params.sort]
+  end
+
+  def standard
+    render_full(r(:foo))
+  end
+
+  def with_query
+    render_full(r(:foo), 'a' => 'b')
+  end
+
+  def with_session
+    render_full(r(:get_session, :user))
+  end
+
+  def get_session(key)
+    session[key].inspect
+  end
+
+  def set_session(key, value)
+    session[key] = value
+  end
+end
+
+class SpecHelperRenderPartial
+  Innate.node '/render_partial'
+
+  layout :layout
+
+  def standard
+    'hello'
+  end
+
+  def layout
+    '{ #{@content} }'
+  end
+
+  def without_layout
+    render_partial(:standard)
+  end
+end
+
+class SpecHelperRenderView
+  Innate.node '/render_view'
+  map_views '/'
+
+  layout :layout
+
+  def standard
+    'hello'
+  end
+
+  def layout
+    '{ #{@content} }'
+  end
+
+  def without_method_or_layout
+    render_view(:num, :n => 42)
+  end
+end
+
+class SpecHelperRenderMisc
+  Innate.node '/misc'
+  map_views '/'
+
+  def recursive
+    @n ||= 1
+  end
+end
+
+describe Innate::Helper::Render do
+  describe '#render_full' do
+    behaves_like :mock
+
+    it 'renders a full action' do
+      get('/render_full/standard').body.should == 'foo: []'
+    end
+
+    it 'renders full action with query parameters' do
+      get('/render_full/with_query').body.should == 'foo: [["a", "b"]]'
+    end
+
+    # this is an edge-case, we don't have a full session running if this is the
+    # first request from the client as Innate creates sessions only on demand
+    # at the end of the request/response cycle.
+    #
+    # So we have to make some request first, in this case we simply set some
+    # value in the session that we can get afterwards.
+
+    it 'renders full action inside a session' do
+      get('/render_full/set_session/user/manveru')
+      get('/render_full/with_session').body.should == '"manveru"'
+    end
+  end
+
+  describe '#render_partial' do
+    behaves_like :mock
+
+    it 'renders action with layout' do
+      get('/render_partial/standard').body.should == '{ hello }'
+    end
+
+    it 'renders partial action without layout' do
+      get('/render_partial/without_layout').body.should == '{ hello }'
+    end
+  end
+
+  describe '#render_view' do
+    behaves_like :mock
+
+    it 'renders action without calling the method or applying layout' do
+      get('/render_view/without_method_or_layout').body.should == '{ 42 }'
+    end
+  end
+
+  describe 'misc functionality' do
+    behaves_like :mock
+
+    it 'can render_partial in a loop' do
+      get('/misc/loop').body.scan(/\d+/).should == %w[1 2 3 4 5]
+    end
+
+    it 'can recursively render_partial' do
+      get('/misc/recursive').body.scan(/\S/).join.should == '{1{2{3{44}3}2}1}'
+    end
+  end
+end

data/spec/innate/helper/view/aspect_hello.xhtml

@@ -0,0 +1 @@
+#{@foo} #{@bar}!

data/spec/innate/helper/view/locals.xhtml

@@ -0,0 +1 @@
+#{say}, #{to}!

data/spec/innate/helper/view/loop.xhtml

@@ -0,0 +1,4 @@
+<?r (1..5).each do |n| ?>
+  <?r @n = n ?>
+  #{ render_partial('num') }
+<?r end ?>

data/spec/innate/helper/view/num.xhtml

@@ -0,0 +1 @@
+#{@n}

data/spec/innate/helper/view/partial.xhtml

@@ -0,0 +1 @@
+From Partial #{@here}

data/spec/innate/helper/view/recursive.xhtml

@@ -0,0 +1,7 @@
+{
+  #{@n}
+  <?r if @n < 4 ?>
+    #{ render_partial(:recursive, :n => @n + 1) }
+  <?r end ?>
+  #{@n}
+}

data/spec/innate/node/node.rb

@@ -4,8 +4,6 @@ Innate.options.merge!(:views => 'view', :layouts => 'view')
 
 class SpecNode
   Innate.node('/')
-  provide(:html, :ERB)
-  provide(:erb, :None)
 
   def foo; end
   def bar; end
@@ -18,24 +16,18 @@ end
 class SpecNodeProvide
   Innate.node('/provide')
 
-  provide(:html, :ERB)
-  provide(:erb, :None)
-
   def foo
-    '<%= 21 * 2 %>'
+    '#{21 * 2}'
   end
 
   def bar
-    '<%= 84 / 2 %>'
+    '#{84 / 2}'
   end
 end
 
 class SpecNodeProvideTemplate
   Innate.node('/provide_template')
 
-  provide :html, :ERB
-  provide :erb, :None
-
   map_views '/'
 end
 
@@ -64,7 +56,7 @@ class SpecNodeWithLayoutMethod < SpecNodeProvide
   layout 'layout_method'
 
   def layout_method
-    '<div class="content"><%= @content %></div>'
+    '<div class="content">#{@content}</div>'
   end
 end
 
@@ -96,14 +88,14 @@ describe 'Innate::Node' do
   should 'wrap with layout' do
     got = Innate::Mock.get('/layout/bar')
     got.status.should == 200
-    got.body.should == %(<div class="content">42</div>\n)
+    got.body.should == %(<div class="content">42</div>)
     got['Content-Type'].should == 'text/html'
   end
 
   should 'find layout with view_root' do
     got = Innate::Mock.get('/another_layout/bar')
     got.status.should == 200
-    got.body.should == %(<div class="content">\n  42\n</div>\n)
+    got.body.should == %(<div class="content">\n  42\n</div>)
     got['Content-Type'].should == 'text/html'
   end
 

data/spec/innate/node/view/another_layout/{another_layout.erb → another_layout.xhtml}

@@ -1,3 +1,3 @@
 <div class="content">
-  <%= @content %>
+  #{@content}
 </div>

data/spec/innate/node/view/foo.html.xhtml

@@ -0,0 +1 @@
+<?r 10.times do |n| ?>#{n}<?r end ?>

data/spec/innate/node/view/with_layout.xhtml

@@ -0,0 +1 @@
+<div class="content">#{@content}</div>

data/spec/innate/provides/list.html.xhtml

@@ -0,0 +1 @@
+<ul><?r @users.each do |user| ?><li>#{user}</li><?r end ?></ul>

data/spec/innate/provides/list.txt.xhtml

@@ -0,0 +1 @@
+<?r @users.each do |user| ?>#{"#{user}\n"}<?r end ?>

data/spec/innate/provides.rb

@@ -12,7 +12,7 @@ Innate.options.merge!(:views => 'provides', :layouts => 'provides')
 class SpecNodeProvides
   Innate.node '/'
 
-  provide(:html, :None)
+  provide(:html, :engine => :None)
   provide(:yaml, :type => 'text/yaml'){|a,s| s.to_yaml }
   provide(:json, :type => 'application/json'){|a,s| s.to_json }
 
@@ -31,7 +31,7 @@ class SpecNodeProvidesTemplates
 
   provide(:yaml, :type => 'text/yaml'){|a,s| s.to_yaml }
   provide(:json, :type => 'application/json'){|a,s| s.to_json }
-  provide(:txt, :engine => :ERB, :type => 'text/plain')
+  provide(:txt, :engine => :Etanni, :type => 'text/plain')
 
   def list
     @users = %w[starbucks apollo athena]

data/spec/innate/request.rb

@@ -74,13 +74,4 @@ describe Innate::Request do
     request('rack.url_scheme' => 'https').domain('/foo', :keep_query => true).
       should == URI('https://localhost:7000/foo?a=b')
   end
-
-  should 'provide #accept_language' do
-    request(@env).accept_language.should == %w[en-us en de-at de]
-  end
-
-  should 'provide #http_variables' do
-    r = request(@env).http_variables
-    r.should.not.be.empty
-  end
 end

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/spec/innate/state/fiber.rb

@@ -1,12 +1,13 @@
-begin
-  require 'fiber'
-rescue LoadError
-  exit
-end
-
 require 'spec/helper'
 
-describe Innate::State::Fiber do
+describe 'Innate::State::Fiber' do
+  begin
+    require 'fiber'
+  rescue LoadError
+    it('needs fiber'){ should.flunk('needed fiber') }
+    exit
+  end
+
   F = Innate::State::Fiber
 
   it 'sets value in current thread with #[]=' do

data/tasks/bacon.rake

@@ -0,0 +1,66 @@
+desc 'Run all bacon specs with pretty output'
+task :bacon => :install_dependencies do
+  require 'open3'
+  require 'scanf'
+  require 'matrix'
+
+  specs = PROJECT_SPECS
+
+  some_failed = false
+  specs_size = specs.size
+  len = specs.map{|s| s.size }.sort.last
+  total_tests = total_assertions = total_failures = total_errors = 0
+  totals = Vector[0, 0, 0, 0]
+
+  red, yellow, green = "\e[31m%s\e[0m", "\e[33m%s\e[0m", "\e[32m%s\e[0m"
+  left_format = "%4d/%d: %-#{len + 11}s"
+  spec_format = "%d specifications (%d requirements), %d failures, %d errors"
+
+  specs.each_with_index do |spec, idx|
+    print(left_format % [idx + 1, specs_size, spec])
+
+    Open3.popen3(RUBY, spec) do |sin, sout, serr|
+      out = sout.read.strip
+      err = serr.read.strip
+
+      # this is conventional, see spec/innate/state/fiber.rb for usage
+      if out =~ /^Bacon::Error: (needed .*)/
+        puts(yellow % ("%6s %s" % ['', $1]))
+      else
+        total = nil
+
+        out.each_line do |line|
+          scanned = line.scanf(spec_format)
+
+          next unless scanned.size == 4
+
+          total = Vector[*scanned]
+          break
+        end
+
+        if total
+          totals += total
+          tests, assertions, failures, errors = total_array = total.to_a
+
+          if tests > 0 && failures + errors == 0
+            puts((green % "%6d passed") % tests)
+          else
+            some_failed = true
+            puts(red % "       failed")
+            puts out unless out.empty?
+            puts err unless err.empty?
+          end
+        else
+          some_failed = true
+          puts(red % "       failed")
+          puts out unless out.empty?
+          puts err unless err.empty?
+        end
+      end
+    end
+  end
+
+  total_color = some_failed ? red : green
+  puts(total_color % (spec_format % totals.to_a))
+  exit 1 if some_failed
+end

data/tasks/changelog.rake

@@ -0,0 +1,18 @@
+desc 'update changelog'
+task :changelog do
+  File.open('CHANGELOG', 'w+') do |changelog|
+    `git log -z --abbrev-commit`.split("\0").each do |commit|
+      next if commit =~ /^Merge: \d*/
+      ref, author, time, _, title, _, message = commit.split("\n", 7)
+      ref    = ref[/commit ([0-9a-f]+)/, 1]
+      author = author[/Author: (.*)/, 1].strip
+      time   = Time.parse(time[/Date: (.*)/, 1]).utc
+      title.strip!
+
+      changelog.puts "[#{ref} | #{time}] #{author}"
+      changelog.puts '', "  * #{title}"
+      changelog.puts '', message.rstrip if message
+      changelog.puts
+    end
+  end
+end

data/tasks/gem.rake

@@ -0,0 +1,22 @@
+require 'rake/gempackagetask'
+
+task :gemspec => [:manifest, :changelog] do
+  gemspec_file = "#{GEMSPEC.name}.gemspec"
+  File.open(gemspec_file, 'w+'){|gs| gs.puts(GEMSPEC.to_ruby) }
+end
+
+desc "package and install from gemspec"
+task :install => [:gemspec] do
+  sh "gem build #{GEMSPEC.name}.gemspec"
+  sh "gem install #{GEMSPEC.name}-#{GEMSPEC.version}.gem"
+end
+
+desc "uninstall the gem"
+task :uninstall => [:clean] do
+  sh %{gem uninstall -x #{GEMSPEC.name}}
+end
+
+Rake::GemPackageTask.new(GEMSPEC) do |p|
+  p.need_tar = true
+  p.need_zip = true
+end

data/tasks/gem_installer.rake

@@ -0,0 +1,76 @@
+task :gem_installer do
+  class GemInstaller
+    def initialize(options = {}, &block)
+      @gems = []
+      @options = options
+
+      run(&block)
+    end
+
+    def run(&block)
+      instance_eval(&block) if block_given?
+    end
+
+    def gem(name, version = nil, options = {})
+      if version.respond_to?(:merge!)
+        options = version
+      else
+        options[:version] = version
+      end
+
+      @gems << [name, options]
+    end
+
+    def setup_gemspec(gemspec)
+      gemspec.dependencies.each do |dependency|
+        dependency.version_requirements.as_list.each do |version|
+          gem(dependency.name, version)
+        end
+      end
+
+      setup
+    end
+
+    def setup
+      require 'rubygems'
+      require 'rubygems/dependency_installer'
+
+      @gems.each do |name, options|
+        setup_gem(name, options)
+      end
+    end
+
+    def setup_gem(name, options, try_install = true)
+      print "activating #{name} ... "
+      Gem.activate(name, *[options[:version]].compact)
+      require(options[:lib] || name)
+      puts "success."
+    rescue LoadError => error
+      puts error
+      install_gem(name, options) if try_install
+      setup_gem(name, options, try_install = false)
+    end
+
+    def install_gem(name, options)
+      installer = Gem::DependencyInstaller.new(options)
+
+      temp_argv(options[:extconf]) do
+        print "Installing #{name} ... "
+        installer.install(name, options[:version])
+        puts "done."
+      end
+    end
+
+    def temp_argv(extconf)
+      if extconf ||= @options[:extconf]
+        old_argv = ARGV.clone
+        ARGV.replace(extconf.split(' '))
+      end
+
+      yield
+
+    ensure
+      ARGV.replace(old_argv) if extconf
+    end
+  end
+end

data/tasks/grancher.rake

@@ -0,0 +1,12 @@
+begin
+  require 'grancher/task'
+
+  Grancher::Task.new do |g|
+    g.branch = 'gh-pages'
+    g.push_to = 'origin'
+    g.message = 'Updated website'
+    g.directory 'ydoc', 'doc'
+  end
+rescue LoadError
+  # oh well :)
+end

data/tasks/install_dependencies.rake

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

data/tasks/manifest.rake

@@ -0,0 +1,4 @@
+desc 'update manifest'
+task :manifest do
+  File.open('MANIFEST', 'w+'){|io| io.puts(*GEMSPEC.files) }
+end

data/tasks/rcov.rake

@@ -0,0 +1,19 @@
+desc 'code coverage'
+task :rcov => :clean do
+  specs = Dir['spec/innate/**/*.rb']
+  specs -= Dir['spec/innate/cache/common.rb']
+
+  # we ignore adapter as this has extensive specs in rack already.
+  ignore = %w[ gem rack bacon innate/adapter\.rb ]
+  ignore << 'fiber\.rb' if RUBY_VERSION < '1.9'
+
+  ignored = ignore.join(',')
+
+  cmd = "rcov --aggregate coverage.data --sort coverage -t --%s -x '#{ignored}' %s"
+
+  while spec = specs.shift
+    puts '', "Gather coverage for #{spec} ..."
+    html = specs.empty? ? 'html' : 'no-html'
+    sh(cmd % [html, spec])
+  end
+end

data/tasks/release.rake

@@ -0,0 +1,51 @@
+namespace :release do
+  task :all => [:release_github, :release_rubyforge]
+
+  desc 'Display instructions to release on github'
+  task :github => [:reversion, :gemspec] do
+    name, version = GEMSPEC.name, GEMSPEC.version
+
+    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/reversion.rake

@@ -0,0 +1,8 @@
+desc "update version.rb"
+task :reversion do
+  File.open("lib/#{GEMSPEC.name}/version.rb", 'w+') do |file|
+    file.puts("module #{PROJECT_MODULE}")
+    file.puts('  VERSION = %p' % GEMSPEC.version.to_s)
+    file.puts('end')
+  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