parade 0.10.0 → 0.10.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjNhNWQwYjM4NjFkMmVmMTRiY2MyZTJiMjIwZjQ2OWJiYjcxNmNmYg==
+    MmQ4ZTVkZmZkN2YwYWIwYmZlNjZlNDdmMGY1OWIyMGI2MjhkNDY4NQ==
   data.tar.gz: !binary |-
-    MTBkM2E3OTA5NmY0ODBhMGM3NDViZjk0M2NlYmNjNTA5ODQ1NGY4NA==
+    OWU1ZWIyZDNiYmYwYzExMTJhZjU2ZDc2MTQxMTVjZWM3Y2U5MzJlOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Y2M5MjcyYTg4OWQyNDQ1MmNkNGJlZGNlNTljMTM0NDUwMTU5YWVmODFiNTA4
-    ZTlhNGMwZWJlOTcwNzI1NDQ5OGMxZjM4OGRjOTc2OWEyZjQwYmQ4NzllMzlj
-    NTljMmRjOTA3YzhjMGQ4MGM2ZWQwMDg5YTE5MTZiNDNkYmE2ZjA=
+    OWI5MmRhMDUyYjkyYzczYzhlMzA1ZjExYTBjOWJkNmVkMzg0NTEwOTYxYzFj
+    NWMzNDEwNWNhNTU3ZDI5NzA3ZjAxMTBiOGRiMTdjZjUzNzBlMDE4ZGI2NThh
+    ZTg3N2UyMWY3OTc0YTgyMGFmYzU2NjdhYmEwMjk0NWQ4ZGQwMTc=
   data.tar.gz: !binary |-
-    OGE1Yjg2ZDgzNmVjZTVhZWU3OTBkNzY1YmU5NTQ3ZWE3ODhhNzhkZDc5MDlj
-    ODIzZWJiNGE4ZTc3YjFmYjYwZDdhMTc5MDU1M2U4YTk3NGRjOGFmN2E0M2I3
-    OTViNmY2MmYwYjE5NDc0MjA0MTcxODk3NmFjNTA5OWExNDlhMjg=
+    ZTdjMGQ0NTdiOWU5YTJhMGY0ZDE1YTE0ODdkMDk3MjBkOGE3MzM3ZWIzMjY2
+    MWM5ZTliOWI4ZDI1MDgwODQxMDI2N2RkYjc3MjAyZTFlZmE1OWRiMWU0NDNl
+    YzlhYTFiZGQzNDE0MDBjOWM0NGFiYjFjZDQ1Y2QyY2JhMjg2Y2Q=

data/lib/parade/renderers/update_image_paths.rb

@@ -32,7 +32,9 @@ module Parade
         content.gsub(/img src=["'](?!https?:\/\/)\/?([^\/].*?)["']/) do |image_source|
           image_name = Regexp.last_match(1)
 
-          html_image_path = File.join("/","image",image_name)
+          presentation_path_prefix = options[:presentation_path_prefix].to_s
+
+          html_image_path = File.join(presentation_path_prefix,"/","image",image_name)
           updated_image_source = %{img src="#{html_image_path}"}
 
           html_asset_path = File.join(render_root_path,image_name)

data/lib/parade/server.rb

@@ -91,12 +91,17 @@ module Parade
 
     helpers do
 
+      def presentation_path_prefix
+        env['SCRIPT_NAME'].to_s
+      end
+
       #
       # A shortcut to define a CSS resource file within a view template
       #
       def css(*filepaths)
         filepaths.map do |filepath|
-          %{<link rel="stylesheet" href="#{File.join "css", filepath}" type="text/css"/>}
+          css_path = File.join(presentation_path_prefix,"css",filepath)
+          %{<link rel="stylesheet" href="#{css_path}" type="text/css"/>}
         end.join("\n")
       end
 
@@ -105,7 +110,8 @@ module Parade
       #
       def js(*filepaths)
         filepaths.map do |filepath|
-          %{<script type="text/javascript" src="#{File.join "js", filepath}"></script>}
+          js_path = File.join(presentation_path_prefix,"js",filepath)
+          %{<script type="text/javascript" src="#{js_path}"></script>}
         end.join("\n")
       end
 
@@ -173,6 +179,7 @@ module Parade
       end
 
       def slides(options = {})
+        options = { presentation_path_prefix: presentation_path_prefix }
         presentation.to_html(options)
       end
 

data/lib/parade/version.rb

@@ -1,3 +1,3 @@
 module Parade
-  VERSION = '0.10.0'
+  VERSION = '0.10.1'
 end

data/lib/public/js/parade.js

@@ -161,15 +161,14 @@ $(document).ready(function() {
       this.element.hide()
     },
     load: function(options,afterLoad) {
-      // get the current window height x width
-      var slidesURL = "/slides?height=" + options.height + "&width=" + options.width;
+
+      var slidesURL = options.urlPrefix + "/slides?height=" + options.height + "&width=" + options.width;
+
       $("#slides").load(slidesURL,$.proxy(function() {
         this.slides = $("#slides > .slide");
         afterLoad();
-        // $("#slides img").batchImageLoad({
-        //   loadingCompleteCallback: presentation.initialize()
-        // });
       },this));
+
     },
     size: function() {
       return this.slides.size();
@@ -311,7 +310,8 @@ $(document).ready(function() {
     init: function() {
 
       var options = { height: this.presentationFrame.height(),
-      width: this.presentationFrame.width() };
+      width: this.presentationFrame.width(),
+      urlPrefix: arguments[0] };
 
       this.slides = new Slides(options,$.proxy(function() {
         this.start();
@@ -531,29 +531,4 @@ $(document).ready(function() {
   });
 
 
-});
-
-$(document).ready(function() {
-  presentation = new Presentation();
-
-  var locationWatcher = new LocationWatcher();
-  locationWatcher.start();
-
-  /* Add Support for Devices */
-
-  var presoElement = document.getElementById('preso');
-
-  Hammer(presoElement).on("swipeleft", function() {
-    $.publish("presentation:slide:next");
-  });
-
-  Hammer(presoElement).on("swiperight", function() {
-    $.publish("presentation:slide:previous");
-  });
-
-  // bind event handlers
-  /* window.onresize  = resized; */
-  /* window.onscroll = scrolled; */
-  /* window.onunload = unloaded; */
-
-});
+});

data/lib/views/index.erb

@@ -26,5 +26,34 @@
   <%= pause_message %>
 </div>
 
+<script type="text/javascript">
+
+  $(document).ready(function() {
+    presentation = new Presentation('<%= presentation_path_prefix %>');
+
+    var locationWatcher = new LocationWatcher();
+    locationWatcher.start();
+
+    /* Add Support for Touch Devices */
+
+    var presoElement = document.getElementById('preso');
+
+    Hammer(presoElement).on("swipeleft", function() {
+      $.publish("presentation:slide:next");
+    });
+
+    Hammer(presoElement).on("swiperight", function() {
+      $.publish("presentation:slide:previous");
+    });
+
+    // bind event handlers
+    /* window.onresize  = resized; */
+    /* window.onscroll = scrolled; */
+    /* window.onunload = unloaded; */
+
+  });
+
+</script>
+
 </body>
 </html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parade
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Scott Chacon