clearwater 1.0.0.beta5 → 1.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c83b9a2ad7fe21e4f47f356a63f64e787f8f7ac
-  data.tar.gz: f35bd0d6f10bc01809b33b9eadaf53f7276edbce
+  metadata.gz: 7a977102139bfa209ce1a27d10bb2a54c62f8fde
+  data.tar.gz: 16d3f137ac9d4d7c613f9b3d5e82ea761d72bc62
 SHA512:
-  metadata.gz: 4c72ec18e0557aa59bebba66aaca56ad70d4543f7065193e4519be52532453f29937037d01b6495308dad4746988c63b9db94bc1b056b2ee5fa4532b9fce34bd
-  data.tar.gz: d58b23dbe9b28e15197902a4e25e3f4e33e678ea0681756fe440b192a660f4f8f67b30b56b6b052b78831c15e6e4620a3a40839c243fd7a9d839b7505daff284
+  metadata.gz: 5bb2ad0849af13dd873b464a59d7c38c0d9f259b86277d6b0067b3ece77d94ff8ffd84b496f2833d778e643f6b8cf27aa70c0a5a60d53e53a3040a01414dc055
+  data.tar.gz: 8aaee323980734782f5751707c5082e4071ea777fede96a562ef63acf4c6b6b6aee6f1a062c610d48de84fb529ccc172031adaf578b2ba90e0b6af605eff690e

data/lib/clearwater/application.rb

@@ -0,0 +1,17 @@
+module Clearwater
+  class Application
+    attr_reader :component, :router
+
+    def initialize options={}
+      @router = options.fetch(:router) { Router.new }
+      @component = options.fetch(:component) { nil }
+      router.application = self
+      component.router = router
+    end
+
+    def render
+      router.set_outlets
+      component.to_s
+    end
+  end
+end

data/lib/clearwater/black_box_node.rb

@@ -0,0 +1,7 @@
+module Clearwater
+  module BlackBoxNode
+    def to_s
+      node.to_s
+    end
+  end
+end

data/lib/clearwater/cached_render.rb

@@ -0,0 +1,4 @@
+module Clearwater
+  module CachedRender
+  end
+end

data/lib/clearwater/component.rb

@@ -0,0 +1,104 @@
+require 'clearwater/component/html_tags'
+require 'clearwater/dom_reference'
+
+module Clearwater
+  module Component
+    extend self
+
+    attr_accessor :outlet
+    attr_accessor :router
+
+    def render
+    end
+
+    HTML_TAGS.each do |tag_name|
+      define_method tag_name do |attributes=nil, content=nil|
+        tag(tag_name, attributes, content)
+      end
+    end
+
+    def tag tag_name, attributes=nil, content=nil
+      unless attributes.nil? || attributes.is_a?(Hash)
+        content = attributes
+        attributes = nil
+      end
+
+      Tag.new(tag_name, attributes, content)
+    end
+
+    def to_s
+      html = render.to_s
+      if html.respond_to? :html_safe
+        html = html.html_safe
+      end
+
+      html
+    end
+
+    def params
+      router.params_for_path(router.current_path)
+    end
+
+    def call &block
+    end
+
+    class Tag
+      def initialize tag_name, attributes=nil, content=nil
+        @tag_name = tag_name
+        @attributes = sanitize_attributes(attributes)
+        @content = content
+      end
+
+      def to_html
+        html = "<#{@tag_name}"
+        if @attributes
+          @attributes.each do |attr, value|
+            html << " #{attr}=#{value.to_s.inspect}"
+          end
+        end
+        if @content
+          html << '>'
+          html << sanitize_content(@content)
+          html << "</#{@tag_name}>"
+        else
+          html << '/>'
+        end
+
+        html
+      end
+      alias to_s to_html
+
+      def sanitize_attributes attributes
+        return attributes unless attributes.is_a? Hash
+
+        if attributes.key? :class_name or attributes.key? :className
+          attributes[:class] ||= attributes.delete(:class_name) || attributes.delete(:className)
+        end
+
+        if Hash === attributes[:style]
+          attributes[:style] = attributes[:style].map { |attr, value|
+            attr = attr.to_s.tr('_', '-')
+            "#{attr}:#{value}"
+          }.join(';')
+        end
+
+        attributes.reject! do |key, handler|
+          key[0, 2] == 'on' || DOMReference === handler
+        end
+
+        attributes
+      end
+
+      def sanitize_content content
+        case content
+        when Array
+          content.map { |c| sanitize_content c }.join
+        when String
+          content.gsub('<', '&lt;')
+        else
+          content.to_s
+        end
+      end
+    end
+  end
+end

