hyper-router 2.4.1 → 4.0.0

data/lib/hyper-router.rb

@@ -1,37 +1,52 @@
-require 'hyperloop-config'
 require 'hyper-component'
 Hyperloop.import 'hyper-router/react-router-source'
 Hyperloop.import 'hyper-router'
 if RUBY_ENGINE == 'opal'
-  no_source = `Opal.global.ReactRouter === undefined`
-  if no_source
+  no_router_source = `Opal.global.ReactRouter === undefined`
+  no_router_dom_source = `Opal.global.ReactRouterDOM === undefined`
+  if no_router_source || no_router_dom_source
     error = <<-ERROR
-No react-router.js Available.
+No react-router.js or react-router-dom.js Available.
 
-A global `ReactRouter` must be defined before requiring 'hyper-router'.
+A global 'ReactRouter' and 'ReactRouterDOM' must be defined before requiring 'hyper-router'.
 
 To USE THE BUILT-IN SOURCE:
   add 'require \"hyper-router/react-router-source\"'
   immediately before the 'require \"hyper-router\" directive.
 
 IF USING NPM/WEBPACK:
-  add "react-router": "~2.4.0" to your package.json.)
+  add '\"react-router\": \"4.0.0\"' and '\"react-router-dom\": \"4.0.0\"' to your package.json.)
     ERROR
     raise error
   end
-  require 'active_support'
-  require 'promise'
-  require 'promise_extras'
+
+
   require 'react/router'
-  require 'react/router/dsl'
-  require 'react/router/dsl/route'
-  require 'react/router/dsl/index'
-  require 'react/router/dsl/transition_context'
+  require 'react/router/dom'
   require 'react/router/history'
+
+  require 'hyper-router/history'
+  require 'hyper-router/location'
+  require 'hyper-router/match'
+  require 'hyper-router/class_methods'
+  require 'hyper-router/component_methods'
+
+  require 'hyperloop/router/base/class_methods'
+  require 'hyperloop/router/browser/class_methods'
+  require 'hyperloop/router/hash/class_methods'
+  require 'hyperloop/router/memory/class_methods'
+  require 'hyperloop/router/static/class_methods'
+  require 'hyperloop/router/base'
+  require 'hyperloop/router/browser'
+  require 'hyperloop/router/component'
+  require 'hyperloop/router/hash'
+  require 'hyperloop/router/memory'
+  require 'hyperloop/router/static'
+  require 'hyperloop/router'
 else
   require 'opal'
-  require 'hyper-react'
-  require 'react/router/version'
+  # require 'hyper-react'
+  require 'hyper-router/version'
 
   Opal.append_path File.expand_path('../', __FILE__).untaint
 end

data/lib/hyper-router/class_methods.rb

@@ -0,0 +1,53 @@
+module HyperRouter
+  module ClassMethods
+    def prerender_path(*args)
+      name = args[0].is_a?(Hash) ? args[0].first[0] : args[0]
+
+      define_method(:prerender_path) do
+        params.send(:"#{name}")
+      end
+
+      param(*args)
+    end
+
+    def history(history_type)
+      define_method(:history) do
+        @history ||= self.class.send(:"#{history_type}_history")
+      end
+    end
+
+    def prerender_router(&block)
+      define_method(:render) do
+        location = {}.tap do |hash|
+          pathname, search = (respond_to?(:prerender_path) ? prerender_path : '').split('?', 2)
+          hash[:pathname] = pathname
+          hash[:search] = search ? "?#{search}" : ''
+        end
+
+        React::Router::StaticRouter(location: location.to_n, context: {}.to_n) do
+          instance_eval(&block)
+        end
+      end
+    end
+
+    def route(&block)
+      if React::IsomorphicHelpers.on_opal_client?
+        render_router(&block)
+      else
+        prerender_router(&block)
+      end
+    end
+
+    def browser_history
+      React::Router::History.current.create_browser_history
+    end
+
+    def hash_history(*args)
+      React::Router::History.current.create_hash_history(*args)
+    end
+
+    def memory_history(*args)
+      React::Router::History.current.create_memory_history(*args)
+    end
+  end
+end

