inesita 0.2.3 → 0.3.0

data/opal/inesita/{component_withs.rb → component_properties.rb}

@@ -1,5 +1,5 @@
 module Inesita
-  module ComponentWiths
+  module ComponentProperties
     attr_reader :root_component
     def with_root_component(component)
       @root_component = component

data/opal/inesita/component_virtual_dom_extension.rb

@@ -0,0 +1,22 @@
+module Inesita
+  module ComponentVirtualDomExtension
+    def self.included(base)
+      base.alias_method :__a, :a
+      base.define_method(:a) do |params, &block|
+        params = { onclick: -> { @router.handle_link(params[:href]) } }.merge(params) if params[:href] && @router
+        __a(params, &block)
+      end
+    end
+
+    def component(comp, opts = {})
+      fail Error, "Component is nil in #{self.class} class" if comp.nil?
+      @__virtual_nodes__ ||= []
+      @__virtual_nodes__ << cache_component(comp) do
+        (comp.is_a?(Class) ? comp.new : comp)
+          .with_root_component(@root_component)
+          .with_router(@router)
+          .with_store(@store)
+      end.with_props(opts[:props] || {}).render_virtual_dom
+    end
+  end
+end

data/opal/inesita/error.rb

@@ -0,0 +1,4 @@
+module Inesita
+  class Error < StandardError
+  end
+end

data/opal/inesita/layout.rb

@@ -1,8 +1,6 @@
 module Inesita
   module Layout
-    def self.included(base)
-      base.include(Component)
-    end
+    include Component
 
     def outlet
       @router

data/opal/inesita/live_reload.rb

@@ -0,0 +1,79 @@
+require 'inesita'
+
+module Inesita
+  WebSocket = JS.global.JS[:WebSocket]
+  Document = JS.global.JS[:document]
+  Head = Document.JS[:head]
+  Window = JS.global
+
+  module Component
+    alias_method :old_mount_to, :mount_to
+    def mount_to(element)
+      Window.JS.addEventListener('inesita:refresh', -> { render! }, false)
+      old_mount_to(element)
+    end
+  end
+
+  class LiveReload
+    def initialize
+      connect
+    end
+
+    def connect
+      ws = `new WebSocket('ws://0.0.0.0:23654')`
+      ws.JS[:onmessage] = ->(e) { on_file_change(e.JS[:data]) }
+      ws.JS[:onclose] = -> { reconnect }
+    end
+
+    def reconnect
+      JS.setTimeout(-> { connect }, 1000)
+    end
+
+    def on_file_change(filename)
+      prefix, mod, ext = filename.split('|')
+      filename = "#{prefix}/#{mod}.self.#{ext}"
+      case ext
+      when 'js'
+        replace_js(filename, mod)
+      when 'css'
+        replace_css(filename)
+      else
+        fail Error, "Don't know how to reload #{ext} file!"
+      end
+    end
+
+    def replace_js(filename, mod)
+      s = create_element(:script, type: 'text/javascript', src: filename, onload: lambda do
+        Opal.load(mod)
+        Window.JS.dispatchEvent(`new Event('inesita:refresh')`)
+      end)
+      replace_or_append(s, 'script') { |t| t.JS[:src].match(filename) }
+    end
+
+    def replace_css(filename)
+      s = create_element(:link, rel: 'stylesheet', type: 'text/css', href: filename)
+      replace_or_append(s, 'link') { |t| t.JS[:href].match(filename) }
+    end
+
+    def create_element(name, attrs = {})
+      s = Document.JS.createElement(name)
+      s.JS[:onload] = attrs.delete(:onload)
+      attrs.each do |k, v|
+        s.JS.setAttribute(k, v)
+      end
+      s
+    end
+
+    def replace_or_append(tag, tags, &block)
+      tags = Document.JS.getElementsByTagName(tags)
+      tags.JS[:length].times do |i|
+        next unless block.call(tags.JS.item(i))
+        Head.JS.replaceChild(tag, tags.JS.item(i))
+        return
+      end
+      Head.JS.appendChild(tag)
+    end
+  end
+end
+
+Inesita::LiveReload.new

data/opal/inesita/router.rb

@@ -1,19 +1,22 @@
 module Inesita
   module Router
-    include Inesita::JSHelpers
     include Inesita::Component
 
     attr_reader :params
 
     def initialize
