roda-component 0.1.26 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78dab2bcfa41cf6dd926bd00316b62a0e002f7e6
-  data.tar.gz: 9adfd1a24eca3929430845cdc978e802712509da
+  metadata.gz: 34af2117ec9844c79388172c7925327234a15420
+  data.tar.gz: 47664199fa77227ee28102b6b3e7f0b79525f49e
 SHA512:
-  metadata.gz: 036dbdf68ded63e356696c7e4dc7d3a6e80748965b8e298c8f84a329f526011c4bc2224ce35178982ed6f3fcad506931bff76b731cc654f22ab8c1dfbc88aada
-  data.tar.gz: 8006ec9a03a51489fa03f931432a2e12d481907aa124a33786646b634e7fdb2dbeecbb0a6d80d9605f3293d43d9a67e285935e536463ea60d1f5ee61728691f6
+  metadata.gz: e1da41e5dd0a4abb369e5c51b3d6407f5dfe46686bd43e7a5f44ba1cddf75300ab2993ab485d712e815cf5418289c1bd9f0024c6d33c2e852582b2cb6eee0541
+  data.tar.gz: 4bf89d4fb46a3d17ecab201d12e2fc462acb3baf2410ddbd857422f1ffc45dc5ab41600644c65ff720498c146ce38e37410339590e0d3d66c7fd1fef207e0589

data/lib/roda/component.rb

@@ -6,6 +6,27 @@ unless RUBY_ENGINE == 'opal'
   require 'tilt'
   require 'nokogiri'
 
+  # this is to fix `.maps` not using correct url.
+  module Opal
+    class Processor < Tilt::Template
+      def evaluate(context, locals, &block)
+        return Opal.compile data unless context.is_a? ::Sprockets::Context
+
+        path = context.logical_path
+        prerequired = []
+
+        builder = self.class.new_builder(context)
+        result = builder.build_str(data, path, :prerequired => prerequired)
+
+        if self.class.source_map_enabled
+          register_source_map(context.logical_path, result.source_map.to_s)
+          "#{result.to_s}\n//# sourceMappingURL=/#{Roda::Component.app.component_opts[:assets_route]}/#{context.logical_path}.map\n"
+        else
+          result.to_s
+        end
+      end
+    end
+  end
 
   module Nokogiri
     module XML

data/lib/roda/component/element.rb

@@ -4,6 +4,14 @@ class Element
   alias_native :serialize_array, :serializeArray
   alias_native :has_class, :hasClass
   alias_native :click
+
+  def get_script url, &block
+    %x{
+      $.getScript(url, function(){
+        #{block.call if block_given?}
+      });
+    }
+  end
 end
 
 class String

data/lib/roda/component/version.rb

@@ -1,5 +1,5 @@
 class Roda
   class Component
-    VERSION = "0.1.26"
+    VERSION = "0.1.27"
   end
 end

data/lib/roda/plugins/component.rb

@@ -81,26 +81,28 @@ class Roda
           options   = Base64.encode64 options.to_json
           comp_name = comp.class._name
 
+          file_path = comp.class.instance_methods(false).map { |m|
+              comp.class.instance_method(m).source_location.first
+          }.uniq.first.gsub("#{Dir.pwd}/#{component_opts[:path]}", '').gsub(/\.rb\Z/, '.js')
+
           js = <<-EOF
             unless $faye
               $faye = Roda::Component::Faye.new('/faye')
             end
 
             unless $component_opts[:comp][:"#{comp_name}"]
-              Document.ready? do
-                c = $component_opts[:comp][:"#{comp_name}"] = #{comp.class}.new
-                c.instance_variable_set(:@_cache, JSON.parse(Base64.decode64('#{cache}')))
-                c.events.trigger_jquery_events
-                c.#{action}(JSON.parse(Base64.decode64('#{options}')))
-              end
+              $component_opts[:comp][:"#{comp_name}"] = true
+              `$.getScript("/#{component_opts[:assets_route]}#{file_path}", function(){`
+                Document.ready? do
+                  c = $component_opts[:comp][:"#{comp_name}"] = #{comp.class}.new
+                  c.instance_variable_set(:@_cache, JSON.parse(Base64.decode64('#{cache}')))
+                  c.events.trigger_jquery_events
+                  c.#{action}(JSON.parse(Base64.decode64('#{options}')))
+                end
+              `});`
             end
           EOF
 
-          file_path = comp.class.instance_methods(false).map { |m|
-              comp.class.instance_method(m).source_location.first
-          }.uniq.first.gsub("#{Dir.pwd}/#{component_opts[:path]}", '').gsub(/\.rb\Z/, '.js')
-
-          loaded_component_js << "<script type=\"text/javascript\" src=\"/#{component_opts[:assets_route]}#{file_path}\"></script>"
           loaded_component_js << ("<script>#{Opal.compile(js)}</script>")
         end
 
@@ -194,12 +196,16 @@ class Roda
           opal = Opal::Server.new do |s|
             # Append the gems path
             if scope.component_opts[:debug]
-              s.debug = true
+              s.debug      = true
               s.source_map = true
             else
               s.source_map = false
             end
 
+            # we are loading the source maps ourselves
+
+            s.prefix = "/#{scope.component_opts[:assets_route]}"
+
             s.append_path Gem::Specification.find_by_name("roda-component").gem_dir + '/lib'
 
             # Append the path to the components folder
@@ -217,7 +223,6 @@ class Roda
               if path[/\.rb\Z/] && js_file = scope.request.env['PATH_INFO'].scan(/(.*\.map)/)
                 scope.request.env['PATH_INFO'] = path.gsub(js_file.last.first, '').gsub("/#{scope.component_opts[:assets_route]}", '')
               end
-
               run Opal::SourceMapServer.new(opal.sprockets, path)
             end
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda-component
 version: !ruby/object:Gem::Version
-  version: 0.1.26
+  version: 0.1.27
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-01 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal