modular 0.2.1 → 0.2.2

data/.gitignore

@@ -2,3 +2,4 @@
 /spec/internal/db/combustion_test.sqlite
 /pkg/
 Gemfile.lock
+/spec/internal/tmp

data/Gemfile

@@ -16,3 +16,4 @@ gem 'memcache-client'
 gem 'pry'
 gem 'pry-nav'
 gem 'webrat'
+gem 'mustache'

data/lib/modular.rb

@@ -6,24 +6,14 @@ module Modular
   eager_autoload do
     autoload :Creation
     autoload :Configuration
+    autoload :Components
     autoload :LayoutGenerator
-    autoload :Helpers    
+    autoload :MstRendering
   end
 
   delegate :create, :from_json, :to => Creation
   delegate :config, :configure, :to => Configuration
-  
-  def layout(id)
-    if Configuration.config.layouts.has_key?(id)
-      Configuration.config.layouts[id]
-    else
-      raise "Layout '#{id}' not found"
-    end
-  end
-
-  def layouts
-    Configuration.config.layouts
-  end
+  delegate :layout, :layouts, :to => :config
   
   def generate_rails_layout(id, params = {})
     LayoutGenerator.generate(id, params)
@@ -32,6 +22,5 @@ module Modular
   extend self
 end
 
-require "modular/components"
 require "modular/version"
 require 'modular/railtie'

data/lib/modular/action_controller_extension.rb

@@ -1,17 +1,26 @@
 module Modular::ActionControllerExtension
   extend ActiveSupport::Concern
 
-  def render_modular_layout(name)
-    layout = Modular.layout name
-    render :text => layout.render
+  def modular_layout(name)
+    render :layout => get_layout_path(name)
+  end
+
+  def get_layout_path(name)
+    if name.is_a?(Symbol) 
+      
+      name = self.__send__(name)
+    end
+
+    path = '../../../' + Modular.generate_rails_layout(name)
+    #cutting off '.html.erb'
+    path[0, path.length-9]
   end
 
   module ClassMethods
-    def modular_layout(name, params = {})
+    def modular_layout(name)
       proc = Proc.new do |controller|
-        path = '../../../' + Modular.generate_rails_layout(name.is_a?(Symbol) ? controller.__send__(name) : name, params)
-        #cutting off '.html.erb'
-        path[0, path.length-9]
+        
+        controller.send(:get_layout_path, name)
       end
       
       layout proc

data/lib/modular/components.rb

@@ -1,6 +1,9 @@
 module Modular::Components
-end
+  extend ActiveSupport::Autoload
 
-require "modular/components/base"
-require "modular/components/container"
-require "modular/components/main_content"
+  eager_autoload do
+    autoload :Base
+    autoload :Container
+    autoload :MainContent
+  end
+end

data/lib/modular/components/base.rb

@@ -1,32 +1,102 @@
 require 'abstract_controller'
 require "modular/rendering"
 require "modular/caching"
+require 'active_model'
 
 module Modular
   module Components
-    class Base < Modular::Helpers::AbstractModel
+    class Base < AbstractController::Base
       #rendering
       include AbstractController::Rendering
       include AbstractController::Helpers
       include Modular::Rendering
 
-      def self.abstract?
-        true
-      end
+      abstract!
 
       #slug
       def self.type
-        self.name.rpartition("::").last
+        self.name.demodulize.underscore
       end
       
       def type
         self.class.type
       end
 
+      def self.use_mustached_template!
+        require 'mustache'
+        self.class_eval do
+          include Modular::MstRendering
+        end
+      end
+
+      include ActiveModel::Validations
+      include ActiveModel::Conversion
+      extend ActiveModel::Naming
+        
+      def self.attr_reader(*fields)
+        fields.each do |field|
+          class_eval <<EOF
+        def #{field}
+          @attributes['#{field}']
+        end
+EOF
+        end
+      end
+        
+      def self.attr_writer(*fields)
+        fields.each do |field|
+          class_eval <<EOF
+        def #{field}=(value)
+          @attributes['#{field}']=value
+        end
+EOF
+        end
+      end
+      
+      def self.attr_accessor(*fields)
+        fields.each do |field|
+          attr_writer field
+          attr_reader field
+        end
+      end
+
       #params for element itself
       attr_accessor :title
+      attr_accessor :uniqid
+      attr_accessor :width
       
       validates :title, :length => {:maximum => 64}      
+    
+      def initialize(attributes = {})
+        append_view_path(Rails.root.join('app', 'views'))
+        append_view_path(Gem.loaded_specs['modular'].full_gem_path + '/templates')
+
+        @attributes ||= ActiveSupport::HashWithIndifferentAccess.new
+        
+        @attributes[:uniqid] = ''
+        @attributes[:width] = 0
+
+        attributes.each do |name, value|
+          @attributes[name.to_s] = value
+        end
+      end
+      
+      def persisted?
+        false
+      end
+
+      def to_hash
+        @attributes.merge({:type => type})
+      end
+      
+      def to_json
+        ActiveSupport::JSON.encode to_hash
+      end
+
+      def all_errors
+        valid? #this call is used to make validation calls
+        { uniqid => errors.to_a }
+      end
     end
   end
 end

