inesita 0.3.5 → 0.4.0

data/opal/inesita.rb

@@ -2,12 +2,9 @@ require 'opal'
 require 'js'
 require 'console'
 
-require 'browser'
-require 'browser/history'
-require 'browser/animation_frame'
-
 require 'virtual_dom'
 
+require 'inesita/browser'
 require 'inesita/error'
 require 'inesita/component_virtual_dom_extension'
 require 'inesita/component_properties'

data/opal/inesita/application.rb

@@ -17,16 +17,16 @@ module Inesita
 
     def setup_router(router)
       if router
-        fail Error, "Invalid #{router} class, should mixin Inesita::Router" unless router.include?(Inesita::Router)
+        raise Error, "Invalid #{router} class, should mixin Inesita::Router" unless router.include?(Inesita::Router)
         @router = router.new
       else
-        @router = Class.new { define_method(:method_missing) { fail 'Router missing' } }.new
+        @router = Class.new { define_method(:method_missing) { raise 'Router missing' } }.new
       end
     end
 
     def setup_layout(layout)
       if layout
-        fail Error, "Invalid #{layout} class, should mixin Inesita::Layout" unless layout.include?(Inesita::Layout)
+        raise Error, "Invalid #{layout} class, should mixin Inesita::Layout" unless layout.include?(Inesita::Layout)
         @layout = layout.new
       end
     end
@@ -37,14 +37,15 @@ module Inesita
       elsif @router
         @root = @router
       else
-        fail Error, 'Router or Layout not found!'
+        raise Error, 'Router or Layout not found!'
       end
     end
 
     def setup_store(store)
       return unless store
-      fail Error, "Invalid #{store} class, should mixin Inesita::Store" unless store.include?(Inesita::Store)
-      @store = store.new.with_root_component(@root).store
+      raise Error, "Invalid #{store} class, should mixin Inesita::Store" unless store.include?(Inesita::Store)
+      @store = store.new.with_root_component(@root).with_router(@router).store
+      @store.init
     end
   end
 end

data/opal/inesita/browser.rb

@@ -0,0 +1,63 @@
+module Inesita
+  module Browser
+    module_function
+
+    Window = JS.global
+    Document = Window.JS[:document]
+    Location = Document.JS[:location]
+    History = Window.JS[:history]
+    AddEventListener = Window.JS[:addEventListener]
+
+    if Native(Window.JS[:requestAnimationFrame])
+      def animation_frame(&block)
+        Window.JS.requestAnimationFrame(block)
+      end
+    else
+      def animation_frame(&block)
+        block.call
+      end
+    end
+
+    def path
+      Location.JS[:pathname]
+    end
+
+    def query
+      Location.JS[:search]
+    end
+
+    def decode_uri_component(value)
+      JS.decodeURIComponent(value)
+    end
+
+    def push_state(path)
+      History.JS.pushState({}, nil, path)
+    end
+
+    def onpopstate(&block)
+      Window.JS[:onpopstate] = block
+    end
+
+    def hashchange(&block)
+      AddEventListener.call(:hashchange, block)
+    end
+
+    def ready?(&block)
+      AddEventListener.call('load', block)
+    end
+
+    def body
+      Document.JS[:body]
+    end
+
+    def append_child(node, new_node)
+      node = node.to_n unless native?(node)
+      new_node = new_node.to_n unless native?(new_node)
+      node.JS.appendChild(new_node)
+    end
+
+    def query_element(css)
+      Document.JS.querySelector(css)
+    end
+  end
+end

data/opal/inesita/component.rb

@@ -5,17 +5,18 @@ module Inesita
     include ComponentProperties
     include ComponentVirtualDomExtension
 
+    def init; end
+
     def render
-      fail Error, "Implement #render in #{self.class} component"
+      raise Error, "Implement #render in #{self.class} component"
     end
 
     def mount_to(element)
-      fail Error, "Can't mount #{self.class}, target element not found!" unless element
+      raise Error, "Can't mount #{self.class}, target element not found!" unless element
       @root_component = self
       @virtual_dom = render_virtual_dom
       @root_node = VirtualDOM.create(@virtual_dom)
-      element.inner_dom = @root_node
-      @root_component.call_after_render
+      Browser.append_child(element, @root_node)
       self
     end
 
@@ -28,36 +29,25 @@ module Inesita
     end
 
     def render_virtual_dom
-      @after_render_callbacks = []
-      @root_component.add_after_render(method(:after_render)) if respond_to?(:after_render)
       @cache_component_counter = 0
       @__virtual_nodes__ = []
       render
