rafters 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06d271740c2834640701158193c17c1054228825
-  data.tar.gz: c4cc3af9945fc8e0ece7e787f7ebbfd1fe5539ad
+  metadata.gz: 72ca3bd17594c2258f6e49db8ae9cd9a790e8401
+  data.tar.gz: 56180a28505beb04a9ed2586b46cbaed30f52e4e
 SHA512:
-  metadata.gz: 89c94d519911b237cf4ed2d29fc5247a0cfd74d4dbd3339d0ea7dcf2a420920a117d161e053debe0e6dda6e192855e6643f3b14920126a137fd252caa4e54e4b
-  data.tar.gz: c86a9ab53bce55b978eea3134a08e7192a28fcec2bcfbcc8676a133bb977963944c499a6f5936d8fa933e7d9fbf1f202db85e0a23b29e83622d6b60fa31b5846
+  metadata.gz: cd5c342a61c308221678523c547564656ff80cca6ac9b1eccfc3eb404862ca100ff90ce48b398eafe63358ec6a91f3fa3c770eb48253526d86e6e112568dc279
+  data.tar.gz: 349c5562bfee46be2fd5fb63a528ecd880dd33f64cb8783b7b2df074b97ff0fb92a872766287b667d07a7c568b56466dd3e1684d79134f65a5f7ac92fe49cbad

data/README.md

@@ -58,7 +58,7 @@ app/rafters/{name}/assets/javascripts/{name}_component.js.coffee
 app/rafters/{name}/views/{name}_component.html.erb
 ```
   
-The two most important files generated above are `app/rafters/[name]/[name]_component.rb` and `app/rafters/[name]/views/[name]_component.html.erb`, which are (respectively) our component controller and view.
+The two most important files generated above are `app/rafters/{name}/{name}_component.rb` and `app/rafters/{name}/views/{name}_component.html.erb`, which are (respectively) our component controller and view.
 
 ### Rendering a component
 
@@ -184,17 +184,17 @@ defaults type: "comment", filter: "none"
 default :published, false
 ```
 
-## Creating a source option for a component
+### Creating a source option for a component
 
 There are often times when a single, general component can be powered by multiple complex data sources. In order to do this Rafters includes to option to create "source" classes that belong to individual components. Each source should expose an interface that can be consumed by the component's template, and options that are set on the component level are accessible at the source level as well.
 
 To create a source, run the following generator:
 
-```ruby
-$ rails g rafters:source {component name} {source name}
+```sh
+$ rails g rafters:source {component_name} {source_name}
 ```
 
-This generator will create a file named `{component name}_{source name}_source.rb` in the specified component's sources directory.
+This generator will create a file named `{component_name}_{source_name}_source.rb` in the specified component's sources directory.
 
 A source class is a simple Ruby class that includes the `Rafters::Source` module. You can do pretty much anything you want with source classes (including subclassing), as long as they all expose the same public interface methods. When a component is configured to use a specific source, the `#source` method in that component will return an instance of the specified source class.
 

data/lib/rafters.rb

@@ -8,8 +8,8 @@ module Rafters
 
   eager_autoload do
     autoload :Component
-    autoload :ComponentContext
-    autoload :ComponentRenderer
+    autoload :Context
+    autoload :Renderer
     autoload :Source
   end
 
@@ -24,4 +24,4 @@ module Rafters
   @@asset_paths = nil
 end
 
-ActionController::Base.send(:include, Rafters::ComponentContext)
+ActionController::Base.send(:include, Rafters::Context)

data/lib/rafters/{component_context.rb → context.rb}

@@ -1,4 +1,4 @@
-module Rafters::ComponentContext
+module Rafters::Context
   extend ActiveSupport::Concern
 
   included do
@@ -34,7 +34,7 @@ module Rafters::ComponentContext
   private
 
   def component_renderer
-    @_component_renderer ||= Rafters::ComponentRenderer.new(self)
+    @_component_renderer ||= Rafters::Renderer.new(self, view_context)
   end
 
   def component(name, options = {})

data/lib/rafters/railtie.rb

