Remove 00_ style extension prefixes

mislav · Jan 4, 2010 · a683a57 · a683a57
1 parent 7277421
commit a683a57
Show file tree

Hide file tree

Showing 30 changed files with 11 additions and 11 deletions.
diff --git a/lib/radiant/extension_loader.rb b/lib/radiant/extension_loader.rb
@@ -73,7 +73,7 @@ def load_extensions
       @observer ||= DependenciesObserver.new(configuration).observe(::ActiveSupport::Dependencies)
       self.extensions = load_extension_roots.map do |root|
         begin
-          extension_file = "#{File.basename(root).gsub(/^\d+_|^radiant-|-[\d.]+$/,'')}_extension"
+          extension_file = "#{File.basename(root).gsub(/^radiant-|-[\d.]+$/,'')}_extension"
           extension = extension_file.camelize.constantize
           extension.unloadable
           extension.root = root
@@ -129,7 +129,7 @@ def select_extension_roots
             :all
           else
             ext_path = all_roots.detect do |maybe_path|
-              File.basename(maybe_path).gsub(/^\d+_|^radiant-|-[\d.]+$/, '') == ext_name.to_s
+              File.basename(maybe_path).gsub(/^radiant-|-[\d.]+$/, '') == ext_name.to_s
             end
             raise LoadError, "Cannot find the extension '#{ext_name}'!" if ext_path.nil?
             all_roots.delete(ext_path)

diff --git a/lib/radiant/initializer.rb b/lib/radiant/initializer.rb
@@ -44,7 +44,7 @@ def all_available_extensions
         available.tap { |a| a << gem.specification.full_gem_path if gem.specification and Dir[gem.specification.full_gem_path + '/*_extension.rb' ].any? }
       end
       # strip version info to glean proper extension names
-      all.flatten.map {|f| File.basename(f).gsub(/^\d+_|^radiant-|-[\d\.]+$/, '') }.sort.map {|e| e.to_sym }
+      all.flatten.map {|f| File.basename(f).gsub(/^radiant-|-[\d\.]+$/, '') }.sort.map {|e| e.to_sym }
     end
 
     def admin

diff --git a/spec/lib/radiant/extension_loader_spec.rb b/spec/lib/radiant/extension_loader_spec.rb
@@ -13,7 +13,7 @@
     @instance = Radiant::ExtensionLoader.send(:new)
     @instance.initializer = @initializer
 
-    @extensions = %w{01_basic 02_overriding load_order_blue load_order_green load_order_red}
+    @extensions = %w{basic overriding load_order_blue load_order_green load_order_red}
     @extension_paths = @extensions.map do |ext|
       File.expand_path("#{RADIANT_ROOT}/test/fixtures/extensions/#{ext}")
     end
@@ -32,7 +32,7 @@
   it "should only load extensions specified in the configuration" do
     @configuration.should_receive(:extensions).at_least(:once).and_return([:basic])
     @instance.stub!(:all_extension_roots).and_return(@extension_paths)
-    @instance.send(:select_extension_roots).should == [File.expand_path("#{RADIANT_ROOT}/test/fixtures/extensions/01_basic")]
+    @instance.send(:select_extension_roots).should == [File.expand_path("#{RADIANT_ROOT}/test/fixtures/extensions/basic")]
   end
 
   it "should load extensions from gem paths" do
@@ -156,8 +156,8 @@
     extensions = [BasicExtension, OverridingExtension]
     @instance.extensions = extensions
     @instance.view_paths.should == [
-       "#{RADIANT_ROOT}/test/fixtures/extensions/02_overriding/app/views",
-       "#{RADIANT_ROOT}/test/fixtures/extensions/01_basic/app/views"
+       "#{RADIANT_ROOT}/test/fixtures/extensions/overriding/app/views",
+       "#{RADIANT_ROOT}/test/fixtures/extensions/basic/app/views"
       ]
   end
 
@@ -166,8 +166,8 @@
     extensions = [BasicExtension, OverridingExtension]
     @instance.extensions = extensions
     @instance.metal_paths.should == [
-       "#{RADIANT_ROOT}/test/fixtures/extensions/02_overriding/app/metal",
-       "#{RADIANT_ROOT}/test/fixtures/extensions/01_basic/app/metal"
+       "#{RADIANT_ROOT}/test/fixtures/extensions/overriding/app/metal",
+       "#{RADIANT_ROOT}/test/fixtures/extensions/basic/app/metal"
       ]
   end
 

diff --git a/spec/lib/radiant/extension_spec.rb b/spec/lib/radiant/extension_spec.rb
@@ -25,7 +25,7 @@
   end
 
   it "should have a migrations path" do
-    BasicExtension.migrations_path.should == "#{RADIANT_ROOT}/test/fixtures/extensions/01_basic/db/migrate"
+    BasicExtension.migrations_path.should == "#{RADIANT_ROOT}/test/fixtures/extensions/basic/db/migrate"
   end
 
   it "should set the extension_name in subclasses" do

diff --git a/spec/lib/radiant/initializer_spec.rb b/spec/lib/radiant/initializer_spec.rb
@@ -147,7 +147,7 @@
   end
 
   it "should load metal from RADIANT_ROOT and exensions" do
-    Rails::Rack::Metal.metal_paths.should == ["#{RADIANT_ROOT}/app/metal", "#{RADIANT_ROOT}/test/fixtures/extensions/02_overriding/app/metal", "#{RADIANT_ROOT}/test/fixtures/extensions/01_basic/app/metal"]
+    Rails::Rack::Metal.metal_paths.should == ["#{RADIANT_ROOT}/app/metal", "#{RADIANT_ROOT}/test/fixtures/extensions/overriding/app/metal", "#{RADIANT_ROOT}/test/fixtures/extensions/basic/app/metal"]
   end
 
   it "should check dependent extensions" do

diff --git a/...controllers/basic_extension_controller.rb → ...controllers/basic_extension_controller.rb b/...controllers/basic_extension_controller.rb → ...controllers/basic_extension_controller.rb
diff --git a/...ensions/01_basic/app/metal/basic_metal.rb → ...extensions/basic/app/metal/basic_metal.rb b/...ensions/01_basic/app/metal/basic_metal.rb → ...extensions/basic/app/metal/basic_metal.rb
diff --git a/...asic/app/models/basic_extension_mailer.rb → ...asic/app/models/basic_extension_mailer.rb b/...asic/app/models/basic_extension_mailer.rb → ...asic/app/models/basic_extension_mailer.rb
diff --git a/...basic/app/models/basic_extension_model.rb → ...basic/app/models/basic_extension_model.rb b/...basic/app/models/basic_extension_model.rb → ...basic/app/models/basic_extension_model.rb
diff --git a/.../app/views/basic_extension/index.html.erb → .../app/views/basic_extension/index.html.erb b/.../app/views/basic_extension/index.html.erb → .../app/views/basic_extension/index.html.erb
diff --git a/...p/views/basic_extension/override.html.erb → ...p/views/basic_extension/override.html.erb b/...p/views/basic_extension/override.html.erb → ...p/views/basic_extension/override.html.erb
diff --git a/...ic_extension_mailer/message.text.html.erb → ...ic_extension_mailer/message.text.html.erb b/...ic_extension_mailer/message.text.html.erb → ...ic_extension_mailer/message.text.html.erb
diff --git a/...es/extensions/01_basic/basic_extension.rb → ...tures/extensions/basic/basic_extension.rb b/...es/extensions/01_basic/basic_extension.rb → ...tures/extensions/basic/basic_extension.rb
diff --git a/...ate/200812131420_create_initial_schema.rb → ...ate/200812131420_create_initial_schema.rb b/...ate/200812131420_create_initial_schema.rb → ...ate/200812131420_create_initial_schema.rb
diff --git a/...ate/200812131421_modify_initial_schema.rb → ...ate/200812131421_modify_initial_schema.rb b/...ate/200812131421_modify_initial_schema.rb → ...ate/200812131421_modify_initial_schema.rb
diff --git a/...res/extensions/01_basic/lib/new_module.rb → ...xtures/extensions/basic/lib/new_module.rb b/...res/extensions/01_basic/lib/new_module.rb → ...xtures/extensions/basic/lib/new_module.rb
diff --git a/.../01_basic/vendor/plugins/multiple/init.rb → ...ons/basic/vendor/plugins/multiple/init.rb b/.../01_basic/vendor/plugins/multiple/init.rb → ...ons/basic/vendor/plugins/multiple/init.rb
diff --git a/...c/vendor/plugins/multiple/lib/multiple.rb → ...c/vendor/plugins/multiple/lib/multiple.rb b/...c/vendor/plugins/multiple/lib/multiple.rb → ...c/vendor/plugins/multiple/lib/multiple.rb
diff --git a/...asic/vendor/plugins/plugin_normal/init.rb → ...asic/vendor/plugins/plugin_normal/init.rb b/...asic/vendor/plugins/plugin_normal/init.rb → ...asic/vendor/plugins/plugin_normal/init.rb
diff --git a/...lugins/plugin_normal/lib/normal_plugin.rb → ...lugins/plugin_normal/lib/normal_plugin.rb b/...lugins/plugin_normal/lib/normal_plugin.rb → ...lugins/plugin_normal/lib/normal_plugin.rb
diff --git a/...ns/02_overriding/app/metal/basic_metal.rb → ...sions/overriding/app/metal/basic_metal.rb b/...ns/02_overriding/app/metal/basic_metal.rb → ...sions/overriding/app/metal/basic_metal.rb
diff --git a/...p/views/basic_extension/override.html.erb → ...p/views/basic_extension/override.html.erb b/...p/views/basic_extension/override.html.erb → ...p/views/basic_extension/override.html.erb
diff --git a/...ons/02_overriding/overriding_extension.rb → ...nsions/overriding/overriding_extension.rb b/...ons/02_overriding/overriding_extension.rb → ...nsions/overriding/overriding_extension.rb
diff --git a/...verriding/vendor/plugins/multiple/init.rb → ...verriding/vendor/plugins/multiple/init.rb b/...verriding/vendor/plugins/multiple/init.rb → ...verriding/vendor/plugins/multiple/init.rb
diff --git a/...g/vendor/plugins/multiple/lib/multiple.rb → ...g/vendor/plugins/multiple/lib/multiple.rb b/...g/vendor/plugins/multiple/lib/multiple.rb → ...g/vendor/plugins/multiple/lib/multiple.rb
diff --git a/...sions/03_upgrading/db/migrate/01_first.rb → ...tensions/upgrading/db/migrate/01_first.rb b/...sions/03_upgrading/db/migrate/01_first.rb → ...tensions/upgrading/db/migrate/01_first.rb
diff --git a/...ions/03_upgrading/db/migrate/02_second.rb → ...ensions/upgrading/db/migrate/02_second.rb b/...ions/03_upgrading/db/migrate/02_second.rb → ...ensions/upgrading/db/migrate/02_second.rb
diff --git a/...ons/03_upgrading/db/migrate/03_pending.rb → ...nsions/upgrading/db/migrate/03_pending.rb b/...ons/03_upgrading/db/migrate/03_pending.rb → ...nsions/upgrading/db/migrate/03_pending.rb
diff --git a/...ns/03_upgrading/db/migrate/04_dont_run.rb → ...sions/upgrading/db/migrate/04_dont_run.rb b/...ns/03_upgrading/db/migrate/04_dont_run.rb → ...sions/upgrading/db/migrate/04_dont_run.rb
diff --git a/...sions/03_upgrading/upgrading_extension.rb → ...tensions/upgrading/upgrading_extension.rb b/...sions/03_upgrading/upgrading_extension.rb → ...tensions/upgrading/upgrading_extension.rb