data/lib/clearwater/dom_reference.rb

@@ -0,0 +1,7 @@
+module Clearwater
+  class DOMReference
+    def to_s
+      ''.freeze
+    end
+  end
+end

data/lib/clearwater/link.rb

@@ -0,0 +1,14 @@
+require 'clearwater/component'
+
+class Link
+  include Clearwater::Component
+
+  def initialize attributes, content
+    @attributes = attributes
+    @content    = content
+  end
+
+  def render
+    a(@attributes, @content)
+  end
+end

data/lib/clearwater/version.rb

@@ -1,3 +1,3 @@
 module Clearwater
-  VERSION = "1.0.0.beta5"
+  VERSION = "1.0.0.rc1"
 end

data/lib/clearwater.rb

@@ -1,8 +1,15 @@
 require "opal"
 require "bowser"
+require "clearwater/component"
+require 'clearwater/link'
+$:.unshift File.expand_path(File.join('..', '..', 'shared'), __FILE__)
+require 'clearwater/router'
+require 'clearwater/application'
 
 module Clearwater
   require_relative "clearwater/version"
 end
 
-Opal.append_path(File.expand_path(File.join("..", "..", "opal"), __FILE__).untaint)
+%w(opal shared).each do |dir|
+  Opal.append_path(File.expand_path(File.join("..", "..", dir), __FILE__).untaint)
+end

data/opal/clearwater/application.rb

@@ -24,6 +24,12 @@ module Clearwater
       router.application = self
       component.router = router if component
 
+      if `#@component.type === 'Thunk' && typeof #@component.render === 'function'`
+        warn "Application root component (#{@component}) points to a cached " +
+             "component. Cached components must not be persistent components, " +
+             "such as application roots or routing targets."
+      end
+
       @document.on 'visibilitychange' do
         if @render_on_visibility_change
           @render_on_visibility_change = false

data/opal/clearwater/component.rb

@@ -1,123 +1,10 @@
 require 'clearwater/virtual_dom'
+require 'clearwater/component/html_tags'
 
 module Clearwater
   module Component
     attr_accessor :router, :outlet
 
-    HTML_TAGS = %w(
-      a
-      abbr
-      address
-      area
-      article
-      aside
-      audio
-      b
-      base
-      bdi
-      bdo
-      blockquote
-      body
-      br
-      button
-      canvas
-      caption
-      cite
-      code
-      col
-      colgroup
-      command
-      data
-      datalist
-      dd
-      del
-      details
-      dfn
-      dialog
-      div
-      dl
-      dt
-      em
-      embed
-      fieldset
-      figcaption
-      figure
-      footer
-      form
-      h1
-      h2
-      h3
-      h4
-      h5
-      h6
-      head
-      header
-      hgroup
-      hr
-      html
-      i
-      iframe
-      img
-      input
-      ins
-      kbd
-      keygen
-      label
-      legend
-      li
-      link
-      main
-      map
-      mark
-      menu
-      meta
-      meter
-      nav
-      noscript
-      object
-      ol
-      optgroup
-      option
-      output
-      p
-      param
-      pre
-      progress
-      q
-      rp
-      rt
-      ruby
-      s
-      samp
-      script
-      section
-      select
-      small
-      source
-      span
-      strong
-      style
-      sub
-      summary
-      sup
-      table
-      tbody
-      td
-      textarea
-      tfoot
-      th
-      thead
-      time
-      title
-      tr
-      track
-      u
-      ul
-      var
-      video
-      wbr
-    )
-
     def params
       router.params
     end
