reactive-ruby 0.7.25 → 0.7.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de348153ef3143a695778ae38f71ab3282402a13
-  data.tar.gz: 3113b14b3394988d09b200057c893e1e1effaaf0
+  metadata.gz: aea6849b4c9284445c1e8d1313fc53310f8758c7
+  data.tar.gz: f7082d055c5dcb39bf7a43187b2b9feb3105518f
 SHA512:
-  metadata.gz: a498ef58657f9adba73020225353168ca8ce45e5bfae520c74f0ad0c7daa5d959a38e69e47193925abf8052cc3894c202963cd966cee4c62cf9339cc77d8f4ee
-  data.tar.gz: fd08e5a0b645aec16359f31d760c2a4ef914a7761ca31bee14c784d836dbe67c4f0da9290931f1e8c560b7d62d75c7278c2bfc6aa33eb6e44723536c1e4b540f
+  metadata.gz: 498495741c08b7e4f8928491c283c48d4e4eb0c9941ac95441013f1261bb6e1299346e26ee9d3df806b214782c8e34065d0c4805899f13b7f7aef4258f3c31c4
+  data.tar.gz: bce4a6ba733275e0bf39b61203a2c4878021038f88dd35b4e417e732dc7bf0f6b7f5c60a683360c2dee96d0dab9d9db9867f0da52ebd2771a50715a536ccd12e

data/.travis.yml

@@ -3,3 +3,6 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1
+script:
+  - bundle exec rake test_app
+  - bundle exec rake

data/Gemfile

@@ -1,5 +1,7 @@
 source 'https://rubygems.org'
 group :development, :test do
-  gem 'react-rails', github: 'catprintlabs/react-rails', branch: 'isomorphic-methods-support'
+  gem 'therubyracer', platforms: :ruby
+  gem 'rails'
+  gem 'react-rails'
 end
 gemspec

data/Gemfile.lock

@@ -1,19 +1,7 @@
-GIT
-  remote: git://github.com/catprintlabs/react-rails.git
-  revision: 98a8d903a51065c8e3ffedeb094d72a2e9883176
-  branch: isomorphic-methods-support
-  specs:
-    react-rails (1.0.0)
-      coffee-script-source (~> 1.8)
-      connection_pool
-      execjs
-      rails (>= 3.2)
-      tilt
-
 PATH
   remote: .
   specs:
-    reactive-ruby (0.7.23)
+    reactive-ruby (0.7.25)
       opal
       opal-activesupport (>= 0.2.0)
       opal-browser
@@ -57,6 +45,10 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     arel (6.0.3)
+    babel-source (5.8.26)
+    babel-transpiler (0.7.0)
+      babel-source (>= 4.0, < 6)
+      execjs (~> 2.0)
     builder (3.2.2)
     coffee-script-source (1.9.1.1)
     connection_pool (2.2.0)
@@ -72,6 +64,7 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (1.8.3)
+    libv8 (3.16.14.11)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
@@ -133,6 +126,14 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
+    react-rails (1.3.1)
+      babel-transpiler (>= 0.7.0)
+      coffee-script-source (~> 1.8)
+      connection_pool
+      execjs
+      rails (>= 3.2)
+      tilt
+    ref (2.0.0)
     rspec-core (3.3.2)
       rspec-support (~> 3.3.0)
     rspec-expectations (3.3.1)
