schofield 0.2.2 → 0.3.0

data/lib/generators/schofield/routes.rb

@@ -1,10 +1,10 @@
 module Schofield
-  
+
   module Generators
-    
+
     class Routes
-  
-      def self.add_routes levels, depth=2
+
+      def self.add_routes levels, depth=3
         childless = []
         levels.each do |level|
           if level.join?
@@ -12,35 +12,40 @@ module Schofield
           elsif level.nests?
             @routes << route_string([level], depth)
             add_routes(level.nested_levels, depth+1)
-            @routes << "#{'  ' * depth}end" + (depth == 2 ? "\n" : '')
+            @routes << "#{'  ' * depth}end" + (depth == 3 ? "\n" : '')
           else
             childless << level
           end
         end
         @routes << route_string(childless, depth) if childless.any?
       end
-  
+
       def self.route_string levels, depth
         string  = '  ' * depth
         string += "resources "
         string += ':' + levels.map{ |level| level.name.tableize }.join(', :')
         string += ", "
-        string += ":except => #{depth == 2 ? ':edit' : '[:index, :edit]'}"
+        string += ":except => #{depth == 3 ? ':edit' : '[:index, :edit]'}"
         string += levels.length == 1 && levels.first.nests? ? ', :shallow => true do' : ''
       end
-  
+
       def self.generate
-        @routes = []
+        @routes = [
+          "  namespace :admin do\n",
+          "    root :to => 'home#index'",
+          "    match '/:locale' => 'home#index'\n",
+          "    scope '/:locale', :locale => /\#{I18n.available_locales.join('|')}/, :shallow_path => '/:locale' do\n"
+        ]
         @joins = []
         add_routes(Levels.all.select(&:routes?))
-        @routes.push "\n    resources :#{@joins.map{ |s| s.name.tableize }.join(', :')}, :only => [:create, :delete]" if @joins.any?
-        @routes.push "\n    resources :#{Levels.sortables.map{ |s| s.tableize }.join(', :')}, :only => [] do\n      post :sort, :on => :collection\n    end" if Levels.sortables.any?
-        @routes.unshift '  namespace :admin do'
+        @routes.push "\n      resources :#{@joins.map{ |s| s.name.tableize }.join(', :')}, :only => [:create, :delete]" if @joins.any?
+        @routes.push "\n      resources :#{Levels.sortables.map{ |s| s.tableize }.join(', :')}, :only => [] do\n        post :sort, :on => :collection\n      end" if Levels.sortables.any?
+        @routes.push '    end'
         @routes.push '  end'
         @routes.join("\n") + "\n\n"
       end
-  
+
     end
-    
+
   end
 end

data/lib/generators/schofield/schofield_generator.rb

@@ -1,24 +1,24 @@
 require 'rails/generators/base'
 
-%w( levels level responses association routes attributes attribute ).each do |file|
+%w( levels level responses association routes attributes attribute navigation ).each do |file|
   require File.join(File.dirname(__FILE__), file)
 end
 
 
 
 module Schofield
-  
+
   module Generators
-    
+
     class Schofield < Rails::Generators::Base
 
       source_root File.expand_path(File.join(File.dirname(__FILE__), '../', 'templates'))
 
       class_option :tables_to_ignore, :aliases => '-i', :type => :string, :default => '', :desc => 'Indicates which tables to ignore'
       class_option :ask_questions,    :aliases => '-a', :type => :boolean, :desc => 'Indicates whether to ask questions again rather than use recorded answers'
-      
-      
-      
+
+
+
       def generate
         Responses.generator    = self
         Responses.re_ask       = options[:ask_questions]
@@ -29,11 +29,11 @@ module Schofield
         Responses.save
         Association.report
       end
-      
+
       def generate_routes
         inject_into_file(File.join(Rails.root, 'config', 'routes.rb'), Routes.generate, :before => /end\s*\Z/)
       end
-      
+
       def generate_controllers
         Levels.all.select(&:controllers?).each do |level|
           source = level.join? ? 'join_controller.erb' : 'controller.erb'
@@ -41,11 +41,11 @@ module Schofield
           template_with_context(source, Proc.new{level}, destination)
         end
       end
-      
+
       def generate_views
         Levels.all.select(&:views?).each do |level|
           template_with_context('form.erb', Proc.new{level}, view_path(level, '_form.haml'))
