Skip to content

Minor refactorings #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 16, 2014
Merged

Minor refactorings #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f0acb0
- Rearrange `React::Renderer` methods and move non-public methods to …
vipulnsward Oct 19, 2014
dbecefa
- Use hash.except! instead of manually deleting hash options.
vipulnsward Oct 19, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/react/rails/view_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module ViewHelper
#
def react_component(name, args = {}, options = {}, &block)
options = {:tag => options} if options.is_a?(Symbol)
block = Proc.new{concat React::Renderer.render(name, args)} if options[:prerender] == true
block = Proc.new{concat React::Renderer.render(name, args)} if options[:prerender]
Copy link
Member

@rmosolgo rmosolgo Oct 19, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can't think of any reason that really needed to be literal true


html_options = options.reverse_merge(:data => {})
html_options[:data].tap do |data|
Expand All @@ -18,7 +18,7 @@ def react_component(name, args = {}, options = {}, &block)
html_tag = html_options[:tag] || :div

# remove internally used properties so they aren't rendered to DOM
[:tag, :prerender].each{|prop| html_options.delete(prop)}
html_options.except!(:tag, :prerender)

content_tag(html_tag, '', html_options, &block)
end
Expand Down
53 changes: 29 additions & 24 deletions lib/react/renderer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ def self.setup!(react_js, components_js, args={})
@@components_js = components_js
@@pool.shutdown{} if @@pool
reset_combined_js!
@@pool = ConnectionPool.new(:size => args[:size]||10, :timeout => args[:timeout]||20) { self.new }
default_pool_options = {:size =>10, :timeout => 20}
@@pool = ConnectionPool.new(default_pool_options.merge(args)) { self.new }
end

def self.render(component, args={})
Expand All @@ -27,6 +28,33 @@ def self.render(component, args={})
end
end

def self.react_props(args={})
if args.is_a? String
args
else
args.to_json
end
end

def context
@context ||= ExecJS.compile(self.class.combined_js)
end

def render(component, args={})
react_props = React::Renderer.react_props(args)
jscode = <<-JS
function() {
return React.renderToString(React.createElement(#{component}, #{react_props}));
}()
JS
context.eval(jscode).html_safe
rescue ExecJS::ProgramError => e
raise PrerenderError.new(component, react_props, e)
end


private

def self.setup_combined_js
<<-CODE
var global = global || this;
Expand Down Expand Up @@ -54,28 +82,5 @@ def self.combined_js
@@combined_js
end

def self.react_props(args={})
if args.is_a? String
args
else
args.to_json
end
end

def context
@context ||= ExecJS.compile(self.class.combined_js)
end

def render(component, args={})
react_props = React::Renderer.react_props(args)
jscode = <<-JS
function() {
return React.renderToString(React.createElement(#{component}, #{react_props}));
}()
JS
context.eval(jscode).html_safe
rescue ExecJS::ProgramError => e
raise PrerenderError.new(component, react_props, e)
end
end
end