zorglub 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0219f50bb07d3009172295d5a5dab9c055cd379475d9a4d292f4938459c4fb8f'
-  data.tar.gz: 224611e8b174fcf26fbd27e2e72beb80adb8562ce9d945a699bbc76fbd976e73
+  metadata.gz: 68a4bd30558640ea906ace0e87f4710be024e9f75dc2013bccba2954a146c994
+  data.tar.gz: c48af64abd895f0cb2c3514442c151ec92e7b59b1312fe4cfa9440e7a81bb610
 SHA512:
-  metadata.gz: f532761158fdb87b7dbd38eb12882158bbab72a4551861c02a7c88a2776f25ecc455c026ec675198853aee6423bcdfcaeca7f3e17a323fc82deff4a629362251
-  data.tar.gz: 660122838f1de84f1ab75ae0788ea8160ba47be3fa3d3f8d3bf9d7fce3ae12270cc704a6b2eae3669a154aac9d33809d1e7a466669eac7d6e6256c22b70e3e9b
+  metadata.gz: 73a4fbea322ebe7bbccdf7433ceb726fe3e0afd69edf8db947342c0f9905d82c523b96eee283949dfbb7850bc6f76b1973e85f59e149b5c8058aff36411dfcdc
+  data.tar.gz: e52eb20c1e9a71c7a4b993c8285f0a3652d7358c0fbe9e541727df6139f9d3279a7338156c6710fc13e17b6686c9ab40026ec768f34fc673c9043b7177ba881a

data/Gemfile

@@ -12,7 +12,7 @@ end
 
 group :test, :development do
     gem 'haml'
-    gem 'sass'
+    gem 'sassc'
 end
 
 gem 'coveralls', require: false

data/Gemfile.lock

@@ -6,53 +6,52 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    coveralls (0.8.22)
+    bigdecimal (3.1.8)
+    coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
       term-ansicolor (~> 1.3)
-      thor (~> 0.19.4)
+      thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
-    diff-lcs (1.3)
-    docile (1.3.1)
-    ffi (1.9.25)
-    haml (5.0.4)
-      temple (>= 0.8.0)
+    diff-lcs (1.5.1)
+    docile (1.4.1)
+    ffi (1.17.0)
+    haml (6.3.0)
+      temple (>= 0.8.2)
+      thor
       tilt
-    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)
+    json (2.7.2)
+    rack (3.1.7)
+    rake (13.2.1)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       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)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    sassc (2.4.0)
+      ffi (~> 1.9)
     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)
+    sync (0.5.0)
+    temple (0.10.3)
+    term-ansicolor (1.11.2)
       tins (~> 1.0)
-    thor (0.19.4)
-    tilt (2.0.9)
-    tins (1.20.2)
+    thor (1.3.1)
+    tilt (2.4.0)
+    tins (1.33.0)
+      bigdecimal
+      sync
 
 PLATFORMS
   ruby
@@ -63,8 +62,8 @@ DEPENDENCIES
   rack
   rake
   rspec
-  sass
+  sassc
   zorglub!
 
 BUNDLED WITH
-   1.17.3
+   2.5.17

data/lib/zorglub/app.rb

@@ -1,112 +1,114 @@
-# -*- coding: UTF-8 -*-
-
 require 'rack'
 
 module Zorglub
+  class App < Rack::URLMap
+    def initialize(map = {}, &block)
+      super
+      @map = map
+      @engines_cache = {}
+      @options = {
+        debug: false,
+        root: '.',
+        layout: 'default',
+        view_dir: 'view',
+        layout_dir: 'layout',
+        static_dir: 'static',
+        engine: nil,
+        engines_cache_enabled: true,
+        engines: {},
+        haml_options: {
+          format: :html5,
+          encoding: 'utf-8',
+          escape_html: false
+        },
+        sass_options: {
+          syntax: :scss,
+          cache: false,
+          style: :compressed
+        },
+        session_options: {
+          enabled: false,
+          key: 'zorglub.sid',
+          secret: 'session-secret-secret',
+          sid_len: 64
+        }
+      }
+      instance_eval(&block) if block_given?
+      remap @map
+    end
+
+    attr_reader :engines_cache
+
+    def map(location, object)
+      return unless location && object
+      raise StandardError, "#{@map[location]} already mapped to #{location}" if @map.key? location
+
+      object.app = self
+      @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)
+      x = if ext.nil? || ext.empty?
+            nil
+          elsif ext[0] == '.'
+            ext.length == 1 ? nil : ext
+          else
+            ".#{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? || ext.empty? ? x : ext]
+    end
+
+    def view_base_path
+      _base_path @options[:view_path], :view_dir
+    end
+
+    def layout_base_path
+      _base_path @options[:layout_path], :layout_dir
+    end
+
+    def static_base_path
+      _base_path @options[:static_path], :static_dir
+    end
+
+    private
 
