gumdrop 0.2.16 → 0.3

data/lib/gumdrop/pager.rb

@@ -11,10 +11,10 @@ module Gumdrop
       @current_page=1
       @page_sets.each do |art_ary|
         @pages << HashObject.new({
-          'items' => art_ary,
-          'page' => @current_page,
-          'uri' => "#{base_path}/#{current_page}",
-          'pager' => self
+          items: art_ary,
+          page: @current_page,
+          uri: "#{base_path}/#{current_page}",
+          pager: self
         })
         @current_page += 1
       end

data/lib/gumdrop/server.rb

@@ -1,39 +1,55 @@
 # Rework this to be nicer.. Extend Sintra::Base
 
 require 'sinatra/base'
+require 'logger'
+
 
 module Gumdrop
 
   class Server < Sinatra::Base
 
     set :port, Gumdrop.config.port if Gumdrop.config.port
+
+
+    server_log= 'logs/server.log'
     
     # get '/' do
     #   redirect '/index.html'
     # end
     
-    Gumdrop.run :dry_run=>true
+    Gumdrop.run dry_run:true, log:server_log
 
     get '/*' do
       file_path= get_content_path params[:splat].join('/')
       
-      if Gumdrop.config.force_reload
-        unless %w(.jpg .jpe .jpeg .gif .ico .png).include? File.extname(file_path).to_s
-          Gumdrop.run :dry_run=>true
-        end
-      end
+      Gumdrop.log.info "[#{$$}] GET /#{params[:splat].join('/')}"
+      #Gumdrop.log.debug " last built: #{Gumdrop.last_run}"
+
       
       if Gumdrop.site.has_key? file_path
         content= Gumdrop.site[file_path]
         if content.useLayout?
+          # Only do a force_reload if the resource is dynamic!
+          if Gumdrop.config.force_reload
+            unless %w(.jpg .jpe .jpeg .gif .ico .png).include? File.extname(file_path).to_s
+              since_last_build= Time.now.to_i - Gumdrop.last_run.to_i
+              if since_last_build > 2
+                Gumdrop.log.debug "[#{$$}] !!> REBUILDING"
+                Gumdrop.run dry_run:true, log:server_log
+              end
+            end
+          end
+          Gumdrop.log.info "[#{$$}]  *Dynamic: #{file_path}"
           content_type :css if content.ext == '.css' # Meh?
           content_type :js if content.ext == '.js' # Meh?
           content_type :xml if content.ext == '.xml' # Meh?
           content.render
         else
+          Gumdrop.log.info "[#{$$}]  *Static: #{file_path}"
           send_file "source/#{file_path}"
         end
       else
+        Gumdrop.log.error "[#{$$}]  *Missing: #{file_path}"
         puts "NOT FOUND: #{file_path}"
         "#{file_path} Not Found"
       end
@@ -54,18 +70,18 @@ module Gumdrop
     end
     
     if Gumdrop.config.auto_run
-      Gumdrop.run :dry_run=>true 
+      Gumdrop.run dry_run:true 
       run!
     end    
 
     def self.start(opts={})
       # Options
-      opts.reverse_merge! :auto_run => true, :cache_data => false
+      opts.reverse_merge! auto_run:true, cache_data:false
       Gumdrop.config.merge! opts
-      Gumdrop.run :dry_run=>true 
+      Gumdrop.run dry_run:true, log:server_log
       ::Gumdrop::Server
     end
 
   end
     
-end
+end

data/lib/gumdrop/template/default/Gemfile

@@ -2,7 +2,8 @@ source "http://rubygems.org"
 
 gem "i18n"
 gem "sinatra"
-gem "active_support"
+gem "active_support"]
+
 gem "rake"
 gem "gumdrop"
 
@@ -12,6 +13,8 @@ gem "slim"
 gem "sass"
 gem "coffee-script"
 
