refinerycms-generators 1.0.1 → 1.0.2

data/lib/gemspec.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-version = '1.0.1'
+version = '1.0.2'
 raise "Could not get version so gemspec can not be built" if version.nil?
 files = Dir.glob("**/*").flatten.reject do |file|
   file =~ /\.gem$/

data/lib/generators/refinery_engine/clash_keywords.yml

@@ -0,0 +1,3 @@
+- case
+- class
+- switch

data/lib/generators/refinery_engine/refinery_engine_generator.rb

@@ -10,6 +10,14 @@ class RefineryEngineGenerator < Rails::Generators::NamedBase
   argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
 
   def generate
+    clash_file = Pathname.new(File.expand_path('../clash_keywords.yml', __FILE__))
+    clash_keywords = File.open(clash_file) { |f| doc = YAML.load(f) }
+    if clash_keywords.member?(singular_name.downcase)
+      puts "Please choose a different name.  Generated code would fail for class '#{singular_name}'"
+      puts ""
+      exit(1)
+    end
+
     if singular_name == plural_name
       puts ""
       if singular_name.singularize != singular_name
@@ -70,6 +78,10 @@ class RefineryEngineGenerator < Rails::Generators::NamedBase
           current_path.open('w+') { |f| f.puts new_contents } unless new_contents.nil?
         end
 
+        if File.exist?(lib_file = engine_path_for(File.expand_path("../templates/lib/refinerycms-#{engine.pluralize}.rb", __FILE__), engine))
+          append_file lib_file, "require File.expand_path('../refinerycms-#{plural_name}', __FILE__)"
+        end
+
         tmp_directories.uniq.each{|d| d.rmtree unless d.nil? or !d.exist?}
       end
 

data/lib/generators/refinery_engine/templates/app/controllers/admin/plural_name_controller.rb

@@ -3,7 +3,7 @@ module Admin
 
     crudify :<%= singular_name %><% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? and title.name != 'title' %>,
             :title_attribute => '<%= title.name %>'<% end %><% if plural_name == singular_name %>,
-              :redirect_to_url => :admin_<%= singular_name %>_index_url
+              :redirect_to_url => :admin_<%= singular_name %>_index_path
 <% end %>, :xhr_paging => true
 
   end

data/lib/generators/refinery_engine/templates/app/views/admin/plural_name/_actions.html.erb

@@ -3,23 +3,23 @@
     <li>
       <%%= render :partial => "/shared/admin/search",
                   :locals => {
-                    :url => admin_<%= plural_name %><%= "_index" if plural_name == singular_name%>_url
+                    :url => admin_<%= plural_name %><%= "_index" if plural_name == singular_name%>_path
                   } %>
     </li>
   <%% end %>
   <li>
-    <%%= link_to t('.create_new'), new_admin_<%= singular_name %>_url,
+    <%%= link_to t('.create_new'), new_admin_<%= singular_name %>_path,
                  :class => "add_icon" %>
   </li>
 <%% if !searching? and Admin::<%= class_name.pluralize %>Controller.sortable? and <%= class_name %>.count > 1 %>
   <li>
     <%%= link_to t('.reorder', :what => "<%= singular_name.titleize.pluralize %>"),
-                 admin_<%= plural_name %><%= "_index" if plural_name == singular_name%>_url,
+                 admin_<%= plural_name %><%= "_index" if plural_name == singular_name%>_path,
                  :id => "reorder_action",
                  :class => "reorder_icon" %>
 
     <%%= link_to t('.reorder_done', :what => "<%= singular_name.titleize.pluralize %>"),
-                 admin_<%= plural_name %><%= "_index" if plural_name == singular_name%>_url,
+                 admin_<%= plural_name %><%= "_index" if plural_name == singular_name%>_path,
                  :id => "reorder_action_done",
                  :style => "display: none;",
                  :class => "reorder_icon" %>

data/lib/generators/refinery_engine/templates/app/views/admin/plural_name/_form.html.erb

