modular 0.2.1 → 0.2.2

data/lib/modular/version.rb

@@ -1,3 +1,3 @@
 module Modular
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/components/{base.rb → base_spec.rb}

@@ -1,12 +1,18 @@
 require 'spec_helper'
 
 describe Modular::Components::Base, ' as basic module' do
-  it "should return type in class" do
-    Modular::Components::Base.type.should === 'Base'
-  end
-  
-  it "should return type in instance" do
-    Modular::Components::Base.new.type.should === 'Base'
+  describe "should return type" do
+    it "in class" do
+      Modular::Components::Base.type.should === 'base'
+    end
+    
+    it "in instance" do
+      Modular::Components::Base.new.type.should === 'base'
+    end
+
+    it "in multi-part name" do
+      FakeNewsFeed.type.should === 'fake_news_feed'
+    end
   end
 
   it "should serialize components correctly" do

data/spec/components/container_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Modular::Components::Container, ' vertical container class ' do
+  before :each do
+    @cmp = described_class.new
+  end
+  
+  it "should have children" do
+    @cmp.children.should be_a_kind_of Array
+  end
+  
+  it "should have add_container and add_child methods" do
+    @cmp.add :container, :title => 'Test container title' do
+      add :FakeNewsFeed, :title => 'Worst news feed'
+      
+      add :Vertical, :title => 'Vertical container'
+    end
+    
+    @cmp.children[0].title.should == 'Test container title'
+    
+    feed = @cmp.children[0].children[0]
+    feed.should be_a_kind_of FakeNewsFeed
+    feed.title.should == 'Worst news feed'
+    
+    @cmp.children[0].children[1].should be_a_kind_of Vertical
+  end
+end

data/spec/controllers/callback_layout_controller_spec.rb

@@ -1,11 +1,15 @@
 require 'spec_helper'
 
 describe CallbackLayoutController do
+  render_views
 
   describe "GET 'index'" do
     it "should be successful" do
       get 'index'
       response.should be_success
+
+      response.body.should contain 'Nested component'
+      response.body.should contain 'CallbackLayout#index'
     end
   end
 

data/spec/controllers/rendering_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe ExampleController do
+  render_views
+
+  describe "straightforward rendering" do
+    it "should be successful" do
+      get 'index'
+      
+      response.body.should contain 'Template - Best news feed'
+      response.body.should contain 'Find me in app/views/example/index.html.erb'
+    end
+  end
+
+  describe "mustache rendering" do
+    it "simple" do
+      get 'mustache'
+      response.should be_success      
+      
+      response.body.should contain 'Text in layout'
+      response.body.should contain 'Text from mustache template - Text from template settings'
+    end
+
+    it "nested" do
+      get 'mustache_nested'
+      response.should be_success      
+      
+      response.body.should contain 'Text from container settings - asdfgh'
+      response.body.should contain 'Text from mustache template - Text from template settings'
+      response.body.should contain 'Text from mustache template - Other text from template settings'      
+    end
+  end
+end

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

@@ -0,0 +1,5 @@
+class MustacheContainer < Modular::Components::Container
+  attr_accessor :text
+
+  use_mustached_template!
+end

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

@@ -0,0 +1,5 @@
+class Mustached < Modular::Components::Base
+  attr_accessor :text
+
+  use_mustached_template!
+end

data/spec/internal/app/controllers/callback_layout_controller.rb

@@ -1,11 +1,11 @@
 class CallbackLayoutController < ApplicationController
-  modular_layout :method_name
-  
-  def method_name
-    'heavy'
-  end
+  modular_layout :callback_method
   
   def index
   end
 
+protected
+  def callback_method
+    'nested'
+  end
 end

data/spec/internal/app/controllers/example_controller.rb

@@ -1,5 +1,13 @@
 class ExampleController < ApplicationController
   def index
-    render_modular_layout :simple
+    modular_layout 'simple'
+  end
+
+  def mustache
+    modular_layout 'mustached'
+  end
+
+  def mustache_nested
+    modular_layout 'mustache_nested'
   end
 end

data/spec/internal/app/views/components/mustache_container.mst

