zorglub 0.0.5 → 0.0.6

data/lib/zorglub.rb

@@ -1,13 +1,8 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
+require 'version'
 require 'zorglub/node'
 require 'zorglub/app'
 #
-module Zorglub
-    #
-    VERSION = '0.0.5'
-    #
-end
-#
 # EOF

data/spec/data/view/node0/engines.scss

@@ -0,0 +1,9 @@
+vbar {
+  width: 80%;
+  height: 23px;
+  ul { list-style-type: none; }
+  li {
+    float: left;
+    a { font-weight: bold; }
+  }
+}

data/spec/node_spec.rb

@@ -199,25 +199,29 @@ describe Zorglub do
             Node5.layout.should be_nil
         end
         #
-        it "inherited_vars should be inherited and extended" do
+        it "cli_vals should be inherited and extended" do
             r = Node5.my_call '/index'
             vars = YAML.load r.body[0]
             vars.should == ['js0','js1','js3','jsx','css0','css1','css2']
             vars[7].should be_nil
         end
         #
-        it "inherited_vars should be extended at method level" do
+        it "cli_vals should be extended at method level" do
             r = Node4.my_call '/more'
             vars = YAML.load r.body[0]
             vars.should == ['js0','js1','js2']
             vars[3].should be_nil
         end
         #
-        it "inherited_vars should be untouched" do
+        it "cli_vals should be untouched" do
             r = Node4.my_call '/index'
             vars = YAML.load r.body[0]
             vars.should == ['js0','js1']
             vars[2].should be_nil
+            r = Node5.my_call '/index'
+            vars = YAML.load r.body[0]
+            vars.should == ['js0','js1','js3','jsx','css0','css1','css2']
+            vars[7].should be_nil
         end
         #
         it "ext definition and file engine should work" do
@@ -228,8 +232,21 @@ describe Zorglub do
         end
         #
         it "haml engine should work" do
+            Node0.app.opt! :engines_cache_enabled, false
             r = Node0.my_call '/engines/haml'
             r.body[0].should == "<h1>Hello world</h1>\n"
+            Node0.app.opt! :engines_cache_enabled, true
+            r = Node0.my_call '/engines/haml'
+            r.body[0].should == "<h1>Hello world</h1>\n"
+        end
+        #
+        it "sass engine should work" do
+            Node0.app.opt! :engines_cache_enabled, true
+            r = Node0.my_call '/engines/sass'
+            r.body[0].should == "vbar{width:80%;height:23px}vbar ul{list-style-type:none}vbar li{float:left}vbar li a{font-weight:bold}\n"
+            Node0.app.opt! :engines_cache_enabled, false
+            r = Node0.my_call '/engines/sass'
+            r.body[0].should == "vbar{width:80%;height:23px}vbar ul{list-style-type:none}vbar li{float:left}vbar li a{font-weight:bold}\n"
         end
         #
         it "view_base_path! should work" do

data/spec/spec_helper.rb

@@ -13,6 +13,7 @@ require 'yaml'
 require 'zorglub'
 require 'zorglub/engines/file'
 require 'zorglub/engines/haml'
+require 'zorglub/engines/sass'
 #
 HASH_PROC = Proc.new { |path,obj| {:path=>path,:layout=>obj.layout,:view=>obj.view,:args=>obj.args,:map=>obj.map}.to_yaml }
 STATIC_PROC = Proc.new { |path,obj| ["VAL #{obj.value}",'text/static'] }
@@ -78,6 +79,8 @@ class Node0 < Zorglub::Node
         case name
         when 'haml'
             engine! :haml
+        when 'sass'
+            engine! :sass
         end
     end
 end
@@ -119,22 +122,25 @@ end
 #
 class Node4 < Zorglub::Node
     no_layout!
-    inherited_var :js,'js0','js1'
+    cli_val :js,'js0'
+    cli_val :js,'js1'
     def index
-        inherited_var(:js).to_yaml
+        cli_val(:js).to_yaml
     end
     def more
-        inherited_var(:js,'js2').to_yaml
+        cli_val :js,'js2'
+        cli_val(:js).to_yaml
     end
 end
 #
 class Node5 < Node4
-    inherited_var :js, 'js3'
-    inherited_var :css, 'css0', 'css1'
+    cli_val :js, 'js3'
+    cli_val :css, 'css0', 'css1'
     # no_layout! inherited from Node4
     def index
-        js = inherited_var(:js,'jsx')
-        css = inherited_var(:css, 'css0', 'css1','css2')
+        js = cli_val(:js,'jsx')
+        cli_val(:css, 'css0', 'css1','css2')
+        css = cli_val :css
         js.concat(css).to_yaml
     end
 end
@@ -172,6 +178,7 @@ end
 APP = Zorglub::App.new do
     register_engine! :file, nil, Zorglub::Engines::File.method(:proc)
     register_engine! :haml, 'haml', Zorglub::Engines::Haml.method(:proc)
+    register_engine! :sass, 'scss', Zorglub::Engines::Sass.method(:proc)
     register_engine! 'default', nil, HASH_PROC
     register_engine! 'engine-1', 'spec', HASH_PROC
     register_engine! 'engine-2', 'spec', HASH_PROC

data/zorglub.gemspec

@@ -0,0 +1,28 @@
+#! /usr/bin/env ruby
+# -*- coding: UTF-8 -*-
+#
+$:.push File.expand_path("../lib", __FILE__)
+require 'version'
+#
+Gem::Specification.new do |s|
+    s.name = "zorglub"
+    s.version = Zorglub::VERSION
+    s.authors = ["Jérémy Zurcher"]
+    s.email = ["jeremy@asynk.ch"]
+    s.homepage = "http://github.com/jeremyz/zorglub"
+    s.summary = %q{a nano web application framework based on rack }
+    s.description = %q{This is a very stripped down version of innate.}
+
+    s.files = `git ls-files`.split("\n")
+    s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+    s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+    s.require_paths = ["lib"]
+
+    s.add_runtime_dependency "rack"
+    s.add_development_dependency "rspec"
+    s.add_development_dependency "rake"
+    s.add_development_dependency "haml"
+    s.add_development_dependency "sass"
+end
+#
+# EOF

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zorglub
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,68 +9,92 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-17 00:00:00.000000000 Z
+date: 2013-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &23057180 !ruby/object:Gem::Requirement
+  requirement: &7940480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23057180
+  version_requirements: *7940480
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &23056680 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: &7939860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.0
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
-  version_requirements: *23056680
+  version_requirements: *7939860
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &23055880 !ruby/object:Gem::Requirement
+  requirement: &7864280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *7864280
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: &7862960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23055880
+  version_requirements: *7862960
 - !ruby/object:Gem::Dependency
