zorglub 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d8537037388d2d3b6171fbd10733d615852ddb74
-  data.tar.gz: d76cbd05b5945098b9e35f337b807719bba33caf
+SHA256:
+  metadata.gz: '0219f50bb07d3009172295d5a5dab9c055cd379475d9a4d292f4938459c4fb8f'
+  data.tar.gz: 224611e8b174fcf26fbd27e2e72beb80adb8562ce9d945a699bbc76fbd976e73
 SHA512:
-  metadata.gz: 67eb88a6feb28a36ed3fbf1cc611e4297d775c46785581af46722e518a02a0baf3795c859ea603ee831093e6ac623d9528f31cbd2005476ff830bbfa9ac42c46
-  data.tar.gz: 47a0fc3960fe8805c3f182a5d198c73c64a50a431d4cb77cc070685bd16e367a1ad56c0972528c54df473c1eec96989527fbd5aaa4ae4c109813262dc899307b
+  metadata.gz: f532761158fdb87b7dbd38eb12882158bbab72a4551861c02a7c88a2776f25ecc455c026ec675198853aee6423bcdfcaeca7f3e17a323fc82deff4a629362251
+  data.tar.gz: 660122838f1de84f1ab75ae0788ea8160ba47be3fa3d3f8d3bf9d7fce3ae12270cc704a6b2eae3669a154aac9d33809d1e7a466669eac7d6e6256c22b70e3e9b

data/Gemfile.lock

@@ -1,46 +1,58 @@
 PATH
   remote: .
   specs:
-    zorglub (0.0.8)
+    zorglub (0.1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    coveralls (0.7.0)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
-    diff-lcs (1.2.5)
-    docile (1.1.3)
-    haml (4.0.5)
+    coveralls (0.8.22)
+      json (>= 1.8, < 3)
+      simplecov (~> 0.16.1)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.4)
+      tins (~> 1.6)
+    diff-lcs (1.3)
+    docile (1.3.1)
+    ffi (1.9.25)
+    haml (5.0.4)
+      temple (>= 0.8.0)
       tilt
-    mime-types (2.1)
-    multi_json (1.8.4)
-    rack (1.5.2)
-    rake (10.1.1)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.5)
-    sass (3.2.14)
-    simplecov (0.8.2)
-      docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    term-ansicolor (1.3.0)
+    json (2.1.0)
+    rack (2.0.6)
+    rake (12.3.2)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    sass (3.7.2)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    temple (0.8.0)
+    term-ansicolor (1.7.0)
       tins (~> 1.0)
-    thor (0.18.1)
-    tilt (2.0.0)
-    tins (1.0.0)
+    thor (0.19.4)
+    tilt (2.0.9)
+    tins (1.20.2)
 
 PLATFORMS
   ruby
@@ -53,3 +65,6 @@ DEPENDENCIES
   rspec
   sass
   zorglub!
+
+BUNDLED WITH
+   1.17.3

data/lib/zorglub.rb

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

data/lib/zorglub/app.rb

@@ -1,11 +1,11 @@
 # -*- coding: UTF-8 -*-
-#
+
 require 'rack'
-#
+
 module Zorglub
-    #
+
     class App < Rack::URLMap
-        #
+
         def initialize map={}, &block
             super
             @map = map