+gem 'jsmin'
+gem 'stitch-rb'
 
 # For markdown support, a couple of options:
 # gem "rdiscount"
@@ -24,4 +27,3 @@ gem "coffee-script"
 # For xml generation support:
 # gem 'builder'
 
-# gem 'jsmin'

data/lib/gumdrop/template/default/Rakefile

@@ -7,6 +7,9 @@ USER='user'
 SERVER='server.com'
 FOLDER="~/#{SERVER}"
 
+# Build folder (change if you change Gumdrop.config.output_dir)
+OUTPUT="output/"
+
 desc "Build source files into output_dir"
 task :build do
   system("bundle exec gumdrop -b")
@@ -19,7 +22,7 @@ end
 
 desc "Syncs with public server using rsync (if configured)"
 task :sync do
-  cmd= "rsync -avz --delete output/ #{USER}@#{SERVER}:#{FOLDER}"
+  cmd= "rsync -avz --delete #{OUTPUT} #{USER}@#{SERVER}:#{FOLDER}"
   puts "Running:\n#{cmd}\n"
   system(cmd)
   puts "Done."

data/lib/gumdrop/template/default/config.ru

@@ -11,7 +11,11 @@ end
 require 'gumdrop'
 
 Gumdrop.config.auto_run= false
-Gumdrop.config.force_reload= false
-Gumdrop.run :dry_run=>true 
+Gumdrop.config.force_reload= true
+
+require 'rack/static'
+#use Rack::Static, :urls => ["/media"], :root => "source"
+use Rack::Static, :urls => ["/theme/images"], :root => "source"
+
 
 run Gumdrop::Server

data/lib/gumdrop/template/default/lib/site.rb

@@ -9,7 +9,7 @@ else
 end
 
 require 'slim'
-Slim::Engine.set_default_options :pretty => true
+Slim::Engine.set_default_options pretty:true
 
 # Example of using a content filter to compress CoffeeScript/JS output
 # require 'jsmin'
@@ -27,11 +27,21 @@ Slim::Engine.set_default_options :pretty => true
 # generate do
 #
 #   page "about.html", :template=>'about', :passthru=>'Available in the template' # requires a about.template.XX file
-#   
+#  
+#   page 'robots.txt' do
+#     # And content returned will be put in the file
+#     """
+#     User-Agent: *
+#     Disallow: /
+#     """
+#   end
+#
+#   stitch 'app.js', :paths=>['source/app_src'], :root=>'source/app_src', :compress=>true, :prune=>true # Prune will remove the source files from the output tree -- you can add :dependencies=>['dir'] too
+#
 #   # Maybe for a tumblr-like pager
-#   pager= Gumdrop.data.pager_for :posts, :base_path=>'posts/page', :page_size=>5
+#   pager= Gumdrop.data.pager_for :posts, base_path:'posts/page', page_size:5
 #   pager.each do |page|
-#     page "#{page.uri}.html", :template=>'post_page', :posts=>page.items, :pager=>pager, :current_page=>pager.current_page
+#     page "#{page.uri}.html", template:'post_page', posts:page.items, pager:pager, current_page:pager.current_page
 #   end
 #   
-# end
+# end

data/lib/gumdrop/template/default/powrc

@@ -0,0 +1,2 @@
+export POW_TIMEOUT=300
+export POW_WORKERS=1

data/lib/gumdrop/version.rb

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

data/specs/content_spec.rb

@@ -0,0 +1,31 @@
+require 'minitest/spec'
+require 'minitest/autorun'
+require 'gumdrop'
+
+describe Gumdrop::Content do
+  # before do
+  #   @ho= Gumdrop::HashObject.new one:"ONE", two:"TWO", three:'THREE'
+  # end
+
+  # it "can be created with no arguments" do
+  #   Gumdrop::HashObject.new.must_be_instance_of Gumdrop::HashObject
+  # end
+
+  # it "can be used as a standard hash" do
+  #   @ho[:one].must_equal "ONE"
+  # end
+
+  # it "can be used as a standard with either a sym or string key" do
+  #   @ho[:two].must_equal "TWO"
+  #   @ho['two'].must_equal "TWO"
+  # end
+
+  # it "can be accessed like an object" do
+  #   @ho.three.must_equal "THREE"
+  # end
+
+  # it "should return nil for an unknown key" do
+  #   @ho.timmy.must_be_nil
+  # end
+
+end

