modular 0.1.2 → 0.2.0

data/spec/internal/db/schema.rb

@@ -0,0 +1,6 @@
+ActiveRecord::Schema.define do
+  create_table "simple_models", :force => true do |t|
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+end

data/spec/internal/log/.gitignore

@@ -0,0 +1 @@
+*.log

data/spec/internal/tmp/modular/cached_for_time.html.erb

@@ -0,0 +1,14 @@
+<% @layout_id = 'cached_for_time'.to_sym %>
+
+
+
+<h3>Template for CachedForTime</h3>
+
+
+
+<% 
+    layout = 'application'
+    #Old one is @_content_for
+    @view_flow.content[:layout] = self.output_buffer
+    self.output_buffer = render(:file => "layouts/#{layout}")
+ %>

data/spec/internal/tmp/modular/cached_forever.html.erb

@@ -0,0 +1,12 @@
+<% @layout_id = 'cached_forever'.to_sym %>
+
+
+
+
+
+<% 
+    layout = 'application'
+    #Old one is @_content_for
+    @view_flow.content[:layout] = self.output_buffer
+    self.output_buffer = render(:file => "layouts/#{layout}")
+ %>

data/spec/internal/tmp/modular/heavy.html.erb

@@ -0,0 +1,19 @@
+<% @layout_id = 'heavy'.to_sym %>
+
+
+
+<table>
+  <tr><td>
+		<h1>Template - Best news feed</h1>
+		<h3>Template for HeavyTask</h3>
+
+  </td></tr>
+</table>
+
+
+<% 
+    layout = 'application'
+    #Old one is @_content_for
+    @view_flow.content[:layout] = self.output_buffer
+    self.output_buffer = render(:file => "layouts/#{layout}")
+ %>

data/spec/internal/tmp/modular/nested.html.erb

@@ -0,0 +1,28 @@
+<% @layout_id = 'nested'.to_sym %>
+
+
+
+<table>
+  <tr><td>
+		<h1>Template - Best news feed</h1>
+		<table>
+  <tr><td>
+		<div>
+  <h3>FooBar component!</h3>
+  <p>Nested component</p>
+</div>
+
+  </td></tr>
+</table>
+
+		<%=yield%>
+  </td></tr>
+</table>
+
+
+<% 
+    layout = 'application'
+    #Old one is @_content_for
+    @view_flow.content[:layout] = self.output_buffer
+    self.output_buffer = render(:file => "layouts/#{layout}")
+ %>

data/spec/modular/configuration_spec.rb

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

data/spec/{base.rb → modular/creation_spec.rb}

@@ -1,37 +1,32 @@
 require 'spec_helper'
 
-describe Modular, ' as modular ' do
+describe Modular, ' widgets creation ' do
   it "should fail creating non-existant class" do
     lambda { Modular.create(:fdgasdasdfasdfasdfasdf) }.should raise_error
   end
 
   it "should create existant class" do
-    cmp = Modular.create(:FakeNewsFeed)
-    cmp.should be_a_kind_of Modular::Components::FakeNewsFeed
+    cmp = Modular.create(:fake_news_feed)
+    cmp.should be_a_kind_of FakeNewsFeed
   end
   
   it "should create class from global namespace" do
-    cmp = Modular.create(:Foobar)
+    cmp = Modular.create(:foobar)
     cmp.should be_a_kind_of Modular::Components::Base
     cmp.should be_a_kind_of Foobar
   end
+
+  it "should return back already created widget" do
+    widget = Modular.create(:foobar)
+
+    Modular.create(widget).should eq(widget)
+  end
   
   it "should unserialize components correctly" do
-    serialized = Modular.create(:FakeNewsFeed, :news_count => 50, :title => 'Best news feed').to_json
+    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'
   end
