wedge 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1fb126f1b18f0f6061d4e1b0d3d967f3d78928f
-  data.tar.gz: 6f421eb5d042463bec1af15d8868f3b867903367
+  metadata.gz: ce2530673c2bea5a82a3493eccee06ca6b38edb8
+  data.tar.gz: 749f488627caa91778e41654e56624e6497c0c1b
 SHA512:
-  metadata.gz: a467b85df744470770de8c6d657cff332c6888a9148e524cdd6fd4e6bd1a3f5d117409091054b50cba121d269eacba68c57473c65032bb5cdb40ca84b932d6ca
-  data.tar.gz: 6ce2261bd89a666e40e0ffed0779bc48b79bcad79ddc7ef4db26400bb3d11fcc6dd75f8032eb177aeacc0b44fbc234061e2be9862e4c7e206ec3ebfff3856d1b
+  metadata.gz: 59e62d4db567029a0a3b52ea62828d830c5305eb13d2f08cf6ab8c8643564a46b2d001477e87e4e7f10339ea6eb66b4cc31d326857f2bfaff4577f57b381546a
+  data.tar.gz: ac916c88681edf2a142e660b0dee92c07a46108acbb26b200324e691c1421f592de925f6cdfb1ec2c968549d26477b11acbfffa8435d5dfbe145617d37869e37

data/lib/wedge.rb

@@ -145,28 +145,7 @@ class Wedge
 
       if server?
         javascript_cache[path_name] ||= begin