@@ -125,23 +12,23 @@ module Clearwater
     def self.sanitize_attributes attributes
       return attributes unless attributes.is_a? Hash
 
+      attributes.each do |key, value|
+        if `key.slice(0, 2)` == 'on'
+          attributes[key] = proc do |event|
+            value.call(Bowser::Event.new(event))
+          end
+        end
+      end
+
       # Allow specifying `class` instead of `class_name`.
       # Note: `class_name` is still allowed
-      if attributes.key? :class
-        if attributes.key? :class_name
+      if attributes.key?(:class)
+        if attributes.key?(:class_name)
           warn "You have both `class` and `class_name` attributes for this " +
             "element. `class` takes precedence: #{attributes}"
         end
 
-        attributes[:class_name] = attributes.delete(:class)
-      end
-
-      attributes.each do |key, handler|
-        if key[0, 2] == 'on'
-          attributes[key] = proc do |event|
-            handler.call(Bowser::Event.new(event))
-          end
-        end
+        attributes[:class_name] = attributes.delete :class
       end
 
       attributes
@@ -150,8 +37,8 @@ module Clearwater
     def self.sanitize_content content
       %x{
         if(content && content.$$class) {
-          if(content.$$class === Opal.Array) {
-            return #{content.map { |c| `self.$sanitize_content(c)` }};
+          if(content.$$is_array) {
+            return #{content.map { |c| sanitize_content(c) }};
           } else {
             var render = content.$render;
 
@@ -177,16 +64,18 @@ module Clearwater
 
     HTML_TAGS.each do |tag_name|
       define_method(tag_name) do |attributes, content|
+        %x{
+          if(!(attributes === nil || attributes.$$is_hash)) {
+            content = attributes;
+            attributes = nil;
+          }
+        }
+
         tag(tag_name, attributes, content)
       end
     end
 
     def tag tag_name, attributes=nil, content=nil
-      if !(`attributes.$$is_hash || attributes === #{nil}`)
-        content = attributes
-        attributes = nil
-      end
-
       VirtualDOM.node(
         tag_name,
         Component.sanitize_attributes(attributes),

data/opal/clearwater/virtual_dom.rb

@@ -2,16 +2,20 @@ require 'clearwater/virtual_dom/js/virtual_dom.js'
 
 module VirtualDOM
   def self.node(tag_name, attributes=nil, content=nil)
-    content = sanitize_content(content)
-    attributes = HashUtils.camelize_keys(attributes).to_n
-    `virtualDom.h(tag_name, attributes, content)`
+    %x{
+      return virtualDom.h(
+        tag_name,
+        #{HashUtils.camelized_native(attributes)},
+        #{sanitize_content(content)}
+      );
+    }
   end
 
   def self.svg(tag_name, attributes=nil, content=nil)
     %x{
       return virtualDom.svg(
         tag_name,
-        #{HashUtils.camelize_keys(attributes).to_n},
+        #{HashUtils.camelized_native(attributes)},
         #{sanitize_content(content)}
       );
     }
@@ -67,31 +71,27 @@ module VirtualDOM
 
   module StringUtils
     def self.camelize string
-      %x{
-        return string.replace(/_(\w)/g, function(full_match, character_match) {
-          return character_match.toUpperCase();
-        })
-      }
+      `string.replace(/_(\w)/g, self.$_camelize_handler)`
+    end
+
+    def self._camelize_handler _, character_match
+      `character_match.toUpperCase()`
     end
   end
 
   module HashUtils
-    def self.camelize_keys(hash)
-      return hash unless hash.is_a? Hash
+    def self.camelized_native hash
+      return hash.to_n unless `!!hash.$$is_hash`
 
-      camelized = {}
-      hash.each do |k, v|
-        key = StringUtils.camelize(k)
-        value = if v.class == Hash
-                  camelize_keys(v)
-                else
-                  v
-                end
-
-        camelized[key] = value
-      end
-
-      camelized
+      %x{
+        var v, keys = #{hash.keys}, key, js_obj = {};
+        for(var index = 0; index < keys.length; index++) {
+          key = keys[index];
+          v = #{hash[`key`]};
+          js_obj[#{StringUtils.camelize(`key`)}] = v.$$is_hash ? self.$camelized_native(v) : v
+        }
+        return js_obj;
+      }
     end
   end
 end

data/shared/clearwater/component/html_tags.rb

@@ -0,0 +1,117 @@
+module Clearwater
+  module Component
+    HTML_TAGS = %w(
+      a
+      abbr
+      address
+      area
+      article
+      aside
+      audio
+      b
+      base
+      bdi
+      bdo
+      blockquote
+      body
+      br
+      button
+      canvas
+      caption
+      cite
+      code
+      col
+      colgroup
+      command
+      data
+      datalist
+      dd
+      del
+      details
+      dfn
+      dialog
+      div
+      dl
+      dt
+      em
+      embed
+      fieldset
+      figcaption
+      figure
+      footer
+      form
+      h1
+      h2
+      h3
+      h4
+      h5
+      h6
+      head
+      header
+      hgroup
+      hr
+      html
+      i
+      iframe
+      img
+      input
+      ins
+      kbd
+      keygen
+      label
+      legend
+      li
+      link
+      main
+      map
+      mark
+      menu
+      meta
+      meter
+      nav
+      noscript
+      object
+      ol
+      optgroup
+      option
+      output
+      p
+      param
+      pre
+      progress
+      q
+      rp
+      rt
+      ruby
+      s
+      samp
+      script
+      section
+      select
+      small
+      source
+      span
+      strong
+      style
+      sub
+      summary
+      sup
+      table
+      tbody
+      td
+      textarea
+      tfoot
+      th
+      thead
+      time
+      title
+      tr
+      track
+      u
+      ul
+      var
+      video
+      wbr
+    )
+  end
+end

data/{opal → shared}/clearwater/router/route.rb

@@ -9,6 +9,12 @@ module Clearwater
         @key = options.fetch(:key)
         @target = options.fetch(:target)
         @parent = options.fetch(:parent)
+
+        if `#@target.type === 'Thunk' && typeof #@target.render === 'function'`
+          warn "Route '#{key}' points to a cached component. Cached " +
+               "components must not be persistent components, such as " +
+               "application roots or routing targets."
+        end
       end
 
       def route *args, &block

data/{opal → shared}/clearwater/router.rb

@@ -6,9 +6,13 @@ module Clearwater
     attr_accessor :application
 
     def initialize options={}, &block
-      @window   = options.fetch(:window)   { Bowser.window  }
-      @location = options.fetch(:location) { window.location }
-      @history  = options.fetch(:history)  { window.history }
+      if RUBY_ENGINE == 'opal'
+        @window   = options.fetch(:window)   { Bowser.window  }
+        @location = options.fetch(:location) { window.location }
+        @history  = options.fetch(:history)  { window.history }
+      else
+        @location = options.fetch(:location)
+      end
       @routes   = RouteCollection.new(self)
       @application = options[:application]
 
@@ -20,7 +24,7 @@ module Clearwater
     end
 
     def routes_for_path path
-      parts = path.split("/").reject(&:empty?)
+      parts = get_path_parts(path)
       @routes[parts]
     end
 
@@ -36,8 +40,8 @@ module Clearwater
     end
 
     def params path=current_path
-      path_parts = path.split("/").reject(&:empty?)
-      canonical_parts = canonical_path_for_path(path).split("/").reject(&:empty?)
+      path_parts = get_path_parts(path)
+      canonical_parts = get_path_parts(canonical_path_for_path(path))
 
       canonical_parts.each_with_index.reduce({}) { |params, (part, index)|
         if part.start_with? ":"
@@ -109,6 +113,10 @@ module Clearwater
 
     private
 
+    def get_path_parts path
+      path.split("/").reject(&:empty?)
+    end
+
     def render_application
       if application && application.component
         application.component.call

data/spec/clearwater/black_box_node_spec.rb

@@ -1,4 +1,6 @@
+require 'spec_helper'
 require 'clearwater/black_box_node'
+require 'clearwater/component'
 
 module Clearwater
   describe BlackBoxNode do
@@ -6,59 +8,14 @@ module Clearwater
       Class.new do
         include Clearwater::BlackBoxNode
 
-        attr_reader :last_update
-
         def node
-          VirtualDOM.node :span, { id: 'foo' }, ['hi']
-        end
-
-        def mount node
-          @mounted = true
-        end
-
-        def update
-          @last_update = Time.now
-        end
-
-        def unmount
-          @mounted = false
-        end
-
-        def mounted?
-          !!@mounted
+          Clearwater::Component.div({ id: 'foo' }, 'hi')
         end
       end.new
     }
-    let(:renderable) { BlackBoxNode::Renderable.new(object) }
-
-    it 'has the special type of "Widget"' do
-      r = renderable
-      expect(`r.type`).to eq 'Widget'
-    end
-
-    it 'uses the delegate node to render into the DOM' do
-      r = renderable
-      expect(`#{renderable.create_element}.native.outerHTML`).to eq '<span id="foo">hi</span>'
-    end
-
-    it 'calls mount when inserted into the DOM' do
-      r = renderable
-      `r.init()`
-      expect(object).to be_mounted
-    end
-
-    it 'calls unmount when removed from the DOM' do
-      r = renderable
-      `r.init()`
-      `r.destroy()`
-      expect(object).not_to be_mounted
-    end
-
-    it 'calls update when updated in the DOM' do
-      r = renderable
-      `r.update({})`
 
-      expect(object.last_update).not_to be_nil
+    it 'just renders the specified node' do
+      expect(object.to_s).to eq '<div id="foo">hi</div>'
     end
   end
 end

data/spec/clearwater/component_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+require_relative '../../lib/clearwater/component'
+
+module Clearwater
+  RSpec.describe Component do
+    let(:component) { Class.new { include Clearwater::Component }.new }
+
+    it 'generates html' do
+      html = component.div({ id: 'foo', class_name: 'bar' }, [
+        component.p("baz"),
+      ]).to_s
+
+      expect(html).to eq('<div id="foo" class="bar"><p>baz</p></div>')
+    end
+
+    it 'converts styles into strings' do
+      html = component.div({
+        style: {
+          font_size: '24px',
+          padding: '3px',
+        }
+      }, "Hello world!").to_s
+
+      expect(html).to eq('<div style="font-size:24px;padding:3px">Hello world!</div>')
+    end
+
+    it 'removes DOMReference attributes' do
+      html = component.div({
+        ref: DOMReference.new,
+      }, 'Hello World!').to_s
+
+      expect(html).to eq('<div>Hello World!</div>')
+    end
+
+    describe 'content sanitization' do
+      it 'sanitizes content strings, but not elements' do
+        html = component.div(component.p('<em>hi</em>')).to_s
+
+        expect(html).to eq '<div><p>&lt;em>hi&lt;/em></p></div>'
+      end
+    end
+  end
+end

data/spec/clearwater/dom_reference_spec.rb

@@ -4,12 +4,8 @@ module Clearwater
   describe DOMReference do
     let(:ref) { DOMReference.new }
 
-    it 'delegates to the DOM node passed in on mount' do
-      r = ref
-
-      `r.hook({ value: 'hi' })`
-
-      expect(r.value).to eq 'hi'
+    it 'sanitizes to an empty string' do
+      expect(ref.to_s).to eq ''
     end
   end
 end

data/spec/spec_helper.rb

@@ -0,0 +1 @@
+$:.unshift 'shared'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clearwater
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta5
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Jamie Gaskins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-06 00:00:00.000000000 Z
+date: 2016-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0.beta2
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0.beta2
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -102,6 +116,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/clearwater.rb
+- lib/clearwater/application.rb
+- lib/clearwater/black_box_node.rb
+- lib/clearwater/cached_render.rb
+- lib/clearwater/component.rb
+- lib/clearwater/dom_reference.rb
+- lib/clearwater/link.rb
 - lib/clearwater/version.rb
 - opal/clearwater.rb
 - opal/clearwater/application.rb
@@ -111,18 +131,17 @@ files:
 - opal/clearwater/component.rb
 - opal/clearwater/dom_reference.rb
 - opal/clearwater/link.rb
-- opal/clearwater/router.rb
-- opal/clearwater/router/route.rb
-- opal/clearwater/router/route_collection.rb
 - opal/clearwater/svg_component.rb
 - opal/clearwater/virtual_dom.rb
 - opal/clearwater/virtual_dom/js/virtual_dom.js
-- spec/clearwater/application_spec.rb
+- shared/clearwater/component/html_tags.rb
+- shared/clearwater/router.rb
+- shared/clearwater/router/route.rb
+- shared/clearwater/router/route_collection.rb
 - spec/clearwater/black_box_node_spec.rb
-- spec/clearwater/cached_render_spec.rb
+- spec/clearwater/component_spec.rb
 - spec/clearwater/dom_reference_spec.rb
-- spec/clearwater/router_spec.rb
-- spec/component_spec.rb
+- spec/spec_helper.rb
 homepage: https://clearwater-rb.github.io/
 licenses:
 - MIT
@@ -131,6 +150,7 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
+- shared
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -143,15 +163,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Front-end Ruby web framework for fast, reasonable, and composable applications
 test_files:
-- spec/clearwater/application_spec.rb
 - spec/clearwater/black_box_node_spec.rb
-- spec/clearwater/cached_render_spec.rb
+- spec/clearwater/component_spec.rb
 - spec/clearwater/dom_reference_spec.rb
-- spec/clearwater/router_spec.rb
-- spec/component_spec.rb
-has_rdoc: 
+- spec/spec_helper.rb

data/spec/clearwater/application_spec.rb

@@ -1,62 +0,0 @@
-require 'clearwater'
-require 'clearwater/svg_component'
-require 'bowser'
-
-module Clearwater
-  RSpec.describe Application do
-    let(:app) {
-      Application.new(
-        component: component,
-        element: element,
-      )
-    }
-    let(:component) {
-      $svg_component = self.svg_component
-      Class.new do
-        include Clearwater::Component
-
-        def render
-          div([
-            p({ class_name: 'foo' }, 'Hello world'),
-            $svg_component,
-          ])
-        end
-      end.new
-    }
-    let(:svg_component) {
-      Class.new do
-        include Clearwater::SVGComponent
-
-        def render
-          svg({ class: 'mysvg', marker_height: 10, marker_end: "url(#arrow)" }, [
-            circle(cx: 50, cy: 50, r: 30),
-          ])
-        end
-      end.new
-    }
-    let(:element) { Bowser.document.create_element('div') }
-
-    it 'renders to the specified element' do
-      app.perform_render
-
-      expect(element.inner_html).to eq '<div><p class="foo">Hello world</p><svg class="mysvg" markerHeight="10" marker-end="url(#arrow)"><circle cx="50" cy="50" r="30"></circle></svg></div>'
-    end
-
-    it 'calls queued blocks after rendering' do
-      i = 1
-      app.on_render << proc { i += 1 }
-      app.on_render << proc { i += 1 }
-
-      app.perform_render
-      expect(i).to eq 3
-    end
-
-    it 'empties the block queue after rendering' do
-      app.on_render << proc { }
-
-      app.perform_render
-
-      expect(app.on_render).to be_empty
-    end
-  end
-end

data/spec/clearwater/cached_render_spec.rb

@@ -1,46 +0,0 @@
-require 'clearwater/component'
-require 'clearwater/cached_render'
-
-module Clearwater
-  describe CachedRender do
-    let(:component_class) {
-      Class.new do
-        include Clearwater::Component
-        include Clearwater::CachedRender
-
-        def initialize value
-          @value = value
-        end
-
-        def render
-          @value.to_s
-        end
-      end
-    }
-    let(:value) { double }
-    let(:component) { component_class.new(value) }
-
-    it 'memoizes the return value of render' do
-      component = component()
-
-      expect(value).to receive(:to_s)
-      %x{ component.render(component) }
-
-      component.instance_exec { @vnode = VirtualDOM.node('div', 'howdy') }
-      expect(value).not_to receive(:to_s)
-
-      2.times { `component.render(component)` }
-    end
-
-    it 'uses should_render? to determine whether to call render again' do
-      component = component()
-      def component.should_render?
-        true
-      end
-
-      expect(value).to receive(:to_s).twice
-
-      2.times { `component.render(component)` }
-    end
-  end
-end

data/spec/clearwater/router_spec.rb

@@ -1,65 +0,0 @@
-require 'clearwater/router'
-require 'ostruct'
-
-module Clearwater
-  RSpec.describe Router do
-    let(:component_class) {
-      Class.new do
-        include Clearwater::Component
-      end
-    }
-    let(:routed_component) { component_class.new }
-    let!(:router) {
-      component = routed_component
-      Router.new do
-        route 'articles' => component do
-          route ':article_id' => component
-        end
-      end
-    }
-
-    it 'sets the router for a routed component' do
-      expect(routed_component.router).to be router
-    end
-
-    it 'gets the params for a given path' do
-      expect(router.params('/articles/foo')).to eq article_id: 'foo'
-    end
-
-    it 'gets the components for a given path' do
-      expect(router.targets_for_path('/articles/1')).to eq [
-        routed_component, routed_component
-      ]
-
-      expect(router.targets_for_path('/articles')).to eq [routed_component]
-    end
-
-    it 'gets the current path' do
-      location = OpenStruct.new(path: '/foo')
-      router = Router.new(location: location)
-
-      expect(router.current_path).to eq '/foo'
-
-      location.path = '/bar'
-
-      expect(router.current_path).to eq '/bar'
-    end
-
-    it 'gets the params from the path' do
-      expect(router.params('/articles/123')).to eq({ article_id: '123' })
-    end
-
-    it 'gets params with a namespace' do
-      component = routed_component
-      router = Router.new do
-        namespace 'clearwater'
-
-        route 'articles' => component do
-          route ':article_id' => component
-        end
-      end
-
-      expect(router.params('/clearwater/articles/123')).to eq({ article_id: '123' })
-    end
-  end
-end

data/spec/component_spec.rb

@@ -1,57 +0,0 @@
-require 'clearwater/component'
-
-module Clearwater
-  RSpec.describe Component do
-    let(:component_class) {
-      Class.new do
-        include Clearwater::Component
-      end
-    }
-    let(:component) { component_class.new }
-
-    it 'provides a default render method' do
-      expect(component.render).to be_nil
-    end
-
-    Component::HTML_TAGS.each do |tag|
-      it "provides helpers for `#{tag}` elements" do
-        expect(`#{component.send(tag)}.tagName`).to eq tag.upcase
-      end
-    end
-
-    it 'sanitizes element attributes' do
-      attributes = Component.sanitize_attributes({
-        class: 'foo',
-        onclick: proc { |event| expect(event).to be_a Bowser::Event },
-      })
-
-      # Renames :class to :class_name
-      expect(attributes[:class_name]).to eq 'foo'
-
-      # Wraps yielded events in a Bowser::Event
-      attributes[:onclick].call(`document.createEvent('MouseEvent')`)
-    end
-
-    describe 'sanitizing content' do
-      it 'sanitizes components by calling `render`' do
-        allow(component).to receive(:render) { 'foo' }
-        expect(Component.sanitize_content(component)).to eq 'foo'
-      end
-
-      it 'sanitizes arrays by sanitizing each element' do
-        allow(component).to receive(:render) { 'foo' }
-        expect(Component.sanitize_content([component, nil, 1])).to eq ['foo', nil, 1]
-      end
-    end
-
-    it 'retrieves params from the router' do
-      router = double('Router')
-      params = { article_id: 123 }
-      allow(router).to receive(:params) { params }
-      allow(router).to receive(:current_path) { '/articles/123' }
-      component.router = router
-
-      expect(component.params).to eq params
-    end
-  end
-end