tdreyno-staticmatic 2.1.1 → 2.1.3

data/bin/staticmatic

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-require File.join(File.dirname(__FILE__), '..', 'lib', 'staticmatic', 'generator')
+require File.join(File.dirname(__FILE__), '..', 'lib', 'staticmatic')
 StaticMatic::Generator.run_cli(Dir.pwd, 'staticmatic', 1, ["setup"].concat(ARGV))

data/lib/staticmatic/autoload.rb

@@ -1,6 +1,7 @@
 module StaticMatic
   autoload :Base,        File.join(File.dirname(__FILE__), 'base')
   autoload :Config,      File.join(File.dirname(__FILE__), 'config')
+  autoload :Builder,     File.join(File.dirname(__FILE__), 'builder')
   autoload :Generator,   File.join(File.dirname(__FILE__), 'generator')
   autoload :Deprecation, File.join(File.dirname(__FILE__), 'deprecation')
   autoload :Previewer,   File.join(File.dirname(__FILE__), 'previewer')

data/lib/staticmatic/base.rb

@@ -56,7 +56,8 @@ module StaticMatic
   
     def render(filename)
       load_helpers
-      output = do_render(filename)
+      filename = full_template_path(filename)
+      output   = do_render(filename)
     
       return output if determine_format_for(filename) == :css
       layout = view.instance_variable_get("@layout")
@@ -82,7 +83,6 @@ module StaticMatic
     end
   
     def do_render(filename)
-      filename = full_template_path(filename)
       view.instance_variable_set("@current_page", filename)
       view.template_format = determine_format_for(filename)
       view.render_file(strip_extension(filename), true)

data/lib/staticmatic/builder.rb

@@ -1,7 +1,7 @@
 require 'templater'
 
 module StaticMatic
-  module Generator
+  module Builder
     extend Templater::Manifold
     desc "Multiple ways to build a staticmatic site"
 

data/lib/staticmatic/generator.rb

@@ -0,0 +1,28 @@
+require 'templater'
+
+module StaticMatic
+  module Generator
+    extend Templater::Manifold
+    desc "Generator for streamlining staticmatic"
+
+    class StaticmaticGenerator < Templater::Generator
+      desc "Creates a new staticmatic scaffold."
+      first_argument :location, :required => true, :desc => "Project location"
+      
+      def destination_root
+        File.expand_path(location)
+      end
+      
+      def self.source_root
+        File.join(File.dirname(__FILE__), '../templates')
+      end
+
+      glob!
+      empty_directory :images, File.join("src", "images")
+      empty_directory :javascripts, File.join("src", "javascripts")
+      empty_directory :build, "build"
+    end
+
+    add :setup, StaticmaticGenerator
+  end
+end

data/lib/staticmatic/previewer.rb

@@ -11,13 +11,13 @@ module StaticMatic
       path_info   = request.params[Mongrel::Const::PATH_INFO].chomp("/")
       get_or_head = %w(GET HEAD).include? request.params[Mongrel::Const::REQUEST_METHOD]
       
-      if StaticMatic::Base.can_render? path_info  
+      if @staticmatic.can_render? path_info
         file_ext  = File.extname(path_info).gsub(/^\./, '')
         file_ext  = "html" if file_ext.blank?
-        file_name = CGI::unescape(path_info.chomp(".#{file_ext}")).gsub!(/^\//, '')
+        file_name = CGI::unescape(path_info).gsub!(/^\//, '') || ''
         
         response.start(200) do |head, out|
-          output = Template.new(file_name).render
+          output = @staticmatic.render(file_name)
           head[Mongrel::Const::CONTENT_TYPE] = Mongrel::DirHandler::MIME_TYPES[".#{file_ext}"] || "application/octet-stream"
           out.write(output || "")
         end  

data/lib/templates/script/builder

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
-require 'staticmatic/builder'
-StaticMatic::Generator.run_cli(Dir.pwd, 'builder', 1, ARGV)
+require 'staticmatic'
+StaticMatic::Builder.run_cli(Dir.pwd, 'builder', 1,  ["build"].concat(ARGV))
 # find setting to always overwrite/merge

data/spec/builder_spec.rb

@@ -7,7 +7,7 @@
 #     
 #     orig_stdout = STDOUT.dup
 #     STDOUT.reopen('/dev/null') # redirect stdout to /dev/null
-#     StaticMatic::Generator.run_cli(File.dirname(@root_dir), 'staticmatic', 1, ["setup", File.basename(@root_dir)])
+#     StaticMatic::Builder.run_cli(File.dirname(@root_dir), 'staticmatic', 1, ["setup", File.basename(@root_dir)])
 #     STDOUT.reopen(orig_stdout) # restore stdout
 #   end
 #   
@@ -22,17 +22,6 @@
 #     FileUtils.rm_rf(@root_dir)
 #   end
 #   
-#   it "should create version tracking file with current build timestamp" do
-#     versions_file = "#{@root_dir}/builds"
-#     about_now     = Time.now.strftime("%Y%m%d%H%M")
-#     
-#     build_site
-#     File.exists?(versions_file).should be_true
-# 
-#     versions = File.read(versions_file).split(/\n/)
-#     versions[0].should include(about_now)
-#   end
-#   
 #   it "should not build partial files" do
 #     File.open("#{@root_dir}/src/pages/_partial.html.erb", "w") do |f|
 #       f.puts "Test"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tdreyno-staticmatic
 version: !ruby/object:Gem::Version 
-  version: 2.1.1
+  version: 2.1.3
 platform: ruby
 authors: 
 - Stephen Bartholomew
@@ -75,9 +75,8 @@ files:
 - lib/staticmatic/builder.rb
 - lib/staticmatic/config.rb
 - lib/staticmatic/deprecation.rb
-- lib/staticmatic/generators.rb
+- lib/staticmatic/generator.rb
 - lib/staticmatic/previewer.rb
-- lib/staticmatic/rescue.rb
 - lib/staticmatic/actionpack_support/mime.rb
 - lib/staticmatic/actionpack_support/remove_partial_benchmark.rb
 - lib/staticmatic/actionpack_support/remove_controller_caching.rb