jeremylightsmith-actionsite 0.4 → 0.6

data/Rakefile

@@ -18,6 +18,7 @@ desc "generate gemspec"
 task :gemspec do
   File.open("actionsite.gemspec", "w") do |f| 
     f << ERB.new(File.read("actionsite.gemspec.erb"), 0, "%<>").result(binding)
-  end  
+  end
+  puts "generated gemspec for actionsite #{ActionSite::VERSION}"
 end
 

data/lib/action_site.rb

@@ -19,5 +19,5 @@ require 'action_site/link_checker'
 require 'action_site/async_link_checker'
 
 module ActionSite
-  VERSION = 0.4
+  VERSION = "0.6"
 end

data/lib/action_site/site.rb

@@ -7,6 +7,8 @@ require 'action_site/generators/markaby_generator'
 require 'action_site/generators/redcloth_generator'
 require 'action_site/generators/yaml_generator'
 
+require 'thin'
+
 module ActionSite
   EXCLUDED_DIRECTORIES = %w(layouts helpers)
   RESOURCE_EXTENSIONS = %w(css ico gif jpg png js pdf)
@@ -19,8 +21,9 @@ module ActionSite
   }
   
   class Site
+    include FileUtils
     attr_reader :context
-
+    
     def initialize(in_dir, out_dir)
       @context = Context.new
       @generator = HtmlGenerator.new(@context, in_dir, generators)
@@ -36,30 +39,44 @@ module ActionSite
     end
     
     def generate(in_dir = @in_dir, out_dir = @out_dir)
-      Dir[in_dir + "/*"].each do |in_file|
-        out_file = in_file.gsub(in_dir, out_dir)
-
-        if excluded?(in_file)
-          # nothing
-        
-        elsif File.symlink?(in_file)
-          cp in_file, out_file rescue nil # maybe the links don't exist here
+      Dir.chdir(@in_dir) do
+        Dir["**/*"].each do |path|
+          refresh_page path
+        end
+      end
+    end
+    
+    def refresh_page(path)
+      in_file, out_file = File.join(@in_dir, path), File.join(@out_dir, path)
 
-        elsif File.directory?(in_file)
-          mkdir_p out_file
-          generate in_file, out_file
+      if !File.exist?(in_file)
+        # is there another version that does?
+        return unless in_file.extension == "html" && (in_file = Dir[in_file.split_filename[0] + ".*"].first)
+      end
+          
+      if excluded?(in_file)
+        # nothing
       
-        elsif resource?(in_file)
-          ln_s File.expand_path(in_file), File.expand_path(out_file)
+      elsif File.symlink?(in_file)
+        mkdir_p File.dirname(out_file)
+        cp in_file, out_file rescue nil # maybe the links don't exist here
 
-        else 
-          out_file = out_file.gsub(/\..+$/, '.html')
-          generate_page(in_file, out_file)
-          puts "   #{in_file} => #{out_file}"
-        end
+      elsif File.directory?(in_file)
+        mkdir_p out_file
+        generate in_file, out_file
+    
+      elsif resource?(in_file)
+        mkdir_p File.dirname(out_file)
+        ln_sf File.expand_path(in_file), File.expand_path(out_file)
+
+      else 
+        mkdir_p File.dirname(out_file)
+        out_file = out_file.gsub(/\..+$/, '.html')
+        generate_page(in_file, out_file)
+        puts "   #{in_file} => #{out_file}"
       end
     end
-  
+    
     def excluded?(file)
       File.directory?(file) && EXCLUDED_DIRECTORIES.include?(File.basename(file))
     end
@@ -68,6 +85,29 @@ module ActionSite
       RESOURCE_EXTENSIONS.include?(file.extension)
     end
     
+    def serve(port = 3000)
+      app = proc do |env|
+        path = env["PATH_INFO"]
+        file = File.join("public", "brenda", path)
+        if File.directory?(file)
+          path = env["PATH_INFO"] = File.join(path, "index.html")
+        end
+
+        begin
+          refresh_page(path)
+        rescue Exception
+          return [500, {"Content-Type" => "text/plain"}, "Error in generation :\n\n#{$!.to_s}\n#{$!.backtrace.join("\n")}"]
+        end
+
+        Rack::File.new("public/brenda").call(env)
+      end
+
+      Thin::Server.start('0.0.0.0', port) do
+        use Rack::CommonLogger
+        run app
+      end
+    end
+    
     private
     
     def generate_page(in_file, out_file)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jeremylightsmith-actionsite
 version: !ruby/object:Gem::Version 
-  version: "0.4"
+  version: "0.6"
 platform: ruby
 authors: 
 - Jeremy Lightsmith
@@ -42,6 +42,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.0.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: thin
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+    version: 
 description: ActionSite is a static site generator for ruby patterned after rails view templates supporting erb, yaml, redcloth and markaby(ish).
 email: jeremy.lightsmith@gmail.com
 executables: []