@@ -22,7 +22,6 @@ module Zorglub
                 :engines => { },
                 :haml_options => {
                     :format => :html5,
-                    :ugly => false,
                     :encoding => 'utf-8'
                 },
                 :sass_options => {
@@ -40,9 +39,9 @@ module Zorglub
             instance_eval &block if block_given?
             remap @map
         end
-        #
+
         attr_reader :engines_cache
-        #
+
         def map location, object
             return unless location and object
             raise Exception.new "#{@map[location]} already mapped to #{location}" if @map.has_key? location
@@ -50,67 +49,64 @@ module Zorglub
             @map.merge! location.to_s=>object
             remap @map
         end
-        #
+
         def delete location
             @map.delete location
             remap @map
         end
-        #
+
         def at location
             @map[location]
         end
-        #
+
         def to object
             @map.invert[object]
         end
-        #
+
         def to_hash
             @map.dup
         end
-        #
+
         # OPTIONS @options
-        #
+
         def opt sym
             @options[sym]
         end
-        #
+
         def opt! sym, val
             @options[sym] = val
         end
-        #
+
         def register_engine! name, ext, proc
-            return unless name
             if ext.nil? or ext.empty?
                 x = nil
             else
-                x = (ext[0]=='.' ? (ext.length==1 ? nil : ext) : '.'+ext)
+                x = (ext[0]=='.' ? (ext.length==1 ? nil : ext) : '.' + ext)
             end
             @options[:engines][name]=[ proc, x ]
         end
-        #
+
         def engine_proc_ext engine, ext
             p,x = @options[:engines][engine]
             return [nil, ''] if p.nil?
             [ p, ((ext.nil? or ext.empty?) ? x : ext ) ]
         end
-        #
+
         def view_base_path
-            p = @options[:view_path]
-            ( p.nil? ? File.join(@options[:root], @options[:view_dir]) : p )
+            _base_path @options[:view_path], :view_dir
         end
-        #
+
         def layout_base_path
-            p = @options[:layout_path]
-            ( p.nil? ? File.join(@options[:root], @options[:layout_dir]) : p )
+            _base_path @options[:layout_path], :layout_dir
         end
-        #
+
         def static_base_path
-            p = @options[:static_path]
-            ( p.nil? ? File.join(@options[:root], @options[:static_dir]) : p )
+            _base_path @options[:static_path], :static_dir
+        end
+
+        private
+        def _base_path p, sym
+            ( p.nil? ? File.join(@options[:root], @options[sym]) : p )
         end
-        #
     end
-    #
 end
-#
-# EOF

data/lib/zorglub/engines/file.rb

@@ -1,8 +1,8 @@
 # -*- coding: UTF-8 -*-
-#
+
 require 'haml/util'
 require 'haml/engine'
-#
+
 module Zorglub
     module Engines
         module File
@@ -14,5 +14,5 @@ module Zorglub
         end
     end
 end
-#
+
 # EOF

data/lib/zorglub/engines/haml.rb

@@ -1,8 +1,8 @@
 # -*- coding: UTF-8 -*-
-#
+
 require 'haml/util'
 require 'haml/engine'
-#
+
 module Zorglub
     module Engines
         module Haml
@@ -19,5 +19,5 @@ module Zorglub
         end
     end
 end
-#
+
 # EOF

data/lib/zorglub/engines/sass.rb

@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
-#
+
 require 'sass'
-#
+
 module Zorglub
     module Engines
         module Sass
@@ -18,5 +18,5 @@ module Zorglub
         end
     end
 end
-#
+
 # EOF

data/lib/zorglub/node.rb

@@ -1,175 +1,175 @@
 # -*- coding: UTF-8 -*-
-#
+
 require 'fileutils'
-#
+
 module Zorglub
-    #
+
     class Node
-        #
+
         UNDEFINED=-1
-        #
+
         # class level engine, layout, static, layout_base_path, view_base_path configuration
-        #
+
         class << self
-            #
+
             attr_reader :static, :cache_lifetime
-            #
+
             def engine! engine
                 @engine = engine
             end
-            #
+
             def engine
                 @engine = @app.opt(:engine) if @engine==UNDEFINED and @app
                 @engine
             end
-            #
+
             def no_layout!
                 layout! nil
             end
-            #
+
             def layout! layout
                 @layout = layout
             end
-            #
+
             def layout
                 @layout = @app.opt(:layout) if @layout==UNDEFINED and @app
                 @layout
             end
-            #
+
             def static! val, lifetime=0
                 @static = ( (val==true or val==false) ? val : false )
                 @cache_lifetime = lifetime
             end
-            #
+
             def layout_base_path! path
                 @layout_base_path = path
             end
-            #
+
             def layout_base_path
                 @layout_base_path ||= @app.layout_base_path
             end
-            #
+
             def view_base_path! path
                 @view_base_path = path
             end
-            #
+
             def view_base_path
                 @view_base_path ||= @app.view_base_path
             end
         end
-        #
+
         # instance level engine, layout, view, static configuration
-        #
+
         def engine! engine
             @engine = engine
         end
-        #
+
         def no_layout!
             layout! nil
         end
-        #
+
         def layout! layout
             @layout = layout
         end
-        #
+
         def layout
             return nil if @layout.nil?
-            File.join(self.class.layout_base_path, @layout)+ext
+            File.join(self.class.layout_base_path, @layout) + ext
         end
-        #
+
         def no_view!
             view! nil
         end
-        #
+
         def view! view
             @view = view
         end
-        #
+
         def view
             return nil if @view.nil?
-            File.join(self.class.view_base_path, @view)+ext
+            File.join(self.class.view_base_path, @view) + ext
         end
-        #
+
         def static! val, lifetime=0
             @static = ( (val==true or val==false) ? val : false )
             @cache_lifetime = lifetime
         end
-        #
+
         def static
             return nil if not @static or @view.nil?
-            File.join(app.static_base_path, @view)+ext
+            File.join(app.static_base_path, @view) + ext
         end
-        #
+
         def ext! ext
-            @ext = ( (ext.nil? or ext.empty?) ? nil : (ext[0]=='.' ? (ext.length==1 ? nil : ext) : '.'+ext) )
+            @ext = ( (ext.nil? or ext.empty?) ? nil : (ext[0]=='.' ? (ext.length==1 ? nil : ext) : '.' + ext) )
         end
-        #
+
         def ext
             @ext || ''
         end
-        #
+
         def mime! mime
             @mime = mime
         end
-        #
+
         # class level basic node functions
-        #
+
         class << self
-            #
+
             attr_accessor :app
             def map app, location
                 @app = app
                 @app.map location, self
             end
-            #
+
             def r *args
                 @r ||= @app.to self
                 (args.empty? ? @r : File.join( @r, args.map { |x| x.to_s } ) )
             end
-            #
+
         end
-        #
+
         # instance level basic node functions
-        #
+
         def app
             self.class.app
         end
-        #
+
         def map
             self.class.r
         end
-        #
+
         def r *args
             File.join map, (args.empty? ? meth : args.map { |x| x.to_s } )
         end
-        #
+
         def html
             [ :map, :r, :args, :engine, :layout, :view ].inject('') { |s,sym| s+="<p>#{sym} => #{self.send sym}</p>"; s }
         end
-        #
+
         def redirect target, options={}, &block
             status = options[:status] || 302
             body   = options[:body] || redirect_body(target)
             header = response.header.merge('Location' => target.to_s)
             throw :stop_realize, Rack::Response.new(body, status, header, &block)
         end
-        #
+
         def redirect_body target
             "You are being redirected, please follow this link to: <a href='#{target}'>#{target}</a>!"
         end
-        #
+
         # class level inherited values are key=>array, copied at inheritance
         # so they can be extanded at class level
         # values are copied from class into instance at object creation
         # so that can be extanded without modifying class level values
         # typical usage are css or js inclusions
-        #
+
         @cli_vals = { }
-        #
+
         class << self
-            #
+
             attr_reader :cli_vals
-            #
+
             def cli_val sym, *args
                 vals = @cli_vals[sym] ||= []
                 unless args.empty?
@@ -178,9 +178,9 @@ module Zorglub
                 end
                 vals
             end
-            #
+
         end
-        #
+
         def cli_val sym, *args
             vals = @cli_vals[sym] ||= []
             unless args.empty?
@@ -189,44 +189,44 @@ module Zorglub
             end
             vals
         end
-        #
+
         # before_all and after_all hooks
-        #
+
         @cli_vals[:before_all] = []
         @cli_vals[:after_all] = []
         class << self
-            #
+
             def call_before_hooks obj
                 @cli_vals[:before_all].each do |blk| blk.call obj end
             end
-            #
+
             def before_all meth=nil, &blk
                 @cli_vals[:before_all]<< ( meth.nil? ? blk : meth )
                 @cli_vals[:before_all].uniq!
             end
-            #
+
             def call_after_hooks obj
                 @cli_vals[:after_all].each do |blk| blk.call obj end
             end
-            #
+
             def after_all meth=nil, &blk
                 @cli_vals[:after_all]<< ( meth.nil? ? blk : meth )
                 @cli_vals[:after_all].uniq!
             end
-            #
+
         end
-        #
+
         # rack entry point, page computation methods
-        #
+
         class << self
-            #
+
             def inherited sub
                 sub.engine! ( engine || (self==Zorglub::Node ? UNDEFINED : nil ) )
                 sub.layout! ( layout || (self==Zorglub::Node ? UNDEFINED : nil ) )
                 sub.instance_variable_set :@cli_vals, {}
                 @cli_vals.each do |s,v| sub.cli_val s, *v end
             end
-            #
+
             def call env
                 meth, *args =  env['PATH_INFO'].sub(/^\/+/,'').split(/\//)
                 meth ||= 'index'
@@ -235,14 +235,14 @@ module Zorglub
                 return error_404 node, meth if not node.respond_to? meth
                 node.realize!
             end
-            #
+
             def partial env, meth, *args
                 node = self.new env, meth.to_s, args, true
                 return error_404 node, meth if not node.respond_to? meth
                 node.feed! env[:no_hooks]
                 node.content
             end
-            #
+
             def error_404 node, meth
                 $stderr << " !! #{node.class.name}::#{meth} not found\n" if app.opt :debug
                 resp = node.response
@@ -251,11 +251,11 @@ module Zorglub
                 resp.write "%s mapped at %p can't respond to : %p" % [ node.class.name, node.map, node.meth ]
                 resp
             end
-            #
+
         end
-        #
+
         attr_reader :request, :response, :content, :mime, :state, :engine, :meth, :args
-        #
+
         def initialize env, meth, args, partial=false
             @meth = meth
             @args = args
@@ -271,7 +271,7 @@ module Zorglub
             @cache_lifetime = self.class.cache_lifetime
             self.class.cli_vals.each do |s,v| cli_val s, *v end
         end
-        #
+
         def realize!
             catch(:stop_realize) {
                 feed!
@@ -281,7 +281,7 @@ module Zorglub
                 response
             }
         end
-        #
+
         def feed! no_hooks=false
             @state = :pre_cb
             self.class.call_before_hooks self unless no_hooks
@@ -298,7 +298,7 @@ module Zorglub
             @state = :finished
             return @content, @mime
         end
-        #
+
         def static_page! path
             if File.exists?(path) and  ( @cache_lifetime.nil? or @cache_lifetime==0 or ( (Time.now-File.stat(path).mtime) < @cache_lifetime ) )
                 $stderr << " * use cache file : #{path}\n" if @debug
@@ -312,7 +312,7 @@ module Zorglub
                 $stderr << " * cache file created : #{path}\n" if @debug
             end
         end
-        #
+
         def compile_page!
             e, @ext = app.engine_proc_ext @engine, @ext
             v, l = view, layout
@@ -328,9 +328,7 @@ module Zorglub
             @content, mime = e.call l, self if e and l and File.exists? l
             @mime = mime if @mime.nil? and not mime.nil?
         end
-        #
+
     end
-    #
+
 end
-#
-# EOF