-      if @__virtual_nodes__.length == 1
+      if @__virtual_nodes__.one?
         @__virtual_nodes__.first
       else
         VirtualDOM::VirtualNode.new('div', {}, @__virtual_nodes__).to_n
       end
     end
 
-    def add_after_render(block)
-      @after_render_callbacks << block
-    end
-
-    def call_after_render
-      @after_render_callbacks.reverse_each(&:call)
-    end
-
     def update_dom
       $console.warn "Use 'render!' instead of 'update_dom'"
       render!
     end
 
     def render!
-      animation_frame do
+      Browser.animation_frame do
         if @root_component
           @root_component.render_if_root
-          @root_component.call_after_render
         end
       end
     end
@@ -68,5 +58,13 @@ module Inesita
       @cache_component_counter += 1
       @cache_component["#{component}-#{@cache_component_counter}"] || @cache_component["#{component}-#{@cache_component_counter}"] = block.call
     end
+
+    def hook(mthd)
+      VirtualDOM::Hook.method(method(mthd))
+    end
+
+    def unhook(mthd)
+      VirtualDOM::UnHook.method(method(mthd))
+    end
   end
 end

data/opal/inesita/component_virtual_dom_extension.rb

@@ -3,19 +3,21 @@ module Inesita
     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
+        params = { onclick: -> { @router.go_to(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?
+      raise 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)
+        comp = (comp.is_a?(Class) ? comp.new : comp)
           .with_root_component(@root_component)
           .with_router(@router)
           .with_store(@store)
+        comp.init
+        comp
       end.with_props(opts[:props] || {}).render_virtual_dom
     end
   end

data/opal/inesita/router.rb

@@ -6,16 +6,17 @@ module Inesita
 
     def initialize
       @routes = Routes.new
-      @url_params = parse_url_params
-      fail Error, 'Add #routes method to router!' unless respond_to?(:routes)
+      raise Error, 'Add #routes method to router!' unless respond_to?(:routes)
       routes
-      fail Error, 'Add #route to your #routes method!' if @routes.routes.empty?
+      raise Error, 'Add #route to your #routes method!' if @routes.routes.empty?
+      find_route
+      parse_url_params
       add_listeners
     end
 
     def add_listeners
-      $window.on(:popstate) { render! }
-      $window.on(:hashchange) { render! }
+      Browser.onpopstate { find_route; parse_url_params; render! }
+      Browser.hashchange { find_route; parse_url_params; render! }
     end
 
     def route(*params, &block)
@@ -25,39 +26,39 @@ module Inesita
     def find_route
       @routes.routes.each do |route|
         next unless path.match(route[:regex])
-        return handle_link(url_for(route[:redirect_to])) if route[:redirect_to]
-        return route
+        return go_to(url_for(route[:redirect_to])) if route[:redirect_to]
+        return @route = route
       end
-      fail Error, "Can't find route for url"
+      raise Error, "Can't find route for url"
     end
 
     def find_component(route)
-      params = path.match(route[:regex])
-      @params = @url_params.merge(Hash[route[:params].zip(params[1..-1])])
       @component_props = route[:component_props]
       route[:component]
     end
 
     def render
-      if route = find_route
-        component find_component(route), props: @component_props
-      end
+      component find_component(@route), props: @component_props if @route
     end
 
-    def handle_link(path)
-      $window.history.push(path)
+    def go_to(path)
+      Browser.push_state(path)
+      find_route
+      parse_url_params
       render!
       false
     end
 
     def parse_url_params
-      params = {}
-      url_query = $window.location.query.to_s
-      url_query[1..-1].split('&').each do |param|
+      @params = compotent_url_params
+      query[1..-1].split('&').each do |param|
         key, value = param.split('=')
-        params[key.decode_uri_component] = value.decode_uri_component
-      end unless url_query.length == 0
-      params
+        @params[Browser.decode_uri_component(key)] = Browser.decode_uri_component(value)
+      end unless query.empty?
+    end
+
+    def compotent_url_params
+      Hash[@route[:params].zip(path.match(@route[:regex])[1..-1])]
     end
 
     def url_for(name, params = nil)
@@ -71,11 +72,15 @@ module Inesita
           false
         end
       end
-      route ? url_with_params(route, params) : fail(Error, "Route '#{name}' not found.")
+      route ? url_with_params(route, params) : raise(Error, "Route '#{name}' not found.")
+    end
+
+    def query
+      Browser.query
     end
 
     def path
-      $window.location.path
+      Browser.path
     end
 
     def current_url?(name)

data/opal/inesita/routes.rb

@@ -8,7 +8,7 @@ module Inesita
     end
 
     def route(*params, &block)
-      path = params.first.delete('/')
+      path = params.first.gsub(/^\//, '')
       path = @parent ? "#{@parent}/#{path}" : "/#{path}"
 
       add_subroutes(path, &block) if block_given?
@@ -21,15 +21,15 @@ module Inesita
     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)
+      raise Error, 'Component not exists' unless component
+      raise Error, "Invalid #{component} class, should mixin Inesita::Component" unless component.include?(Inesita::Component)
     end
 
     def add_redirect(path, redirect_to)
       @routes << {
         path: path,
         redirect_to: redirect_to
-      }.merge(params_and_regex(path))
+      }.merge(build_params_and_regex(path))
     end
 
     def add_route(name, path, component, component_props)
@@ -39,7 +39,7 @@ module Inesita
         component: component,
         component_props: component_props,
         name: name || component.to_s.gsub(/(.)([A-Z])/, '\1_\2').downcase
-      }.merge(params_and_regex(path))
+      }.merge(build_params_and_regex(path))
     end
 
     def add_subroutes(path, &block)