@@ -1,4 +1,4 @@
-require 'rafters/directive_processor'
+require 'rafters/sprockets/directive_processor'
 
 class Rafters::Railtie < Rails::Railtie
   initializer "rafters.load_view_paths" do |app|

data/lib/rafters/{component_renderer.rb → renderer.rb}

@@ -1,6 +1,7 @@
-class Rafters::ComponentRenderer
-  def initialize(controller)
+class Rafters::Renderer
+  def initialize(controller, view_context)
     @controller = controller
+    @view_context = view_context
 
     Rafters.view_paths.each do |view_path|
       @controller.prepend_view_path(view_path)
@@ -12,8 +13,8 @@ class Rafters::ComponentRenderer
 
     store(component)
 
-    @controller.view_context.content_tag(:div, class: "component #{component.name.dasherize}", id: component.identifier) do
-      @controller.view_context.render(file: "/#{component.template_name}", locals: component.attributes)
+    @view_context.content_tag(:div, class: "component #{component.name.dasherize}", id: component.identifier) do
+      @view_context.render(file: "/#{component.template_name}", locals: component.attributes)
     end
   end
 

data/lib/rafters/version.rb

@@ -1,3 +1,3 @@
 module Rafters
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/spec/rafters/{component_context_spec.rb → context_spec.rb}

@@ -1,19 +1,19 @@
 require 'spec_helper'
 
 class FooController < ActionController::Base
-  include Rafters::ComponentContext
+  include Rafters::Context
 end
 
 class FooComponent
   include Rafters::Component
 end
 
-describe Rafters::ComponentContext do
+describe Rafters::Context do
   let(:controller) { FooController.new }
-  let(:renderer) { double("ComponentRenderer", render: "<p>Output</p>") }
+  let(:renderer) { double("Renderer", render: "<p>Output</p>") }
 
   before do
-    Rafters::ComponentRenderer.stub(:new).and_return(renderer)
+    Rafters::Renderer.stub(:new).and_return(renderer)
   end
 
   describe "#render_component" do

data/spec/rafters/{component_renderer_spec.rb → renderer_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Rafters::ComponentRenderer do
+describe Rafters::Renderer do
   let(:view_context) { double("ViewContext").as_null_object }
   let(:controller) { double("Controller").as_null_object }
 
@@ -17,12 +17,12 @@ describe Rafters::ComponentRenderer do
 
     it "should add the view paths for all components to the controller" do
       controller.should_receive(:prepend_view_path).with("/path/to/views")
-      Rafters::ComponentRenderer.new(controller)
+      Rafters::Renderer.new(controller)
     end
   end
 
   describe "#render" do
-    subject { Rafters::ComponentRenderer.new(controller) }
+    subject { Rafters::Renderer.new(controller) }
 
     let(:component) { double("Component").as_null_object }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rafters
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Andrew Hite
@@ -177,13 +177,12 @@ files:
 - lib/generators/rafters/source/templates/source.rb.erb
 - lib/rafters.rb
 - lib/rafters/component.rb
-- lib/rafters/component_context.rb
-- lib/rafters/component_renderer.rb
-- lib/rafters/directive_processor.rb
+- lib/rafters/context.rb
 - lib/rafters/railtie.rb
+- lib/rafters/renderer.rb
 - lib/rafters/source.rb
+- lib/rafters/sprockets/directive_processor.rb
 - lib/rafters/version.rb
-- lib/tasks/rafters_tasks.rake
 - rafters.gemspec
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
@@ -245,10 +244,10 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
-- spec/rafters/component_context_spec.rb
-- spec/rafters/component_renderer_spec.rb
 - spec/rafters/component_spec.rb
+- spec/rafters/context_spec.rb
 - spec/rafters/features/rendering_a_page_spec.rb
+- spec/rafters/renderer_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -336,9 +335,9 @@ test_files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
-- spec/rafters/component_context_spec.rb
-- spec/rafters/component_renderer_spec.rb
 - spec/rafters/component_spec.rb
+- spec/rafters/context_spec.rb
 - spec/rafters/features/rendering_a_page_spec.rb
+- spec/rafters/renderer_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/lib/tasks/rafters_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :rafters do
-#   # Task goes here
-# end