@@ -8,7 +8,7 @@
           :include_object_name => true
         } %>
   <% attributes.each_with_index do |attribute, index| %>
-<% unless attribute.field_type.to_s == 'text_area' -%>
+<% if attribute.field_type.to_s != 'text_area' -%>
   <div class='field'>
     <%%= f.label :<%= attribute.name %> -%>
 <% end -%>
@@ -44,11 +44,10 @@
         <%% end %>
       </div>
     </div>
+  </div>
 <% generated_text_areas = true -%>
 <% elsif attribute.field_type.to_s != 'text_area' -%>
-    <%%= f.<%= attribute.field_type -%> :<%= attribute.name -%><%= ", :class => 'larger widest'" if (index == 0 && attribute.field_type == :text_field) -%> -%>
-<% end -%>
-<% if attribute.field_type.to_s != 'text_area' -%>
+    <%%= f.<%= attribute.field_type -%> :<%= attribute.name -%><%= ", :class => 'larger widest'" if (index == 0 && attribute.field_type == :text_field) -%><%= ", :checked => @#{singular_name}[:#{attribute.name}]" if attribute.field_type == :check_box %>  -%>
   </div>
 <% end -%>
   <% end %>
@@ -68,4 +67,4 @@
     });
   </script>
 <%% end %>
-<% end -%>
+<% end -%>

data/lib/generators/refinery_engine/templates/app/views/admin/plural_name/_singular_name.html.erb

@@ -4,7 +4,7 @@
     <span class="preview">&nbsp;</span>
   </span>
   <span class='actions'>
-    <%%= link_to refinery_icon_tag("application_go.png"), <%= singular_name %>_url(<%= singular_name %>),
+    <%%= link_to refinery_icon_tag("application_go.png"), <%= singular_name %>_path(<%= singular_name %>),
         :title => t('.view_live_html'),
         :target => "_blank" %>
     <%%= link_to refinery_icon_tag("application_edit.png"), edit_admin_<%= singular_name %>_path(<%= singular_name %>),

data/lib/generators/refinery_engine/templates/app/views/plural_name/index.html.erb

@@ -2,7 +2,7 @@
   <ul id="<%= plural_name %>">
     <%% @<%= "all_" if plural_name == singular_name%><%= plural_name %>.each do |<%= singular_name %>| %>
       <li>
-        <%%= link_to <%= singular_name %><% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? %>.<%= title.name %><% end %>, <%= singular_name %>_url(<%= singular_name %>) %>
+        <%%= link_to <%= singular_name %><% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? %>.<%= title.name %><% end %>, <%= singular_name %>_path(<%= singular_name %>) %>
       </li>
     <%% end %>
   </ul>

data/lib/generators/refinery_engine/templates/app/views/plural_name/show.html.erb

@@ -25,7 +25,7 @@
     <ul id="<%= plural_name %>">
       <%% @<%= "all_" if plural_name == singular_name%><%= plural_name %>.each do |<%= singular_name %>| %>
         <li>
-          <%%= link_to <%= singular_name %><% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? %>.<%= title.name %><% else %>.title<% end %>, <%= singular_name %>_url(<%= singular_name %>) %>
+          <%%= link_to <%= singular_name %><% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? %>.<%= title.name %><% else %>.title<% end %>, <%= singular_name %>_path(<%= singular_name %>) %>
         </li>
       <%% end %>
     </ul>

data/lib/generators/refinery_engine/templates/config/locales/fr.yml

