doozer 0.2.5 → 0.2.6

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/doozer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{doozer}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["grippy"]
-  s.date = %q{2009-10-26}
+  s.date = %q{2009-10-27}
   s.default_executable = %q{doozer}
   s.description = %q{This GEM provides a small, barebones framework for creating MVC Rack applications.}
   s.email = %q{gmelton@whorde.com}
@@ -72,7 +72,7 @@ Gem::Specification.new do |s|
      "templates/skeleton/app/views/index/index.html.erb",
      "templates/skeleton/app/views/layouts/default.html.erb",
      "templates/skeleton/config/app.yml",
-     "templates/skeleton/config/boot.rb",
+     "templates/skeleton/config/boot.erb",
      "templates/skeleton/config/database.yml",
      "templates/skeleton/config/environment.rb",
      "templates/skeleton/config/rack.rb",

data/lib/doozer/app.rb

@@ -257,10 +257,12 @@ module Doozer
             puts "modified: #{file}"
             load_files
             Doozer::Partial.clear_loaded_partials
+            Doozer::Configs.clear_static_files
         elsif(status == FileSystemWatcher::DELETED) then
             puts "deleted: #{file}"
             load_files
             Doozer::Partial.clear_loaded_partials
+            Doozer::Configs.clear_static_files
         end
       }
       #don't join the thread it messes up rackup threading watcher.join()

data/lib/doozer/configs.rb

@@ -10,6 +10,8 @@ module Doozer
   class Configs
    @@possible_orm = [:active_record, :data_mapper, :sequel]
    @@app_path = nil
+   @@static_file = {}
+   @@orm_loaded = false
    
    # Load all the config files for the application. Also instantiates a default application Logger.
    def self.load(rack_env)
@@ -100,7 +102,7 @@ module Doozer
    end
 
    def self.orm_loaded
-     @@orm_loaded || false
+     @@orm_loaded
    end
    
    def self.orm_loaded=(t)
@@ -130,8 +132,13 @@ module Doozer
    # Return the app name
    def self.app_name
      self.app["name"] || ""
-   end      
+   end
       
+   # Return the app name
+   def self.static_root
+     self.app["static_root"] || ""
+   end
+
    # Return the app 404 url
    def self.page_not_found_url
      self.app[404] || nil
@@ -142,5 +149,27 @@ module Doozer
      self.app[500] || nil
    end
 
+    def self.static_url(path)
+      return path if path.index('http://') or path.index('https://')
+      key = "#{@@app_path}/#{static_root}#{path}"
+      if not @@static_file[key].nil?
+        return "#{path}?#{@@static_file[key]}"
+      else
+        begin
+          time = File.stat(key).mtime
+          hash = Digest::SHA1.hexdigest(time.to_s)[0...5]
+          @@static_file[key] = hash
+          return "#{path}?#{hash}"
+        rescue => e
+          logger.error(e.to_s)
+        end
+      end
+      return path
+    end
+    
+    def self.clear_static_files
+      @@static_file = {}
+    end
+
   end
 end

data/lib/doozer/controller.rb

@@ -270,7 +270,7 @@ module Doozer
     # Controller hook called after controller#method call
     def after_filter; end
 
-    # Global tear called at the end of every request. Hooks ORM.teardown
+    # Global teardown called at the end of every request. Hooks ORM.teardown
     def finished!
       Doozer::ORM.after_request if Doozer::Configs.orm_loaded
     end

data/lib/doozer/lib.rb

@@ -27,6 +27,5 @@ module Doozer
       end
       s
     end
-        
   end
 end

data/lib/doozer/version.rb

@@ -2,7 +2,7 @@ module Doozer
   module Version
     MAJOR=0
     MINOR=2
-    PATCH=5
+    PATCH=6
     STRING=[MAJOR, MINOR, PATCH].join('.')
   end
 end

data/lib/doozer/view_helpers.rb

@@ -75,8 +75,7 @@ module Doozer
     #
     # prop - a hash of image tag attributes
     def img(path, prop={})
