modular 0.1.2 → 0.2.0

data/lib/modular/creation.rb

@@ -0,0 +1,29 @@
+module Modular
+  module Creation
+    def create(typ, params = {})
+      return typ if typ.is_a? Modular::Components::Base
+      
+      begin
+        begin
+          component = typ.to_s.camelize.constantize.new params
+        rescue NameError
+          component = (Components.name + '::' + typ.to_s.camelize).constantize.new params
+        end
+      rescue Exception => e
+        raise "Unable to create element " + typ.to_s
+      end
+
+      raise "Component has errors: " + component.errors.to_s if component.invalid?
+      
+      component
+    end
+    
+    def from_json(text)
+      obj = ActiveSupport::JSON.decode text
+      raise "Type expected in json string" unless obj['type']
+      create(obj['type'], obj.except('type'))
+    end    
+
+    extend self
+  end
+end

data/lib/modular/layout_generator.rb

@@ -3,7 +3,7 @@ require 'erb'
 module Modular
   class LayoutGenerator
     class ERBContext
-      def initialize(hash)
+      def initialize(hash = {})
         hash.each_pair do |key, value|
           instance_variable_set('@' + key.to_s, value)
         end
@@ -23,7 +23,7 @@ module Modular
       filename.to_s
     end
 
-    def initialize(id, params)
+    def initialize(id, params= {})
       @id = id
       @params = params
     end
@@ -38,7 +38,7 @@ module Modular
     end
     
     def layout_exists?
-      if (defined? Rails) && (Rails.configuration.action_controller.perform_caching)
+      if Rails.configuration.action_controller.perform_caching
         File.exists?(filename)
       else
         false
@@ -48,19 +48,20 @@ module Modular
     def write_layout
       folder = self.foldername
       filename = self.filename
-      
-      Dir.mkdir(folder) unless File.exists? folder
+      path = "#{Rails.root}/#{folder}"
+
+      Dir.mkdir(path) unless File.exists? path
       
       template = ERB.new File.new(Gem.loaded_specs['modular'].full_gem_path + '/templates/layout.erb').read
       output = template.result(ERBContext.new(template_variables).get_binding)
       
-      File.open(filename, 'w') do |f| 
+      File.open("#{Rails.root}/#{filename}", 'w') do |f| 
         f.write(output)
       end
     end
     
     def template_variables
-      @params.merge :layout_id => @id
+      { :original_layout => 'application' }.merge(@params.merge(:layout_id => @id))
     end
   end
 end

data/lib/modular/railtie.rb

@@ -0,0 +1,11 @@
+require 'modular/action_controller_extension'
+
+module TaggableCache
+  class Railtie < ::Rails::Railtie
+    initializer "modular" do |app|
+      ActiveSupport.on_load(:action_controller) do
+        ::ActionController::Base.__send__ :include, Modular::ActionControllerExtension
+      end
+    end
+  end  
+end

data/lib/modular/rendering.rb

@@ -1,82 +1,77 @@
-module Modular
-  module Components
-    module DirectRender
-      extend ActiveSupport::Concern
-      
-      module InstanceMethods
+module Modular::Rendering
+  extend ActiveSupport::Concern
   
-        def controller_path
-          'components'
-        end
-        
-        def action_name
-          type.underscore
-        end
-        
-        def config
-          ActionController::Base.config
-        end
-        
-        def execute
-          
-        end
-        
-        def render
-          execute
-          modular_render :render_type => :direct
-        end
-        
-        def initialize(attributes = {})
-          append_view_path File.join('app', 'views')
-          super
-        end
-        
-        protected 
-        def modular_render(args = {})
-          render_to_string :file => 'components/' + action_name, :locals => args
-        end
-      end
-      
-      
-      module ClassMethods
-        def view_context_class
-          context = super
-          
-          context.send :define_method, :render_component do |component|
-            if component.is_a?(Modular::Components::IndirectRender)
-              component.indirect_render
-            else
-               a = "<%= Modular.from_json('"+ component.to_json + "').render %>"
-               a.html_safe
-            end
-          end
-          
-          context.send :include, Rails.application.routes.url_helpers if defined? Rails
-          
-          context.send :include, ApplicationHelper if defined? ApplicationHelper
-          
-          context
-        end
-      end
+  def controller_path
+    'components'
+  end
+  
+  def action_name
+    type.underscore
+  end
 
-    end
+  # def config
+  #   ActionController::Base.config
+  # end
+  
+  def execute
+  end
+  
+  def render
+    execute
+    modular_render :render_type => :indirect
+  end
 
-    module IndirectRender
-      def execute
-      end
-      
-      def indirect_render
-        execute
-        modular_render :render_type => :indirect
-      end
+  # configure the different paths correctly
+  def initialize(*args)
+    super()
+    lookup_context.view_paths = Rails.root.join('app', 'views')
+    config.javascripts_dir = Rails.root.join('public', 'javascripts')
+    config.stylesheets_dir = Rails.root.join('public', 'stylesheets')
+    config.assets_dir = Rails.root.join('public')
+  end
+  
+  # we are not in a browser, no need for this
+  def protect_against_forgery?
+    false
+  end
+  
+  # so that your flash calls still work
+  def flash
+    {}
+  end
 