-  
-  it "should return list of layouts" do
-    Modular.configure do
-      register_layout :simple_existing, :Container do |layout|
-      end
-    end
-    
-    Modular.layouts.should be_a_kind_of Array
-    Modular.layouts.should include 'simple_existing'
-  end
-  
 end

data/spec/spec_helper.rb

@@ -1,7 +1,15 @@
 require 'rubygems'
 require 'bundler'
-require 'modular'
+Bundler.require :default, :development
 
-Dir.glob('modular-app/app/components/*.rb').each {|f| require f }
+require 'capybara/rspec'
 
-Bundler.require(:default, :development)
+Combustion.initialize!
+
+require 'rspec/rails'
+require 'capybara/rails'
+require 'modular/railtie'
+
+RSpec.configure do |config|
+  config.use_transactional_fixtures = true
+end

data/spec/views/indirect_render/index.html.erb_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe "indirect_render/index" do
+end

data/templates/layout.erb

@@ -1,17 +1,12 @@
 <%% @layout_id = '<%=@layout_id%>'.to_sym %>
 
-
-
 <% layout = Modular.layout(@layout_id) %>
 
-<% if layout.is_a? Modular::Components::IndirectRender %>
-  <%= layout.indirect_render %>
-<% else %>
-  <%%= Modular.layout('<%=@layout_id%>').render %>
-<% end %>
+<%= layout.render %>
 
 <%% 
-    layout = 'application'
-    @_content_for[:layout] = self.output_buffer
+    layout = '<%=@original_layout%>'
+    #Old one is @_content_for
+    @view_flow.content[:layout] = self.output_buffer
     self.output_buffer = render(:file => "layouts/#{layout}")
- %>
+ %>

metadata

@@ -1,137 +1,85 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: modular
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
 platform: ruby
-authors: 
+authors:
 - Alex Rozumiy
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-28 00:00:00 +03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  type: :development
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
-  prerelease: false
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  name: autotest
   type: :development
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
-  requirement: *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 description: This gem provides functionality for modular frontend layout
-email: 
+email:
 - brain-geek@yandex.ua
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- .gitignore
+- .rvmrc
+- .travis.yml
 - Gemfile
-- README
+- Gemfile.lock
+- LICENSE
+- README.rdoc
 - Rakefile
 - TODO
-- autotest/discover.rb
+- 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/abstract_model.rb
+- lib/modular/action_controller_extension.rb
 - lib/modular/caching.rb
+- lib/modular/components.rb
 - lib/modular/components/base.rb
 - lib/modular/components/container.rb
 - lib/modular/components/main_content.rb
 - lib/modular/configuration.rb
+- lib/modular/creation.rb
+- lib/modular/helpers.rb
 - lib/modular/layout_generator.rb
-- lib/modular/rails.rb
+- lib/modular/railtie.rb
 - lib/modular/rendering.rb
 - lib/modular/version.rb
 - modular-app/Gemfile
 - modular-app/Rakefile
