gumdrop 0.3.3 → 0.3.4

data/ChangeLog.md

@@ -1,3 +1,8 @@
+# v0.3.4
+- Fixed a bug in the default template
+- Added custom Stitch compilers for hogan, css/sass, and serenade files.
+- Added -r --reload switches to commandline to force reloading on server, per request.
+
 # v0.3.3
 - Updated Backbone template to include a default view (and some core bugfixes)
 

data/lib/gumdrop/cli.rb

@@ -22,6 +22,7 @@ EOS
   opt :build,  "Build HTML output"
   opt :server, "Runs development server"
     opt :port, "Specifies port to run server on", :type=>:int
+    opt :reload, "Force reloading on dev server"
 end
 
 # Trollop::die :volume, "must be non-negative" if opts[:volume] < 0
@@ -58,6 +59,7 @@ elsif opts[:build_given]
 
 elsif opts[:server_given]
   Gumdrop.config.auto_run= true
+  Gumdrop.config.force_reload= opts[:reload_given]
   Gumdrop::Server
 
 else

data/lib/gumdrop/generator.rb

@@ -54,6 +54,7 @@ module Gumdrop
     
     def stitch(name, opts)
       require 'gumdrop/stitch_ex'
+      require 'gumdrop/stitch_compilers'
       page name do
         content= Stitch::Package.new(opts).compile
         if opts[:compress]

data/lib/gumdrop/stitch_compilers.rb

