rafters 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ac7e06cae8eb40c60138562dca5806c7e7c91a9
-  data.tar.gz: 27e6adca0f5e3859ab26c2ec2a6dcb84c0be4a20
+  metadata.gz: 2b8a73a896bfba469e100d5a3c02490ef024d28a
+  data.tar.gz: 7cf3fb207afc711be5d5f926232ec8be6eed1c3c
 SHA512:
-  metadata.gz: e5f25e71ba70d5b4953a70ec870701b1a82a1d84394fc5f3ebdaa394c6d9291a6deb869d3436f038f4103025f91501c999a14d4a114cade086da3eeaf921b959
-  data.tar.gz: 01891c2592c824bc5da723fa63f9b7b8bbe659d8909975328e10d56376ca4b9d1ce45b7a7d772379564aa205d70565a2a84034eae2c2990ff6851c1ff170d85a
+  metadata.gz: 6c8b02e99d48f53ff3a3674811798af36b477773969488c2f80e93fd843c73b39a29761c6b140dbff5ffb8cd96c75971361dc640043d7924975972536001e7e2
+  data.tar.gz: 87f68f5526e6766ac70793ef96db2d38bbd0defde239717a47e188dbe27979d7f373a58b8782d06449f458cb61d7697fabb0b17ad9385e849ccfbe4a47dcd04d

data/lib/rafters/component.rb

@@ -11,6 +11,14 @@ module Rafters::Component
     @settings = settings
   end
 
+  def name
+    self.class.name.underscore
+  end
+
+  def identifier
+    @identifier ||= "#{name}-#{random_identifier}"
+  end
+
   def template_name
     @_template_name ||= begin
       _template_name = (self.class._template_name || self.class.name.underscore)
@@ -43,8 +51,20 @@ module Rafters::Component
     end
   end
 
+  def as_json
+    { identifier => { "class" => self.class.name, "attributes" => attributes.as_json } }
+  end
+
   private
 
+  def random_seed
+    rand(DateTime.now.to_i).to_s
+  end
+
+  def random_identifier
+    Digest::MD5.hexdigest(random_seed)[0..6]
+  end
+
   module ClassMethods
     attr_accessor :_attributes, :_defaults, :_template_name
 

data/lib/rafters/component_context.rb

@@ -2,20 +2,20 @@ module Rafters::ComponentContext
   extend ActiveSupport::Concern
 
   included do
+    attr_accessor :rendered_components
+    helper_method :rendered_components
     helper_method :render_component
     alias_method_chain :render, :component
   end
 
-  def render_component(name, settings = {}, template_name = nil)
-    component_klass = "#{name}_component".classify.constantize
-    component = component_klass.new(settings)
-    component_renderer.render(component, template_name)
+  def component_attributes(name, settings = {})
+    component = component(name, settings)
+    component.as_json
   end
 
-  def render_component_attributes(name, settings = {})
-    component_klass = "#{name}_component".classify.constantize
-    component = component_klass.new(settings)
-    { :"#{name}" => component.attributes }.as_json
+  def render_component(name, settings = {}, template_name = nil)
+    component = component(name, settings)
+    component_renderer.render(component, template_name)
   end
 
   def render_with_component(*args, &block)
@@ -23,13 +23,8 @@ module Rafters::ComponentContext
       component, settings = params[:component], params[:settings]
 
       respond_to do |format|
-        format.html do
-          render_without_component(text: render_component(component, settings)) and return
-        end
-
-        format.json do
-          render_without_component(json: render_component_attributes(component, settings)) and return
-        end
+        format.html { render_without_component(text: render_component(component, settings)) }
+        format.json { render_without_component(json: component_attributes(component, settings)) }
       end
     else
       render_without_component(*args, &block)
@@ -41,4 +36,9 @@ module Rafters::ComponentContext
   def component_renderer
     @_component_renderer ||= Rafters::ComponentRenderer.new(self)
   end
+
+  def component(name, settings = {})
+    component_klass = "#{name}_component".classify.constantize
+    component = component_klass.new(settings)
+  end
 end

data/lib/rafters/component_renderer.rb

@@ -12,9 +12,17 @@ class Rafters::ComponentRenderer
 
     template_name = (template_name || component.template_name)
 
-    @controller.view_context.render({
-      file: "/#{template_name}", 
-      locals: component.attributes
-    })
+    store(component)
+
+    @controller.view_context.content_tag(:div, class: "component", id: component.identifier) do
+      @controller.view_context.render(file: "/#{template_name}", locals: component.attributes)
+    end
+  end
+
+  private
+
+  def store(component)
+    @controller.rendered_components ||= {}
+    @controller.rendered_components.merge!(component.as_json)
   end
 end

data/lib/rafters/version.rb

@@ -1,3 +1,3 @@
 module Rafters
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

data/spec/dummy/app/components/post/views/post_component.html.erb

@@ -1,5 +1,5 @@
 <h2><%= link_to_if settings.link_to_post?, post.title, post_path(post.id) %></h2>
 
-<%= render_component :author, { id: post.author.id } %>
+<%= render_component :author, id: post.author.id %>
 
 <%= simple_format post.body %>

data/spec/dummy/app/components/posts/views/posts_component.html.erb

@@ -1,5 +1,5 @@
 <div class="posts">
   <% posts.each do |post| %>
-    <%= render_component :post, { post: post, link_to_post: true } %>
+    <%= render_component :post, post: post, link_to_post: true %>
   <% end %>
 </div>

data/spec/dummy/app/views/posts/index.html.erb

@@ -1,6 +1,6 @@
 <div class="main">
   <div class="content">
-    <%= render_component :heading, { title: "Posts" } %>
+    <%= render_component :heading, title: "Posts" %>
     <%= render_component :posts %>
   </div>
 

data/spec/rafters/component_renderer_spec.rb

@@ -1,8 +1,14 @@
 require 'spec_helper'
 
 describe Rafters::ComponentRenderer do
-  let(:view_context) { double("ViewContext", render: "<p>Output</p>") }
-  let(:controller) { double("Controller", prepend_view_path: true, view_context: view_context) }
+  let(:view_context) { double("ViewContext").as_null_object }
+  let(:controller) { double("Controller").as_null_object }
+
+  before do
+    view_context.stub(:render).and_return("<p>Output</p>")
+    view_context.stub(:content_tag).and_yield
+    controller.stub(:view_context).and_return(view_context)
+  end
 
   describe "when initialized" do
     before do
@@ -18,8 +24,11 @@ describe Rafters::ComponentRenderer do
   describe "#render" do
     subject { Rafters::ComponentRenderer.new(controller) }
 
-    let(:component) do
-      double("Component", attributes: { title: "Foo" }, :'controller=' => true, template_name: "template")
+    let(:component) { double("Component").as_null_object }
+
+    before do
+      component.stub(:attributes).and_return({ title: "Foo" })
+      component.stub(:template_name).and_return("template")
     end
 
     it "renders the component template with it's settings and attributes" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rafters
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Andrew Hite