usmu 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b7b08e084b2c129c12ddd463cb68495ca8a6aaa
-  data.tar.gz: dcd4850e8638d73f485fd9201d7f7041bcf85be5
+  metadata.gz: 461146e9c2898d92826965dbb6fcc57c54e9e2d4
+  data.tar.gz: 95c4b21ba16f9a240449c9e17a0aeb28985390cf
 SHA512:
-  metadata.gz: 1486bbb4cb3bdc76f9f25fc367eaa26a4e27afabf36d08be5e2c463a4a7a3133edfe5c0a7a956282d1dd9dce0e62e2eb5b94194082b7508d00a78b30a53e6116
-  data.tar.gz: ee271e9654c2ade75d048def639c71e98b722ab8221eed83a9e8509832489fe8193958126b5d2e4417246217c83596f3e17e09692b8b4cc5330a99d618f27e7d
+  metadata.gz: ca0fb7ae477db1637b1d98c7060ec4a1a5d9dd177b557423f96f52b8ec4e4c4a5b55630aa602b700cf01e0bb985380bcf60c899ab8fa90a6d35085a47b00a679
+  data.tar.gz: a71ee92f2fb6c51be007df21de215819430a7a2987ccad1388460d394273e8e7808a5c6f89f883df480fa2e55338c8805665734f0d2c9f8982d6405648e97201

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Usmu Change Log
 
+## 0.4.0
+
+Matthew Scharley <matt.scharley@gmail.com>
+
+* Bump to 0.4.0.dev for further dev (32596fe063dfb0452098b0bcac7d97f57ee772a5)
+* Ensure that loggers have the right functions available (df1c685c9ee7f3e4070351700d0ec28d999bc345)
+* [#25] Include a Rack app for viewing site dynamically (964486386bfa6325f191a44be0eb301ce5d200be)
+
 ## 0.3.4
 
 Matthew Scharley <matt.scharley@gmail.com>

data/lib/usmu.rb

@@ -70,6 +70,18 @@ module Usmu
   def self.plugins
     @plugins ||= Usmu::Plugin.new
   end
+
+  def self.load_lazy_tilt_modules
+    # There be magic here. Not nice, but gets the job done. Tilt's data structure here is a little unusual.
+    Tilt.default_mapping.lazy_map.map {|pair| pair[1]}.map {|i| i.map {|j| j[1]}}.flatten.uniq.each do |f|
+      begin
+        require f
+        @log.debug("Loaded #{f}")
+      rescue LoadError => e
+        @log.debug("Failed to load #{f}: #{e.inspect}")
+      end
+    end
+  end
 end
 
 %W{

data/lib/usmu/plugin/core.rb

@@ -28,6 +28,12 @@ module Usmu
           command.description = 'Initialise a new website in the given path, or the current directory if none given.'
           command.action &method(:command_init)
         end
+
+        c.command(:serve) do |command|
+          command.syntax = 'usmu server'
+          command.description = 'Serve files processed files directly. This won\'t update files on disk, but you will be able to view your website as rendered.'
+          command.action &method(:command_serve)
+        end
       end
 
       # Command to generate a website.
@@ -59,6 +65,17 @@ module Usmu
         Dir["#{from}/**/{*,.??*}"].each {|f| init_copy_file(from, path, f) }
       end
 
+      def command_serve(args, options)
+        configuration = @ui.configuration
+        @log.info('Starting webserver...')
+        require 'rack'
+        require 'usmu/ui/rack_server'
+
+        Rack::Handler::WEBrick.run Ui::RackServer.new(configuration),
+                                   host: configuration['serve', 'host', default: '0.0.0.0'],
+                                   port: configuration['serve', 'port', default: 8080]
+      end
+
       private
 
       # Helper to copy a file.

data/lib/usmu/ui/console.rb

@@ -21,6 +21,7 @@ module Usmu
       def initialize(args)
         @log = Logging.logger[self]
         initialize_logging args
+        Usmu.load_lazy_tilt_modules
         @commander = initialize_commander(args)
 
         Usmu.plugins.load_plugins

data/lib/usmu/ui/rack_server.rb

@@ -0,0 +1,41 @@
+
+module Usmu
+  module Ui
+    class RackServer
+      def initialize(configuration)
+        @log = Logging.logger[self]
+        @generator = SiteGenerator.new(configuration)
+        @configuration = configuration
+        @index = configuration['serve', 'index', default: 'index.html']
+      end
+
+      def call(env)
+        path = env['PATH_INFO'][1...env['PATH_INFO'].length]
+        @log.info "Received a request for: #{path}"
+        path = File.join(path, @index) if File.directory? File.join(@configuration.source_path, path)
+        path = path[1...path.length] if path[0] == '/'
+        @log.info "Serving: #{path}"
+
+        valid = @generator.renderables.select {|r| r.output_filename == path }
+
+        if valid.length > 0
+          page = valid[0]
+          type = case page.output_filename[page.output_filename.rindex('.')...page.output_filename.length]
+                   when '.html', '.php'
+                     'text/html'
+                   when '.css'
+                     'text/css'
+                   when '.js'
+                     'text/javascript'
+                   else
+                     'text/plain'
+                 end
+
+          ['200', {'Content-Type' => type}, [page.render]]
+        else
+          ['404', {'Content-Type' => 'text/html'}, ['<!DOCTYPE html><h1>File not found.</h1>']]
+        end
+      end
+    end
+  end
+end

data/lib/usmu/version.rb

@@ -1,5 +1,5 @@
 
 module Usmu
   # The current version string for the gem
-  VERSION = '0.3.4'
+  VERSION = '0.4.0'
 end

data/spec/spec_helper.rb

@@ -8,6 +8,8 @@ require 'logging'
 require 'rspec/logging_helper'
 require 'timeout'
 
+Logging.init :debug, :info, :success, :warn, :error, :fatal
+
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # The generated `.rspec` file contains `--require spec_helper` which will cause this

data/usmu.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'slim', '~> 3.0'
   spec.add_dependency 'tilt', '~> 2.0'
+  spec.add_dependency 'rack', '~> 1.6'
   spec.add_dependency 'deep_merge', '~> 1.0'
   spec.add_dependency 'commander', '~> 4.2'
   spec.add_dependency 'logging', '~> 1.8'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usmu
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Matthew Scharley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-17 00:00:00.000000000 Z
+date: 2015-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slim
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
@@ -279,6 +293,7 @@ files:
 - lib/usmu/template/static_file.rb
 - lib/usmu/ui.rb
 - lib/usmu/ui/console.rb
+- lib/usmu/ui/rack_server.rb
 - lib/usmu/version.rb
 - share/init-site/.gitignore
 - share/init-site/Gemfile