-          create_file(view_path(level, 'new.haml'), %q(= render :partial => 'form', :layout => 'shared/admin/module_layout'))
+          create_file(view_path(level, 'new.haml'), %q(= render :partial => 'form', :layout => 'admin/shared/module_layout'))
           template_with_context('show.erb', Proc.new{level}, view_path(level, 'show.haml'))
           if !level.nested?
             template_with_context('index.erb', Proc.new{level}, view_path(level, 'index.haml'))
@@ -59,12 +59,16 @@ module Schofield
           template_with_context('model.erb', Proc.new{level}, destination)
         end
       end
-      
+
+      def generate_navigation
+        inject_into_file(File.join(Rails.root, 'app/views/admin/shared', '_navigation.haml'), Navigation.generate, :after => /- if current_user\n/)
+      end
+
       def generate_tables
         tables = []
         Levels.all.select(&:tables?).each do |level|
           columns_level = level.subclass? ? level.superclass : level
-          columns = columns_level.attributes.select{ |a| columns_level.form_field?(a) }.sort{ |a,b| a.weight <=> b.weight }.map(&:to_column)
+          columns = columns_level.attributes.select{ |a| columns_level.form_field?(a) && !a.text? }.sort_by(&:weight).map(&:to_column)
           if level.nested?
             tables << <<-STRING.gsub(/^ {12}/, '')
               def #{level.name.pluralize}_table
@@ -76,7 +80,7 @@ module Schofield
           else
             tables << <<-STRING.gsub(/^ {12}/, '')
               def render_#{level.name.pluralize} collection