-      on_popstate method(:update_dom)
-      on_hashchange method(:update_dom)
       @routes = Routes.new
       @url_params = parse_url_params
+      fail Error, 'Add #routes method to router!' unless respond_to?(:routes)
       routes
+      fail Error, 'Add #route to your #routes method!' if @routes.routes.empty?
+      add_js_listeners
     end
 
-    def routes; end
+    def add_js_listeners
+      $window.on(:popstate) { render! }
+      $window.on(:hashchange) { render! }
+    end
 
     def route(*params, &block)
       @routes.route(*params, &block)
@@ -21,13 +24,13 @@ module Inesita
 
     def find_component
       @routes.routes.each do |route|
-        if params = path.match(route[:regex])
-          @params = @url_params.merge(Hash[route[:params].zip(params[1..-1])])
-          @component_props = route[:component_props]
-          return route[:component]
-        end
+        params = path.match(route[:regex])
+        next unless params
+        @params = @url_params.merge(Hash[route[:params].zip(params[1..-1])])
+        @component_props = route[:component_props]
+        return route[:component]
       end
-      fail 'not_found'
+      fail Error, "Can't find route for url"
     end
 
     def render
@@ -35,16 +38,17 @@ module Inesita
     end
 
     def handle_link(path)
-      push_state path
-      update_dom
+      $window.history.push(path)
+      render!
       false
     end
 
     def parse_url_params
       params = {}
+      url_query = $window.location.query.to_s
       url_query[1..-1].split('&').each do |param|
         key, value = param.split('=')
-        params[decode_uri(key)] = decode_uri(value)
+        params[key.decode_uri_component] = value.decode_uri_component
       end unless url_query.length == 0
       params
     end
@@ -52,15 +56,15 @@ module Inesita
     def url_for(name)
       route = case name
               when String
-                @routes.routes.find { |route| route[:name] == name }
+                @routes.routes.find { |r| r[:name] == name }
               when Object
-                @routes.routes.find { |route| route[:component] == name }
+                @routes.routes.find { |r| r[:component] == name }
               end
-      if route
-        route[:path]
-      else
-        raise "Route '#{name}' not found."
-      end
+      route ? route[:path] : fail(Error, "Route '#{name}' not found.")
+    end
+
+    def path
+      $window.location.path
     end
 
     def current_url?(name)

data/opal/inesita/routes.rb

@@ -15,7 +15,13 @@ module Inesita
       component_props = params.last[:props]
 
       add_subroutes(path, &block) if block_given?
-      add_route(name, path, component, component_props) if component
+      validate_component(component)
+      add_route(name, path, component, component_props)
+    end
+
+    def validate_component(component)
+      fail Error, 'Component not exists' unless component
+      fail Error, "Invalid #{component} class, should mixin Inesita::Component" unless component.include?(Inesita::Component)
     end
 
     def add_route(name, path, component, component_props)
@@ -23,7 +29,7 @@ module Inesita
         path: path,
         component: component,
         component_props: component_props,
-        name: name || component.to_s.downcase
+        name: name || component.to_s.gsub(/(.)([A-Z])/, '\1_\2').downcase
       }.merge(params_and_regex(path))
     end
 
@@ -37,18 +43,15 @@ module Inesita
       regex = ['^']
       params = []
       parts = path.split('/')
-      if parts.empty?
+      regex << '\/' if parts.empty?
+      parts.each do |part|
+        next if part.empty?
         regex << '\/'
-      else
-        parts.each do |part|
-          next if part.empty?
-          regex << '\/'
-          if part[0] == ':'
-            params << part[1..-1]
-            regex << '([^\/]+)'
-          else
-            regex << part
-          end
+        if part[0] == ':'
+          params << part[1..-1]
+          regex << '([^\/]+)'
+        else
+          regex << part
         end
       end
       regex << '$'

data/opal/inesita/store.rb

@@ -5,7 +5,12 @@ module Inesita
     end
 
     def update_dom
-      root_component.update_dom
+      $console.warn "Use 'render!' instead of 'update_dom'"
+      render!
+    end
+
+    def render!
+      root_component.render!
     end
 
     attr_reader :root_component

data/spec/lib/nil_spec.rb

@@ -0,0 +1,7 @@
+require 'lib/spec_helper'
+
+describe do
+  it 'nil is nil' do
+    expect(nil).to be_nil
+  end
+end

data/spec/lib/spec_helper.rb

@@ -0,0 +1 @@
+include RSpec

data/spec/opal/application_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe Inesita::Application do
+  let(:application) { Inesita::Application }
+  let(:layout) { Class.new { include Inesita::Layout } }
+  let(:store) { Class.new { include Inesita::Store } }
+  let(:router) do
+    Class.new do
+      include Inesita::Router
+
+      class TestComponent
+        include Inesita::Component
+      end
+
+      def routes
+        route '/', to: TestComponent
+      end
+    end
+  end
+
+  it 'should respond to #render' do
+    expect(application.new(router: router)).to respond_to(:render)
+  end
+
+  it 'should fail with wrong :router class' do
+    expect { application.new(router: Class) }.to raise_error Inesita::Error
+  end
+
+  it 'should not fail with :router class' do
+    expect { application.new(router: router) }.not_to raise_error
+  end
+
+  it 'should fail with wrong :layout class' do
+    expect { application.new(layout: Class) }.to raise_error Inesita::Error
+  end
+
+  it 'should not fail with :layout class' do
+    expect { application.new(layout: layout) }.not_to raise_error
+  end
+
+  it 'should fail with wrong :store class' do
+    expect { application.new(store: Class) }.to raise_error Inesita::Error
+  end
+
+  it 'should not fail with :layout class' do
+    expect { application.new(router: router) }.not_to raise_error
+  end
+end

data/spec/opal/component_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe Inesita::Router do
+  let(:empty_component) { Class.new { include Inesita::Component }}
+  let(:component) do
+    Class.new do
+      include Inesita::Component
+
+      def render
+        h1 class: 'test' do
+          'Test'
+        end
+      end
+    end
+  end
+
+  let(:nested_component) do
+    Class.new do
+      include Inesita::Component
+
+      Inner = Class.new do
+        include Inesita::Component
+
+        def render
+          div do
+            'Inner'
+          end
+        end
+      end
+
+      def render
+        h1 class: 'test' do
+          component Inner
+        end
+      end
+    end
+  end
+
+  let(:element) do
+    $document.create_element('div')
+  end
+
+  it 'should fail when no #render method' do
+    expect { empty_component.new.mount_to(element) }.to raise_error Inesita::Error
+  end
+
+  it 'should render html' do
+    component.new.mount_to(element)
+    expect(element.inner_html).to eq '<h1 class="test">Test</h1>'
+  end
+
+  it 'should render html with nested components' do
+    nested_component.new.mount_to(element)
+    expect(element.inner_html).to eq '<h1 class="test"><div>Inner</div></h1>'
+  end
+end

data/spec/opal/layout_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe Inesita::Layout do
+  let(:layout) { Class.new { include Inesita::Layout } }
+
+  it 'should respond to #outlet' do
+    expect(layout.new).to respond_to(:outlet)
+  end
+end

data/spec/opal/router_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+describe Inesita::Router do
+  let(:wrong_router) { Class.new { include Inesita::Router } }
+  let(:empty_router) { Class.new { include Inesita::Router; def routes; end } }
+  let(:router) do
+    Class.new do
+      include Inesita::Router
+
+      class TestComponent
+        include Inesita::Component
+      end
+
+      class OtherTestComponent
+        include Inesita::Component
+      end
+
+      def routes
+        route '/', to: TestComponent
+        route '/other', to: OtherTestComponent
+      end
+    end
+  end
+
+  it 'should fail without routes' do
+    expect { wrong_router.new }.to raise_error Inesita::Error
+  end
+
+  it 'should fail with empty routes' do
+    expect { empty_router.new }.to raise_error Inesita::Error
+  end
+
+  it 'should not fail with routes' do
+    expect { router.new }.not_to raise_error
+  end
+
+  describe '#url_for' do
+    it 'should return url for component name' do
+      expect(router.new.url_for(:test_component)).to eq '/'
+    end
+
+    it 'should return url for component name' do
+      expect(router.new.url_for(:other_test_component)).to eq '/other'
+    end
+
+    it 'should fail when no route for component' do
+      expect { router.new.url_for(:nothing) }.to raise_error Inesita::Error
+    end
+  end
+
+  describe '#current_url?' do
+    it 'should return true for current url' do
+      expect(router.new.current_url?(:test_component)).to eq true
+    end
+
+    it 'should return false for current url' do
+      expect(router.new.current_url?(:other_test_component)).to eq false
+    end
+  end
+end