@@ -48,7 +48,7 @@ module Inesita
       @routes += subroutes.routes
     end
 
-    def params_and_regex(path)
+    def build_params_and_regex(path)
       regex = ['^']
       params = []
       parts = path.split('/')
@@ -56,9 +56,14 @@ module Inesita
       parts.each do |part|
         next if part.empty?
         regex << '\/'
-        if part[0] == ':'
+        case part[0]
+        when ':'
           params << part[1..-1]
           regex << '([^\/]+)'
+        when '*'
+          params << part[1..-1]
+          regex << '(.*)'
+          break
         else
           regex << part
         end

data/opal/inesita/store.rb

@@ -1,8 +1,8 @@
 module Inesita
   module Store
-    def store
-      self
-    end
+
+    def init; end
+    def store; self end
 
     def update_dom
       $console.warn "Use 'render!' instead of 'update_dom'"
@@ -18,5 +18,11 @@ module Inesita
       @root_component = component
       self
     end
+
+    attr_reader :router
+    def with_router(router)
+      @router = router
+      self
+    end
   end
 end

data/spec/opal/component_spec.rb

@@ -37,7 +37,7 @@ describe Inesita::Router do
   end
 
   let(:element) do
-    $document.create_element('div')
+    Inesita::Browser::Document.JS.createElement('div')
   end
 
   it 'should fail when no #render method' do
@@ -46,11 +46,11 @@ describe Inesita::Router do
 
   it 'should render html' do
     component.new.mount_to(element)
-    expect(element.inner_html).to eq '<h1 class="test">Test</h1>'
+    expect(element.JS[:innerHTML]).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>'
+    expect(element.JS[:innerHTML]).to eq '<h1 class="test"><div>Inner</div></h1>'
   end
 end

data/spec/opal/spec_helper.rb

@@ -2,4 +2,3 @@ include RSpec
 
 require 'virtual-dom'
 require 'inesita'
-require 'browser'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inesita
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Michał Kalbarczyk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -24,34 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: opal-browser
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: opal-virtual-dom
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: websocket
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: Frontent web framework for Opal
 email: fazibear@gmail.com
 executables:
@@ -153,7 +125,6 @@ files:
 - bin/inesita
 - inesita.gemspec
 - lib/inesita.rb
-- lib/inesita/app_files_listener.rb
 - lib/inesita/cli.rb
 - lib/inesita/cli/build.rb
 - lib/inesita/cli/new.rb
@@ -174,19 +145,17 @@ files:
 - lib/inesita/cli/template/static/inesita-rb.png
 - lib/inesita/cli/watch.rb
 - lib/inesita/config.rb
-- lib/inesita/live_reload.rb
 - lib/inesita/minify.rb
 - lib/inesita/server.rb
-- lib/rubame.rb
 - opal/inesita.rb
 - opal/inesita/application.rb
+- opal/inesita/browser.rb
 - opal/inesita/component.rb
 - opal/inesita/component_helpers.rb
 - opal/inesita/component_properties.rb
 - opal/inesita/component_virtual_dom_extension.rb
 - opal/inesita/error.rb
 - opal/inesita/layout.rb
-- opal/inesita/live_reload.rb
 - opal/inesita/router.rb
 - opal/inesita/routes.rb
 - opal/inesita/store.rb