slick 0.16.3 → 0.17.0

data/lib/slick/util/params_hash.rb

@@ -0,0 +1,38 @@
+
+class Slick::Util::ParamsHash < Hash
+
+    def initialize
+       super
+    end
+
+    def []=(key, value)
+        super(key.to_s, value)
+    end
+
+    def[](key)
+        super(key.to_s)
+    end
+
+    def merge!(hash)
+        hash.each{|key, value| self[key] = value }
+    end
+
+    def merge(hash)
+        out = clone
+        out.merge!(hash)
+        out
+    end
+
+    def key?(name)
+        super(name.to_s)
+    end
+
+    def method_missing(name, *args, &block)
+        if args.length == 0 && !block
+            self[name]
+        else
+            super
+        end
+    end
+
+end

data/lib/slick/version.rb

@@ -1,3 +1,3 @@
 module Slick
-  VERSION = "0.16.3"
+  VERSION = "0.17.0"
 end

data/lib/slick/web.rb

@@ -0,0 +1,4 @@
+
+module Slick::Web
+    
+end

data/lib/slick/web/dir.rb

@@ -0,0 +1,92 @@
+
+require "slick/web/node"
+
+class Slick::Web::Dir < Slick::Web::Node
+    
+    attr_reader :children
+
+    def initialize(*args)
+        super
+        @children = {}
+    end
+
+    def merge_dir(path)
+        Dir.open(path).each do |name|
+            next if name.match(/\A\.{1,2}\z/)
+            current_path = "#{path}/#{name}"
+            if File.file?(current_path)
+                children[name] ||= Slick::Web::File.new(self, name)
+                children[name].paths << current_path
+            else
+                children[name] ||= Slick::Web::Dir.new(self, name)
+                children[name].merge_dir(current_path)
+            end
+        end
+    end
+
+    def find_file(path)
+        if self[path]
+            if self[path].dir?
+                file = self["#{path}/index"]
+                file if file && file.file?
+            else
+                self[path]
+            end
+        end
+    end
+
+    def [](path)
+        _index[_normalize_path(path)]
+    end
+
+    def inspect
+        out = []
+        out << ""
+        children.each do |name, node|
+            out << " * #{name}" if node.dir?
+        end
+        children.each do |name, node|
+            out << " * #{name}" if node.file?
+        end
+        out << ""
+        out.join("\n")
+    end
+
+    def method_missing(name, *args, &block)
+        if args.length == 0
+            self[name]
+        else
+            super
+        end
+    end
+
+    private
+
+    def _normalize_path(path)
+        path = path.to_s
+        while path.match(/\/\.\//)
+            path.sub!(/\/\.\//, '/')
+        end
+        while path.match(/\/[^\/]+\/\.\.\//)
+            path.sub!(/\/[^\/]+\/\.\.\//, '')
+        end
+        path.sub!(/\A[\/\.]*/, '')
+        path.sub!(/[\/\.]*\z/, '')
+        path
+    end
+
+    def _index()
+        @_index ||= begin
+            out = {'' => self}
+            children.each do |name, child|
+                out[name] = child
+                if matches = name.match(/\A(.+?)\.(.+)\z/i)
+                    out[matches[1]] = child if matches[2].downcase == 'rb' || !out[matches[1]]
+                end
+                child.send(:_index).each{ |name2, child2| out["#{name}/#{name2}"] = child2 } if child.dir?
+            end
+            out
+        end
+    end
+
+end

data/lib/slick/web/file.rb

@@ -0,0 +1,66 @@
+
+require "slick/web/node"
+
+class Slick::Web::File < Slick::Web::Node
+
+    attr_reader :paths
+
+    def initialize(*args)
+        super
+        @paths = []
+    end
+
+    def path
+        paths.last
+    end
+
+    def extension
+        @extension ||= if matches = name.match(/\.(.+)\z/i)
+            matches[1].downcase
+        else
+            ""
+        end
+    end
+    
+    def render(params = {}, &block)
+        previous_file = Slick.resource_provider["file"]
+        previous_params = Slick.resource_provider["params"]
+        Slick.resource_provider["file"] = self
+        Slick.resource_provider["params"] = params
+        Slick::Web::FileInterpreter.interpret(self, &block)
+        Slick.resource_provider["file"] = previous_file
+        Slick.resource_provider["params"] = previous_params
+        self
+    end
+
+    def grab(params = {}, &block)
+        _self = self
+        Slick::Workspace.new.instance_eval do
+            grab{_self.render(params, &block)}
+        end
+    end
+
+    def url(params = {})
+        path = relative_path
+        candidate_path = path.sub(/\.[^\/]+\z/, '')
+        if root.find_file(candidate_path) == self
+            path = candidate_path
+            candidate_path = path.sub(/\/[^\/]*\z/, '')
+            candidate_path = '/' if candidate_path == ''
+            path = candidate_path if root.find_file(candidate_path) == self
+        end
+        out = [path]
+
+        if params.count > 0
+            out << '?'
+            out << params.url_encode
+        end
+
+        out.join
+    end
+
+    def inspect
+        relative_path
+    end
+
+end

data/lib/slick/web/file_interpreter.rb

@@ -0,0 +1,24 @@
+
+require "slick/registry"
+require "rack/mime"
+
+class Slick::Web::FileInterpreter
+
+    class << self
+        
+        include Slick::Registry
+        
+        def interpret(file, &block)
+            create(file.extension).interpret(file, &(block || Proc.new{}))
+        end
+
+    end
+
+    include Slick::Helpers
+
+    def interpret(file, &block)
+        response.headers['Content-Type'] = Rack::Mime.mime_type(".#{self.class.name}")
+        response.body << File.read(file.path)
+    end
+
+end

data/lib/slick/web/file_interpreters/erb.rb

@@ -0,0 +1,33 @@
+
+require "slick/web/file_interpreter"
+
+Class.new Slick::Web::FileInterpreter do
+    
+    register "erb"
+
+    def interpret(file, &block)
+        _self = self
+        file.instance_eval do
+            Slick::Workspace.new.instance_eval(@compiled_contents ||= _self.compile(file), file.path)
+        end
+    end
+
+    def compile(file)
+        File.read(file.path).gsub(/.*?<%={0,1}.*?%>|.+/m) do |chunk|
+            if matches = chunk.match(/\A(.*?)(<%={0,1})(.*?)%>\z/m)
+                if matches[2] == '<%='
+                    "echo '#{escape(matches[1])}'; text #{matches[3]};"
+                else
+                    "echo '#{escape(matches[1])}'; #{matches[3]};"
+                end
+            else
+                "echo '#{escape(chunk)}';"
+            end
+        end
+    end
+
+    def escape(html)
+        html.gsub(/'/, '\\\\\'')
+    end
+
+end

data/lib/slick/web/file_interpreters/js.rb

@@ -0,0 +1,17 @@
+
+require "slick/web/file_interpreter"
+
+Class.new Slick::Web::FileInterpreter do
+    
+    register "js"
+
+    def interpret(file, &block)
+        bundle_file = dir.find_file(file.name.sub(/\.js/, '-bundle.js'))
+        if bundle_file
+            bundle_file.render
+        else
+            super
+        end
+    end
+
+end

data/lib/slick/web/file_interpreters/rb.rb

@@ -0,0 +1,14 @@
+
+require "slick/web/file_interpreter"
+
+Class.new Slick::Web::FileInterpreter do
+    
+    register "rb"
+
+    def interpret(file, &block)
+        file.instance_eval do
+            Slick::Workspace.new.instance_eval(@contents ||= File.read(file.path), file.path)
+        end
+    end
+
+end

data/lib/slick/web/file_interpreters/sass.rb

@@ -0,0 +1,30 @@
+
+require "sassc"
+require "slick/web/file_interpreter"
+
+['sass', 'scss'].each do |extension|
+    Class.new Slick::Web::FileInterpreter do
+        
+        register extension
+
+        def interpret(file, &block)
+            response.headers['Content-Type'] = "text/css"
+            response.body << file.instance_eval do
+                @cache ||= SassC::Engine.new(File.read(file.path), {
+                    filename: file.relative_path,
+                    importer: Class.new(SassC::Importer) do
+                        def imports(path, parent_path)
+                            file = Slick.web.find_file("#{parent_path.sub(/[^\/]*\z/, '')}#{path}")
+                            if file && ['sass', 'scss', 'css'].include?(file.extension)
+                                SassC::Importer::Import.new(file.relative_path, source: File.read(file.path), source_map_path: file.path)
+                            else
+                                raise "Can't resolve path: #{path}"
+                            end
+                        end
+                    end
+                }).render
+            end
+        end
+
+    end
+end

data/lib/slick/web/node.rb

@@ -0,0 +1,35 @@
+
+class Slick::Web::Node
+    
+    attr_reader :parent, :name
+
+    def initialize(parent = nil, name = nil)
+        @parent = parent
+        @name = name
+    end
+
+    def relative_path
+        @relative_path ||= begin
+            out = []
+            current = self
+            while current
+                out.unshift(current.name)
+                current = current.parent
+            end
+            out.join('/')
+        end
+    end
+
+    def root
+        @root ||= parent ? parent.root : self
+    end
+
+    def file?
+        kind_of?(Slick::Web::File)
+    end
+
+    def dir?
+        kind_of?(Slick::Web::Dir)
+    end
+
+end

data/lib/slick/workspace.rb

@@ -0,0 +1,8 @@
+
+require "slick/helpers"
+
+class Slick::Workspace
+
+    include Slick::Helpers
+
+end

data/slick.gemspec

@@ -8,19 +8,30 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Jody Salt"]
   spec.email         = ["jody@jodysalt.com"]
 
-  spec.summary       = "A web framework"
-  spec.description   = "A web framework"
+  spec.summary       = "An entrepreneurial web framework that allows small (or one-man) teams to be highly productive."
+
+  # spec.homepage      = "TODO: Put your gem's website or public repo URL here."
+  # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
+  # spec.metadata["homepage_uri"] = spec.homepage
+  # spec.metadata["source_code_uri"] = "TODO: Put your gem's public repo URL here."
+  # spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
+  
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_dependency "mysql2", "~> 0.5"
+  spec.add_dependency "bundler", "~> 2.0"
+  spec.add_dependency "rack", "~> 2.2"
+  spec.add_dependency "sassc", "~> 2.3"
+  
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", "~> 5.0"
+  
 end

data/web/_layout.erb

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title><%= params[:title] %></title>
+        <% link :rel => "stylesheet", :type => "text/css", :href => web.stylesheets.index.url %>
+        <% script :src => web.javascripts.index.url %>
+    </head>
+    <body>
+        <hr>
+        <% yield %>
+        asdas
+    </body>
+</html>

data/web/index.erb

@@ -0,0 +1,7 @@
+<% dir._layout.render :title => "Hello World" do %>
+
+    <% h1 "Hello World!" %>
+
+    <p>This is a test!</p>
+
+<% end %>

data/web/javascripts/index.js

@@ -0,0 +1,2 @@
+
+// nothing here

data/web/stylesheets/index.scss

@@ -0,0 +1,2 @@
+
+// nothing here