hx 0.10.0 → 0.11.0

data/VERSION

@@ -1 +1 @@
-0.10.0
+0.11.0

data/lib/hx.rb

@@ -461,11 +461,16 @@ class Site
 
     def load(io, config_path)
       raw_config = YAML.load(io)
+      load_raw(raw_config, config_path)
+    end
+
+    def load_raw(raw_config, config_path)
       options = {}
       options[:base_dir] = File.dirname(config_path)
       for key, value in raw_config.fetch('options', {})
         options[key.intern] = value
       end
+      options[:config_file] = config_path
 
       if raw_config.has_key? 'require'
         for library in raw_config['require']

data/lib/hx/cli.rb

@@ -86,10 +86,7 @@ EOS
     end
   end
 
-  site = nil
-  options.config_file.open("r") do |stream|
-    site = Hx::Site.load(stream, options.config_file)
-  end
+  site = Hx::Site.load_file(options.config_file)
 
   subcommand = args.shift || "upgen"
   method_name = "cmd_#{subcommand}".intern
@@ -104,9 +101,16 @@ end
 def self.cmd_serve(site, port=nil)
   server = WEBrick::HTTPServer.new({:Port => port || 0})
   real_port = server.config[:Port]
+
   base_url = "http://localhost:#{real_port}/"
   server.logger.info "Serving on #{base_url}"
-  site.options[:base_url] = base_url
+
+  # reload the site/config, folding in the new base URL
+  config_file = site.options[:config_file]
+  raw_config = File.open(config_file, 'r') { |s| YAML.load(s) }
+  (raw_config['options'] ||= {})['base_url'] = base_url
+  site = Hx::Site.load_raw(raw_config, config_file)
+
   app = Hx::Rack::Application.new(site, site.options)
   server.mount('/', ::Rack::Handler::WEBrick, app)
   %w(INT TERM).each { |s| trap(s) { server.shutdown } }

data/lib/hx/path.rb

@@ -30,11 +30,11 @@ module Selector
   end
 
   def |(other)
-    Disjunction.new(self, other)
+    Disjunction.build(self, other)
   end
 
   def &(other)
-    Conjunction.new(self, other)
+    Conjunction.build(self, other)
   end
 
   def ~()
@@ -92,7 +92,7 @@ end
 class Conjunction
   include Connective
 
-  def self.new(*selectors)
+  def self.build(*selectors)
     if selectors.any? { |s| All === s }
       selectors.reject! { |s| All === s }
       case selectors.size
@@ -100,7 +100,7 @@ class Conjunction
       when 1; return selectors.first
       end
     end
-    super(*selectors)
+    new(*selectors)
   end
 
   def accept_path?(path)
@@ -111,6 +111,11 @@ end
 class Disjunction
   include Connective
 
+  def self.build(*selectors)
+    return ALL if selectors.any? { |s| All === s }
+    new(*selectors)
+  end
+
   def accept_path?(path)
     @selectors.any? { |s| s.accept_path? path }
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hx
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 51
   prerelease: false
   segments: 
   - 0
-  - 10
+  - 11
   - 0
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors: 
 - MenTaLguY
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 -08:00
+date: 2011-03-02 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency