reactive-router 0.2.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7a8fd6cc3a6c46b51545b58ab6cd38c209702d0
-  data.tar.gz: d752c6775a07ed7533921b3b080f33ec29e9b575
+  metadata.gz: 76464038f9ab3477f15cfa11a50f726339a2488f
+  data.tar.gz: c9a74c8523720d3e0d60dee87145e13b2285ed27
 SHA512:
-  metadata.gz: 66cbf2995946b6c6126bb9b819608630e538d98c548051cc7454f0dd40bac89141e26ae7ea9eb8623ea1ec43b73b9fcbe29d9fc67a9caf1d67976496e620faf7
-  data.tar.gz: c5f1b5f780a41e82b7fe139050e39e47c686a99b8e1f6e1b526cff52f64180ffe32c09a8be619f839bbaf4d3181ea1a7f4861aa2ce139f112826b1de6122579e
+  metadata.gz: 6e49d2cad407f11eaf7069fd3da3ac057442236b040a5bd8cc0da838f5d7895318feac5964b21f6c106ab090cfeb413aefd3f5d67ff00c66c1ec6c76397bcfaa
+  data.tar.gz: 26ffb6cd930963f45bac01f83de27dd8dd9531266dbb8a7b3d16aa19e8e071da97426d1f68659a9042ae6a744d408d23c0271747e0c6c697571e92ebb38c3f08

data/lib/reactive-router.rb

@@ -5,6 +5,7 @@ if RUBY_ENGINE == 'opal'
 else
   require 'opal'
   require 'opal-react'
+  require 'reactive-router/window_location'
   require 'reactive-router/version'
 
   Opal.append_path File.expand_path('../', __FILE__).untaint

data/lib/reactive-router/router.rb

@@ -10,11 +10,37 @@ module React
       base.class_eval do
 
         include React::Component
+        include React::IsomorphicHelpers
+        
+        before_first_mount do |context|
+          if `typeof ReactRouter === 'undefined'`
+            if on_opal_client?
+              message = "ReactRouter not defined in browser assets - you must manually include it in your assets"
+            else
+              message = "ReactRouter not defined in components.js.rb assets manifest - you must manually include it in your assets"
+            end
+            `console.error(message)`
+            @routing = true
+          else
+            @routing = false
+          end
+        end
 
         export_component
 
         def render
-          show if self.class.routing?
+          if self.class.routing?
+            show
+          elsif on_opal_server?
+            self.class.routing!
+            routes = self.class.build_routes
+            %x{
+              ReactRouter.run(#{routes}, window.reactive_router_static_location, function(root) {
+                self.root = React.createElement(root);
+              });
+            }
+            React::Element.new(@root, 'Root', {}, nil)
+          end
         end
 
         def self.routing?
@@ -27,30 +53,33 @@ module React
           was_routing
         end
 
-        def self.handler(handler)
-          React::API.create_native_react_class(handler)
-        end
-
         after_mount do
           unless self.class.routing!
-            x = `React.findDOMNode(#{self}.native)`
-            routes = self.class.class_eval { @routes.call }
+            dom_node = `React.findDOMNode(#{self}.native)`
+            routes = self.class.build_routes
             %x{
               ReactRouter.run(#{routes}, ReactRouter.HistoryLocation, function(root) {
-                React.render(React.createElement(root), #{x});
+                React.render(React.createElement(root), #{dom_node});
               });
             }
           end
         end
 
         def self.routes(opts = {}, &block)
-          opts[:handler] ||= self
-          @routes = -> { self.route(opts, generate_node = true, &block) }
+          @routes_opts = opts
+          @routes_block = block
+        end
+        
+        def self.build_routes
+          routes_opts = @routes_opts.dup
+          routes_opts[:handler] ||= self 
+          route(routes_opts, generate_node = true, &@routes_block)
         end
 
         def self.route(opts = {}, generate_node = nil, &block)
-          opts[:handler] = self.handler(opts[:handler])
-          generate_node ? RR::Route_as_node(opts, &block) : RR::Route(opts, &block)
+          opts = opts.dup
+          opts[:handler] = React::API.create_native_react_class(opts[:handler])
+          (generate_node ? RR::Route_as_node(opts, &block) : RR::Route(opts, &block)) 
         end
 
         def self.default_route(ops = {}, &block)

data/lib/reactive-router/version.rb

@@ -1,3 +1,3 @@
 module ReactiveRouter
-  VERSION = "0.2.0"
+  VERSION = "0.7.1"
 end

data/lib/reactive-router/window_location.rb

@@ -0,0 +1,13 @@
+module React
+  module Router
+    class WindowLocation
+      
+      include React::IsomorphicHelpers
+      
+      before_first_mount do |context|
+        context.eval("window.reactive_router_static_location = '#{context.controller.request.path}?#{context.controller.request.query_string}'")
+      end
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reactive-router
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Adam George
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: react-router-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.13.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.13.3
 description: Adds the ability to write and use the react-router in Ruby through Opal
 email:
 - adamgeorge.31@gmail.com
@@ -94,6 +80,7 @@ files:
 - lib/reactive-router/component.rb
 - lib/reactive-router/router.rb
 - lib/reactive-router/version.rb
+- lib/reactive-router/window_location.rb
 homepage: 
 licenses: []
 metadata: {}