-    class App < Rack::URLMap
-
-        def initialize map={}, &block
-            super
-            @map = map
-            @engines_cache = { }
-            @options = {
-                :debug => false,
-                :root => '.',
-                :layout => 'default',
-                :view_dir => 'view',
-                :layout_dir => 'layout',
-                :static_dir => 'static',
-                :engine => nil,
-                :engines_cache_enabled => true,
-                :engines => { },
-                :haml_options => {
-                    :format => :html5,
-                    :encoding => 'utf-8'
-                },
-                :sass_options => {
-                    :syntax => :scss,
-                    :cache => :false,
-                    :style => :compressed
-                },
-                :session_options => {
-                    :enabled => false,
-                    :key => 'zorglub.sid',
-                    :secret => 'session-secret-secret',
-                    :sid_len => 64
-                }
-            }
-            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
-            object.app = self
-            @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
-            if ext.nil? or ext.empty?
-                x = nil
-            else
-                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
-            _base_path @options[:view_path], :view_dir
-        end
-
-        def layout_base_path
-            _base_path @options[:layout_path], :layout_dir
-        end
-
-        def static_base_path
-            _base_path @options[:static_path], :static_dir
-        end
-
-        private
-        def _base_path p, sym
-            ( p.nil? ? File.join(@options[:root], @options[sym]) : p )
-        end
+    def _base_path(path, sym)
+      path.nil? ? File.join(@options[:root], @options[sym]) : path
     end
+  end
 end

data/lib/zorglub/engines/file.rb

@@ -1,18 +1,14 @@
-# -*- coding: UTF-8 -*-
-
 require 'haml/util'
 require 'haml/engine'
 
 module Zorglub
-    module Engines
-        module File
-            def self.proc path,obj
-                content = ::File.open(path,'r'){|f| f.read }
-                ext = path.sub /.*\.(.+)$/,'\1'
-                return content, "text/#{ext}"
-            end
-        end
+  module Engines
+    module File
+      def self.proc(path, _obj)
+        content = ::File.read(path)
+        ext = path.sub(/.*\.(.+)$/, '\1')
+        [content, "text/#{ext}"]
+      end
     end
+  end
 end
-
-# EOF

data/lib/zorglub/engines/haml.rb

@@ -1,23 +1,19 @@
-# -*- coding: UTF-8 -*-
-
 require 'haml/util'
-require 'haml/engine'
+require 'haml/template'
 
 module Zorglub
-    module Engines
-        module Haml
-            def self.proc path,obj
-                if obj.app.opt(:engines_cache_enabled)
-                    key = path.sub obj.app.opt(:root),''
-                    haml = obj.app.engines_cache[key] ||= ::Haml::Engine.new( ::File.open(path,'r'){|f| f.read }, obj.app.opt(:haml_options) )
-                else
-                    haml = ::Haml::Engine.new( ::File.open(path,'r'){|f| f.read }, obj.app.opt(:haml_options) )
-                end
-                html = haml.render(obj)
-                return html, 'text/html'
-            end
+  module Engines
+    module Haml
+      def self.proc(path, obj)
+        if obj.app.opt(:engines_cache_enabled)
+          key = path.sub obj.app.opt(:root), ''
+          haml = obj.app.engines_cache[key] || ::Haml::Template.new(obj.app.opt(:haml_options)) { ::File.read(path) }
+        else
+          haml = ::Haml::Template.new(obj.app.opt(:haml_options)) { ::File.read(path) }
         end
+        html = haml.render(obj)
+        [html, 'text/html']
+      end
     end
+  end
 end
-
-# EOF

data/lib/zorglub/engines/sass.rb

@@ -1,22 +1,18 @@
-# -*- coding: UTF-8 -*-
-
 require 'sass'
 
 module Zorglub
-    module Engines
-        module Sass
-            def self.proc path,obj
-                if obj.app.opt(:engines_cache_enabled)
-                    key = path.sub obj.app.opt(:root),''
-                    sass = obj.app.engines_cache[key] ||= ::Sass::Engine.new( ::File.open(path,'r'){|f| f.read }, obj.app.opt(:sass_options) )
-                else
-                    sass = ::Sass::Engine.new( ::File.open(path,'r'){|f| f.read }, obj.app.opt(:sass_options) )
-                end
-                css = sass.render
-                return css, 'text/css'
-            end
+  module Engines
+    module Sass
+      def self.proc(path, obj)
+        if obj.app.opt(:engines_cache_enabled)
+          key = path.sub obj.app.opt(:root), ''
+          sass = obj.app.engines_cache[key] || ::Sass::Engine.new(::File.read(path), obj.app.opt(:sass_options))
+        else
+          sass = ::Sass::Engine.new(::File.read(path), obj.app.opt(:sass_options))
         end
+        css = sass.render
+        [css, 'text/css']
+      end
     end
+  end
 end
-
-# EOF