modular 0.1.2 → 0.2.0

data/.gitignore

@@ -0,0 +1,2 @@
+/tmp/*
+/spec/internal/db/combustion_test.sqlite

data/.rvmrc

@@ -0,0 +1 @@
+rvm use 1.9.3-falcon

data/.travis.yml

@@ -0,0 +1,2 @@
+rvm:           # перечень всех версий Ruby, на которых хотите протестировать
+  - 1.9.3

data/Gemfile

@@ -2,3 +2,17 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in modular.gemspec
 gemspec
+
+gem 'rails', '~> 3.2.0'
+
+gem 'rspec-rails', :require => false
+gem 'rspec'
+gem 'capybara'
+gem "combustion", "~> 0.3.2"
+gem 'sqlite3'
+
+gem 'memcache-client'
+
+gem 'pry'
+gem 'pry-nav'
+gem 'webrat'

data/Gemfile.lock

@@ -0,0 +1,155 @@
+PATH
+  remote: .
+  specs:
+    modular (0.2.0)
+      rails
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.2.6)
+      actionpack (= 3.2.6)
+      mail (~> 2.4.4)
+    actionpack (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.6)
+      activesupport (= 3.2.6)
+      builder (~> 3.0.0)
+    activerecord (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
+    activesupport (3.2.6)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    addressable (2.2.8)
+    arel (3.0.2)
+    builder (3.0.0)
+    capybara (1.1.2)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (~> 2.0)
+      xpath (~> 0.1.4)
+    childprocess (0.3.3)
+      ffi (~> 1.0.6)
+    coderay (1.0.7)
+    combustion (0.3.2)
+      rails (>= 3.0.0)
+      thor (>= 0.14.6)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    ffi (1.0.11)
+    hike (1.2.1)
+    i18n (0.6.0)
+    journey (1.0.4)
+    json (1.7.3)
+    libwebsocket (0.1.3)
+      addressable
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    memcache-client (1.8.5)
+    method_source (0.7.1)
+    mime-types (1.19)
+    multi_json (1.3.6)
+    nokogiri (1.5.5)
+    polyglot (0.3.3)
+    pry (0.9.9.6)
+      coderay (~> 1.0.5)
+      method_source (~> 0.7.1)
+      slop (>= 2.4.4, < 3)
+    pry-nav (0.2.1)
+      pry (~> 0.9.9)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.2.6)
+      actionmailer (= 3.2.6)
+      actionpack (= 3.2.6)
+      activerecord (= 3.2.6)
+      activeresource (= 3.2.6)
+      activesupport (= 3.2.6)
+      bundler (~> 1.0)
+      railties (= 3.2.6)
+    railties (3.2.6)
+      actionpack (= 3.2.6)
+      activesupport (= 3.2.6)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.0)
+    rspec-expectations (2.11.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.1)
+    rspec-rails (2.11.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.11.0)
+    rubyzip (0.9.9)
+    selenium-webdriver (2.24.0)
+      childprocess (>= 0.2.5)
+      libwebsocket (~> 0.1.3)
+      multi_json (~> 1.0)
+      rubyzip
+    slop (2.4.4)
+    sprockets (2.1.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.6)
+    thor (0.15.4)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.33)
+    webrat (0.7.3)
+      nokogiri (>= 1.2.0)
+      rack (>= 1.0)
+      rack-test (>= 0.5.3)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  capybara
+  combustion (~> 0.3.2)
+  memcache-client
+  modular!
+  pry
+  pry-nav
+  rails (~> 3.2.0)
+  rspec
+  rspec-rails
+  sqlite3
+  webrat

data/LICENSE

@@ -0,0 +1,7 @@
+Copyright (C) 2011-2012, Alex Rozumiy
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -0,0 +1,21 @@
+= Modular
+
+This gem makes changing layout structure as easy as change ruby hash structure.
+
+= Build Status {<img src="https://secure.travis-ci.org/brain-geek/modular.png"/>}[http://travis-ci.org/brain-geek/modular]
+
+= How to use
+See example in spec/internal.
+
+== Contributing to modular
+ 
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
+* Fork the project.
+* Commit and push until you are happy with your contribution.
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
+== Copyright
+
+Copyright (c) 2011-2012 Alex Rozumey. See LICENSE for further details.

data/Rakefile

@@ -1,2 +1,14 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
+# encoding: utf-8
+
+begin
+  require 'bundler'
+  Bundler::GemHelper.install_tasks
+rescue LoadError => e
+  warn "[WARNING]: It is recommended that you use bundler during development: gem install bundler"
+end
+
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new('spec')
+
+task :default => :spec

data/TODO

@@ -1,2 +1,3 @@
-* Fix autotest discovery to use one autotest, not two separate
-* Use custom context
+***	Allow accessing request object from components
+** 	Write README with usage examples
+* 	Clean up obsolete classes/components in app

data/config.ru

@@ -0,0 +1,7 @@
+require 'rubygems'
+require 'bundler'
+
+Bundler.require :default, :development
+
+Combustion.initialize!
+run Combustion::Application

data/lib/modular.rb

@@ -1,45 +1,29 @@
-require "active_support/all"
+require 'rails'
+require 'modular/railtie'
 
 module Modular
   extend ActiveSupport::Autoload
 
   eager_autoload do
+    autoload :Creation
     autoload :Configuration
     autoload :LayoutGenerator
+    autoload :Helpers    
   end
-  
-  def create(typ, params = {})
-    return typ if typ.is_a? 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 unless component.valid?
-    
-    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
-  
+
+  delegate :create, :from_json, :to => Creation
   delegate :config, :configure, :to => Configuration
   
   def layout(id)
-    Configuration.config.layouts[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.keys
+    Configuration.config.layouts
   end
   
   def generate_rails_layout(id, params = {})
@@ -49,9 +33,5 @@ module Modular
   extend self
 end
 
-require "modular/components/base"
-require "modular/components/container"
-require "modular/components/main_content"
-require "modular/version"
-
-require "modular/rails" if defined? Rails
+require "modular/components"
+require "modular/version"

data/lib/modular/action_controller_extension.rb

@@ -0,0 +1,20 @@
+module Modular::ActionControllerExtension
+  extend ActiveSupport::Concern
+
+  def render_modular_layout(name)
+    layout = Modular.layout name
+    render :text => layout.render
+  end
+
+  module ClassMethods
+    def modular_layout(name, params = {})
+      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]
+      end
+      
+      layout proc
+    end
+  end
+end

data/lib/modular/components.rb

@@ -0,0 +1,6 @@
+module Modular::Components
+end
+
+require "modular/components/base"
+require "modular/components/container"
+require "modular/components/main_content"

data/lib/modular/components/base.rb

@@ -1,5 +1,4 @@
 require 'abstract_controller'
-require "modular/abstract_model"
 require "modular/rendering"
 require "modular/caching"
 
@@ -7,9 +6,13 @@ module Modular
   module Components
     class Base < Modular::Helpers::AbstractModel
       #rendering
-      include AbstractController
-      include Rendering, Helpers
-      include Modular::Components::DirectRender
+      include AbstractController::Rendering
+      include AbstractController::Helpers
+      include Modular::Rendering
+
+      def self.abstract?
+        true
+      end
 
       #slug
       def self.type
@@ -21,10 +24,9 @@ module Modular
       end
 
       #params for element itself
-      attr_reader_with_default :width, 300
-      attr_reader :title
+      attr_accessor :title
       
-      validates :title, :length => {:maximum => 64}
+      validates :title, :length => {:maximum => 64}      
     end
   end
 end

data/lib/modular/components/container.rb

@@ -1,8 +1,6 @@
 module Modular
   module Components
     class Container < Base
-      include Modular::Components::IndirectRender
-      
       attr_accessor :components
       
       def initialize(attributes = {})
@@ -26,14 +24,7 @@ module Modular
         cont.instance_eval &block if block_given?
         components.push cont
       end
-      
-      # def render_child(component, render_type)
-        # if component.is_a?(Modular::Components::IndirectRender)&&(render_type == :indirect) 
-          # component.indirect_render.html_safe
-        # else
-          # ("<%= Modular.from_json('" + component.to_json.html_safe + "').render %>").html_safe
-        # end
-      # end
+
     end
   end
 end

data/lib/modular/components/main_content.rb

@@ -1,7 +1,5 @@
 class Modular::Components::MainContent < Modular::Components::Base
-  include Modular::Components::IndirectRender
-  
-  def indirect_render(args = {})
+  def render(args = {})
     '<%=yield%>'.html_safe
   end
 end

data/lib/modular/configuration.rb

@@ -1,22 +1,23 @@
+require 'singleton'
+
 module Modular
   class Configuration
-    attr_accessor_with_default :columns, 12
-    attr_accessor_with_default :column_width, 68
-    attr_accessor_with_default :padding_width, 15
+    include ::Singleton
+
     attr_reader :layouts
     
     def self.config
-      @@config ||= new
+      self.instance
     end
   
     def self.configure(&block)
-      @@config = new
-      @@config.instance_eval &block if block_given?
-      @@config
+      instance = self.instance
+      instance.instance_eval &block if block_given?
+      instance
     end
     
-    def register_layout(layout, mod = :Container, params = {}, &block)
-      @layouts ||= {}.with_indifferent_access
+    def register_layout(layout, mod = :container, params = {}, &block)
+      @layouts ||= Hash.new.with_indifferent_access
       
       if mod.is_a? Components::Base
         @layouts[layout.to_s] = mod
@@ -26,6 +27,5 @@ module Modular
         @layouts[layout.to_s] = root_layout
       end
     end
-    
   end
 end