rails3_plugin_toolbox 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

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
+        attr_reader :methods, :module_const, :rails_const, :submodules, :bad_const, :cause
       
         def initialize(module_const, submodules=nil)
           @module_const = module_const     
@@ -14,10 +14,12 @@ module Rails3
 
         def matches? type
           begin
-            @rails_const = get_base_class(type)                  
+            @rails_const = get_base_class(type)
             return match_submodules? if submodules
+            @bad_const = module_const
             methods_included? module_const.instance_methods 
           rescue
+            @cause = ", but the extension module wasn't found"
             false
           end
         end
@@ -28,7 +30,10 @@ module Rails3
 
         def match_submodules?
           submodules.each do |name|
-            return false if !methods_included? get_methods(name)            
+            @bad_const = make_constant(module_const, name)
+            if !methods_included? get_methods(name)                          
+              return false               
+            end
           end
           true
         end
@@ -42,11 +47,11 @@ module Rails3
         end
   
         def failure_message   
-          "Expected the rails class #{rails_const} to be extended with all the methods in #{module_const}"
+          "Expected the rails class #{rails_const} to be extended with the methods in #{bad_const}#{cause}"
         end 
   
         def negative_failure_message  
-          "Din not expect the rails class #{rails_const} to be extended with all the methods in #{module_const}"
+          "Did not expect the rails class #{rails_const} to be extended with the methods in #{module_const}"
         end                   
       end
     

data/lib/plugin_toolbox/util.rb

@@ -5,13 +5,29 @@ module Rails3
       ACTIVE_MODULES = {:AR => :active_record, :view => :action_view, :controller => :action_controller, :mailer => :action_mailer}    
 
       def get_base_class type
-        type = get_load_type(type).to_s
-        return "#{type.to_s.camelize}::Base".constantize if type =~/action/ || type =~/active/
-        "#{type.to_s.camelize}".constantize        
+        begin
+          type = get_load_type(type).to_s
+          const = act_type?(type) ? rails_const_base(type) : "#{type.to_s.camelize}"          
+          const.constantize        
+        rescue                            
+          raise ArgumentError, "Can't find rails constant: #{const}"
+        end
+      end
+
+      def act_type? type
+        type =~/action/ || type =~/active/        
       end
 
       def get_constant base_name, name   
-        "#{base_name.to_s.camelize}::#{name.to_s.camelize}".constantize
+        make_constant(base_name, name).constantize
+      end
+
+      def rails_const_base type
+        "#{type.to_s.camelize}::Base"
+      end
+
+      def make_constant base_name, name
+        "#{base_name.to_s.camelize}::#{name.to_s.camelize}"
       end
 
       def get_load_type type

data/rails3_plugin_toolbox.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails3_plugin_toolbox}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   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

@@ -43,6 +43,9 @@ describe Rails3::PluginExtender do
     
       :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
   end
 end

data/spec/plugin_toolbox/extender_action_spec.rb

@@ -4,6 +4,7 @@ describe Rails3::PluginExtender do
   describe '#extend_rails' do
     it "should extend Action View" do
       extender = Rails3::PluginExtender.new
+      
       extender.extend_rails :view do
         with MyAddition
       

data/spec/plugin_toolbox/extender_spec.rb

@@ -1,20 +1,17 @@
 require 'spec_helper'
 
+def extend_unknown
+  Rails3::PluginExtender.new do
+    extend_rails :unknown do
+      with MyAddition
+    end
+  end     
+end  
+
 describe Rails3::PluginExtender do
   describe '#extend_rails' do
     it "should NOT extend Unknown" do
-      lambda do
-        Rails3::PluginExtender.new
-          extend_rails :unknown do
-            with MyAddition
-          end
-        end     
-      end.should raise_error
-    
-      # Initialize the rails application
-      Minimal::Application.initialize!    
-        
-      MyAddition.heard.should == null
+      lambda { extend_unknown }.should raise_error    
     end
     
     it "should extend Active Record" do

data/spec/spec_helper.rb

@@ -4,13 +4,14 @@ require 'rails3_plugin_toolbox'
 
 # See http://www.igvita.com/2010/08/04/rails-3-internals-railtie-creating-plugins/
 
-# require 'active_support'
-# require 'active_record'
-# require 'action_controller'
-# require 'action_view'
-# require 'action_mailer'
-# require 'active_support/railtie'
-require 'rails/all'
+
+require 'active_record'
+require 'action_mailer'
+require 'active_support'
+require 'action_controller'
+require 'action_view'
+require 'active_support/railtie'
+# require 'rails/all'
 
 module Minimal
   class Application < Rails::Application

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Kristian Mandrup