gumdrop 0.2.7 → 0.2.8

data/ChangeLog.md

@@ -1,3 +1,6 @@
+# v0.2.8
+- Added better support for site reloading in server
+
 # v0.2.7
 - Added support for `yield` in templates
 - Added support for content_for -- only tested in SLIM

data/lib/gumdrop.rb

@@ -37,7 +37,9 @@ module Gumdrop
       src= File.join root, 'source'
       $: << "#{root}/lib"
       if File.exists? "#{root}/lib/view_helpers.rb"
-        require 'view_helpers'
+        # In server mode, we want to reload it every time... right?
+        load "#{root}/lib/view_helpers.rb"
+        #require 'view_helpers'
       end
 
       @site        = Hash.new {|h,k| h[k]= nil }
@@ -47,13 +49,11 @@ module Gumdrop
       @root_path   = root.split '/'
       @source_path = src.split '/'
       @data        = Gumdrop::DeferredLoader.new()
-
+      
       if File.exists? "#{root}/lib/site.rb"
         # In server mode, we want to reload it every time... right?
         source= IO.readlines("#{root}/lib/site.rb").join('')
-        
         GenerationDSL.class_eval source
-        
         #load "#{root}/lib/site.rb" 
         # require 'site' 
       end

data/lib/gumdrop/deferred_loader.rb

@@ -35,7 +35,7 @@ module Gumdrop
   
     def set(key, value, opts={})
       @cache[key]= value
-      @persisted[key]= value if opts[:persist]
+      @persisted[key]= value #unless opts[:persist] == false
     end
   
     def reset

data/lib/gumdrop/server.rb

@@ -11,13 +11,18 @@ module Gumdrop
     # get '/' do
     #   redirect '/index.html'
     # end
+    
+    Gumdrop.run :dry_run=>true
 
     get '/*' do
-      
-      Gumdrop.run :dry_run=>true if Gumdrop.config.force_reload
-      
       file_path= get_content_path params[:splat].join('/')
       
+      if Gumdrop.config.force_reload
+        unless %w(.css .js .jpg .jpe .jpeg .gif .ico .png).include? File.extname(file_path).to_s
+          Gumdrop.run :dry_run=>true
+        end
+      end
+      
       if Gumdrop.site.has_key? file_path
         content= Gumdrop.site[file_path]
         if content.useLayout?

data/lib/gumdrop/version.rb

@@ -1,5 +1,5 @@
 module Gumdrop
   
-  VERSION = "0.2.7" unless defined?(::Gumdrop::VERSION)
+  VERSION = "0.2.8" unless defined?(::Gumdrop::VERSION)
   
 end

metadata

@@ -1,89 +1,109 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: gumdrop
-version: !ruby/object:Gem::Version
-  version: 0.2.7
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 8
+  version: 0.2.8
 platform: ruby
-authors:
+authors: 
 - Matt McCray
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-22 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-07-22 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: sinatra
-  requirement: &70267787964340 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70267787964340
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: tilt
-  requirement: &70267787963900 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70267787963900
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: active_support
-  requirement: &70267787963400 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70267787963400
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: trollop
-  requirement: &70267787962920 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70267787962920
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: haml
-  requirement: &70267787962460 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70267787962460
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: sass
-  requirement: &70267787962000 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70267787962000
+  version_requirements: *id006
 description: A simple cms/prototyping tool.
 email: matt@elucidata.net
-executables:
+executables: 
 - gumdrop
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - ChangeLog.md
 - Gemfile
@@ -141,28 +161,37 @@ files:
 - lib/gumdrop/utils.rb
 - lib/gumdrop/version.rb
 - lib/gumdrop/view_helpers.rb
+has_rdoc: true
 homepage: https://github.com/darthapo/gumdrop
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: gumdrop
-rubygems_version: 1.8.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A simple cms/prototyping tool.
 test_files: []
+