data/specs/deferred_loader_spec.rb

@@ -0,0 +1,31 @@
+require 'minitest/spec'
+require 'minitest/autorun'
+require 'gumdrop'
+
+# describe Gumdrop::HashObject do
+#   before do
+#     @ho= Gumdrop::HashObject.new one:"ONE", two:"TWO", three:'THREE'
+#   end
+
+#   it "can be created with no arguments" do
+#     Gumdrop::HashObject.new.must_be_instance_of Gumdrop::HashObject
+#   end
+
+#   it "can be used as a standard hash" do
+#     @ho[:one].must_equal "ONE"
+#   end
+
+#   it "can be used as a standard with either a sym or string key" do
+#     @ho[:two].must_equal "TWO"
+#     @ho['two'].must_equal "TWO"
+#   end
+
+#   it "can be accessed like an object" do
+#     @ho.three.must_equal "THREE"
+#   end
+
+#   it "should return nil for an unknown key" do
+#     @ho.timmy.must_be_nil
+#   end
+
+# end

data/specs/hash_object_spec.rb

@@ -0,0 +1,31 @@
+require 'minitest/spec'
+require 'minitest/autorun'
+require 'gumdrop'
+
+describe Gumdrop::HashObject do
+  before do
+    @ho= Gumdrop::HashObject.new one:"ONE", two:"TWO", three:'THREE'
+  end
+
+  it "can be created with no arguments" do
+    Gumdrop::HashObject.new.must_be_instance_of Gumdrop::HashObject
+  end
+
+  it "can be used as a standard hash" do
+    @ho[:one].must_equal "ONE"
+  end
+
+  it "can be used as a standard with either a sym or string key" do
+    @ho[:two].must_equal "TWO"
+    @ho['two'].must_equal "TWO"
+  end
+
+  it "can be accessed like an object" do
+    @ho.three.must_equal "THREE"
+  end
+
+  it "should return nil for an unknown key" do
+    @ho.timmy.must_be_nil
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gumdrop
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-07-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70132697222300 !ruby/object:Gem::Requirement
+  requirement: &70223760593860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70132697222300
+  version_requirements: *70223760593860
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70132697221740 !ruby/object:Gem::Requirement
+  requirement: &70223760593440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70132697221740
+  version_requirements: *70223760593440
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70132697221280 !ruby/object:Gem::Requirement
+  requirement: &70223760593020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70132697221280
+  version_requirements: *70223760593020
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70132697220820 !ruby/object:Gem::Requirement
+  requirement: &70223760592600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70132697220820
+  version_requirements: *70223760592600
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70132697220260 !ruby/object:Gem::Requirement
+  requirement: &70223760592180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70132697220260
+  version_requirements: *70223760592180
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70132697219820 !ruby/object:Gem::Requirement
+  requirement: &70223743177860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70132697219820
+  version_requirements: *70223743177860
 description: A simple cms/prototyping tool.
 email: matt@elucidata.net
 executables:
@@ -116,6 +116,7 @@ files:
 - examples/simple/source/theme/templates/test.template.erb
 - gumdrop.gemspec
 - lib/gumdrop.rb
+- lib/gumdrop/build.rb
 - lib/gumdrop/cli.rb
 - lib/gumdrop/content.rb
 - lib/gumdrop/context.rb
@@ -123,6 +124,7 @@ files:
 - lib/gumdrop/dsl.rb
 - lib/gumdrop/generator.rb
 - lib/gumdrop/hash_object.rb