-                table_renderer(collection).render(
+                table_renderer(:#{level.name.pluralize}, collection).render(
                   #{columns.join(",\n                  ")}
                 )
               end
@@ -87,15 +91,15 @@ module Schofield
           "module Admin::TableDefinitionsHelper\n\n#{tables.join("\n\n")}\nend"
         end
       end
-      
-      
-      
+
+
+
       private
 
       def tables_to_ignore
         @tables_to_ignore ||= %w( schema_migrations ) + options[:tables_to_ignore].split(',').map{ |e| e.strip.tableize }
       end
-      
+
       def view_path level, file_name
         File.join('app/views/admin', level.name.tableize, file_name)
       end
@@ -107,7 +111,7 @@ module Schofield
       def tables
         ActiveRecord::Base.connection.tables - tables_to_ignore
       end
-      
+
       def template_with_context(source, context, destination=nil, config={}, &block)
         destination ||= source
         source  = File.expand_path(find_in_source_paths(source.to_s))

data/lib/generators/templates/controller.erb

@@ -1,23 +1,23 @@
 class Admin::<%= level.name.tableize.camelize %>Controller < Admin::AdminController
-  
+
   include InheritResources
   <%- if level.sortable? -%>
   include SortAction
-  
+
   <%- end -%>
-  
+
   actions :new, :create, :update, :destroy, :show<%= ', :index' unless level.nested? %>
-  
+
   <%- if level.nests? -%>
   drill_down_on_create
-    
+
   <%- end -%>
   <%- if level.nested? -%>
   <%= level.polymorphic? ? 'polymorphic_' : '' %>belongs_to :<%= level.parent_associations.select(&:nest?).map(&:parent_name).join(', :') %>, :optional => true
-  
+
   <%- end -%>
   private
-    
+
     def titles
       generate_titles :<%= level.ancestry.join(', :') %>
     end

data/lib/generators/templates/form.erb

@@ -3,13 +3,13 @@
 = semantic_form_for <%= level.nested? ? 'parent? ? [:admin, parent, resource] : ' : '' %>[:admin, resource]<%= level.multipart? ? ', :html => { :multipart => true }' : '' %> do |f|
 
   = f.inputs do
-  
+
 <%- level.attributes.each do |attribute| -%>
   <%- if level.form_field?(attribute) -%>
     <%- if attribute.attachment? -%>
-    = f.input :<%= attribute.name.gsub(/_file_name$/, '') %>, :as => :image
+    = f.input :<%= attribute.name.gsub(/_file_name$/, '') %>, :as => :<%= attribute.image? ? 'image' : 'attachment' %><%= attribute.required_attachment? ? ', :required => true' : '' %>
     <%- else -%>
-    = f.input :<%= attribute.actual_name %><%= attribute.text? ? %q(, :input_html => { :class => 'medium previewable' }) : '' %>
+    = f.input :<%= attribute.actual_name %><%= attribute.text? ? %q(, :input_html => { :class => 'medium wysiwyg' }) : '' %>
     <%- end -%>
   <%- end -%>
 <%- end -%>
@@ -19,13 +19,17 @@
   <%- child.attributes.each do |attribute| -%>
     <%- if child.form_field?(attribute) && attribute.actual_name != level.name -%>
       <%- if attribute.attachment? -%>
-      = <%= child.name %>.input :<%= attribute.name.gsub(/_file_name$/, '') %>, :as => :image
+      = <%= child.name %>.input :<%= attribute.name.gsub(/_file_name$/, '') %>, :as => :<%= attribute.image? ? 'image' : 'attachment' %><%= attribute.required_attachment? ? ', :required => true' : '' %>
       <%- else -%>
-      = <%= child.name %>.input :<%= attribute.actual_name %><%= attribute.text? ? %q(, :input_html => { :class => 'medium previewable' }) : '' %>
+      = <%= child.name %>.input :<%= attribute.actual_name %><%= attribute.text? ? %q(, :input_html => { :class => 'medium wysiwyg' }) : '' %>
       <%- end -%>
     <%- end -%>
   <%- end -%>
       = <%= child.name %>.input :nested, :as => :hidden
 <%- end -%>
-                      
-  = f.buttons
+
+  = f.buttons
+<%- if level.multipart? -%>
+
+= render :partial => 'admin/shared/progress_bar'
+<%- end -%>

data/lib/generators/templates/index.erb

@@ -1,5 +1,5 @@
 .module
   .add
-    %p= link_to('Add new <%= level.name.gsub('_', ' ') %>', new_admin_<%= level.name %>_path) 
-  
+    %p= link_to('Add new <%= level.name.gsub('_', ' ') %>', new_admin_<%= level.name %>_path)
+
   = render_<%= level.name.pluralize %> collection

data/lib/generators/templates/join_controller.erb

@@ -5,7 +5,7 @@ class Admin::<%= level.name.tableize.camelize %>Controller < Admin::AdminControl
     <%= level.name %>.save
     redirect_to_form_referer
   end
-      
+
   def destroy
     <%= level.name %> = <%= level.name.camelize %>.find(params[:id])
     <%= level.name %>.destroy

data/lib/generators/templates/model.erb

@@ -1,11 +1,8 @@
 class <%= level.name.camelize %> < <%= level.subclass? ? level.superclass.name.camelize : 'ActiveRecord::Base' %>
-  
+
   strip_attributes!
-  <%- if level.has_manies? -%>
-  prevent_destroy_if_has_children :<%= level.has_manies.map{ |l| l.name.pluralize }.join(', :') %>
-  <%- end -%>
   <%- if level.sortable? -%>
-  acts_as_list<%= 
+  acts_as_list<%=
     if level.polymorphic?
       " :scope => [:#{level.polymorphic_name}_type, :#{level.polymorphic_name}_id]"
     elsif level.nested?
@@ -13,28 +10,29 @@ class <%= level.name.camelize %> < <%= level.subclass? ? level.superclass.name.c
     end
   %>
   <%- end -%>
-  <%- if level.acts_as_markdowns? -%>
-  <%= level.acts_as_markdowns %>
-  <%- end -%>
-  
-  
+
+
   # ATTRIBUTES
-  <%- if level.attr_protecteds? -%>
-  
-  <%= level.attr_protecteds %>
+  <%- if level.attr_accessors? -%>
+
+  <%= level.attr_accessors %>
+  <%- end -%>
+  <%- if level.attr_accessibles? -%>
+
+  <%= level.attr_accessibles %>
   <%- end -%>
   <%- if level.belongs_to_one? -%>
-  
+
   attr_accessor :nested
   <%- end -%>
-  
-  
+
+
   # FILTERS
-  
-  
+
+
   # ASSOCIATIONS
   <%- if level.parent_associations.find(&:non_polymorphic?) -%>
-  
+
     <%- level.parent_associations.select(&:non_polymorphic?).each do |association| -%>
   belongs_to :<%= association.parent_name %>
     <%- end -%>
@@ -45,7 +43,7 @@ class <%= level.name.camelize %> < <%= level.subclass? ? level.superclass.name.c
     <%- end -%>
   <%- end -%>
   <%- if level.child_associations.find(&:non_polymorphic_one_to_many?) -%>
-  
+
     <%- level.child_associations.select(&:non_polymorphic_one_to_many?).map(&:child).each do |child| -%>
   has_many :<%= child.name.pluralize %>, :dependent => :destroy
       <%- if child.join? -%>
@@ -54,56 +52,56 @@ class <%= level.name.camelize %> < <%= level.subclass? ? level.superclass.name.c
     <%- end -%>
   <%- end -%>
   <%- if level.child_associations.find(&:non_polymorphic_one_to_one?) -%>
-  
+
     <%- level.child_associations.select(&:non_polymorphic_one_to_one?).each do |association| -%>
   has_one :<%= association.child_name %>, :dependent => :destroy
     <%- end -%>
   <%- end -%>
   <%- if level.child_associations.find(&:polymorphic_one_to_many?) -%>
-  
+
     <%- level.child_associations.select(&:polymorphic_one_to_many?).each do |association| -%>
   has_many :<%= association.child_name.pluralize %>, :as => :<%= association.polymorphic_name %>, :dependent => :destroy
     <%- end -%>
   <%- end -%>
   <%- if level.child_associations.find(&:polymorphic_one_to_one?) -%>
-  
+
     <%- level.child_associations.select(&:polymorphic_one_to_one?).each do |association| -%>
   has_one :<%= association.child_name %>, :as => :<%= association.polymorphic_name %>, :dependent => :destroy
     <%- end -%>
   <%- end -%>
-  
-  
+
+
   # NESTING
   <%- if level.child_associations.find(&:one_to_one?) %>
-  
+
     <%- level.child_associations.select(&:one_to_one?).each do |association| -%>
   accepts_nested_attributes_for :<%= association.child_name %>
     <%- end -%>
   <%- end -%>
-  
-  
+
+
   # ATTACHMENTS
   <%- if level.attachments? -%>
-  <%= level.attached_files %>
+<%= level.attached_files %>
   <%- end -%>
-  
-  
+
+
   # VALIDATIONS
   <%- if !level.subclass? && level.validations? -%>
-  
+
   <%= level.validations.join("\n  ") %>
   <%- end -%>
-  
-  
+
+
   # SCOPES
-  
+
   scope :collection
-  
-  
+
+
   # METHODS
-  
+
   def to_s
     <%= level.to_s_string || (level.join? && level.nested? && level.parent_associations.find(&:nest?).parent_name) || '"##{id}"' %>
   end
-  
+
 end

data/lib/generators/templates/show.erb

@@ -1,4 +1,4 @@
-= render :partial => 'form', :layout => 'shared/admin/module_layout'
+= render :partial => 'form', :layout => 'admin/shared/module_layout'
 <%- level.nested_levels.each do |child| -%>
 
 <%- if child.join? -%>

data/schofield.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{schofield}
-  s.version = "0.2.2"
+  s.name = "schofield"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marc Tauber"]
-  s.date = %q{2010-12-15}
-  s.description = %q{longer description of your gem}
-  s.email = %q{marc@marctauber.com}
+  s.date = "2012-01-04"
+  s.description = "longer description of your gem"
+  s.email = "marc@marctauber.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".bundle/config",
     ".document",
+    ".rvmrc",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -30,6 +31,7 @@ Gem::Specification.new do |s|
     "lib/generators/schofield/attributes.rb",
     "lib/generators/schofield/level.rb",
     "lib/generators/schofield/levels.rb",
+    "lib/generators/schofield/navigation.rb",
     "lib/generators/schofield/responses.rb",
     "lib/generators/schofield/routes.rb",
     "lib/generators/schofield/schofield_generator.rb",
@@ -44,18 +46,17 @@ Gem::Specification.new do |s|
     "spec/spec.opts",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/sauberia/schofield}
+  s.homepage = "http://github.com/sauberia/schofield"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{one-line summary of your gem}
+  s.rubygems_version = "1.8.10"
+  s.summary = "one-line summary of your gem"
   s.test_files = [
     "spec/schofield_spec.rb",
     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then