@@ -0,0 +1,25 @@
+fr:
+  shared:
+    admin:
+      image_picker:
+        image: image
+  plugins:
+    <%= class_name.pluralize.underscore.downcase %>:
+      title: <%= plural_name.titleize %>
+  admin:
+    <%= plural_name %>:
+      actions:
+        create_new: Créer un(e) nouve(au/l/lle) <%= singular_name.titleize %>
+        reorder: Réordonner les <%= singular_name.titleize.pluralize %>
+        reorder_done: Fin de réordonnancement des <%= singular_name.titleize.pluralize %>
+      records:
+        title: <%= plural_name.titleize %>
+        sorry_no_results: "Désolé ! Aucun résultat."
+        no_items_yet: 'Il n''y a actuellement aucun(e) <%= singular_name.titleize %>. Cliquer sur "Créer un(e) nouve(au/l/lle) <%= singular_name.titleize %>" pour créer votre premi(er/ère) <%= singular_name.titleize.downcase %>.'
+      <%= singular_name %>:
+        view_live_html: Voir ce(t/tte) <%= singular_name.titleize.downcase %> <br/><em>(Ouvre une nouvelle fenêtre)</em>
+        edit: Modifier ce(t/tte) <%= singular_name.titleize.downcase %>
+        delete: Supprimer définitivement ce(t/tte) <%= singular_name.titleize.downcase %>
+  <%= plural_name %>:
+    show:
+      other: Autres <%= singular_name.titleize.pluralize %>

data/lib/generators/refinery_engine/templates/config/routes.rb

@@ -1,4 +1,4 @@
-Refinery::Application.routes.draw do
+::Refinery::Application.routes.draw do
   resources :<%= class_name.pluralize.underscore.downcase %>, :only => [:index, :show]
 
   scope(:path => 'refinery', :as => 'admin', :module => 'admin') do

data/lib/generators/refinery_engine/templates/db/migrate/create_plural_name.rb

@@ -23,9 +23,13 @@ class Create<%= class_name.pluralize %> < ActiveRecord::Migration
   end
 
   def self.down
-    UserPlugin.destroy_all({:name => "<%= class_name.pluralize.underscore.downcase %>"})
+    if defined?(UserPlugin)
+      UserPlugin.destroy_all({:name => "<%= class_name.pluralize.underscore.downcase %>"})
+    end
 
-    Page.delete_all({:link_url => "/<%= plural_name %>"})
+    if defined?(Page)
+      Page.delete_all({:link_url => "/<%= plural_name %>"})
+    end
 
     drop_table :<%= table_name %>
   end

data/lib/generators/refinery_engine/templates/db/seeds/plural_name.rb

@@ -1,17 +1,21 @@
-User.all.each do |user|
-  if user.plugins.where(:name => '<%= class_name.pluralize.underscore.downcase %>').blank?
-    user.plugins.create(:name => '<%= class_name.pluralize.underscore.downcase %>',
-                        :position => (user.plugins.maximum(:position) || -1) +1)
+if defined?(User)
+  User.all.each do |user|
+    if user.plugins.where(:name => '<%= class_name.pluralize.underscore.downcase %>').blank?
+      user.plugins.create(:name => '<%= class_name.pluralize.underscore.downcase %>',
+                          :position => (user.plugins.maximum(:position) || -1) +1)
+    end
   end
 end
 
-page = Page.create(
-  :title => '<%= class_name.pluralize.underscore.titleize %>',
-  :link_url => '/<%= plural_name %>',
-  :deletable => false,
-  :position => ((Page.maximum(:position, :conditions => {:parent_id => nil}) || -1)+1),
-  :menu_match => '^/<%= plural_name %>(\/|\/.+?|)$'
-)
-Page.default_parts.each do |default_page_part|
-  page.parts.create(:title => default_page_part, :body => nil)
-end
+if defined?(Page)
+  page = Page.create(
+    :title => '<%= class_name.pluralize.underscore.titleize %>',
+    :link_url => '/<%= plural_name %>',
+    :deletable => false,
+    :position => ((Page.maximum(:position, :conditions => {:parent_id => nil}) || -1)+1),
+    :menu_match => '^/<%= plural_name %>(\/|\/.+?|)$'
+  )
+  Page.default_parts.each do |default_page_part|
+    page.parts.create(:title => default_page_part, :body => nil)
+  end
+end

data/lib/generators/refinery_engine/templates/lib/refinerycms-plural_name.rb