@@ -162,9 +163,13 @@ GEM
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.10)
+    therubyracer (0.12.2)
+      libv8 (~> 3.16.14.0)
+      ref
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (2.0.1)
+    timecop (0.7.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
@@ -174,12 +179,12 @@ PLATFORMS
 DEPENDENCIES
   opal-rails
   opal-rspec
+  rails
   rake
-  react-rails!
+  react-rails
   reactive-ruby!
   rspec-rails
   sinatra
   sqlite3
-
-BUNDLED WITH
-   1.10.6
+  therubyracer
+  timecop

data/README.md

@@ -159,7 +159,7 @@ To run the above examples project yourself:
 ## Testing
 
 1. Run `bundle exec rake test_app` to generate a dummy test app.
-2. `bundle exec rspec`
+2. `bundle exec rake`
 
 ## Contributions
 

data/Rakefile

@@ -2,11 +2,16 @@ require 'bundler'
 Bundler.require
 Bundler::GemHelper.install_tasks
 
-begin
-  require 'rspec/core/rake_task'
-  RSpec::Core::RakeTask.new(:spec)
-  task default: :spec
-rescue LoadError
+
+require 'rspec/core/rake_task'
+require 'opal/rspec/rake_task'
+
+RSpec::Core::RakeTask.new('ruby:rspec')
+Opal::RSpec::RakeTask.new('opal:rspec')
+
+task :test do
+  Rake::Task['ruby:rspec'].invoke
+  # Rake::Task['opal:rspec'].invoke
 end
 
 require 'generators/reactive_ruby/test_app/test_app_generator'
@@ -16,3 +21,5 @@ task :test_app do
   puts "Setting up test app database..."
   system("bundle exec rake db:drop db:create db:migrate > #{File::NULL}")
 end
+
+task default: [ :test ]

data/example/examples/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    reactive-ruby (0.7.23)
+    reactive-ruby (0.7.25)
       opal
       opal-activesupport (>= 0.2.0)
       opal-browser

data/example/rails-tutorial/Gemfile

@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
 gem 'therubyracer', platforms: :ruby
-gem 'react-rails', git: "https://github.com/catprintlabs/react-rails.git", :branch => 'isomorphic-methods-support'  # you need this branch of react-rails
-gem 'opal-rails'       
+gem 'react-rails' #, git: "https://github.com/catprintlabs/react-rails.git", :branch => 'isomorphic-methods-support'  # you need this branch of react-rails
+gem 'opal-rails'
                 # integrates opal with sprockets etc
 gem 'reactive-ruby', path: "../.."
 
@@ -48,4 +48,3 @@ group :development, :test do
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
 end
-

data/example/rails-tutorial/Gemfile.lock

@@ -1,21 +1,9 @@
-GIT
-  remote: https://github.com/catprintlabs/react-rails.git
-  revision: 98a8d903a51065c8e3ffedeb094d72a2e9883176
-  branch: isomorphic-methods-support
-  specs:
-    react-rails (1.0.0)
-      coffee-script-source (~> 1.8)
-      connection_pool
-      execjs
-      rails (>= 3.2)
-      tilt
-
 PATH
   remote: ../..
   specs:
-    reactive-ruby (0.7.13)
+    reactive-ruby (0.7.25)
       opal
-      opal-activesupport
+      opal-activesupport (>= 0.2.0)
       opal-browser
 
 GEM
@@ -57,6 +45,10 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     arel (6.0.3)
+    babel-source (5.8.26)
+    babel-transpiler (0.7.0)
+      babel-source (>= 4.0, < 6)
+      execjs (~> 2.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     builder (3.2.2)
@@ -89,18 +81,18 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mime-types (2.6.1)
+    mime-types (2.6.2)
     mini_portile (0.6.2)
-    minitest (5.8.0)
+    minitest (5.8.1)
     multi_json (1.11.2)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    opal (0.8.0)
+    opal (0.8.1)
       hike (~> 1.2)
       sourcemap (~> 0.1.0)
       sprockets (~> 3.1)
       tilt (>= 1.4)
-    opal-activesupport (0.1.0)
+    opal-activesupport (0.2.0)
       opal (>= 0.5.0, < 1.0.0)
     opal-browser (0.2.0)
       opal
@@ -116,7 +108,7 @@ GEM
       rails (>= 3.2, < 5.0)
     opal-rspec (0.4.3)
       opal (>= 0.7.0, < 0.9)
-    paggio (0.2.4)
+    paggio (0.2.5)
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -146,6 +138,13 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
     rdoc (4.2.0)
+    react-rails (1.3.2)
+      babel-transpiler (>= 0.7.0)
+      coffee-script-source (~> 1.8)
+      connection_pool
+      execjs
+      rails (>= 3.2)
+      tilt
     ref (2.0.0)
     sass (3.4.18)
     sass-rails (5.0.3)
@@ -159,9 +158,9 @@ GEM
       rdoc (~> 4.0)
     sourcemap (0.1.1)
     spring (1.3.6)
-    sprockets (3.3.3)
-      rack (~> 1.0)
-    sprockets-rails (2.3.2)
+    sprockets (3.4.0)
+      rack (> 1, < 3)
+    sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
@@ -195,7 +194,7 @@ DEPENDENCIES
   jquery-rails
   opal-rails
   rails (= 4.2.3)
-  react-rails!
+  react-rails
   reactive-ruby!
   sass-rails (~> 5.0)
   sdoc (~> 0.4.0)

data/example/sinatra-tutorial/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: ../..
   specs:
-    reactive-ruby (0.7.13)
+    reactive-ruby (0.7.25)
       opal
-      opal-activesupport
+      opal-activesupport (>= 0.2.0)
       opal-browser
 
 GEM
@@ -15,14 +15,14 @@ GEM
       sourcemap (~> 0.1.0)
       sprockets (~> 3.1)
       tilt (>= 1.4)
-    opal-activesupport (0.1.0)
+    opal-activesupport (0.2.0)
       opal (>= 0.5.0, < 1.0.0)
     opal-browser (0.2.0)
       opal
       paggio
     opal-jquery (0.4.0)
       opal (>= 0.7.0, < 0.9.0)
-    paggio (0.2.4)
+    paggio (0.2.5)
     rack (1.6.4)
     rack-protection (1.5.3)
       rack

data/lib/generators/reactive_ruby/test_app/templates/views/components/hello_world.rb

@@ -0,0 +1,11 @@
+module Components
+  class HelloWorld
+    include React::Component
+
+    def render
+      div do
+        "Hello, World!".span
+      end
+    end
+  end
+end

data/lib/generators/reactive_ruby/test_app/templates/views/components/todo.rb

@@ -0,0 +1,14 @@
+module Components
+  class Todo
+    include React::Component
+    export_component
+
+    params do
+      requires :todo
+    end
+
+    def render
+      li { "#{params[:todo]}" }
+    end
+  end
+end

data/lib/generators/reactive_ruby/test_app/test_app_generator.rb

@@ -1,7 +1,7 @@
 require 'rails/generators/rails/app/app_generator'
 
 module ReactiveRuby
-  class TestAppGenerator < Rails::Generators::Base
+  class TestAppGenerator < ::Rails::Generators::Base
     def self.source_paths
       paths = self.superclass.source_paths
       paths << File.expand_path('../templates', __FILE__)
@@ -19,7 +19,7 @@ module ReactiveRuby
       opts[:skip_bundle] = true
 
       puts "Generating Test Rails Application..."
-      invoke Rails::Generators::AppGenerator,
+      invoke ::Rails::Generators::AppGenerator,
         [ File.expand_path(test_app_path, destination_root) ], opts
     end
 
@@ -30,6 +30,10 @@ module ReactiveRuby
         "#{test_app_path}/app/assets/javascripts/application.rb", force: true
       template 'assets/javascripts/components.rb',
         "#{test_app_path}/app/views/components.rb", force: true
+      template 'views/components/hello_world.rb',
+        "#{test_app_path}/app/views/components/hello_world.rb", force: true
+      template 'views/components/todo.rb',
+        "#{test_app_path}/app/views/components/todo.rb", force: true
     end
 
     def clean_superfluous_files

data/lib/reactive-ruby.rb

@@ -1,7 +1,7 @@
 if RUBY_ENGINE == 'opal'
   require "sources/react.js"
   require "reactive-ruby/top_level"
-  require "reactive-ruby/component"  
+  require "reactive-ruby/component"
   require "reactive-ruby/element"
   require "reactive-ruby/event"
   require "reactive-ruby/version"
@@ -12,14 +12,12 @@ if RUBY_ENGINE == 'opal'
   require "reactive-ruby/state"
   require "reactive-ruby/isomorphic_helpers"
   require "rails-helpers/top_level_rails_component"
-  
 else
   require "opal"
-  require "opal-rails"
   require "opal-browser"
-  require "reactive-ruby/version"
   require "opal-activesupport"
-  require "rails-helpers/react_component"
+  require "reactive-ruby/version"
+  require "reactive-ruby/rails" if defined?(Rails)
   require "reactive-ruby/isomorphic_helpers"
   require "reactive-ruby/serializers"
 

data/lib/reactive-ruby/component_loader.rb

@@ -0,0 +1,42 @@
+module ReactiveRuby
+  class ComponentLoader
+    attr_reader :v8_context
+    private :v8_context
+
+    def initialize(v8_context)
+      @v8_context = v8_context
+    end
+
+    def load(file = components)
+      return true if loaded?
+      !!v8_context.eval(opal(file))
+    end
+
+    def load!(file = components)
+      return true if loaded?
+      self.load(file)
+    ensure
+      raise "No react.rb components found in #{components}.rb" unless loaded?
+    end
+
+    def loaded?
+      !!v8_context.eval('Opal.React')
+    end
+
+    private
+
+    def components
+      # Make this configurable at some point
+      'components'
+    end
+
+    def opal(file)
+      Opal::Processor.load_asset_code(assets, file)
+    rescue # What exception is being caught here?
+    end
+
+    def assets
+      ::Rails.application.assets
+    end
+  end
+end

data/lib/reactive-ruby/isomorphic_helpers.rb

@@ -1,21 +1,17 @@
 module React
-  
   module IsomorphicHelpers
-    
     def self.included(base)
       base.extend(ClassMethods)
     end
-    
+
     if RUBY_ENGINE != 'opal'
-      
       def self.load_context(ctx, controller, name = nil)
         puts "************************** React Server Context Initialized #{name} *********************************************"
-        @context = Context.new("#{controller.object_id}-#{Time.now.to_i}", ctx, controller, name) 
+        @context = Context.new("#{controller.object_id}-#{Time.now.to_i}", ctx, controller, name)
       end
-
     else
-      
-      def self.load_context(unique_id = nil, name = nil)  # can be called on the client to force re-initialization for testing purposes
+      def self.load_context(unique_id = nil, name = nil)
+        # can be called on the client to force re-initialization for testing purposes
         if !unique_id or !@context or @context.unique_id != unique_id
           if on_opal_server?
             message = "************************ React Prerendering Context Initialized #{name} ***********************"
@@ -23,13 +19,12 @@ module React
             message = "************************ React Browser Context Initialized ****************************"
           end
           log(message)
-          @context = Context.new(unique_id) 
+          @context = Context.new(unique_id)
         end
         @context
       end
-      
     end
-    
+
     def self.log(message, message_type = :info)
       message = [message] unless message.is_a? Array
       if message_type == :info
@@ -46,41 +41,37 @@ module React
         `console.error.apply(console, message)`
       end
     end
-    
+
     if RUBY_ENGINE != 'opal'
-      
       def self.on_opal_server?
         false
       end
-      
+
       def self.on_opal_client?
         false
       end
-      
     else
-      
       def self.on_opal_server?
         `typeof window.document === 'undefined'`
       end
-      
+
       def self.on_opal_client?
         !on_opal_server?
       end
-      
     end
-    
+
     def log(*args)
       IsomorphicHelpers.log(*args)
     end
-    
+
     def on_opal_server?
-      IsomorphicHelpers.on_opal_server?
+      self.class.on_opal_server?
     end
-    
+
     def on_opal_client?
-      IsomorphicHelpers.on_opal_client?
+      self.class.on_opal_client?
     end
-      
+
     def self.prerender_footers
       footer = Context.prerender_footer_blocks.collect { |block| block.call }.join("\n")
       if RUBY_ENGINE != 'opal'
@@ -89,88 +80,78 @@ module React
       end
       footer
     end
-    
+
     class Context
-      
       attr_reader :controller
       attr_reader :unique_id
-      
+
       def self.before_first_mount_blocks
         @before_first_mount_blocks ||= []
       end
-      
+
       def self.prerender_footer_blocks
         @prerender_footer_blocks ||= []
       end
-      
+
       def initialize(unique_id, ctx = nil, controller = nil, name = nil)
         @unique_id = unique_id
-        if RUBY_ENGINE != 'opal' 
+        if RUBY_ENGINE != 'opal'
           @controller = controller
-          @ctx = ctx 
+          @ctx = ctx
           ctx["ServerSideIsomorphicMethods"] = self
           send_to_opal(:load_context, @unique_id, name)
         end
-        self.class.before_first_mount_blocks.each { |block| block.call(self) } 
+        self.class.before_first_mount_blocks.each { |block| block.call(self) }
       end
-      
+
       def eval(js)
         @ctx.eval(js) if @ctx
       end
-      
+
       def send_to_opal(method, *args)
+        return unless @ctx
         args = [1] if args.length == 0
-        if @ctx
-          unless @ctx.eval('Opal.React')
-            @ctx.eval(Opal::Processor.load_asset_code(::Rails.application.assets, 'components')) rescue nil
-            raise "No opal-react components found in the components.rb file" unless @ctx.eval('Opal.React')
-          end
-          @ctx.eval("Opal.React.IsomorphicHelpers.$#{method}(#{args.collect { |arg| "'#{arg}'"}.join(', ')})")
-        end
+        ::ReactiveRuby::ComponentLoader.new(@ctx).load!
+        @ctx.eval("Opal.React.IsomorphicHelpers.$#{method}(#{args.collect { |arg| "'#{arg}'"}.join(', ')})")
       end
-      
+
       def self.register_before_first_mount_block(&block)
         before_first_mount_blocks << block
       end
-      
+
       def self.register_prerender_footer_block(&block)
         prerender_footer_blocks << block
       end
-      
     end
-    
+
     class IsomorphicProcCall
-      
       def result
         @result.first if @result
       end
-      
+
       def initialize(name, block, *args)
         @name = name
         block.call(self, *args)
         @result ||= send_to_server(*args) if IsomorphicHelpers.on_opal_server?
       end
-      
+
       def when_on_client(&block)
         @result = [block.call] if IsomorphicHelpers.on_opal_client?
       end
-            
-      def send_to_server(*args) 
+
+      def send_to_server(*args)
         if IsomorphicHelpers.on_opal_server?
           args_as_json = args.to_json
-          @result = [JSON.parse(`window.ServerSideIsomorphicMethods[#{@name}](#{args_as_json})`)] 
+          @result = [JSON.parse(`window.ServerSideIsomorphicMethods[#{@name}](#{args_as_json})`)]
         end
       end
-      
+
       def when_on_server(&block)
         @result = [block.call.to_json] unless IsomorphicHelpers.on_opal_client? or IsomorphicHelpers.on_opal_server?
       end
-      
     end
-      
-    
+
     module ClassMethods
-      
       def on_opal_server?
         IsomorphicHelpers.on_opal_server?
       end
@@ -178,46 +159,38 @@ module React
       def on_opal_client?
         IsomorphicHelpers.on_opal_client?
       end
-      
+
       def log(*args)
         IsomorphicHelpers.log(*args)
       end
-      
+
       def controller
         IsomorphicHelpers.context.controller
       end
-  
+
       def before_first_mount(&block)
         React::IsomorphicHelpers::Context.register_before_first_mount_block &block
       end
-      
+
       def prerender_footer(&block)
         React::IsomorphicHelpers::Context.register_prerender_footer_block &block
       end
-        
+
       if RUBY_ENGINE != 'opal'
-        
         def isomorphic_method(name, &block)
           React::IsomorphicHelpers::Context.send(:define_method, name) do |args_as_json|
             React::IsomorphicHelpers::IsomorphicProcCall.new(name, block, *JSON.parse(args_as_json)).result
           end
         end
-        
       else
-        
         require 'json'
-        
+
         def isomorphic_method(name, &block)
           self.class.send(:define_method, name) do | *args |
             React::IsomorphicHelpers::IsomorphicProcCall.new(name, block, *args).result
           end
         end
-        
       end
-      
-      
     end
-    
   end
-  
-end
+end