@@ -0,0 +1,3 @@
+Text from container settings - {{text}}
+
+{{# children }}{{{ render }}}{{/ children }}

data/spec/internal/app/views/components/mustached.mst

@@ -0,0 +1 @@
+Text from mustache template - {{text}}

data/spec/internal/app/views/example/mustache.html.erb

@@ -0,0 +1 @@
+Text in template

data/spec/internal/app/views/example/mustache_nested.html.erb

@@ -0,0 +1 @@
+Some text

data/spec/internal/config/initializers/modular.rb

@@ -1,5 +1,8 @@
 Modular.configure do
-  register_layout :simple, Modular.create(:FakeNewsFeed, :news_count => 50, :title => 'Best news feed')
+  register_layout :simple do
+    add Modular.create(:FakeNewsFeed, :news_count => 50, :title => 'Best news feed')
+    add :main_content    
+  end
   
   register_layout :nested do
     add Modular.layout(:simple)
@@ -8,12 +11,14 @@ Modular.configure do
     end
     add :MainContent
   end
-  
-  register_layout :heavy do
-    add Modular.layout(:simple)
-    add :heavy_task
+
+  register_layout :mustached, :mustached, :text => 'Text from template settings'
+
+  register_layout :mustache_nested, :mustache_container, :text => 'asdfgh' do
+    add Modular.layout(:mustached)
+    add :mustached, :text => 'Other text from template settings'
   end
-  
+
   register_layout :cached_forever, Modular.create(:CachedForever)
   
   register_layout :cached_for_time, Modular.create(:CachedForTime)

data/spec/modular/configuration_spec.rb

@@ -5,15 +5,15 @@ describe Modular::Configuration, ' as modular config' do
     component = Modular.create :fake_news_feed, :news_count => 50, :title => 'Best news feed'
     
     Modular.configure do
-      register_layout :simple, component
+      register_layout :testing_layout, component
     end
     
-    Modular.layout(:simple).to_json == component
+    Modular.layout(:testing_layout).should == component
   end
 
   it "should have DSL for registering layout" do
     Modular.configure do
-      register_layout :simple do
+      register_layout :testing_layout do
         add :fake_news_feed, :title => 'Best news feed'
         add :fake_news_feed, :title => 'Just news feed'
         
@@ -23,15 +23,15 @@ describe Modular::Configuration, ' as modular config' do
       end
     end
     
-    l = Modular.layout(:simple)
+    l = Modular.layout(:testing_layout)
     
     l.should be_a_kind_of Modular::Components::Container
     
-    l.components[0..1].each do |e|
+    l.children[0..1].each do |e|
       e.should be_a_kind_of FakeNewsFeed
     end
 
-    l.components.length.should == 3
+    l.children.length.should == 3
   end
 
   it "should return list of layouts" do

data/spec/modular/creation_spec.rb

@@ -22,11 +22,42 @@ describe Modular, ' widgets creation ' do
     Modular.create(widget).should eq(widget)
   end
   
-  it "should unserialize components correctly" do
-    serialized = Modular.create(:fake_news_feed, :news_count => 50, :title => 'Best news feed').to_json
+  describe "creation from json" do
+    it "unserialized components" do
+      serialized = Modular.create(:fake_news_feed, :news_count => 50, :title => 'Best news feed').to_json
 
-    cmp_uns = Modular.from_json(serialized)
-    cmp_uns.news_count.to_i.should === 50
-    cmp_uns.title.should === 'Best news feed'
+      cmp_uns = Modular.from_json(serialized)
+      cmp_uns.news_count.to_i.should === 50
+      cmp_uns.title.should === 'Best news feed'
+    end
+
+    it "plain objects" do
+      data = '{
+              "type":"fake_news_feed",
+              "news_count":5
+            }'
+
+      feed = Modular.from_json(data)
+      feed.news_count.to_i.should == 5
+      feed.should be_a_kind_of FakeNewsFeed
+    end
+
+    it "component with children" do
+      data = '
+        {
+          "children":
+            [{
+              "type":"fake_news_feed",
+              "news_count":5
+            }],
+            "type":"container"
+        }'
+
+      c = Modular.from_json(data)
+      c.children.count.should == 1
+      feed = c.children.first
+      feed.news_count.to_i.should == 5
+      feed.should be_a_kind_of FakeNewsFeed
+    end
   end
 end

data/spec/modular/validation_spec.rb

@@ -0,0 +1,115 @@
+require 'spec_helper'
+
+describe Modular, ' widgets validation ' do
+  it "should be valid if all is OK" do
+    widget = Modular.create'container', 
+      children: [
+        type: 'fake_news_feed'
+      ]    
+      
+    widget.invalid?.should be_false
+    widget.valid?.should be_true
+
+    widget.errors.to_a.should be_empty
+  end
+
+  it "should be invalid if component is not valid" do
+    widget = Modular.create('container', title: 'dsfghaskjfhagsdklfjhaflkasjhflkajshflkajdhfalkjhfaldkjhflkjasdhflkjahflkjsdhflkasdjfhaslkjfhasldkfjhaslkfjhaslkfjhaglkjfhlkjdfhglkjsdfhglkjsdfhgkjsdhglkajfhlkjsdfhlkasjdhflkasdjhfalksdjhflkasdjfhalskjfhaljkfhasldkfjhalskdf')
+
+    widget.invalid?.should be_true
+    widget.valid?.should be_false
+
+    widget.errors.to_a.should == ["Title is too long (maximum is 64 characters)"]
+  end
+
+  describe "children validation" do
+    before :each do 
+      @widget = Modular.from_json type: 'container',
+        children: [
+          {
+            type: 'fake_news_feed',
+            title: 'dsfghaskjfhagsdklfjhaflkasjhflkajshflkajdhfalkjhfaldkjhflkjasdhflkjahflkjsdhflkasdjfhaslkjfhasldkfjhaslkfjhaslkfjhaglkjfhlkjdfhglkjsdfhglkjsdfhgkjsdhglkajfhlkjsdfhlkasjdhflkasdjhfalksdjhflkasdjfhalskjfhaljkfhasldkfjhalskdf'
+            },
+          {
+            type: 'validated'
+          }
+        ]
+    end
+
+    it "should be valid if everything is ok" do
+      widget = Modular.from_json type: 'container',
+        children: [
+          {
+            type: 'fake_news_feed'
+          },
+          {
+            type: 'validated',
+            non_existant_property: 'something'
+          }
+        ]
+
+      widget.invalid?.should be_false
+      widget.valid?.should be_true
+    end
+
+    it "should be invalid if has invalid children" do
+      @widget.invalid?.should be_true
+      @widget.valid?.should be_false
+    end
+
+    it "should return all errors for any widget" do
+      widget = Modular.from_json type: 'fake_news_feed', title: 'dsfghaskjfhagsdklfjhaflkasjhflkajshflkajdhfalkjhfaldkjhflkjasdhflkjahflkjsdhflkasdjfhaslkjfhasldkfjhaslkfjhaslkfjhaglkjfhlkjdfhglkjsdfhglkjsdfhgkjsdhglkajfhlkjsdfhlkasjdhflkasdjhfalksdjhflkasdjfhalskjfhaljkfhasldkfjhalskdf'
+      widget.all_errors.should == { '' => ["Title is too long (maximum is 64 characters)" ] }
+    end
+
+    it "should return all errors for children correctly if elemnts dont have uids" do
+      @widget.errors.to_a.should be_empty
+      @widget.all_errors.should == {
+        '' => ["Title is too long (maximum is 64 characters)", 'Non existant property can\'t be blank']
+      }
+    end
+
+    it "should return errors with uniqid" do
+      @widget.children.first.uniqid = 'first'
+      @widget.errors.to_a.should be_empty
+      @widget.all_errors.should == {
+        'first' => ["Title is too long (maximum is 64 characters)"],
+        '' => ['Non existant property can\'t be blank']
+      }
+    end
+
+    it "should return all errors with uids" do
+      widget = Modular.from_json type: 'container', uniqid: 'first',
+        children: [
+          {
+            uniqid: 'second',
+            type: 'fake_news_feed',
+            title: 'dsfghaskjfhagsdklfjhaflkasjhflkajshflkajdhfalkjhfaldkjhflkjasdhflkjahflkjsdhflkasdjfhaslkjfhasldkfjhaslkfjhaslkfjhaglkjfhlkjdfhglkjsdfhglkjsdfhgkjsdhglkajfhlkjsdfhlkasjdhflkasdjhfalksdjhflkasdjfhalskjfhaljkfhasldkfjhalskdf'
+          },
+          {
+            type: 'container',
+            uniqid: 'fourth',
+            title: 'dsfghaskjfhdfgsdfgsdgsdfsdfgsdfgsdfgsddgfdagsdklfjhaflkasjhflkajshflkajdhfalkjhfaldkjhflkjasdhflkjahflkjsdhflkasdjfhaslkjfhasldkfjhaslkfjhaslkfjhaglkjfhlkjdfhglkjsdfhglkjsdfhgkjsdhglkajfhlkjsdfhlkasjdhflkasdjhfalksdjhflkasdjfhalskjfhaljkfhasldkfjhalskdf',
+            children: [
+              {
+                uniqid: 'last',
+                type: 'fake_news_feed',
+                title: 'dsfghaskjfhagsdklfjhaflkasjhflkajshflkajdhfalkjhfaldkjhflkjasdhflkjahflkjsdhflkasdjfhaslkjfhasldkfjhaslkfjhaslkfjhaglkjfhlkjdfhglkjsdfhglkjsdfhgkjsdhglkajfhlkjsdfhlkasjdhflkasdjhfalksdjhflkasdjfhalskjfhaljkfhasldkfjhalskdf'
+              }
+            ]
+          },
+          {
+            uniqid: 'third',
+            type: 'validated'
+          }
+        ]
+
+      widget.all_errors.should == {
+        'second' => ["Title is too long (maximum is 64 characters)"],
+        'last' => ["Title is too long (maximum is 64 characters)"],
+        'fourth' => ["Title is too long (maximum is 64 characters)"],
+        'third' => ['Non existant property can\'t be blank']
+      }
+    end
+  end
+end

data/templates/components/container.html.erb

@@ -0,0 +1,7 @@
+<table>
+  <tr><td>
+    <% @attributes[:children].each do |child| %>
+		  <%= render_component child %>
+    <% end %>
+  </td></tr>
+</table>

data/templates/layout.erb

@@ -1,8 +1,6 @@
 <%% @layout_id = '<%=@layout_id%>'.to_sym %>
 
-<% layout = Modular.layout(@layout_id) %>
-
-<%= layout.render %>
+<%= Modular.layout(@layout_id).render %>
 
 <%% 
     layout = '<%=@original_layout%>'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modular
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-20 00:00:00.000000000 Z
+date: 2012-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -59,10 +59,6 @@ files:
 - Rakefile
 - TODO
 - config.ru
-- lib/generators/component/USAGE
-- lib/generators/component/component_generator.rb
-- lib/generators/component/templates/component.rb.erb
-- lib/generators/component/templates/template.erb
 - lib/modular.rb
 - lib/modular/action_controller_extension.rb
 - lib/modular/caching.rb
@@ -72,52 +68,34 @@ files:
 - lib/modular/components/main_content.rb
 - lib/modular/configuration.rb
 - lib/modular/creation.rb
-- lib/modular/helpers.rb
+- lib/modular/generators/component/USAGE
+- lib/modular/generators/component/component_generator.rb
+- lib/modular/generators/component/templates/component.rb.erb
+- lib/modular/generators/component/templates/template.erb
 - lib/modular/layout_generator.rb
+- lib/modular/mst_rendering.rb
 - lib/modular/railtie.rb
 - lib/modular/rendering.rb
 - lib/modular/version.rb
-- modular-app/Gemfile
-- modular-app/Rakefile
-- modular-app/config.ru
-- modular-app/config/application.rb
-- modular-app/config/boot.rb
-- modular-app/config/database.yml
-- modular-app/config/environment.rb
-- modular-app/config/environments/development.rb
-- modular-app/config/environments/production.rb
-- modular-app/config/environments/test.rb
-- modular-app/config/initializers/backtrace_silencers.rb
-- modular-app/config/initializers/inflections.rb
-- modular-app/config/initializers/mime_types.rb
-- modular-app/config/initializers/secret_token.rb
-- modular-app/config/initializers/session_store.rb
-- modular-app/config/locales/en.yml
-- modular-app/config/routes.rb
-- modular-app/db/migrate/20110721090602_create_simple_models.rb
-- modular-app/db/schema.rb
-- modular-app/db/seeds.rb
-- modular-app/script/rails
-- modular-app/spec/spec_helper.rb
 - modular.gemspec
-- spec/components/base.rb
-- spec/components/container.rb
-- spec/components/hello_world.rb
-- spec/components/helpers_example.rb
-- spec/components/validated.rb
+- spec/components/base_spec.rb
+- spec/components/container_spec.rb
+- spec/components/hello_world_spec.rb
+- spec/components/helpers_example_spec.rb
+- spec/components/spec/internal/log/test.log
 - spec/controllers/cached_for_time_controller_spec.rb
 - spec/controllers/cached_forever_controller_spec.rb
 - spec/controllers/callback_layout_controller_spec.rb
-- spec/controllers/example_controller_spec.rb
-- spec/controllers/indirect_render_controller_spec.rb
 - spec/controllers/layout_test_controller_spec.rb
+- spec/controllers/rendering_spec.rb
 - spec/internal/app/components/cached_for_time.rb
 - spec/internal/app/components/cached_forever.rb
 - spec/internal/app/components/fake_news_feed.rb
 - spec/internal/app/components/foobar.rb
-- spec/internal/app/components/heavy_task.rb
 - spec/internal/app/components/hello_world.rb
 - spec/internal/app/components/helpers_example.rb
+- spec/internal/app/components/mustache_container.rb
+- spec/internal/app/components/mustached.rb
 - spec/internal/app/components/validated.rb
 - spec/internal/app/components/vertical.rb
 - spec/internal/app/controllers/application_controller.rb
@@ -125,7 +103,6 @@ files:
 - spec/internal/app/controllers/cached_forever_controller.rb
 - spec/internal/app/controllers/callback_layout_controller.rb
 - spec/internal/app/controllers/example_controller.rb
-- spec/internal/app/controllers/indirect_render_controller.rb
 - spec/internal/app/controllers/layout_test_controller.rb
 - spec/internal/app/models/simple_model.rb
 - spec/internal/app/views/cached_for_time/index.html.erb
@@ -133,15 +110,17 @@ files:
 - spec/internal/app/views/callback_layout/index.html.erb
 - spec/internal/app/views/components/cached_for_time.html.erb
 - spec/internal/app/views/components/cached_forever.html.erb
-- spec/internal/app/views/components/container.html.erb
 - spec/internal/app/views/components/fake_news_feed.html.erb
 - spec/internal/app/views/components/foobar.html.erb
-- spec/internal/app/views/components/heavy_task.html.erb
 - spec/internal/app/views/components/hello_world.html.erb
 - spec/internal/app/views/components/helpers_example.html.erb
+- spec/internal/app/views/components/mustache_container.mst
+- spec/internal/app/views/components/mustached.mst
 - spec/internal/app/views/components/validated.html.erb
 - spec/internal/app/views/components/vertical.html.erb
 - spec/internal/app/views/example/index.html.erb
+- spec/internal/app/views/example/mustache.html.erb
+- spec/internal/app/views/example/mustache_nested.html.erb
 - spec/internal/app/views/indirect_render/index.html.erb
 - spec/internal/app/views/layout_test/index.html.erb
 - spec/internal/app/views/layouts/application.html.erb
@@ -152,14 +131,11 @@ files:
 - spec/internal/log/.gitignore
 - spec/internal/public/favicon.ico
 - spec/internal/tmp/.gitkeep
-- spec/internal/tmp/modular/cached_for_time.html.erb
-- spec/internal/tmp/modular/cached_forever.html.erb
-- spec/internal/tmp/modular/heavy.html.erb
-- spec/internal/tmp/modular/nested.html.erb
 - spec/modular/configuration_spec.rb
 - spec/modular/creation_spec.rb
+- spec/modular/validation_spec.rb
 - spec/spec_helper.rb
-- spec/views/indirect_render/index.html.erb_spec.rb
+- templates/components/container.html.erb
 - templates/layout.erb
 homepage: https://github.com/brain-geek/modular
 licenses: []
@@ -175,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 541330603454818341
+      hash: -3892738958547389268
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -184,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 541330603454818341
+      hash: -3892738958547389268
 requirements: []
 rubyforge_project: modular
 rubygems_version: 1.8.22