highcarb 0.2 → 0.2.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    highcarb (0.1)
+    highcarb (0.2)
       coffee-script
       em-websocket
       haml
@@ -15,30 +15,30 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.7)
+    addressable (2.3.2)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.2.0)
-    daemons (1.1.8)
-    em-websocket (0.3.6)
+    coffee-script-source (1.3.3)
+    daemons (1.1.9)
+    em-websocket (0.3.8)
       addressable (>= 2.1.1)
       eventmachine (>= 0.12.9)
-    eventmachine (0.12.10)
-    execjs (1.3.0)
+    eventmachine (1.0.0)
+    execjs (1.4.0)
       multi_json (~> 1.0)
-    haml (3.1.4)
-    kramdown (0.13.5)
-    mime-types (1.17.2)
-    multi_json (1.1.0)
-    nokogiri (1.5.0)
+    haml (3.1.7)
+    kramdown (0.14.0)
+    mime-types (1.19)
+    multi_json (1.3.6)
+    nokogiri (1.5.5)
     rack (1.4.1)
-    sass (3.1.15)
-    thin (1.3.1)
+    sass (3.2.1)
+    thin (1.5.0)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    trollop (1.16.2)
+    trollop (2.0)
 
 PLATFORMS
   ruby

data/lib/highcarb/generator.rb

@@ -66,6 +66,10 @@ module HighCarb
           vendor_path.children.first.rename vendor_path.join("deck.js")
         end
       end
+
+      create_file path.join("config.yml"), {
+        "jquery" => Dir.chdir(path) { "/#{Dir["assets/**/jquery*.js"].first}" }
+      }.to_yaml
     end
 
     # Helpers

data/lib/highcarb/rack_app.rb

@@ -3,6 +3,7 @@ require "mime/types"
 require "pathname"
 require "haml"
 require "kramdown"
+require "yaml"
 
 require "highcarb/assets_controller"
 require "highcarb/slides_controller"
@@ -19,11 +20,15 @@ module HighCarb
     attr_reader :command
     attr_reader :root
     attr_reader :assets_root
+    attr_reader :config
 
     def initialize(command)
       @command = command
       @root = Pathname.new(command.args.first)
       @assets_root = @root.join("./assets")
+
+      config_path = @root.join("config.yml")
+      @config = config_path.exist? ? YAML.load(config_path.read) : {}
     end
 
     def plain_response!(status, content)

data/lib/highcarb/version.rb

@@ -1,3 +1,3 @@
 module HighCarb
-  Version = "0.2"
+  Version = "0.2.1"
 end

data/lib/highcarb/views_controller.rb

@@ -8,8 +8,9 @@ module HighCarb
     DefaultViewsPath = Pathname.new(File.expand_path("../../../resources/views/", __FILE__))
 
     class ViewContext
-      attr_reader :options, :root
-      def initialize(options, root)
+      attr_reader :app, :options, :root
+      def initialize(app, options, root)
+        @app = app
         @options = options
         @root = root
       end
@@ -17,6 +18,10 @@ module HighCarb
       def load_coffe(source)
         "<script>//<![CDATA[\n" + CoffeeScript.compile(root.join(source + ".coffee").read) + "\n//]]></script>"
       end
+
+      def jquery_path
+        Dir.chdir(root) { Dir["assets/vendor/deck.js/jquery-*.js"].first }
+      end
     end
 
     def render_view(view_name)
@@ -29,7 +34,7 @@ module HighCarb
         not_found! view_name + " view"
       end
 
-      output = Haml::Engine.new(view_path.read).render(ViewContext.new(command.options, view_path.dirname))
+      output = Haml::Engine.new(view_path.read).render(ViewContext.new(self, command.options, view_path.dirname))
 
       throw :response, [200, {'Content-Type' => 'text/html'}, output]
     end

data/resources/views/index.haml

@@ -6,7 +6,7 @@
   %body.presenter.deck-container
     .slides Loading...
 
-    %script{ src: "/assets/vendor/deck.js/jquery-1.7.min.js" }
+    %script{ src: app.config["jquery"] }
     %script{ src: "/assets/vendor/deck.js/modernizr.custom.js" }
     %script{ src: "/assets/vendor/deck.js/core/deck.core.js" }
     %script{ src: "/assets/vendor/deck.js/extensions/menu/deck.menu.js" }

data/resources/views/remote.haml

@@ -2,7 +2,7 @@
 %html
   %head
     %title Remote control
-    %script{ src: "/assets/vendor/deck.js/jquery-1.7.min.js" }
+    %script{ src: app.config["jquery"] }
     %script{ src: "/assets/custom.coffee" }
     %script{ src: "/assets/custom-remote.coffee" }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: highcarb
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-20 00:00:00.000000000 Z
+date: 2012-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thin