-- modular-app/app/components/cached_for_time.rb
-- modular-app/app/components/cached_forever.rb
-- modular-app/app/components/fake_news_feed.rb
-- modular-app/app/components/foobar.rb
-- modular-app/app/components/heavy_task.rb
-- modular-app/app/components/hello_world.rb
-- modular-app/app/components/helpers_example.rb
-- modular-app/app/components/validated.rb
-- modular-app/app/components/vertical.rb
-- modular-app/app/controllers/application_controller.rb
-- modular-app/app/controllers/cached_for_time_controller.rb
-- modular-app/app/controllers/cached_forever_controller.rb
-- modular-app/app/controllers/callback_layout_controller.rb
-- modular-app/app/controllers/example_controller.rb
-- modular-app/app/controllers/indirect_render_controller.rb
-- modular-app/app/controllers/layout_test_controller.rb
-- modular-app/app/helpers/application_helper.rb
-- modular-app/app/helpers/callback_layout_helper.rb
-- modular-app/app/helpers/example_helper.rb
-- modular-app/app/helpers/indirect_render_helper.rb
-- modular-app/app/models/simple_model.rb
-- modular-app/app/views/cached_for_time/index.html.erb
-- modular-app/app/views/cached_forever/index.html.erb
-- modular-app/app/views/callback_layout/index.html.erb
-- modular-app/app/views/components/cached_for_time.html.erb
-- modular-app/app/views/components/cached_forever.html.erb
-- modular-app/app/views/components/container.html.erb
-- modular-app/app/views/components/fake_news_feed.html.erb
-- modular-app/app/views/components/foobar.html.erb
-- modular-app/app/views/components/heavy_task.html.erb
-- modular-app/app/views/components/hello_world.html.erb
-- modular-app/app/views/components/helpers_example.html.erb
-- modular-app/app/views/components/validated.html.erb
-- modular-app/app/views/components/vertical.html.erb
-- modular-app/app/views/example/index.html.erb
-- modular-app/app/views/indirect_render/index.html.erb
-- modular-app/app/views/layout_test/index.html.erb
-- modular-app/app/views/layouts/application.html.erb
 - modular-app/config.ru
 - modular-app/config/application.rb
 - modular-app/config/boot.rb
@@ -143,7 +91,6 @@ files:
 - modular-app/config/initializers/backtrace_silencers.rb
 - modular-app/config/initializers/inflections.rb
 - modular-app/config/initializers/mime_types.rb
-- modular-app/config/initializers/modular.rb
 - modular-app/config/initializers/secret_token.rb
 - modular-app/config/initializers/session_store.rb
 - modular-app/config/locales/en.yml
@@ -152,58 +99,97 @@ files:
 - modular-app/db/schema.rb
 - modular-app/db/seeds.rb
 - modular-app/script/rails
-- modular-app/spec/components/base.rb
-- modular-app/spec/components/container.rb
-- modular-app/spec/components/hello_world.rb
-- modular-app/spec/components/helpers_example.rb
-- modular-app/spec/components/validated.rb
-- modular-app/spec/controllers/cached_for_time_controller_spec.rb
-- modular-app/spec/controllers/cached_forever_controller_spec.rb
-- modular-app/spec/controllers/callback_layout_controller_spec.rb
-- modular-app/spec/controllers/example_controller_spec.rb
-- modular-app/spec/controllers/indirect_render_controller_spec.rb
-- modular-app/spec/controllers/layout_test_controller_spec.rb
-- modular-app/spec/helpers/indirect_render_helper_spec.rb
 - modular-app/spec/spec_helper.rb
-- modular-app/spec/views/indirect_render/index.html.erb_spec.rb
 - modular.gemspec
-- spec/base.rb
-- spec/configuration.rb
+- spec/components/base.rb
+- spec/components/container.rb
+- spec/components/hello_world.rb
+- spec/components/helpers_example.rb
+- spec/components/validated.rb
+- 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/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/validated.rb
+- spec/internal/app/components/vertical.rb
+- spec/internal/app/controllers/application_controller.rb
+- spec/internal/app/controllers/cached_for_time_controller.rb
+- 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
+- spec/internal/app/views/cached_forever/index.html.erb
+- 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/validated.html.erb
+- spec/internal/app/views/components/vertical.html.erb
+- spec/internal/app/views/example/index.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
+- spec/internal/config/database.yml
+- spec/internal/config/initializers/modular.rb
+- spec/internal/config/routes.rb
+- spec/internal/db/schema.rb
+- 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/spec_helper.rb
+- spec/views/indirect_render/index.html.erb_spec.rb
 - templates/layout.erb
-has_rdoc: true
 homepage: https://github.com/brain-geek/modular
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3904542877357458912
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -3904542877357458912
 requirements: []
-
 rubyforge_project: modular
-rubygems_version: 1.6.2
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: This gem provides functionality for modular frontend layout
 test_files: []
-