-          js = options.delete(:js) || build(path_name, options).javascript
-
-          if path_name == 'wedge'
-            compiled_data = Base64.encode64 config.client_data.to_json
-            # We need to merge in some data that is only set on the server.
-            # i.e. path, assets_key etc....
-            js << Opal.compile("Wedge.config.data = HashObject.new(Wedge.config.data.to_h.merge JSON.parse(Base64.decode64('#{compiled_data}')))")
-            # load all global plugins into wedge
-            config.plugins.each do |path|
-              js << Wedge.javascript(path)
-            end
-          elsif comp_class = Wedge.config.component_class[path_name.gsub(/\//, '__')]
-            comp_class.config.on_compile.each { |blk| comp_class.instance_eval(&blk) }
-            comp_name     = comp_class.config.name
-            compiled_data = Base64.encode64 comp_class.config.client_data.to_json
-
-            js << Opal.compile("Wedge.config.component_class[:#{comp_name}].config.data = HashObject.new(Wedge.config.component_class[:#{comp_name}].config.data.to_h.merge JSON.parse(Base64.decode64('#{compiled_data}')))")
-
-            load_requires path_name, js
-          end
-
-          js
+          build(path_name, options).to_s
         end
       else
         url   = "#{Wedge.assets_url_with_host}/#{options[:path]}.js"
@@ -196,23 +175,6 @@ class Wedge
       end
     end
 
-    def load_requires path_name, js
-      if requires = config.requires[path_name.gsub(/\//, '__')]
-        requires.each do |path|
-          next unless comp_class = Wedge.config.component_class[path]
-
-          comp_class.config.on_compile.each { |blk| comp_class.instance_eval(&blk) }
-
-          comp_name     = comp_class.config.name
-          compiled_data = Base64.encode64 comp_class.config.client_data.to_json
-
-          load_requires path, js
-
-          js << Opal.compile("Wedge.config.component_class[:#{comp_name}].config.data = HashObject.new(Wedge.config.component_class[:#{comp_name}].config.data.to_h.merge JSON.parse(Base64.decode64('#{compiled_data}')))")
-        end
-      end
-    end
-
     def config
       @config ||= begin
         args = { component_class: IndifferentHash.new }

data/lib/wedge/config.rb

@@ -17,6 +17,7 @@ class Wedge
         html: nil,
         scope: nil,
         debug: false,
+        app_dir: 'app',
         assets_url: '/assets/wedge',
         assets_key: nil,
         cache_assets: false,

data/lib/wedge/opal.rb

@@ -9,6 +9,61 @@ unless RUBY_ENGINE == 'opal'
         to_s
       end
     end
+
+    def self.original_compile(source, options = {})
+      Compiler.new(source, options).original_compile
+    end
+
+    class Compiler
+      alias_method :original_compile, :compile
+      def compile
+        @result = original_compile
+
+        if defined? Wedge
+          logical_path = self.file
+          classes    = Wedge.config.component_class
+          comp_class = classes["#{Wedge.config.app_dir}/#{logical_path}".gsub(/\//, '__')] || classes[logical_path.gsub(/\//, '__')]
+
+          if logical_path == 'wedge'
+            compiled_data = Base64.encode64 Wedge.config.client_data.to_json
+            # We need to merge in some data that is only set on the server.
+            # i.e. path, assets_key etc....
+            @result << Opal.original_compile("require '#{self.file}'; Wedge.config.data = HashObject.new(Wedge.config.data.to_h.merge JSON.parse(Base64.decode64('#{compiled_data}')))")
+            # load all global plugins into wedge
+            Wedge.config.plugins.each do |path|
+              @result << Builder.build(path).to_s
+            end
+          elsif comp_class
+            comp_class.config.on_compile.each { |blk| comp_class.instance_eval(&blk) }
+            comp_name     = comp_class.config.name
+            compiled_data = Base64.encode64 comp_class.config.client_data.to_json
+
+            @result << Opal.original_compile("require '#{self.file}'; Wedge.config.component_class[:#{comp_name}].config.data = HashObject.new(Wedge.config.component_class[:#{comp_name}].config.data.to_h.merge JSON.parse(Base64.decode64('#{compiled_data}')))")
+
+            load_requires logical_path
+          end
+        end
+
+        @result
+      end
+
+      def load_requires path_name
+        if requires = Wedge.config.requires[path_name.gsub(/\//, '__')]
+          requires.each do |path|
+            next unless comp_class = Wedge.config.component_class[path]
+
+            comp_class.config.on_compile.each { |blk| comp_class.instance_eval(&blk) }
+
+            comp_name     = comp_class.config.name
+            compiled_data = Base64.encode64 comp_class.config.client_data.to_json
+
+            load_requires path
+
+            @result << Opal.original_compile("require '#{path}'; Wedge.config.component_class[:#{comp_name}].config.data = HashObject.new(Wedge.config.component_class[:#{comp_name}].config.data.to_h.merge JSON.parse(Base64.decode64('#{compiled_data}')))")
+          end
+        end
+      end
+    end
   end
 end
 

data/lib/wedge/version.rb

@@ -1,3 +1,3 @@
 class Wedge
-  VERSION = '0.1.12'
+  VERSION = '0.1.13'
 end

data/playground/app/app.rb

@@ -25,8 +25,14 @@ class Playground
     }
   }
 
+  # builder = Opal::Builder.new(:stubs=>['opal'])
+  # builder.append_paths(APP_ROOT)
+  # builder.use_gem('opal-jquery')
+  # builder.use_gem('wedge')
+
   plugin :assets, {
     path: "#{APP_ROOT}/../", css_dir: '', js_dir: '', group_subdirs: false,
+    # js_opts: { builder: builder }
     css: {
       default: [
         'public/vendor/normalize-css/normalize.css',

data/playground/app/components/index.rb

@@ -1,3 +1,5 @@
+require_relative 'layout'
+
 class Playground
   class IndexComponent < Wedge::Component
     name :index

data/playground/public/includes/_head.html

@@ -1,9 +1,3 @@
-<script type="text/javascript">
-  document.write('<script src="http://'
-    + (location.host || 'localhost').split(':')[0]
-    + ':35729/livereload.js"></'
-    + 'script>')</script>
-</script>
 <meta charset="utf-8" />
 <!--Page Info--><title>Wedge - </title><!--Styles-->
 <link href="css/styles.css" rel="stylesheet" />

data/playground/public/index.html

@@ -1,12 +1,6 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script type="text/javascript">
-      document.write('<script src="http://'
-        + (location.host || 'localhost').split(':')[0]
-        + ':35729/livereload.js"></'
-        + 'script>')</script>
-    </script>
     <meta charset="utf-8" />
     <!--Page Info--><title>Wedge - </title><!--Styles-->
     <link href="css/styles.css" rel="stylesheet" />

data/playground/public/uploader.html

@@ -1,12 +1,6 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script type="text/javascript">
-      document.write('<script src="http://'
-        + (location.host || 'localhost').split(':')[0]
-        + ':35729/livereload.js"></'
-        + 'script>')</script>
-    </script>
     <meta charset="utf-8" />
     <!--Page Info--><title>Wedge - </title><!--Styles-->
     <link href="css/styles.css" rel="stylesheet" />

data/playground/src/includes/_head.slim

@@ -1,9 +1,9 @@
 / Remove this in production
-javascript:
-  document.write('<script src="http://'
-    + (location.host || 'localhost').split(':')[0]
-    + ':35729/livereload.js"></'
-    + 'script>')</script>
+/javascript:
+/  document.write('<script async src="http://'
+/    + (location.host || 'localhost').split(':')[0]
+/    + ':35729/livereload.js"></'
+/    + 'script>')</script>
 meta charset="utf-8"
 /! Page Info
 title

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wedge
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -281,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Components for the Browser and Server