wedge 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 718735ba9ce3899b2c328eb7bd411f0244003724
-  data.tar.gz: 45ac6eb70f51932a213a9c64b317ca3b7d12034d
+  metadata.gz: a94aeb77ec52e4aeac034e6f49461c0a83d563e3
+  data.tar.gz: 1bf42f2f509758307845f8aaf82e9e09df0772ae
 SHA512:
-  metadata.gz: c5f46f7e97f8df35c2e1c4c934a0a402aabf20ae4cef61b09b83841271bd56e7e185c86d5f3ba0619a7e0b988e8260f3aa8cd2ffb88648f665e8cbf667e9a409
-  data.tar.gz: 64a4d78594594771581d2175e848ce982e71fc0b0bf279b90c6169d53705929f0689563165c74322c7d1c7060f1cdd90419be2637e4f7747fcf2c2c46912ef5b
+  metadata.gz: 995a85b4e0cf6ebbce656c4d72238bfe254460a28c5912d0c5eb06e918cb36d7c39666fe923514e1fa06c35837cf8a074cf7b4608f689e47bc19393381de9a08
+  data.tar.gz: c98f4ecfc2025f8d2e2942a393025a0ad7f4a0d2649643d5ee84b636a5b7da408b549d060b6f76f2ca5c24fe8ebdcd887c6bf2f7ef90db2d9fc705005e6f17cf

data/lib/wedge.rb

@@ -47,10 +47,12 @@ class Wedge
 
     def html!(scope = false, &block)
       if !block_given?
-        DOM.new HTML::DSL.html(&scope).to_html
+        html = HTML::DSL.html(&scope).to_html
       else
-        DOM.new HTML::DSL.scope!(scope).html(&block).to_html
+        html = HTML::DSL.scope!(scope).html(&block).to_html
       end
+
+      DOM.new html
     end
 
     def script_tag
@@ -130,9 +132,9 @@ class Wedge
           # fix: make this a config option i.e.
           # gems: [:ability_list]
           # then grab that path and add it to the opal path list
-          Dir["#{gems_dir}/**/"].sort.each do |folder|
-            Wedge::Opal.append_path "#{folder}/lib"
-          end
+          # Dir["#{gems_dir}/**/"].sort.each do |folder|
+          #   Wedge::Opal.append_path "#{folder}/lib"
+          # end
         end
       end
     end

data/lib/wedge/component.rb

@@ -212,9 +212,7 @@ class Wedge
       end
 
       def html!(&b)
-        unless RUBY_ENGINE == 'opal'
-          Wedge.html!(self, &b)
-        end
+        Wedge.html!(self, &b)
       end
 
       def store

data/lib/wedge/config.rb

@@ -18,7 +18,7 @@ class Wedge
         scope: nil,
         debug: false,
         assets_url: '/assets/wedge',
-        assets_key: false,
+        assets_key: nil,
         cache_assets: false,
         is_plugin: false,
         requires: IndifferentHash.new,

data/lib/wedge/html.rb

@@ -40,16 +40,20 @@ td textarea tfoot th thead time title tr track tt u ul var video wbr}
     # http://erikonrails.snowedin.net/?p=379
     class DSL
       def initialize(tag, *args, &block)
-        @tag = tag
-        @content = args.find {|a| a.instance_of? String}
-        @attributes = args.find{|a| a.instance_of? Hash}
+        @tag         = tag
+        @content     = args.find { |a| a.instance_of? String }
+        @attributes  = args.find { |a| a.instance_of? Hash }
         @attr_string = []
         self.instance_eval &block if block_given?
       end
 
       def to_html
-        @attr_string << " #{@attributes.map {|k,v| "#{k}=#{v.to_s.inspect}" }.join(" ")}" if @attributes
-        "<#{@tag}#{@attr_string.join}>#{@content}#{children.map(&:to_html).join}</#{@tag}>"
+        if @tag
+          @attr_string << " #{@attributes.map {|k,v| "#{k}=#{v.to_s.inspect}" }.join(" ")}" if @attributes
+          "<#{@tag}#{@attr_string.join}>#{@content}#{children.map(&:to_html).join}</#{@tag}>"
+        else
+          "#{@content}#{children.map(&:to_html).join}"
+        end
       end
 
       def children