-  name: bones
-  requirement: &23055180 !ruby/object:Gem::Requirement
+  name: sass
+  requirement: &7862020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.7.3
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23055180
-description: a nano web application framework based on rack[http://rack.rubyforge.org/]
-email: jeremy@asynk.ch
+  version_requirements: *7862020
+description: This is a very stripped down version of innate.
+email:
+- jeremy@asynk.ch
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.rdoc
-- spec/data/view/node0/plain_file.txt
+extra_rdoc_files: []
 files:
+- .gitignore
+- .travis.yml
 - Changelog
+- Gemfile
+- Gemfile.lock
 - MIT-LICENSE
-- README.rdoc
+- README.md
 - Rakefile
+- TODO
+- example/layout/css.haml
+- example/layout/default.haml
+- example/layout/other.haml
+- example/sample.ru
+- example/view/url1/index.haml
+- example/view/url1/meth0.haml
+- example/view/url3/index.haml
+- lib/version.rb
 - lib/zorglub.rb
 - lib/zorglub/app.rb
 - lib/zorglub/engines/file.rb
 - lib/zorglub/engines/haml.rb
+- lib/zorglub/engines/sass.rb
 - lib/zorglub/node.rb
 - lib/zorglub/rack_session.rb
 - lib/zorglub/session.rb
@@ -82,31 +106,16 @@ files:
 - spec/data/view/node0/do_partial
 - spec/data/view/node0/do_render
 - spec/data/view/node0/engines.haml
+- spec/data/view/node0/engines.scss
 - spec/data/view/node0/plain_file.txt
 - spec/data/view/node0/xml_file.xml
 - spec/node_spec.rb
 - spec/spec_helper.rb
-- tasks/ann.rake
-- tasks/constants.rb
-- tasks/gem.rake
-- tasks/git.rake
-- tasks/helpers.rb
-- tasks/notes.rake
-- tasks/post_load.rake
-- tasks/rdoc.rake
-- tasks/rubyforge.rake
-- tasks/setup.rb
-- tasks/spec.rake
-- tasks/svn.rake
-- tasks/test.rake
-homepage: http://cgit.asynk.ch/cgi-bin/cgit/zorglub
+- zorglub.gemspec
+homepage: http://github.com/jeremyz/zorglub
 licenses: []
 post_install_message: 
-rdoc_options:
-- -x
-- ext
-- --main
-- README.rdoc
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -122,9 +131,23 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: FIXME
+rubyforge_project: 
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: a nano web application framework based on rack[http://rack
-test_files: []
+summary: a nano web application framework based on rack
+test_files:
+- spec/app_spec.rb
+- spec/data/alt/do_render
+- spec/data/alt/layout/default
+- spec/data/layout/default
+- spec/data/layout/main.spec
+- spec/data/view/node0/do_partial
+- spec/data/view/node0/do_render
+- spec/data/view/node0/engines.haml
+- spec/data/view/node0/engines.scss
+- spec/data/view/node0/plain_file.txt
+- spec/data/view/node0/xml_file.xml
+- spec/node_spec.rb
+- spec/spec_helper.rb
+has_rdoc: 

data/tasks/ann.rake

@@ -1,83 +0,0 @@
-# -*- coding: UTF-8 -*-
-#
-begin
-    require 'bones/smtp_tls'
-rescue LoadError
-    require 'net/smtp'
-end
-require 'time'
-
-namespace :ann do
-
-    # A prerequisites task that all other tasks depend upon
-    task :prereqs
-    file PROJ.ann.file do
-        ann = PROJ.ann
-        puts "Generating #{ann.file}"
-        File.open(ann.file,'w') do |fd|
-            fd.puts("#{PROJ.name} version #{PROJ.version}")
-            fd.puts("    by #{Array(PROJ.authors).first}") if PROJ.authors
-            fd.puts("    #{PROJ.url}") if PROJ.url.valid?
-            fd.puts("    (the \"#{PROJ.release_name}\" release)") if PROJ.release_name
-            fd.puts
-            fd.puts("== DESCRIPTION")
-            fd.puts
-            fd.puts(PROJ.description)
-            fd.puts
-            fd.puts(PROJ.changes.sub(%r/^.*$/, '== CHANGES'))
-            fd.puts
-            ann.paragraphs.each do |p|
-                fd.puts "== #{p.upcase}"
-                fd.puts
-                fd.puts paragraphs_of(PROJ.readme_file, p).join("\n\n")
-                fd.puts
-            end
-            fd.puts ann.text if ann.text
-        end
-    end
-
-    desc "Create an announcement file"
-    task :announcement => ['ann:prereqs', PROJ.ann.file]
-
-    desc "Send an email announcement"
-    task :email => ['ann:prereqs', PROJ.ann.file] do
-        ann = PROJ.ann
-        from = ann.email[:from] || Array(PROJ.authors).first || PROJ.email
-        to   = Array(ann.email[:to])
-
-        ### build a mail header for RFC 822
-        rfc822msg =  "From: #{from}\n"
-        rfc822msg << "To: #{to.join(',')}\n"
-        rfc822msg << "Subject: [ANN] #{PROJ.name} #{PROJ.version}"
-        rfc822msg << " (#{PROJ.release_name})" if PROJ.release_name
-        rfc822msg << "\n"
-        rfc822msg << "Date: #{Time.new.rfc822}\n"
-        rfc822msg << "Message-Id: "
-        rfc822msg << "<#{"%.8f" % Time.now.to_f}@#{ann.email[:domain]}>\n\n"
-        rfc822msg << File.read(ann.file)
-
-        params = [:server, :port, :domain, :acct, :passwd, :authtype].map do |key|
-            ann.email[key]
-        end
-
-        params[3] = (PROJ.ann.email[:from] || PROJ.email) if params[3].nil?
-
-#        if ann.email[:tls] and params[4].nil?
-        if params[4].nil?
-            STDOUT.write "Please enter your e-mail password (#{params[3]}): "
-            params[4] = STDIN.gets.chomp
-        end
-#        params = params.shift 2 if not ann.email[:tls]
-
-        ### send email
-        # TODO find a way to bypass /var/lib/gems/1.9/gems/bones-3.6.5/lib/bones/smtp_tls.rb which forces starttls usage
-        Net::SMTP.start(*params) {|smtp| smtp.sendmail(rfc822msg, from, to)}
-    end
-end  # namespace :ann
-
-desc 'Alias to ann:announcement'
-task :ann => 'ann:announcement'
-
-CLOBBER << PROJ.ann.file
-
-# EOF

data/tasks/constants.rb

@@ -1,118 +0,0 @@
-# -*- coding: UTF-8 -*-
-#
-require 'rbconfig'
-
-# Setup some constants
-WIN32 = %r/djgpp|(cyg|ms|bcc)win|mingw/ =~ RUBY_PLATFORM unless defined? WIN32
-
-DEV_NULL = WIN32 ? 'NUL:' : '/dev/null'
-
-def quiet( &block )
-    io = [STDOUT.dup, STDERR.dup]
-    STDOUT.reopen DEV_NULL
-    STDERR.reopen DEV_NULL
-    block.call
-ensure
-    STDOUT.reopen io.first
-    STDERR.reopen io.last
-    $stdout, $stderr = STDOUT, STDERR
-end
-
-BUILD_DIR = "build"
-
-USE_RAKE_COMPILER = ( ( (RUBY_PLATFORM =~ /java/) ? false : true ) and test ?d, 'ext' )
-if USE_RAKE_COMPILER
-    gem 'rake-compiler', '>=0.6.0'
-    require 'rake/extensiontask'
-    ENV['RUBY_CC_VERSION'] = '1.8.7:1.9.2'
-end
-
-LIBEXT = case RbConfig::CONFIG['host_os'].downcase
-    when /darwin/
-        "dylib"
-    when /mswin|mingw/
-        "dll"
-    else
-        RbConfig::CONFIG['DLEXT']
-    end
-
-CPU = case RbConfig::CONFIG['host_cpu'].downcase
-    when /i[3456]86/
-        # Darwin always reports i686, even when running in 64bit mode
-        if RbConfig::CONFIG['host_os'] =~ /darwin/ && 0xfee1deadbeef.is_a?(Fixnum)
-            "x86_64"
-        else
-        "i386"
-        end
-    when /amd64|x86_64/
-        "x86_64"
-    when /ppc64|powerpc64/
-        "powerpc64"
-    when /ppc|powerpc/
-        "powerpc"
-    else
-        RbConfig::CONFIG['host_cpu']
-    end
-
-OS = case RbConfig::CONFIG['host_os'].downcase
-    when /linux/
-        "linux"
-    when /darwin/
-        "darwin"
-    when /freebsd/
-        "freebsd"
-    when /openbsd/
-        "openbsd"
-    when /sunos|solaris/
-        "solaris"
-    when /mswin|mingw/
-        "win32"
-    else
-        RbConfig::CONFIG['host_os'].downcase
-    end
-
-CC=ENV['CC'] || RbConfig::CONFIG['CC'] || "gcc"
-
-GMAKE = RbConfig::CONFIG['host_os'].downcase =~ /bsd|solaris/ ? "gmake" : "make"
-
-
-DIFF = if WIN32 then 'diff.exe'
-       else
-            if quiet {system "gdiff", __FILE__, __FILE__} then 'gdiff'
-            else 'diff' end
-       end unless defined? DIFF
-
-SUDO = if WIN32 then ''
-       else
-            if quiet {system 'which sudo'} then 'sudo'
-            else '' end
-       end
-
-RCOV = WIN32 ? 'rcov.bat' : 'rcov'
-RDOC = WIN32 ? 'rdoc.bat' : 'rdoc'
-GEM  = WIN32 ? 'gem.bat'  : 'gem'
-
-%w(rcov spec/rake/spectask rubyforge bones facets/ansicode).each do |lib|
-    begin
-        require lib
-        Object.instance_eval {const_set "HAVE_#{lib.tr('/','_').upcase}", true}
-    rescue LoadError
-        Object.instance_eval {const_set "HAVE_#{lib.tr('/','_').upcase}", false}
-    end
-end
-
-HAVE_SVN = (Dir.entries(Dir.pwd).include?('.svn') and system("svn --version 2>&1 > #{DEV_NULL}"))
-HAVE_GIT = (Dir.entries(Dir.pwd).include?('.git') and system("git --version 2>&1 > #{DEV_NULL}"))
-
-# Add rake as a development dependency
-#
-PROJ.gem.development_dependencies << ['rake', '>=0.8.7']
-
-# Add bones as a development dependency
-#
-if HAVE_BONES
-    bones_version = defined?(Bones::VERSION) ? Bones::VERSION : Bones.version
-    PROJ.gem.development_dependencies << ['bones', ">= #{bones_version}"]
-end
-
-# EOF