modular 0.2.3 → 0.2.5

data/.gitignore

@@ -1,5 +1,5 @@
-/tmp/*
-/spec/internal/db/combustion_test.sqlite
-/pkg/
+/tmp
+/spec/internal/db/*.sqlite
+/pkg
 Gemfile.lock
 /spec/internal/tmp

data/.travis.yml

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

data/CHANGELOG

@@ -0,0 +1,8 @@
+0.2.4
+---
+Added possibility to find by uniqid.
+
+0.2.5
+---
+Remove obsolete 'caching' functionality
+Fix layout generation - it will not be generated if already exists on FS. Cleanup should be done from the application itself.

data/lib/modular.rb

@@ -15,10 +15,6 @@ module Modular
   delegate :config, :configure, :to => Configuration
   delegate :layout, :layouts, :to => :config
   
-  def generate_rails_layout(id, params = {})
-    LayoutGenerator.generate(id, params)
-  end
-  
   extend self
 end
 

data/lib/modular/action_controller_extension.rb

@@ -7,19 +7,19 @@ module Modular::ActionControllerExtension
 
   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]
+    path = ::Modular::LayoutGenerator.generate(name)
+
+    #cutting off '.html.erb' and relative path prefix
+
+    "../../../#{path[0, path.length-9]}"
   end
 
   module ClassMethods
     def modular_layout(name)
       proc = Proc.new do |controller|
-        
         controller.send(:get_layout_path, name)
       end
       

data/lib/modular/components/base.rb

@@ -1,6 +1,5 @@
 require 'abstract_controller'
 require "modular/rendering"
-require "modular/caching"
 require 'active_model'
 
 module Modular
@@ -97,6 +96,10 @@ EOF
         valid? #this call is used to make validation calls
         { uniqid => errors.to_a }
       end
+
+      def find_by_uniqid(id)
+        self if id.to_s == uniqid.to_s
+      end
     end
   end
 end

data/lib/modular/components/container.rb

@@ -53,6 +53,20 @@ module Modular
 
         errs
       end      
+      def find_by_uniqid(id)
+        id = id.to_s
+
+        result = super
+
+        if result.nil?
+          children.each do |child|
+            result = child.find_by_uniqid(id)
+            return result unless result.nil?
+          end
+        end
+
+        result
+      end
     end
   end
 end

data/lib/modular/layout_generator.rb

@@ -34,12 +34,16 @@ module Modular
     end
       
     def filename
-      foldername + (@id.to_s + (@params[:cache_key].to_s) + '.html.erb')
+      foldername + (@id.to_s + @params[:cache_key].to_s + '.html.erb')
+    end
+
+    def full_filepath
+      "#{Rails.root}/#{filename}"
     end
     
     def layout_exists?
       if Rails.configuration.action_controller.perform_caching
-        File.exists?(filename)
+        File.exists?(full_filepath)
       else
         false
       end
@@ -55,7 +59,7 @@ module Modular
       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("#{Rails.root}/#{filename}", 'w') do |f| 
+      File.open(full_filepath, 'w') do |f| 
         f.write(output)
       end
     end

data/lib/modular/rendering.rb

@@ -8,16 +8,13 @@ module Modular::Rendering
   def execute
   end
 
-  def render
+  def render(args = {})
     execute
-    modular_render :render_type => :indirect
+    render_to_string :file => 'components/' + action_name, :locals => args
   end
 
   protected 
-  def modular_render(args = {})
-    render_to_string :file => 'components/' + action_name, :locals => args
-  end
-  
+ 
   module ClassMethods
     def view_context_class
       context = super

data/lib/modular/version.rb

@@ -1,3 +1,3 @@
 module Modular
-  VERSION = "0.2.3"
+  VERSION = "0.2.5"
 end

data/spec/controllers/layout_test_controller_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe LayoutTestController do
-  describe "prerequirements" do
+  describe "requirements" do
     it "should render itself" do
       Modular.layout(:nested).render
     end
@@ -33,6 +33,27 @@ describe LayoutTestController do
     it "should not be cached" do
       get 'index'
     end
-    
+  end
+
+  it "it should not call render twice" do
+    File.unlink("#{Rails.root}/tmp/modular/nested.html.erb") rescue
+
+    Rails.configuration.action_controller.perform_caching = true
+
+    SimpleModel.should_receive(:foobar_method).twice
+
+    get 'index'
+
+    Rails.configuration.action_controller.perform_caching = true
+
+    get 'index'
+    get 'index'
+
+    File.unlink("#{Rails.root}/tmp/modular/nested.html.erb") rescue
+
+    get 'index'
+
+    get 'index'
+    get 'index'    
   end
 end

data/spec/internal/app/models/simple_model.rb

@@ -1,14 +1,4 @@
 class SimpleModel < ActiveRecord::Base
-  
-  class << self
-    def called_by_cached_forever
-    end
-  
-    def called_by_cached_for_time
-    end
-    
-    def foobar_method
-    end
+  def self.foobar_method
   end
-
 end

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

@@ -18,8 +18,4 @@ Modular.configure 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)
 end

data/spec/modular/finders_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe Modular, ' finders ' do
+  describe "simple objects" do
+    let(:element) { Modular.create(:fake_news_feed, :news_count => 50, :title => 'Best news feed', :uniqid => 'asdf') }
+
+    it "finds itself" do
+      element.find_by_uniqid('asdf').should be element
+    end
+
+    it "does not find itself if id is wrong" do
+      element.find_by_uniqid('qwe').should be_nil
+    end
+  end
+
+  describe "containers" do
+    let(:element) { Modular.create(:container, :uniqid => 'asdf') }
+
+    it "finds itself" do
+      element.find_by_uniqid('asdf').should be element
+    end
+
+    it "finds itself as symbol" do
+      element.find_by_uniqid(:asdf).should be element
+    end
+
+    it "does not find itself if id is wrong" do
+      element.find_by_uniqid('qwe').should be_nil
+    end
+
+    it "finds children in containers" do
+      element.children.push(child = Modular.create(:fake_news_feed, :uniqid => 'gfsd'))
+      element.find_by_uniqid('gfsd').should be child
+    end
+
+    it "finds children in children containers" do
+      element.children.push(child_cont = Modular.create(:container))
+      child_cont.children.push(child = Modular.create(:fake_news_feed, :uniqid => 'gfsd'))
+
+      element.find_by_uniqid('gfsd').should be child
+    end
+
+    it "does not find if nothing to be found" do
+      element.children.push(child = Modular.create(:fake_news_feed, :uniqid => '1'))      
+
+      element.children.push(child_cont = Modular.create(:container))
+      child_cont.children.push(child = Modular.create(:fake_news_feed, :uniqid => '2'))
+
+      element.find_by_uniqid('3').should be_nil
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modular
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-28 00:00:00.000000000 Z
+date: 2012-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -53,15 +53,14 @@ files:
 - .gitignore
 - .rvmrc
 - .travis.yml
+- CHANGELOG
 - Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
-- TODO
 - config.ru
 - lib/modular.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
@@ -83,13 +82,9 @@ files:
 - 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/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/hello_world.rb
@@ -99,14 +94,10 @@ files:
 - 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/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
@@ -121,7 +112,6 @@ files:
 - 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
 - spec/internal/config/database.yml
@@ -133,6 +123,7 @@ files:
 - spec/internal/tmp/.gitkeep
 - spec/modular/configuration_spec.rb
 - spec/modular/creation_spec.rb
+- spec/modular/finders_spec.rb
 - spec/modular/validation_spec.rb
 - spec/spec_helper.rb
 - templates/components/container.html.erb
@@ -151,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1289225652377390815
+      hash: 926453680788598348
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -160,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1289225652377390815
+      hash: 926453680788598348
 requirements: []
 rubyforge_project: modular
 rubygems_version: 1.8.22

data/TODO

@@ -1,3 +0,0 @@
-***	Allow accessing request object from components
-** 	Write README with usage examples
-* 	Clean up obsolete classes/components in app

data/lib/modular/caching.rb

@@ -1,62 +0,0 @@
-module Modular
-  module Components
-    module Caching
-      def self.included(base)
-        base.cattr_accessor :cache_options
-        
-        base.class_eval do
-          def self.cache(*args, &block)
-            self.cache_options = args.extract_options!
-            self.cache_options[:cache_key] = block if block_given?
-          end
-        end
-      end
-      
-      def render
-        if cache_options.nil?
-          super
-        elsif cached?
-          get_cached
-        else
-          data = super
-          do_caching data
-          data
-        end
-      end
-
-      def cache_store
-        ::ActionController::Base.cache_store
-      end
-      
-      def cache_options
-        self.class.cache_options
-      end
-      
-      def clear_cache
-        cache_store.delete cache_key
-      end
-      
-      protected
-      def cache_key
-        key = cache_options[:cache_key]
-        key = key.call(self) if key.is_a? Proc
-        key = self.to_json if key.nil?
-        
-        ::ActiveSupport::Cache.expand_cache_key key, :modular
-      end
-      
-      def cached?
-        cache_store.exist? cache_key
-      end
-      
-      def get_cached
-        cache_store.read cache_key
-      end
-      
-      def do_caching(data)
-        cache_store.write cache_key, data, cache_options
-      end
-
-    end
-  end
-end

data/spec/controllers/cached_for_time_controller_spec.rb

@@ -1,20 +0,0 @@
-require 'spec_helper'
-
-describe CachedForTimeController do
-  render_views
-
-  it "should expire cache" do
-    obj = Modular.layout('cached_for_time')
-    obj.clear_cache
-    SimpleModel.should_receive(:called_by_cached_for_time).once
-     
-    get 'index'
-    get 'index'
-    
-    sleep 2
-    
-    SimpleModel.should_receive(:called_by_cached_for_time).once
-    get 'index'
-  end
-
-end

data/spec/controllers/cached_forever_controller_spec.rb

@@ -1,17 +0,0 @@
-require 'spec_helper'
-
-describe CachedForeverController do
-  render_views
-  
-  it "should do caching" do
-    Modular.layout('cached_forever').clear_cache
-    SimpleModel.should_receive(:called_by_cached_forever).once
-     
-    get 'index'
-    
-    Modular.layout('cached_forever').should_receive(:cached?).and_return(true)
-    Modular.layout('cached_forever').should_receive(:get_cached)
-    
-    get 'index'
-  end
-end

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

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

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

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

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

@@ -1,7 +0,0 @@
-class CachedForTimeController < ApplicationController
-  modular_layout 'cached_for_time'
-  
-  def index
-  end
-
-end

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

@@ -1,6 +0,0 @@
-class CachedForeverController < ApplicationController
-  modular_layout 'cached_forever'
-  
-  def index
-  end
-end

data/spec/internal/app/views/cached_for_time/index.html.erb

@@ -1,2 +0,0 @@
-<h1>CachedForTime#index</h1>
-<p>Find me in app/views/cached_for_time/index.html.erb</p>

data/spec/internal/app/views/indirect_render/index.html.erb

@@ -1,2 +0,0 @@
-<h1>IndirectRender#index</h1>
-<p>Find me in app/views/indirect_render/index.html.erb</p>