@@ -57,7 +61,7 @@ td textarea tfoot th thead time title tr track tt u ul var video wbr}
       end
 
       # Some of these are Kernel or Object methods or whatever that we need to explicitly override
-      [:p, :select].each do |name|  
+      [:p, :select].each do |name|
         define_method name do |*args, &block|
           send :method_missing, name, *args, &block
         end
@@ -77,8 +81,9 @@ td textarea tfoot th thead time title tr track tt u ul var video wbr}
         self.class.scope
       end
 
-      def self.method_missing(tag, *args, &block)
-        DSL.scope!(scope).new(tag.to_s, *args, &block)
+      # fix: opal bug. for some reason this can't be in the class << self block.
+      def self.html &block
+        DSL.scope!(scope).new(nil, nil, &block)
       end
 
       class << self

data/lib/wedge/version.rb

@@ -1,3 +1,3 @@
 class Wedge
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

data/spec/spec_helper.rb

@@ -16,8 +16,9 @@ else
     def html(_); end
   end
 
-  RSpec.configure do |config|
-    config.extend RSpecHelpers
+  RSpec.configure do |c|
+    c.extend RSpecHelpers
+    c.filter_run_excluding :slow
   end
 
   require 'app/config/boot'

data/spec/wedge/component_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+require 'wedge/component'
+
+class Comp < Wedge::Component
+  name :comp
+  html (html! {
+    html do
+      body do
+        button 'bar'
+      end
+    end
+  }.to_html) do
+    tmpl :foo, dom.find('button')
+  end
+
+  def foo
+    'bar'
+  end
+end
+
+describe Wedge::Component do
+  subject(:comp) { Wedge[:comp] }
+
+  it 'should respond to foo' do
+    expect(subject.foo).to eq 'bar'
+  end
+
+  if Wedge.server?
+    it 'should set/get templates' do
+      expect(subject.tmpl(:foo).to_html).to eq '<button>bar</button>'
+    end
+
+    it 'should return html with opal js' do
+      expect(subject.to_js(:foo)).to match /Opal/
+    end
+  end
+end

data/spec/wedge_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+require 'wedge'
+
+describe Wedge do
+  context 'config' do
+    if Wedge.server?
+      it 'should have an assets key' do
+        expect(Wedge.config.assets_key).not_to be_nil
+      end
+
+      it 'should return javascript and resource maps', :slow do
+        expect(Wedge.javascript).to match /Opal/
+        expect(Wedge.source_map).to match /mappings/
+      end
+    else
+      it 'should not have an assets key' do
+        expect(Wedge.config.assets_key).to be_nil
+      end
+    end
+  end
+
+  it '#html!' do
+    expect(Wedge.html! { button('test') }.to_html).to eq '<button>test</button>'
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wedge
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -257,11 +257,9 @@ files:
 - spec/playground/layout_spec.rb
 - spec/playground/uploader_spec.rb
 - spec/spec_helper.rb
+- spec/wedge/component_spec.rb
 - spec/wedge/plugins/uploader_spec.rb
-- test/test.js
-- test/test_basic_component.rb
-- test/test_browserio.rb
-- test/test_helper.rb
+- spec/wedge_spec.rb
 - wedge.gemspec
 homepage: ''
 licenses:
@@ -283,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
@@ -292,9 +290,7 @@ test_files:
 - spec/playground/layout_spec.rb
 - spec/playground/uploader_spec.rb
 - spec/spec_helper.rb
+- spec/wedge/component_spec.rb
 - spec/wedge/plugins/uploader_spec.rb
-- test/test.js
-- test/test_basic_component.rb
-- test/test_browserio.rb
-- test/test_helper.rb
+- spec/wedge_spec.rb
 has_rdoc: 

data/test/test.js

