rails3_plugin_toolbox 0.3.2 → 0.3.3

data/README.markdown

@@ -110,9 +110,9 @@ describe "My Plugin rails extensions" do
     # pull in a macro that makes 'after_init' available!
     extend Rails3::PluginExtender::Macro      
 
-    after_init :view do |view|
-      view.should be_extended_with Helper::View, :panel, :window, :button, :form
-      view.should_not be_extended_with Helper::View, :unknown
+    after_init :view do
+      :view.should be_extended_with Helper::View, :panel, :window, :button, :form
+      :view.should_not be_extended_with Helper::View, :unknown
     end
     
     Minimal::Application.initialize!    
@@ -130,8 +130,8 @@ describe "My other Plugin rails extensions" do
     end
   end
 
-  after_init :view do |view|
-    view.should be_extended_with Helper::View, :panel, :window, :button, :form
+  after_init :view do
+    :view.should be_extended_with Helper::View, :panel, :window, :button, :form
   end
 
   it "should extend Action View" do      

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/plugin_toolbox/rspec/macro.rb

@@ -1,10 +1,14 @@
 module Rails3
   class PluginExtender
     module Macro
-      ACTIVE_MODULES = {:AR => :active_record, :view => :action_view, :controller => :action_controller, :mailer => :action_mailer}    
+      class << self
+        include Rails3::PluginExtender::Util
+      end
+
+      MACRO = Rails3::PluginExtender::Macro
             
       def after_init component, &block
-        type = get_load_type component
+        type = MACRO.get_load_type component
         Rails3::PluginExtender.new do
           extend_rails type do          
             after :initialize do
@@ -13,16 +17,15 @@ module Rails3
           end
         end        
       end # def
-         
-      protected
 
-      def get_load_type type
-         return ACTIVE_MODULES[type] if ACTIVE_MODULES[type]
-         return type if ACTIVE_MODULES.values.include? type                
-         return type if type == :i18n
-         logger.warn "WARNING: The Rails 3 load handler for the component #{type} is not part of the default load process."
+      def init_app_railties app_name, *railties
+        app = "#{app_name.to_s.camelize}::Application".constantize 
+        app.initialize!                        
+        railties.each do |railtie|
+          MACRO.get_base_class(railtie).constantize
+        end
       end
-      
+               
     end
   end
 end

data/lib/plugin_toolbox/rspec/matchers/be_extended_with.rb

@@ -4,7 +4,7 @@ module Rails3
       class BeExtendedWith
         include Rails3::PluginExtender::Util
       
-        attr_reader :methods, :module_const, :rails_const, :submodules, :bad_const, :cause, :rails_const_name
+        attr_reader :methods, :module_const, :rails_const, :submodules, :cause, :rails_const_name, :bad_const
       
         def initialize(module_const, submodules=nil)
           @module_const = module_const     
@@ -13,11 +13,13 @@ module Rails3
         end
 
         def matches? type
-          begin
+          begin  
             @rails_const_name = get_base_class(type)
-            @bad_const = module_const            
-            @rails_const = const.constantize            
+            @bad_const = module_const
+            @rails_const = rails_const_name.constantize            
+            
             return match_submodules? if submodules            
+
             methods_included? module_const.instance_methods 
           rescue
             @cause = ", but the extension module wasn't found"
@@ -29,12 +31,10 @@ module Rails3
           (rails_const == I18n) ? rails_const.methods : rails_const.instance_methods
         end
 
-        def match_submodules?
+        def match_submodules? 
           submodules.each do |name|
             @bad_const = make_constant(module_const, name)
-            if !methods_included? get_methods(name)                          
-              return false               
-            end
+            return false if !methods_included? get_methods(name)                          
           end
           true
         end
@@ -52,7 +52,7 @@ module Rails3
         end 
   
         def negative_failure_message  
-          "Did not expect the rails class #{rails_const_name} to be extended with the methods in #{module_const}"
+          "Did not expect the rails class #{rails_const_name} to be extended with the methods in #{bad_const}"
         end                   
       end
     

data/rails3_plugin_toolbox.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails3_plugin_toolbox}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]

data/spec/plugin_toolbox/extend_view_content_spec.rb

@@ -21,23 +21,21 @@ module Helper
     end    
 
     module Form
-      def draw_button
-        'button'
+      def draw_form
+        'form'
       end
     end        
   end
 end
 
-
 describe Rails3::PluginExtender do
   describe '#extend_rails' do        
 
-    before :each do
+    before :each do 
       Rails3::PluginExtender.new do
-        extend_rails :view do          
+        extend_rails :view do
           extend_from_module Helper::View, :panel, :window
-          extend_with Helper::View::Button, Helper::View::Form
-          
+          extend_with Helper::View::Button, Helper::View::Form          
         end        
       end
     end
@@ -50,13 +48,17 @@ describe Rails3::PluginExtender do
     it "should extend Action View" do      
       extend Rails3::PluginExtender::Macro      
 
-      after_init :view do |view|
-        view.should be_extended_with Helper::View, :panel, :window, :button, :form
-        view.should_not be_extended_with Helper::View, :unknown
-        lambda { view.should be_extended_with Helper::View, :unknown }.should raise_error
+      after_init :view do
+        puts "View initialized!"
+        
+        :view.should be_extended_with Helper::View, :panel, :window, :button, :form
+        :view.should_not be_extended_with Helper::View, :unknown
+        lambda { :view.should be_extended_with Helper::View, :unknown }.should raise_error
+        
+        # :view.should be_extended_with Helper::View, :unknown
       end
-      
-      Minimal::Application.initialize!    
+
+      init_app_railties :minimal, :view
     end
   end
 end

data/spec/spec_helper.rb

@@ -5,9 +5,9 @@ require 'rails3_plugin_toolbox'
 # See http://www.igvita.com/2010/08/04/rails-3-internals-railtie-creating-plugins/
 
 
-require 'active_record'
-require 'action_mailer'
-require 'active_support'
+# require 'active_record'
+# require 'action_mailer'
+# require 'active_support'
 require 'action_controller'
 require 'action_view'
 require 'active_support/railtie'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Kristian Mandrup