-      path = timestamp_path(path)
-      "<img src=\"#{path}\"#{hash_to_props(prop)} />"
+      "<img src=\"#{static_url(path)}\"#{hash_to_props(prop)} />"
     end
     
     # Creates a stylesheet link tag.
@@ -88,11 +87,10 @@ module Doozer
     # => Defaults to :rel=>'stylesheet', :type=>'text/css', :media=>'all'
     def stylesheet(path, prop={})
       #<link rel="stylesheet" type="text/css" media="all" href="/css/style.css" />
-      path = timestamp_path(path)
       prop[:rel] = 'stylesheet' if prop[:rel].nil?
       prop[:type] = 'text/css' if prop[:type].nil?
       prop[:media] = 'all' if prop[:media].nil?
-      "<link #{hash_to_props(prop)} href=\"#{path}\" />"
+      "<link #{hash_to_props(prop)} href=\"#{static_url(path)}\" />"
     end
 
     # Creates a link tag for feeds.
@@ -114,9 +112,18 @@ module Doozer
     #
     # => Defaults to: :type=>'text/javascript'
     def javascript(path, prop={})
-      path = timestamp_path(path)
       prop[:type] = 'text/javascript' if prop[:type].nil?
-      "<script #{hash_to_props(prop)} src=\"#{path}\"></script>"
+      "<script #{hash_to_props(prop)} src=\"#{static_url(path)}\"></script>"
+    end
+
+
+    # Creates a url for static files
+    #
+    # hahses the file date and appends it to the end of the file for cache busting...
+    #
+    # 
+    def static_url(path)
+      Doozer::Configs.static_url(path)
     end
 
     # Creates metatags

data/lib/generator/generator.rb

@@ -1,3 +1,5 @@
+require 'erb'
+
 module Doozer
   
   #= Generate Project Skeletons and Files
@@ -349,7 +351,7 @@ Task - Create a task file in project/tasks with the class name of TaskName.
 
     # TODO: Dry this up...
     def self.skeleton(name)
-      
+    
       # create application skeleton
       if not File.exist?(name)
         p "Creating #{name}/"
@@ -435,7 +437,12 @@ Task - Create a task file in project/tasks with the class name of TaskName.
         system("cp #{skeleton_path 'config/*.rb'} #{name}/config")
         
         ## load boot.erb replace version number and save as boot.rb
-        
+        boot_skel = skeleton_path 'config/boot.erb'
+        results = []
+        @version = Doozer::Version::STRING
+        File.new(boot_skel, "r").each { |line| results << line }
+        boot = ERB.new(results.join(""))
+        File.open("#{name}/config/boot.rb", 'w') {|f| f.write(boot.result(binding)) }
       else
         p "Skipping #{name}/config directory (already exists)"
       end

data/templates/skeleton/config/{boot.rb → boot.erb}

@@ -1,4 +1,4 @@
-DOOZER_GEM_VERSION='0.2.5'
+DOOZER_GEM_VERSION='<%=@version%>'
 
 require 'date'
 require 'rubygems'
@@ -7,5 +7,5 @@ begin
   gem 'doozer', "= #{DOOZER_GEM_VERSION}"
   require 'doozer'
 rescue Gem::LoadError
-  raise "grippy-doozer-#{DOOZER_GEM_VERSION} gem not installed"
+  raise "doozer-#{DOOZER_GEM_VERSION} gem not installed"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: doozer
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - grippy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-26 00:00:00 -07:00
+date: 2009-10-27 00:00:00 -07:00
 default_executable: doozer
 dependencies: []
 
@@ -76,7 +76,7 @@ files:
 - templates/skeleton/app/views/index/index.html.erb
 - templates/skeleton/app/views/layouts/default.html.erb
 - templates/skeleton/config/app.yml
-- templates/skeleton/config/boot.rb
+- templates/skeleton/config/boot.erb
 - templates/skeleton/config/database.yml
 - templates/skeleton/config/environment.rb
 - templates/skeleton/config/rack.rb