@@ -12,8 +12,8 @@ module Refinery
           plugin.name = "<%= class_name.pluralize.underscore.downcase %>"
           plugin.activity = {
             :class => <%= class_name %><% if (title = attributes.detect { |a| a.type.to_s == "string" }).present? and title.name != 'title' %>,
-            :title => '<%= title.name %>'
-          <% end %>}
+            :title => '<%= title.name %>'<% end %>
+          }
         end
       end
     end

data/lib/generators/refinery_engine/templates/readme.md

@@ -3,7 +3,7 @@
 ## How to build this engine as a gem
 
     cd vendor/engines/<%= plural_name %>
-    gem build refinerycms-<%= plural_name %>.gempspec
+    gem build refinerycms-<%= plural_name %>.gemspec
     gem install refinerycms-<%= plural_name %>.gem
     
     # Sign up for a http://rubygems.org/ account and publish the gem

data/readme.md

@@ -67,7 +67,7 @@ Now you have a fully managed products section in Refinery, nice.
 
 If you want to modify your generated engine you need to understand the basic structure of how they work.
 
-See: [The Structure of an Engine](http://github.com/resolve/refinerycms/blob/master/vendor/refinerycms/core/engines.md)
+See: [The Structure of an Engine](https://github.com/resolve/refinerycms/blob/master/doc/engines.md)
 
 ## Nesting Engines: Generating Engines Inside Engines
 

data/refinerycms-generators.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-generators}
-  s.version           = %q{1.0.1}
-  s.date              = %q{2011-03-24}
+  s.version           = %q{1.0.2}
+  s.date              = %q{2011-06-03}
   s.summary           = %q{Core generators for the Refinery CMS project.}
   s.description       = %q{Core generators for Refinery CMS including refinery_engine.}
   s.homepage          = %q{http://refinerycms.com}
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
     'lib/gemspec.rb',
     'lib/generators',
     'lib/generators/refinery_engine',
+    'lib/generators/refinery_engine/clash_keywords.yml',
     'lib/generators/refinery_engine/refinery_engine_generator.rb',
     'lib/generators/refinery_engine/templates',
     'lib/generators/refinery_engine/templates/app',
@@ -48,6 +49,7 @@ Gem::Specification.new do |s|
     'lib/generators/refinery_engine/templates/config',
     'lib/generators/refinery_engine/templates/config/locales',
     'lib/generators/refinery_engine/templates/config/locales/en.yml',
+    'lib/generators/refinery_engine/templates/config/locales/fr.yml',
     'lib/generators/refinery_engine/templates/config/locales/lolcat.yml',
     'lib/generators/refinery_engine/templates/config/locales/nb.yml',
     'lib/generators/refinery_engine/templates/config/locales/nl.yml',

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-generators
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Resolve Digital
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-24 00:00:00 +13:00
+date: 2011-06-03 00:00:00 +12:00
 default_executable: 
 dependencies: []
 
@@ -28,6 +28,7 @@ files:
 - features/step_definitions/generator_steps.rb
 - features/support/paths.rb
 - lib/gemspec.rb
+- lib/generators/refinery_engine/clash_keywords.yml
 - lib/generators/refinery_engine/refinery_engine_generator.rb
 - lib/generators/refinery_engine/templates/app/controllers/admin/plural_name_controller.rb
 - lib/generators/refinery_engine/templates/app/controllers/plural_name_controller.rb
@@ -44,6 +45,7 @@ files:
 - lib/generators/refinery_engine/templates/app/views/plural_name/index.html.erb
 - lib/generators/refinery_engine/templates/app/views/plural_name/show.html.erb
 - lib/generators/refinery_engine/templates/config/locales/en.yml
+- lib/generators/refinery_engine/templates/config/locales/fr.yml
 - lib/generators/refinery_engine/templates/config/locales/lolcat.yml
 - lib/generators/refinery_engine/templates/config/locales/nb.yml
 - lib/generators/refinery_engine/templates/config/locales/nl.yml
@@ -90,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Core generators for the Refinery CMS project.