@@ -0,0 +1,99 @@
+require 'stitch-rb'
+
+class SerenadeCompiler < Stitch::Compiler
+  
+  extensions :serenade
+  
+  def compile(path)
+    content= File.read(path)
+    viewname= File.basename(path).gsub('.serenade', '').gsub('.html', '').gsub('.', '_')
+    %{
+      Serenade.view(#{ viewname.to_json }, #{content.to_json});
+    }
+  end
+  
+end
+
+class HoganCompiler < Stitch::Compiler
+  # List of supported extensions
+  extensions :mustache
+
+  # A compile method which takes a file path,
+  # and returns a compiled string
+  def compile(path)
+    content = File.read(path)
+    %{
+      var template = Hogan.compile(#{content.to_json});
+      module.exports = (function(data){ return template.render(data); });
+    }
+  end
+end
+
+module CssJsCode
+  
+  def export_js_code(path)
+    content= File.read(path)
+    %{
+      var css = #{ transpile(content, File.extname(path)).to_json },
+          node = null;
+      module.exports= {
+        content: css,
+        add: function(to){
+          if(node != null) return;
+          if(to == null) to= document.getElementsByTagName('HEAD')[0] || document.body;
+          node= document.createElement('style');
+          node.innerHTML= css;
+          to.appendChild(node);
+          return this;
+        },
+        remove: function() {
+          if(node != null) {
+            node.parentNode.removeChild(node);
+            node = null;
+          }
+          return this;
+        }
+      };
+    }
+  end
+
+  def transpile(content, ext)
+    content
+  end
+
+end
+
+class CssCompiler < Stitch::Compiler
+  include CssJsCode
+
+  extensions :css
+
+  def compile(path)
+    export_js_code path
+  end
+
+end
+
+
+begin
+  require 'sass'
+
+  class SassCompiler < Stitch::Compiler
+    include CssJsCode
+
+    extensions :sass, :scss
+
+    def compile(path)
+      export_js_code path
+    end
+
+    def transpile(content, ext)
+      type = (ext == '.sass') ? :sass : :scss
+      Sass::Engine.new(content, :syntax=>type).render
+    end
+  end
+
+rescue
+  # Sass Not available
+end
+

data/lib/gumdrop/template/backbone/app/views/home.js.coffee

@@ -0,0 +1,17 @@
+{log}= require 'utils'
+
+
+class HomeView extends Backbone.View
+  className: 'home'
+
+  src:
+    template: require('./templates/home')
+    styles: require('./styles/home')
+
+  render: -> 
+    @src.styles.add()
+    @el.innerHTML= @src.template({})
+    @
+
+
+module.exports= HomeView

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

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

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

@@ -11,7 +11,8 @@ end
 require 'slim'
 Slim::Engine.set_default_options pretty:true
 
-require 'stitch_compilers'
+# If you want to specify custom stitch compilers, uncomment this:
+#require 'stitch_compilers'
 
 generate do
 

data/lib/gumdrop/template/backbone/lib/stitch_compilers.rb

@@ -1,85 +1 @@
-require 'stitch-rb'
-
-class HoganCompiler < Stitch::Compiler
-  # List of supported extensions
-  extensions :mustache
-
-  # A compile method which takes a file path,
-  # and returns a compiled string
-  def compile(path)
-    content = File.read(path)
-    %{
-      var template = Hogan.compile(#{content.to_json});
-      module.exports = (function(data){ return template.render(data); });
-    }
-  end
-end
-
-module CssJsCode
-  
-  def export_js_code(path)
-    content= File.read(path)
-    %{
-      var css = #{ transpile(content, File.extname(path)).to_json },
-          node = null;
-      module.exports= {
-        content: css,
-        add: function(to){
-          if(node != null) return;
-          if(to == null) to= document.getElementsByTagName('HEAD')[0] || document.body;
-          node= document.createElement('style');
-          node.innerHTML= css;
-          to.appendChild(node);
-          return this;
-        },
-        remove: function() {
-          if(node != null) {
-            node.parentNode.removeChild(node);
-            node = null;
-          }
-          return this;
-        }
-      };
-    }
-  end
-
-  def transpile(content, ext)
-    content
-  end
-
-end
-
-class CssCompiler < Stitch::Compiler
-  include CssJsCode
-
-  extensions :css
-
-  def compile(path)
-    export_js_code path
-  end
-
-end
-
-
-begin
-  require 'sass'
-
-  class SassCompiler < Stitch::Compiler
-    include CssJsCode
-
-    extensions :sass, :scss
-
-    def compile(path)
-      export_js_code path
-    end
-
-    def transpile(content, ext)
-      type = (ext == '.sass') ? :sass : :scss
-      Sass::Engine.new(content, :syntax=>type).render
-    end
-  end
-
-rescue
-  # Sass Not available
-end
-
+# You can add your own stitch compilers here...

data/lib/gumdrop/template/default/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gem "i18n"
 gem "sinatra"
-gem "active_support"]
+gem "active_support"
 
 gem "rake"
 gem "gumdrop"

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

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

data/lib/gumdrop/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gumdrop
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-07-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70203140877540 !ruby/object:Gem::Requirement
+  requirement: &70198988300240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70203140877540
+  version_requirements: *70198988300240
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &70203140876080 !ruby/object:Gem::Requirement
+  requirement: &70198988298660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70203140876080
+  version_requirements: *70198988298660
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70203140874980 !ruby/object:Gem::Requirement
+  requirement: &70198988297060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70203140874980
+  version_requirements: *70198988297060
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70203140874060 !ruby/object:Gem::Requirement
+  requirement: &70198988296220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70203140874060
+  version_requirements: *70198988296220
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70203140873180 !ruby/object:Gem::Requirement
+  requirement: &70198988295160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70203140873180
+  version_requirements: *70198988295160
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70203140872140 !ruby/object:Gem::Requirement
+  requirement: &70198988293960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70203140872140
+  version_requirements: *70198988293960
 description: A simple cms/prototyping tool.
 email: matt@elucidata.net
 executables:
@@ -127,6 +127,7 @@ files:
 - lib/gumdrop/logging.rb
 - lib/gumdrop/pager.rb
 - lib/gumdrop/server.rb
+- lib/gumdrop/stitch_compilers.rb
 - lib/gumdrop/stitch_ex.rb
 - lib/gumdrop/template/backbone/Gemfile
 - lib/gumdrop/template/backbone/Rakefile
@@ -134,9 +135,9 @@ files:
 - lib/gumdrop/template/backbone/app/init.js.coffee
 - lib/gumdrop/template/backbone/app/models/.gitkeep
 - lib/gumdrop/template/backbone/app/utils/index.js.coffee
-- lib/gumdrop/template/backbone/app/views/views/home.js.coffee
-- lib/gumdrop/template/backbone/app/views/views/styles/home.scss
-- lib/gumdrop/template/backbone/app/views/views/templates/home.mustache
+- lib/gumdrop/template/backbone/app/views/home.js.coffee
+- lib/gumdrop/template/backbone/app/views/styles/home.scss
+- lib/gumdrop/template/backbone/app/views/templates/home.mustache
 - lib/gumdrop/template/backbone/config.ru
 - lib/gumdrop/template/backbone/data/config.yml
 - lib/gumdrop/template/backbone/lib/javascript/all.js.coffee

data/lib/gumdrop/template/backbone/app/views/views/home.js.coffee

@@ -1,17 +0,0 @@
-{log}= require 'utils'
-
-
-class HomeView extends Backbone.View
-  className: 'home'
-
-  template: require('./templates/home')
-  styles: require('./styles/home')
-
-  render: -> 
-    log @styles
-    @styles.add()
-    @el.innerHTML= @template({})
-    @
-
-
-module.exports= HomeView