@@ -1,59 +0,0 @@
-var page = require('webpage').create();
-page.settings.localToRemoteUrlAccessEnabled = true;
-page.settings.resourceTimeout = 1000;
-// page.content = "<!doctype html>\n<html>\n<head>\new<script type=\"text/javascript\" src=\"https://code.jquery.com/jquery-1.11.2.min.js\"></script>\n</head>\n<body>\n<div id=\"foo\">bar<div>\n</body>\n</html>";
-var content = '<!doctype html>';
-content += '<html><head>';
-content += '<script type="text/javascript" src="https://code.jquery.com/jquery-1.11.2.min.js"></script>';
-content += '</head><body>';
-content += '<h1 id="foo">bar</h1>';
-content += '</body></html>';
-
-// page.content = "<div id='foo'>bar</div>";
-
-page.onConsoleMessage = function(msg) {
-  console.log(msg);
-};
-
-page.onResourceTimeout = function(a) {
-  phantom.exit(1);
-};
-
-page.onError = function(msg, trace) {
-
-  var msgStack = ['ERROR: ' + msg];
-
-  if (trace && trace.length) {
-    msgStack.push('TRACE:');
-    trace.forEach(function(t) {
-      msgStack.push(' -> ' + t.file + ': ' + t.line + (t.function ? ' (in function "' + t.function +'")' : ''));
-    });
-  }
-
-  console.log(msgStack.join('\n'));
-  phantom.exit();
-};
-
-phantom.onError = function(msg, trace) {
-  var msgStack = ['PHANTOM ERROR: ' + msg];
-  if (trace && trace.length) {
-    msgStack.push('TRACE:');
-    trace.forEach(function(t) {
-      msgStack.push(' -> ' + (t.file || t.sourceURL) + ': ' + t.line + (t.function ? ' (in function ' + t.function +')' : ''));
-    });
-  }
-  console.log(msgStack.join('\n'));
-  phantom.exit();
-};
-
-page.content = content
-
-page.onLoadFinished = function() {
-  page.evaluate(function() {
-    console.log($('#foo').html());
-  });
-  phantom.exit();
-};
-
-// page.includeJs("http://code.jquery.com/jquery-1.11.2.min.js", function(){
-// });

data/test/test_basic_component.rb

@@ -1,34 +0,0 @@
-require_relative 'test_helper'
-
-class BasicComponent < Wedge::Component
-  name :basic
-  html <<-HTML
-    <!DOCTYPE html>
-    <html>
-      <body>
-        <div id='foo'>bar</div>
-      </body>
-    </html>
-  HTML
-  dom do
-    tmpl :foo, dom.find('#foo')
-  end
-
-  def foo
-    'bar'
-  end
-end
-
-class TestComponent < Minitest::Test
-  def test_calling_basic_component
-    assert_equal 'bar', wedge(:basic).foo
-  end
-
-  def test_parsing_html
-    assert_equal '<div id="foo">bar</div>', wedge(:basic).tmpl(:foo).to_html
-  end
-
-  def test_returning_js
-    assert wedge(:basic).to_js(:foo)[/Opal/]
-  end
-end

data/test/test_browserio.rb

@@ -1,13 +0,0 @@
-require 'phantomjs'
-require_relative 'test_helper'
-
-class Testwedge < Minitest::Test
-  def test_javascript_and_source_maps
-    assert wedge.javascript[/Opal/]
-    assert wedge.source_map[/mappings/]
-  end
-
-  # def test_moo
-  #   Phantomjs.run('./test/test.js')
-  # end
-end

data/test/test_helper.rb

@@ -1,38 +0,0 @@
-require 'bundler'
-Bundler.setup :default, ENV.fetch('RACK_ENV') { 'development' }
-
-require 'minitest/autorun'
-require 'minitest/reporters'
-require 'wedge'
-
-require 'pry'
-require 'awesome_print'
-
-Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new # spec-like progress
-
-module Minitest
-  class Test
-    extend Minitest::Spec::DSL
-
-    def session
-      @_session ||= OpenStruct.new
-    end
-
-    def wedge(name, *args, &block)
-      Wedge[name, *args, &block]
-    end
-
-    # def app(*args)
-    #   a = Class.new(PropertyLink).new
-    #
-    #   a.instance_variable_set(:@_request, OpenStruct.new(
-    #     session: session,
-    #     env: {
-    #       'rack.session' => {}
-    #     }
-    #   ))
-    #
-    #   a.component(*args)
-    # end
-  end
-end