Skip to content
This repository was archived by the owner on Oct 19, 2018. It is now read-only.

Commit a58bec6

Browse files
committed
merged recent changes from 0.8
1 parent 7d83333 commit a58bec6

File tree

3 files changed

+74
-11
lines changed

3 files changed

+74
-11
lines changed

lib/react/hash.rb

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
class Hash
2+
3+
alias_method :_pre_react_patch_initialize, :initialize
4+
5+
def initialize(defaults = undefined, &block)
6+
if (`defaults===null`)
7+
_pre_react_patch_initialize(&block)
8+
else
9+
_pre_react_patch_initialize(defaults, &block)
10+
end
11+
end
12+
13+
end

lib/reactrb.rb

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
2+
3+
if RUBY_ENGINE == 'opal'
4+
if `window.React === undefined || window.React.version === undefined`
5+
raise [
6+
"No React.js Available",
7+
"",
8+
"React.js must be defined before requiring 'reactrb'",
9+
"'reactrb' has been tested with react v13, v14, and v15.",
10+
"",
11+
"IF USING 'react-rails':",
12+
" add 'require \"react\"' immediately before the 'require \"reactive-ruby\" directive in 'views/components.rb'.",
13+
"IF USING WEBPACK:",
14+
" add 'react' to your webpack manifest.",
15+
"OTHERWISE TO GET THE LATEST TESTED VERSION",
16+
" add 'require \"react-latest\"' immediately before the require of 'reactrb',",
17+
"OR TO USE A SPECIFIC VERSION",
18+
" add 'require \"react-v1x\"' immediately before the require of 'reactrb'."
19+
].join("\n")
20+
end
21+
require 'react/hash'
22+
require 'react/top_level'
23+
require 'react/observable'
24+
require 'react/component'
25+
require 'react/component/base'
26+
require 'react/element'
27+
require 'react/event'
28+
require 'react/api'
29+
require 'react/validator'
30+
require 'react/rendering_context'
31+
require 'react/state'
32+
require 'reactive-ruby/isomorphic_helpers'
33+
require 'rails-helpers/top_level_rails_component'
34+
require 'reactive-ruby/version'
35+
36+
else
37+
require 'opal'
38+
require 'opal-browser'
39+
begin
40+
require 'opal-jquery'
41+
rescue LoadError
42+
end
43+
require 'opal-activesupport'
44+
require 'reactive-ruby/version'
45+
require 'reactive-ruby/rails' if defined?(Rails)
46+
require 'reactive-ruby/isomorphic_helpers'
47+
require 'reactive-ruby/serializers'
48+
49+
Opal.append_path File.expand_path('../', __FILE__).untaint
50+
Opal.append_path File.expand_path('../sources/', __FILE__).untaint
51+
end

reactive-ruby.gemspec renamed to reactrb.gemspec

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ $:.push File.expand_path('../lib/', __FILE__)
44
require 'reactive-ruby/version'
55

66
Gem::Specification.new do |s|
7-
s.name = 'reactive-ruby'
7+
s.name = 'reactrb'
88
s.version = React::VERSION
99

10-
s.author = 'David Chang'
11-
s.email = 'zeta11235813@gmail.com'
12-
s.homepage = 'https://reactrb.org'
10+
s.authors = ['David Chang', 'Adam Jahn', 'Mitch VanDuyn']
11+
s.email = 'reactrb@catprint.com'
12+
s.homepage = 'http://reactrb.org'
1313
s.summary = 'Opal Ruby wrapper of React.js library.'
1414
s.license = 'MIT'
1515
s.description = "Write React UI components in pure Ruby."
@@ -18,21 +18,20 @@ Gem::Specification.new do |s|
1818
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
1919
s.require_paths = ['lib']
2020

21-
22-
23-
s.add_dependency 'opal', '0.8.0'
24-
s.add_dependency 'opal-activesupport', '>= 0.3.0'
21+
s.add_dependency 'opal', '>= 0.8.0'
22+
s.add_dependency 'opal-activesupport', '>= 0.2.0'
2523
s.add_dependency 'opal-browser', '0.2.0'
2624
s.add_development_dependency 'rake'
2725
s.add_development_dependency 'rspec-rails', '3.3.3'
2826
s.add_development_dependency 'timecop'
29-
s.add_development_dependency 'opal-rspec', '0.4.3'
27+
s.add_development_dependency 'opal-rspec'
3028
s.add_development_dependency 'sinatra'
29+
s.add_development_dependency 'opal-jquery'
3130

3231
# For Test Rails App
3332
s.add_development_dependency 'rails', '4.2.4'
34-
s.add_development_dependency 'react-rails', '1.3.1'
35-
s.add_development_dependency 'opal-rails', '0.8.1'
33+
s.add_development_dependency 'react-rails'
34+
s.add_development_dependency 'opal-rails'
3635
if RUBY_PLATFORM == 'java'
3736
s.add_development_dependency 'jdbc-sqlite3'
3837
s.add_development_dependency 'activerecord-jdbcsqlite3-adapter'

0 commit comments

Comments
 (0)