-      def render(args = {})
-        throw "Direct render unavailible for this component"
-      end
+  def params
+    {}
+  end
+  
+  # # same asset host as the controllers
+  # self.asset_host = ActionController::Base.asset_host
+  
+  def initialize(attributes = {})
+    append_view_path(Rails.root.join('app', 'views'))
+    append_view_path(Gem.loaded_specs['modular'].full_gem_path + '/templates')
+
+    super
+  end
+  
+  protected 
+  def modular_render(args = {})
+    render_to_string :file => 'components/' + action_name, :locals => args
+  end
+  
+  module ClassMethods
+    def view_context_class
+      context = super
       
-      def self.included(base)
-        thow "Unable to use indirect render without direct render" unless base.ancestors.include? Modular::Components::DirectRender
+      context.send :define_method, :render_component do |component|
+        component.render
       end
+      
+      context.send :include, Rails.application.routes.url_helpers if defined? Rails
+      
+      context.send :include, ApplicationHelper if defined? ApplicationHelper
+      
+      context
     end
   end
 end

data/lib/modular/version.rb

@@ -1,3 +1,3 @@
 module Modular
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/modular.gemspec

@@ -21,5 +21,4 @@ Gem::Specification.new do |s|
   
   s.add_dependency "rails"
   s.add_development_dependency "rspec", ">= 2.0.0"
-  s.add_development_dependency "autotest"
 end

data/{modular-app/spec → spec}/components/container.rb

@@ -13,7 +13,7 @@ describe Modular::Components::Container, ' vertical container class ' do
     @cmp.components.push Modular.create(:FakeNewsFeed, { :news_count => 50, :title => 'Best news feed' }).to_json
     json = @cmp.to_json
     container = Modular.from_json(json)
-    container.components[0].should be_a_kind_of Modular::Components::FakeNewsFeed
+    container.components[0].should be_a_kind_of FakeNewsFeed
   end
   
   it "should have add_container and add_child methods" do
@@ -26,9 +26,9 @@ describe Modular::Components::Container, ' vertical container class ' do
     @cmp.components[0].title.should == 'Test container title'
     
     feed = @cmp.components[0].components[0]
-    feed.should be_a_kind_of Modular::Components::FakeNewsFeed
+    feed.should be_a_kind_of FakeNewsFeed
     feed.title.should == 'Worst news feed'
     
-    @cmp.components[0].components[1].should be_a_kind_of Modular::Components::Vertical
+    @cmp.components[0].components[1].should be_a_kind_of Vertical
   end
 end

data/{modular-app/spec → spec}/controllers/layout_test_controller_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe LayoutTestController do
   describe "prerequirements" do
     it "should render itself" do
-      Modular.layout(:nested).indirect_render
+      Modular.layout(:nested).render
     end
   end
   

data/{modular-app → spec/internal}/app/components/cached_for_time.rb

@@ -1,10 +1,8 @@
-class Modular::Components::CachedForTime < Modular::Components::Base
+class CachedForTime < Modular::Components::Base
   include Modular::Components::Caching
   cache :expires_in => 2.seconds
   
   def execute
     SimpleModel.called_by_cached_for_time
   end
-end
-
-CachedForTime = Modular::Components::CachedForTime 
+end

data/spec/internal/app/components/cached_forever.rb

@@ -0,0 +1,8 @@
+class CachedForever < Modular::Components::Base
+  include Modular::Components::Caching
+  cache
+  
+  def execute
+    SimpleModel.called_by_cached_forever
+  end
+end

data/spec/internal/app/components/fake_news_feed.rb

@@ -0,0 +1,3 @@
+class FakeNewsFeed < Modular::Components::Base
+  attr_accessor :news_count
+end

data/spec/internal/app/components/heavy_task.rb

@@ -0,0 +1,8 @@
+class Modular::Components::HeavyTask < Modular::Components::Base
+  include Modular::Rendering
+
+  def execute
+  end
+end
+
+HeavyTask = Modular::Components::HeavyTask 

data/spec/internal/config/database.yml

@@ -0,0 +1,3 @@
+test:
+  adapter:  sqlite3
+  database: db/combustion_test.sqlite

data/{modular-app → spec/internal}/config/initializers/modular.rb

@@ -11,7 +11,7 @@ Modular.configure do
   
   register_layout :heavy do
     add Modular.layout(:simple)
-    add :HeavyTask
+    add :heavy_task
   end
   
   register_layout :cached_forever, Modular.create(:CachedForever)

data/spec/internal/config/routes.rb

@@ -0,0 +1,7 @@
+Rails.application.routes.draw do
+  get "cached_for_time/index"
+
+  root :to => "example#index"
+  
+  match ':controller/(:action)'
+end