data/lib/hyper-router/component_methods.rb

@@ -0,0 +1,63 @@
+# rubocop:disable Style/MethodName
+
+module HyperRouter
+  module ComponentMethods
+    def Link(to, opts = {}, &children)
+      opts[:to] = {}.tap do |hash|
+        hash[:pathname] = to
+        hash[:search] = opts.delete(:search) if opts[:search]
+        hash[:hash] = opts.delete(:hash) if opts[:hash]
+      end.to_n
+      React::Router::DOM::Link(opts, &children)
+    end
+
+    def NavLink(to, opts = {}, &children)
+      opts[:to] = to.to_n
+      opts[:activeClassName] = opts.delete(:active_class).to_n if opts[:active_class]
+      opts[:activeStyle] = opts.delete(:active_style).to_n if opts[:active_style]
+      opts[:isActive] = opts.delete(:active).to_n if opts[:active]
+      React::Router::DOM::NavLink(opts, &children)
+    end
+
+    def Redirect(to, opts = {})
+      opts[:to] = to.to_n
+      React::Router::Redirect(opts)
+    end
+
+    def format_params(e)
+      {
+        match:    HyperRouter::Match.new(`#{e}.match`),
+        location: HyperRouter::Location.new(`#{e}.location`),
+        history:  HyperRouter::History.new(`#{e}.history`)
+      }
+    end
+
+    def Route(to, opts = {}, &block)
+      opts[:path] = to.to_n
+
+      if opts[:mounts]
+        component = opts.delete(:mounts)
+
+        opts[:component] = lambda do |e|
+          route_params = format_params(e)
+
+          React.create_element(component, route_params).to_n
+        end
+      end
+
+      if block
+        opts[:render] = lambda do |e|
+          route_params = format_params(e)
+
+          yield(route_params.values).to_n
+        end
+      end
+
+      React::Router::Route(opts)
+    end
+
+    def Switch(&children)
+      React::Router::Switch(&children)
+    end
+  end
+end

data/lib/hyper-router/history.rb

@@ -0,0 +1,22 @@
+module HyperRouter
+  class History
+    include Native
+
+    def initialize(native)
+      @native = native
+    end
+
+    def to_n
+      @native
+    end
+
+    alias_native :block
+    alias_native :create_href, :createHref
+    alias_native :go
+    alias_native :go_back, :goBack
+    alias_native :go_forward, :goForward
+    alias_native :location, :location
+    alias_native :push, :push
+    alias_native :replace, :replace
+  end
+end

data/lib/hyper-router/location.rb

@@ -0,0 +1,29 @@
+module HyperRouter
+  class Location
+    include Native
+
+    def initialize(native)
+      @native = native
+    end
+
+    def to_n
+      @native
+    end
+
+    def query
+      return {} if search.blank?
+
+      Hash[search[1..-1].split('&').map { |part|
+        name, value = part.split('=')
+
+        [`decodeURIComponent(#{name})`, `decodeURIComponent(#{value})`]
+      }]
+    end
+
+    alias_native :pathname
+    alias_native :search
+    alias_native :hash
+    alias_native :state
+    alias_native :key
+  end
+end

data/lib/hyper-router/match.rb

@@ -0,0 +1,18 @@
+module HyperRouter
+  class Match
+    include Native
+
+    def initialize(native)
+      @native = native
+    end
+
+    def to_n
+      @native
+    end
+
+    alias_native :params
+    alias_native :is_exact, :isExact
+    alias_native :path
+    alias_native :url
+  end
+end

data/lib/hyper-router/react-router-source.rb

@@ -1,2 +1,4 @@
-# rubocop:disable
-require 'src/react-router.js'
+# rubocop:disable Style/FileName
+require 'src/react-router.min.js'
+require 'src/react-router-dom.min.js'
+require 'src/history.min.js'

data/lib/{react/router → hyper-router}/version.rb

@@ -1,3 +1,3 @@
 module HyperRouter
-  VERSION = '2.4.1'
+  VERSION = '4.0.0'
 end

data/lib/hyperloop/router.rb

@@ -0,0 +1,36 @@
+module Hyperloop
+  class Router
+    def self.inherited(child)
+      child.include(React::Component)
+      child.include(Base)
+    end
+  end
+
+  class BrowserRouter
+    def self.inherited(child)
+      child.include(React::Component)
+      child.include(Hyperloop::Router::Browser)
+    end
+  end
+
+  class HashRouter
+    def self.inherited(child)
+      child.include(React::Component)
+      child.include(Hyperloop::Router::Hash)
+    end
+  end
+
+  class MemoryRouter
+    def self.inherited(child)
+      child.include(React::Component)
+      child.include(Hyperloop::Router::Memory)
+    end
+  end
+
+  class StaticRouter
+    def self.inherited(child)
+      child.include(React::Component)
+      child.include(Hyperloop::Router::Static)
+    end
+  end
+end

data/lib/hyperloop/router/base.rb

@@ -0,0 +1,12 @@
+module Hyperloop
+  class Router
+    module Base
+      def self.included(base)
+        base.extend(HyperRouter::ClassMethods)
+        base.extend(ClassMethods)
+
+        base.include(HyperRouter::ComponentMethods)
+      end
+    end
+  end
+end

data/lib/hyperloop/router/base/class_methods.rb

@@ -0,0 +1,21 @@
+module Hyperloop
+  class Router
+    module Base
+      module ClassMethods
+        def render_router(&block)
+          define_method(:render) do
+            if respond_to?(:history)
+              React::Router::Router(history: history.to_n) do
+                instance_eval(&block)
+              end
+            else
+              React::Router::MemoryRouter(location: { pathname: '/' }.to_n) do
+                instance_eval(&block)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/hyperloop/router/browser.rb

@@ -0,0 +1,12 @@
+module Hyperloop
+  class Router
+    module Browser
+      def self.included(base)
+        base.extend(HyperRouter::ClassMethods)
+        base.extend(ClassMethods)
+
+        base.include(HyperRouter::ComponentMethods)
+      end
+    end
+  end
+end

data/lib/hyperloop/router/browser/class_methods.rb

@@ -0,0 +1,15 @@
+module Hyperloop
+  class Router
+    module Browser
+      module ClassMethods
+        def render_router(&block)
+          define_method(:render) do
+            React::Router::DOM::BrowserRouter() do
+              instance_eval(&block)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/hyperloop/router/component.rb

@@ -0,0 +1,28 @@
+module Hyperloop
+  class Router
+    class Component
+      def self.inherited(base)
+        base.include(React::Component)
+        base.include(HyperRouter::ComponentMethods)
+
+        base.class_eval do
+          param :match, default: nil
+          param :location, default: nil
+          param :history, default: nil
+
+          define_method(:match) do
+            params.match
+          end
+
+          define_method(:location) do
+            params.location
+          end
+
+          define_method(:history) do
+            params.history
+          end
+        end
+      end
+    end
+  end
+end

data/lib/hyperloop/router/hash.rb

@@ -0,0 +1,12 @@
+module Hyperloop
+  class Router
+    module Browser
+      def self.included(base)
+        base.extend(HyperRouter::ClassMethods)
+        base.extend(ClassMethods)
+        
+        base.include(HyperRouter::ComponentMethods)
+      end
+    end
+  end
+end

data/lib/hyperloop/router/hash/class_methods.rb

@@ -0,0 +1,15 @@
+module Hyperloop
+  class Router
+    module Hash
+      module ClassMethods
+        def render(&block)
+          define_method(:render) do
+            React::Router::DOM::HashRouter() do
+              instance_eval(&block)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/hyperloop/router/memory.rb

@@ -0,0 +1,12 @@
+module Hyperloop
+  class Router
+    module Memory
+      def self.included(base)
+        base.extend(HyperRouter::ClassMethods)
+        base.extend(ClassMethods)
+        
+        base.include(HyperRouter::ComponentMethods)
+      end
+    end
+  end
+end