+- lib/gumdrop/logging.rb
 - lib/gumdrop/pager.rb
 - lib/gumdrop/server.rb
 - lib/gumdrop/template/default/Gemfile
@@ -131,6 +133,7 @@ files:
 - lib/gumdrop/template/default/data/config.yml
 - lib/gumdrop/template/default/lib/site.rb
 - lib/gumdrop/template/default/lib/view_helpers.rb
+- lib/gumdrop/template/default/powrc
 - lib/gumdrop/template/default/source/default.htaccess
 - lib/gumdrop/template/default/source/favicon.ico
 - lib/gumdrop/template/default/source/feed.xml.builder.txt
@@ -139,79 +142,12 @@ files:
 - lib/gumdrop/template/default/source/theme/scripts/app.js.coffee
 - lib/gumdrop/template/default/source/theme/styles/_tools.scss
 - lib/gumdrop/template/default/source/theme/templates/site.template.slim
-- lib/gumdrop/template/twitter/Gemfile
-- lib/gumdrop/template/twitter/Rakefile
-- lib/gumdrop/template/twitter/config.ru
-- lib/gumdrop/template/twitter/data/config.yml
-- lib/gumdrop/template/twitter/lib/site.rb
-- lib/gumdrop/template/twitter/lib/view_helpers.rb
-- lib/gumdrop/template/twitter/source/_sidebar.html.slim
-- lib/gumdrop/template/twitter/source/container-app.html.slim
-- lib/gumdrop/template/twitter/source/default.htaccess
-- lib/gumdrop/template/twitter/source/favicon.ico
-- lib/gumdrop/template/twitter/source/feed.xml.builder.txt
-- lib/gumdrop/template/twitter/source/fluid.html.slim
-- lib/gumdrop/template/twitter/source/hero.html.slim
-- lib/gumdrop/template/twitter/source/index.html.erb
-- lib/gumdrop/template/twitter/source/theme/screen.css.sass
-- lib/gumdrop/template/twitter/source/theme/scripts/app.js.coffee
-- lib/gumdrop/template/twitter/source/theme/scripts/jquery.js
-- lib/gumdrop/template/twitter/source/theme/styles/_tools.scss
-- lib/gumdrop/template/twitter/source/theme/templates/site.template.slim
-- lib/gumdrop/template/twitter/source/theme/twitter/LICENSE
-- lib/gumdrop/template/twitter/source/theme/twitter/Makefile
-- lib/gumdrop/template/twitter/source/theme/twitter/README.md
-- lib/gumdrop/template/twitter/source/theme/twitter/bootstrap-min.css
-- lib/gumdrop/template/twitter/source/theme/twitter/bootstrap.css
-- lib/gumdrop/template/twitter/source/theme/twitter/docs/assets/css/docs.css
-- lib/gumdrop/template/twitter/source/theme/twitter/docs/assets/ico/bootstrap-apple-114x114.png
-- lib/gumdrop/template/twitter/source/theme/twitter/docs/assets/ico/bootstrap-apple-57x57.png
-- lib/gumdrop/template/twitter/source/theme/twitter/docs/assets/ico/bootstrap-apple-72x72.png
-- lib/gumdrop/template/twitter/source/theme/twitter/docs/assets/ico/favicon.ico
-- lib/gumdrop/template/twitter/source/theme/twitter/docs/assets/img/bird.png
-- lib/gumdrop/template/twitter/source/theme/twitter/docs/assets/img/browsers.png
-- lib/gumdrop/template/twitter/source/theme/twitter/docs/assets/img/example-diagram-01.png
-- lib/gumdrop/template/twitter/source/theme/twitter/docs/assets/img/example-diagram-02.png
-- lib/gumdrop/template/twitter/source/theme/twitter/docs/assets/img/example-diagram-03.png
-- lib/gumdrop/template/twitter/source/theme/twitter/docs/assets/img/grid-18px.png
-- lib/gumdrop/template/twitter/source/theme/twitter/docs/assets/img/twitter-logo-no-bird.png
-- lib/gumdrop/template/twitter/source/theme/twitter/docs/assets/js/application.js
-- lib/gumdrop/template/twitter/source/theme/twitter/docs/assets/js/google-code-prettify/prettify.css
-- lib/gumdrop/template/twitter/source/theme/twitter/docs/assets/js/google-code-prettify/prettify.js
-- lib/gumdrop/template/twitter/source/theme/twitter/docs/index.html
-- lib/gumdrop/template/twitter/source/theme/twitter/docs/javascript.html
-- lib/gumdrop/template/twitter/source/theme/twitter/examples/container-app.html
-- lib/gumdrop/template/twitter/source/theme/twitter/examples/fluid.html
-- lib/gumdrop/template/twitter/source/theme/twitter/examples/hero.html
-- lib/gumdrop/template/twitter/source/theme/twitter/js/bootstrap-alerts.js
-- lib/gumdrop/template/twitter/source/theme/twitter/js/bootstrap-dropdown.js
-- lib/gumdrop/template/twitter/source/theme/twitter/js/bootstrap-modal.js
-- lib/gumdrop/template/twitter/source/theme/twitter/js/bootstrap-popover.js
-- lib/gumdrop/template/twitter/source/theme/twitter/js/bootstrap-scrollspy.js
-- lib/gumdrop/template/twitter/source/theme/twitter/js/bootstrap-tabs.js
-- lib/gumdrop/template/twitter/source/theme/twitter/js/bootstrap-twipsy.js
-- lib/gumdrop/template/twitter/source/theme/twitter/js/tests/index.html
-- lib/gumdrop/template/twitter/source/theme/twitter/js/tests/unit/bootstrap-alerts.js
-- lib/gumdrop/template/twitter/source/theme/twitter/js/tests/unit/bootstrap-dropdown.js
-- lib/gumdrop/template/twitter/source/theme/twitter/js/tests/unit/bootstrap-modal.js
-- lib/gumdrop/template/twitter/source/theme/twitter/js/tests/unit/bootstrap-popover.js
-- lib/gumdrop/template/twitter/source/theme/twitter/js/tests/unit/bootstrap-scrollspy.js
-- lib/gumdrop/template/twitter/source/theme/twitter/js/tests/unit/bootstrap-tabs.js
-- lib/gumdrop/template/twitter/source/theme/twitter/js/tests/unit/bootstrap-twipsy.js
-- lib/gumdrop/template/twitter/source/theme/twitter/js/tests/vendor/qunit.css
-- lib/gumdrop/template/twitter/source/theme/twitter/js/tests/vendor/qunit.js
-- lib/gumdrop/template/twitter/source/theme/twitter/lib/bootstrap.less
-- lib/gumdrop/template/twitter/source/theme/twitter/lib/forms.less
-- lib/gumdrop/template/twitter/source/theme/twitter/lib/mixins.less
-- lib/gumdrop/template/twitter/source/theme/twitter/lib/patterns.less
-- lib/gumdrop/template/twitter/source/theme/twitter/lib/reset.less
-- lib/gumdrop/template/twitter/source/theme/twitter/lib/scaffolding.less
-- lib/gumdrop/template/twitter/source/theme/twitter/lib/tables.less
-- lib/gumdrop/template/twitter/source/theme/twitter/lib/type.less
-- lib/gumdrop/template/twitter/source/theme/twitter/lib/variables.less
 - lib/gumdrop/utils.rb
 - lib/gumdrop/version.rb
 - lib/gumdrop/view_helpers.rb
+- specs/content_spec.rb
+- specs/deferred_loader_spec.rb
+- specs/hash_object_spec.rb
 homepage: https://github.com/darthapo/gumdrop
 licenses: []
 post_install_message: