mascut 0.0.3 → 0.0.4

data/HISTORY.rdoc

@@ -1,3 +1,7 @@
+= 0.0.4
+* remove sinatra dependency, mascut is now a Rack middleware (use Mascut::Mascut)
+* add command line option
+
 = 0.0.3 (2010-04-08)
 * add Rack option
 

data/README.rdoc

@@ -19,6 +19,9 @@ Simply execute this command at the top of your working directory
 Accessing <http://localhost:9203/working_html.html> with your browser, you can see it works as comet.
 When you edit your working stuffs, your browser will automatically be reloaded!!
 
+For Additional Information, just see helps
+  % mascut --help
+
 == Copyright
 
-Copyright (c) 2009 okitan. See LICENSE for details.
+Copyright (c) 2009-2010 okitan. See LICENSE for details.

data/Rakefile

@@ -11,8 +11,6 @@ begin
     gem.homepage = 'http://github.com/okitan/mascut'
     gem.authors = %w[ okitan ]
 
-    gem.add_dependency 'sinatra', '>=0.9.4'
-    
     gem.add_development_dependency 'rspec', '>= 1.2.9'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/bin/mascut

@@ -14,14 +14,17 @@ rescue LoadError
 end
 
 Version = Mascut::VERSION
-p opts = Mascut::Option.parse
+opts = Mascut::Option.parse
 
 app = Rack::Builder.new do
   use Rack::CommonLogger, $stdout
   use Rack::ShowExceptions
   use Rack::ShowStatus
+
+  use Rack::ContentLength
   
-  run Rack::Cascade.new([ Mascut::Mascut.new, Rack::File.new('.') ])
+  use Mascut::Mascut, opts[:mascut], opts[:files], opts
+  run Rack::File.new('.')
 end.to_app
 
 begin

data/lib/mascut/mascut.rb

@@ -1,32 +1,51 @@
-require 'sinatra/base'
-
 module Mascut
-  class Mascut < Sinatra::Base
-    get '/mascut' do
-      headers 'Cache-Control' => 'no-cache', 'Pragma' => 'no-cache'
-      
+  class Mascut
+    def initialize(app, path = nil, files = nil, opts = nil)
+      @app   = app
+      @path  = path  || '/mascut'
+      @files = files || Dir['**/*']
+      @opts  = opts  || {}
+    end
+
+    def call(env)
+      if env['PATH_INFO'] == @path
+        mascut
+      else
+        status, headers, body = @app.call(env)
+        if status == 200 and headers['Content-Type'] =~ /^text\/html/
+          body = [ File.read(body.path) ] if body.is_a?(Rack::File)
+          body.map! {|html| mascutize(html) }
+          headers['Content-Length'] = body.to_a.inject(0) { |len, part| len + Rack::Utils.bytesize(part) }.to_s
+          
+          [ status, headers, [mascutize(body.first)] ]
+        else
+          [ status, headers, body ]
+        end
+      end
+    end
+
+    def mascut
       now = Time.now
-      files = Dir['**/*']
       
       catch :reload do
         loop do 
-          files.each {|file| throw(:reload, 'reload') if File.exist?(file) and now < File.mtime(file) }
-          sleep 1
+          @files.each {|file| throw(:reload, 'reload') if File.exist?(file) and now < File.mtime(file) }
+          sleep (@opts[:interval] || 1.0)
         end
       end
-    end
-    
-    get %r{^/(.+\.html)$} do |name|
-      halt(404) unless File.exist?(name)
       
-      # I don't use nokogiri because it corercts wrong html.
-      File.read(name).sub('</head>', <<-JS)
+      [ 200, { 'Cache-Control' => 'no-cache', 'Pragma' => 'no-cache', 'Content-Type' => 'text/plain' },  ['reload'] ]
+    end
+
+    def mascutize(html)
+      # I don't use html parser like nokogiri, because it corrects html to be debugged
+      html.sub('</head>', <<-JS)
   <script src='http://www.google.com/jsapi'></script>
   <script>
 var comet = function() {
   $.ajax({
     type: 'GET',
-    url:  '/mascut',
+    url:  '#{@path}',
     success: function(msg) {
       msg == 'reload' ? location.reload() : comet();
     }
@@ -39,10 +58,5 @@ google.setOnLoadCallback(comet);
 </head>
       JS
     end
-    
-    get %r{^/(.+\.css)$} do |name|
-      content_type :css
-      File.exist?(name) ? File.read(name) : halt(404)
-    end
   end
 end

data/lib/mascut/option.rb

@@ -9,28 +9,38 @@ module Mascut
         :Port   => 9203
       }.tap do |options|
         OptionParser.new do |opts|
+          opts.banner = "Usage: mascut [files] [rack options] [mascut options]"
+          
           opts.separator 'Rack options:' # almost same as rack
-          opts.on('-s', '--server SERVER', 'serve using SERVER (default: mongrel)') { |s|
+          opts.on('-s', '--server SERVER', 'serve using SERVER (default: mongrel)') do |s|
             options[:server] = s
-          }
+          end
           
-          opts.on('-o', '--host HOST', 'listen on HOST (default: 0.0.0.0)') { |host|
+          opts.on('-o', '--host HOST', 'listen on HOST (default: 0.0.0.0)') do |host|
             options[:Host] = host
-          }
+          end
           
-          opts.on('-p', '--port PORT', 'use PORT (default: 9203)') { |port|
+          opts.on('-p', '--port PORT', 'use PORT (default: 9203)') do |port|
             options[:Port] = port
-          }
+          end
           
-          opts.on('-D', '--daemonize', 'run daemonized in the background') { |d|
+          opts.on('-D', '--daemonize', 'run daemonized in the background') do |d|
             options[:daemonize] = d ? true : false
-          }
+          end
           
           opts.separator ''
-          opts.separator 'Mascut options:(TODO)'
+          opts.separator 'Mascut options:'
+
+          opts.on('-m', '--mascut PATH', 'absolute path for comet(default on Mascut::Mascut: /mascut)') do |path|
+            options[:mascut] = path.index('/') == 0 ? path : "/#{path}"
+          end
+
+          opts.on('-i', '--interval SEC', Float, 'interval to monitor files(default on Mascut::Mascut: 1.0 sec)') do |sec|
+            options[:interval] = sec
+          end
           
           opts.permute!(args)
-          options[:files] = args
+          options[:files] = args.size > 0 ? args : nil
         end
       end
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - okitan
@@ -14,27 +14,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-08 00:00:00 +09:00
+date: 2010-04-12 00:00:00 +09:00
 default_executable: mascut
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: sinatra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 4
-        version: 0.9.4
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -44,7 +30,7 @@ dependencies:
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id002
+  version_requirements: *id001
 description: instant comet-like server in order to debug web pages
 email: okitakunio@gmail.com
 executables: