WIP

refinery · Dec 30, 2012 · cfbac08 · cfbac08
1 parent bd05370
commit cfbac08
Show file tree

Hide file tree

Showing 26 changed files with 50 additions and 28 deletions.
diff --git a/core/lib/generators/refinery/engine/templates/config/locales/cs.yml b/core/lib/generators/refinery/engine/templates/config/locales/cs.yml
@@ -1,7 +1,7 @@
 cs:
   refinery:
     plugins:
-      <%= plural_name %>:
+      <%= plugin_name %>:
         title: <%= plural_name.titleize %>
     <%= namespacing.underscore %>:
       admin:

diff --git a/core/lib/generators/refinery/engine/templates/config/locales/en.yml b/core/lib/generators/refinery/engine/templates/config/locales/en.yml
@@ -1,7 +1,7 @@
 en:
   refinery:
     plugins:
-      <%= plural_name %>:
+      <%= plugin_name %>:
         title: <%= plural_name.titleize %>
     <%= namespacing.underscore %>:
       admin:

diff --git a/core/lib/generators/refinery/engine/templates/config/locales/es.yml b/core/lib/generators/refinery/engine/templates/config/locales/es.yml
@@ -1,7 +1,7 @@
 es:
   refinery:
     plugins:
-      <%= plural_name %>:
+      <%= plugin_name %>:
         title: <%= plural_name.titleize %>
 #        article: masculino/femenino
     <%= namespacing.underscore %>:

diff --git a/core/lib/generators/refinery/engine/templates/config/locales/fr.yml b/core/lib/generators/refinery/engine/templates/config/locales/fr.yml
@@ -1,7 +1,7 @@
 fr:
   refinery:
     plugins:
-      <%= plural_name %>:
+      <%= plugin_name %>:
         title: <%= plural_name.titleize %>
     <%= namespacing.underscore %>:
       admin:

diff --git a/core/lib/generators/refinery/engine/templates/config/locales/nb.yml b/core/lib/generators/refinery/engine/templates/config/locales/nb.yml
@@ -1,7 +1,7 @@
 nb:
   refinery:
     plugins:
-      <%= plural_name %>:
+      <%= plugin_name %>:
         title: <%= plural_name.titleize %>
     <%= namespacing.underscore %>:
       admin:

diff --git a/core/lib/generators/refinery/engine/templates/config/locales/nl.yml b/core/lib/generators/refinery/engine/templates/config/locales/nl.yml
@@ -1,7 +1,7 @@
 nl:
   refinery:
     plugins:
-      <%= plural_name %>:
+      <%= plugin_name %>:
         title: <%= plural_name.titleize %>
     <%= namespacing.underscore %>:
       admin:

diff --git a/core/lib/generators/refinery/engine/templates/config/locales/sk.yml b/core/lib/generators/refinery/engine/templates/config/locales/sk.yml
@@ -1,7 +1,7 @@
 sk:
   refinery:
     plugins:
-      <%= plural_name %>:
+      <%= plugin_name %>:
         title: <%= plural_name.titleize %>
     <%= namespacing.underscore %>:
       admin:

diff --git a/core/lib/generators/refinery/engine/templates/config/locales/zh-CN.yml b/core/lib/generators/refinery/engine/templates/config/locales/zh-CN.yml
@@ -1,7 +1,7 @@
 zh-CN:
   refinery:
     plugins:
-      <%= plural_name %>:
+      <%= plugin_name %>:
         title: <%= plural_name.titleize %>
     <%= namespacing.underscore %>:
       admin:

diff --git a/core/lib/generators/refinery/engine/templates/lib/refinery/plural_name/engine.rb.erb b/core/lib/generators/refinery/engine/templates/lib/refinery/plural_name/engine.rb.erb
@@ -1,3 +1,4 @@
+<% if plugin_name == plural_name -%>
 module Refinery
   module <%= namespacing %>
     class Engine < Rails::Engine
@@ -6,9 +7,9 @@ module Refinery
 
       engine_name :refinery_<%= extension_plural_name %>
 
-      initializer "register refinerycms_<%= namespacing.underscore %>_<%= plural_name %> plugin" do
+      initializer "register refinerycms_<%= plugin_name %> plugin" do
         Refinery::Plugin.register do |plugin|
-          plugin.name = "refinerycms_<%= namespacing.underscore %>_<%= plural_name %>"
+          plugin.name = '<%= plugin_name %>'
           plugin.url = proc { Refinery::Core::Engine.routes.url_helpers.<%= namespacing.underscore %>_admin_<%= plural_name %>_path }
           plugin.pathname = root
           plugin.activity = {
@@ -25,3 +26,20 @@ module Refinery
     end
   end
 end
+<% else -%>
+require 'refinery/<%= extension_plural_name %>/engine'
+Refinery::<%= namespacing %>::Engine.class_eval do
+  initializer "register refinerycms_<%= plugin_name %> plugin" do
+    Refinery::Plugin.register do |plugin|
+      plugin.name = '<%= plugin_name %>'
+      plugin.url = proc { Refinery::Core::Engine.routes.url_helpers.<%= namespacing.underscore %>_admin_<%= plural_name %>_path }
+      plugin.pathname = root
+      plugin.activity = {
+        :class_name => :'refinery/<%= namespacing.underscore %>/<%= singular_name %>'<% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? and title.name != 'title' %>,
+        :title => '<%= title.name %>'<% end %>
+      }
+      plugin.menu_match = %r{refinery/<%= namespacing.underscore %>/<%= plural_name %>(/.*)?$}
+    end
+  end
+end
+<% end -%>
diff --git a/core/lib/generators/refinery/form/templates/config/locales/cs.yml b/core/lib/generators/refinery/form/templates/config/locales/cs.yml
@@ -1,7 +1,7 @@
 cs:
   refinery:
     plugins:
-      <%= plural_name %>:
+      <%= plugin_name %>:
         title: <%= plural_name.titleize %>
         description: Poskytuje kontaktní formulář a zaznamenáva <%= plural_name.humanize.downcase %>
     <%= namespacing.underscore %>:

diff --git a/core/lib/generators/refinery/form/templates/config/locales/da.yml b/core/lib/generators/refinery/form/templates/config/locales/da.yml
@@ -1,7 +1,7 @@
 da:
   refinery:
     plugins:
-      <%= plural_name %>:
+      <%= plugin_name %>:
         title: <%= plural_name.titleize %>
     <%= namespacing.underscore %>:
       <%= plural_name %>:

diff --git a/core/lib/generators/refinery/form/templates/config/locales/de.yml b/core/lib/generators/refinery/form/templates/config/locales/de.yml
@@ -1,7 +1,7 @@
 de:
   refinery:
     plugins:
-      <%= plural_name %>:
+      <%= plugin_name %>:
         title: <%= plural_name.titleize %>
         description: Stellt ein Kontaktformular zur Verfügung und speichert Kontaktanfragen
     <%= namespacing.underscore %>:

diff --git a/core/lib/generators/refinery/form/templates/config/locales/en.yml b/core/lib/generators/refinery/form/templates/config/locales/en.yml
@@ -1,7 +1,7 @@
 en:
   refinery:
     plugins:
-      <%= plural_name %>:
+      <%= plugin_name %>:
         title: <%= plural_name.titleize %>
         description: Provides a contact form and stores <%= plural_name.humanize.downcase %>
     <%= namespacing.underscore %>:

diff --git a/core/lib/generators/refinery/form/templates/config/locales/es.yml b/core/lib/generators/refinery/form/templates/config/locales/es.yml
@@ -1,7 +1,7 @@
 es:
   refinery:
     plugins:
-      <%= plural_name %>:
+      <%= plugin_name %>:
         title: <%= plural_name.titleize %>
     <%= namespacing.underscore %>:
       <%= plural_name %>:

diff --git a/core/lib/generators/refinery/form/templates/config/locales/fr.yml b/core/lib/generators/refinery/form/templates/config/locales/fr.yml
@@ -1,7 +1,7 @@
 fr:
   refinery:
     plugins:
-      <%= plural_name %>:
+      <%= plugin_name %>:
         title: <%= plural_name.titleize %>
         description: Fournit un formulaire de contact et gère les demandes de contacts.
     <%= namespacing.underscore %>:

diff --git a/core/lib/generators/refinery/form/templates/config/locales/it.yml b/core/lib/generators/refinery/form/templates/config/locales/it.yml
@@ -1,7 +1,7 @@
 it:
   refinery:
     plugins:
-      <%= plural_name %>:
+      <%= plugin_name %>:
         title: <%= plural_name.titleize %>
     <%= namespacing.underscore %>:
       <%= plural_name %>:

diff --git a/core/lib/generators/refinery/form/templates/config/locales/lv.yml b/core/lib/generators/refinery/form/templates/config/locales/lv.yml
@@ -1,7 +1,7 @@
 lv:
   refinery:
     plugins:
-      <%= plural_name %>:
+      <%= plugin_name %>:
         title: <%= plural_name.titleize %>
     <%= namespacing.underscore %>:
       <%= plural_name %>:

diff --git a/core/lib/generators/refinery/form/templates/config/locales/nb.yml b/core/lib/generators/refinery/form/templates/config/locales/nb.yml
@@ -1,7 +1,7 @@
 nb:
   refinery:
     plugins:
-      <%= plural_name %>:
+      <%= plugin_name %>:
         title: <%= plural_name.titleize %>
     <%= namespacing.underscore %>:
       <%= plural_name %>:

diff --git a/core/lib/generators/refinery/form/templates/config/locales/nl.yml b/core/lib/generators/refinery/form/templates/config/locales/nl.yml
@@ -1,7 +1,7 @@
 nl:
   refinery:
     plugins:
-      <%= plural_name %>:
+      <%= plugin_name %>:
         title: <%= plural_name.titleize %>
         description: Contactformulier en beheer van <%= plural_name.humanize.downcase %>
     <%= namespacing.underscore %>:

diff --git a/core/lib/generators/refinery/form/templates/config/locales/pt-BR.yml b/core/lib/generators/refinery/form/templates/config/locales/pt-BR.yml
@@ -1,7 +1,7 @@
 pt-BR:
   refinery:
     plugins:
-      <%= plural_name %>:
+      <%= plugin_name %>:
         title: <%= plural_name.titleize %>
         description: Gerenciar contatos
     <%= namespacing.underscore %>:

diff --git a/core/lib/generators/refinery/form/templates/config/locales/ru.yml b/core/lib/generators/refinery/form/templates/config/locales/ru.yml
@@ -1,7 +1,7 @@
 ru:
   refinery:
     plugins:
-      <%= plural_name %>:
+      <%= plugin_name %>:
         title: <%= plural_name.titleize %>
     <%= namespacing.underscore %>:
       <%= plural_name %>:

diff --git a/core/lib/generators/refinery/form/templates/config/locales/sk.yml b/core/lib/generators/refinery/form/templates/config/locales/sk.yml
@@ -1,7 +1,7 @@
 sk:
   refinery:
     plugins:
-      <%= plural_name %>:
+      <%= plugin_name %>:
         title: <%= plural_name.titleize %>
         description: Poskytuje kontaktný formulár a zaznamenáva <%= plural_name.humanize.downcase %>
     <%= namespacing.underscore %>:

diff --git a/core/lib/generators/refinery/form/templates/config/locales/sl.yml b/core/lib/generators/refinery/form/templates/config/locales/sl.yml
@@ -1,7 +1,7 @@
 sl:
   refinery:
     plugins:
-      <%= plural_name %>:
+      <%= plugin_name %>:
         title: <%= plural_name.titleize %>
     <%= namespacing.underscore %>:
       <%= plural_name %>:

diff --git a/core/lib/generators/refinery/form/templates/config/locales/zh-CN.yml b/core/lib/generators/refinery/form/templates/config/locales/zh-CN.yml
@@ -1,7 +1,7 @@
 zh-CN:
   refinery:
     plugins:
-      <%= plural_name %>:
+      <%= plugin_name %>:
         title: <%= plural_name.titleize %>
         description: 提供联系方式表格来存放 <%= plural_name.humanize.downcase %>
     <%= namespacing.underscore %>:

diff --git a/core/lib/generators/refinery/form/templates/lib/refinery/plural_name/engine.rb.erb b/core/lib/generators/refinery/form/templates/lib/refinery/plural_name/engine.rb.erb
@@ -6,9 +6,9 @@ module Refinery
 
       engine_name :refinery_<%= extension_plural_name %>
 
-      initializer "register refinerycms_<%= namespacing.underscore %>_<%= plural_name %> plugin" do
+      initializer "register refinerycms_<%= plugin_name %> plugin" do
         Refinery::Plugin.register do |plugin|
-          plugin.name = "refinerycms_<%= namespacing.underscore %>_<%= plural_name %>"
+          plugin.name = "refinerycms_<%= plugin_name %>"
           plugin.url = proc { Refinery::Core::Engine.routes.url_helpers.<%= namespacing.underscore %>_admin_<%= plural_name %>_path }
           plugin.pathname = root
           plugin.activity = {

diff --git a/core/lib/refinery/extension_generation.rb b/core/lib/refinery/extension_generation.rb
@@ -55,6 +55,10 @@ def extension_plural_name
       end
     end
 
+    def plugin_name
+      [extension_plural_name, plural_name].uniq.join '_'
+    end
+
     def localized?
       localized_attributes.any?
     end
@@ -169,7 +173,7 @@ def extension_path_for(path, extension, apply_tmp = true)
           elsif %r{/readme.md$} === path || %r{/#{plural_name}.rb$} === path
             path = nil
           end
-        elsif extension.present? and path =~ /lib\/#{plural_name}.rb$/
+        elsif extension.present? && /lib\/#{plural_name}.rb$/ === path
           path = nil
         end
       end