data/lib/modular/components/container.rb

@@ -1,30 +1,56 @@
 module Modular
   module Components
     class Container < Base
-      attr_accessor :components
+      attr_accessor :children
       
       def initialize(attributes = {})
-        @attributes = ActiveSupport::HashWithIndifferentAccess.new(:components => [])
+        @attributes = ActiveSupport::HashWithIndifferentAccess.new(:children => [])
         attributes = attributes.with_indifferent_access
-        attributes["components"] ||= []
+        attributes["children"] ||= []
 
-        attributes["components"].each do |value|
-          if value.is_a? Modular::Components::Base
-            @attributes[:components].push value
-          else
-            @attributes[:components].push(Modular.from_json(value)) rescue ''
-          end
+        attributes["children"].each do |value|
+          @attributes[:children].push value if value.is_a? Modular::Components::Base
         end
         
-        super(attributes.except("components"))
+        super(attributes.except("children"))
       end
       
       def add(type, args = {}, &block)
         cont = Modular.create(type, args)
         cont.instance_eval &block if block_given?
-        components.push cont
+        children.push cont
+      end
+
+      def valid_with_children?(context = nil)
+        children.each do |child|
+          return false if child.invalid?
+        end
+
+        valid_with_no_children?
       end
 
+      alias_method :valid_with_no_children?, :valid?
+      alias_method :valid?, :valid_with_children?
+
+      def all_errors
+        if valid_with_no_children?
+          errs = {} 
+        else
+          errs = super
+        end
+
+        children.each do |child|
+          e = child.all_errors
+          e.each do |key, value|
+            unless value.empty?
+              errs[key] ||= []
+              errs[key] += value
+            end
+          end
+        end
+
+        errs
+      end      
     end
   end
 end

data/lib/modular/configuration.rb

@@ -15,6 +15,14 @@ module Modular
       instance.instance_eval &block if block_given?
       instance
     end
+
+    def layout(id)
+      if layouts.has_key?(id)
+        layouts[id]
+      else
+        raise "Layout '#{id}' not found"
+      end      
+    end
     
     def register_layout(layout, mod = :container, params = {}, &block)
       @layouts ||= Hash.new.with_indifferent_access

data/lib/modular/creation.rb

@@ -4,25 +4,32 @@ module Modular
       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
+        component = typ.to_s.camelize.constantize.new params
+      rescue NameError
+        component = (Components.name + '::' + typ.to_s.camelize).constantize.new params
       end
-
-      raise "Component has errors: " + component.errors.to_s if component.invalid?
       
       component
     end
     
-    def from_json(text)
-      obj = ActiveSupport::JSON.decode text
+    def from_json(obj)
+      obj = ActiveSupport::JSON.decode obj if obj.is_a? String
+      obj = obj.with_indifferent_access
+      
       raise "Type expected in json string" unless obj['type']
-      create(obj['type'], obj.except('type'))
-    end    
+      component = create(obj['type'], obj.except('type').except("children"))
+
+      if obj.has_key?('children') && component.is_a?(Modular::Components::Container)
+        obj['children'].each do |child|
+          if child.is_a? Hash
+            child_component = from_json(child)
+            component.add(child_component)
+          end
+        end
+      end
+
+      component
+    end
 
     extend self
   end

data/lib/modular/generators/component/component_generator.rb

@@ -0,0 +1,18 @@
+module Modular
+  class ComponentGenerator < Rails::Generators::NamedBase
+    source_root File.expand_path('../templates', __FILE__)
+    
+    def generate_template
+      template "component.rb.erb", "app/components/#{filename}.rb"  
+    end
+    
+    def generate_controller
+      template "template.erb", "app/views/components/#{filename}.html.erb"  
+    end
+    
+    private
+    def filename
+      name.underscore
+    end
+  end
+end

data/lib/modular/mst_rendering.rb

@@ -0,0 +1,10 @@
+module Modular
+  module MstRendering
+    def render
+      path = Rails.root + "app/views/components/#{type}.mst"
+      template = File.open(path, "rb").read
+
+      Mustache.render(template, @attributes).html_safe
+    end
+  end
+end

data/lib/modular/railtie.rb

@@ -7,5 +7,9 @@ module TaggableCache
         ::ActionController::Base.__send__ :include, Modular::ActionControllerExtension
       end
     end
+
+    generators do
+      require "modular/generators/component/component_generator"
+    end    
   end  
 end

data/lib/modular/rendering.rb

@@ -1,59 +1,18 @@
 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 => :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 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