jrhicks-static-generators 0.2.2 → 0.2.3

data/Manifest

@@ -34,7 +34,6 @@ rails_generators/static_scaffold/templates/view_show.html.erb
 rails_generators/static_scaffold/USAGE
 Rakefile
 README.md
-static-generators.gemspec
 tasks/deployment.rake
 TODO
 USAGE

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('static-generators', '0.2.2') do |p|
+Echoe.new('static-generators', '0.2.3') do |p|
   p.project        = "staticgenerators"
   p.description    = "Generate attractive interfaces that are easy to edit."
   p.url            = "http://github.com/jrhicks/static-scaffolds"

data/rails_generators/static_gen_specs/templates/generator_specs.rb

@@ -29,6 +29,26 @@ class GeneratorSpecs < GenSpecFactory
       end
     end
     
+    def file_columns
+      column_specs.select {|k,v| v[:type]==:file or v[:type]==:photo}
+    end
+
+    def safe_form_groups
+      form_groups.map {|group| {:group_name=>group[:group_name], :attributes=>(group[:attributes]-ascendant_columns-primary_columns)}}
+    end    
+
+    def belongs_to_hash(column_name)
+      belongs_to.select {|bt| bt[:key].to_s==column_name.to_s}.first
+    end
+    
+    def belongs_to_name(column_name)
+      belongs_to_hash(column_name)[:name]
+    end
+
+    def belongs_to_model(column_name)
+      belongs_to_hash(column_name)[:model]
+    end
+    
     def primary_columns
       column_specs.keys.select {|k| column_specs[k][:type]==:primary_key }
     end
@@ -64,8 +84,4 @@ class GeneratorSpecs < GenSpecFactory
         # <%=model_name.underscore.inspect%> 
         model_name.pluralize.underscore
     end
-
-    
-end
-
-
+end

data/rails_generators/static_gen_specs/templates/model_gen_specs.rb

@@ -88,14 +88,6 @@ class <%=class_name%>GenSpecs < GeneratorSpecs
 <%end -%>
     }
   end
-  
-  def file_columns
-      column_specs.select {|k,v| v[:type]==:file or v[:type]==:photo}
-  end
-  
-  def safe_form_groups
-    form_groups.map {|group| {:group_name=>group[:group_name], :attributes=>(group[:attributes]-ascendant_columns-primary_columns)}}
-  end
 
   def belongs_to
     [

data/rails_generators/static_scaffold/templates/controller.rb

@@ -2,7 +2,13 @@ class <%= controller_class_name %>Controller < ApplicationController
   # GET /<%= table_name %>
   # GET /<%= table_name %>.xml
   def index
-    @<%= table_name %> = <%= class_name %>.all
+<%  if gen_spec.ascendant -%>
+    @<%=gen_spec.ascendant[:name]%> = <%=gen_spec.ascendant[:model]%>.find(params["<%=gen_spec.ascendant[:name]%>"])
+    @<%=gen_spec.plural_name %> = @<%=gen_spec.ascendant[:name]%>.<%= gen_spec.plural_name %>    
+<%else -%>
+    @<%=gen_spec.plural_name %> = <%= gen_spec.model_name %>.all
+<%end -%>
+
 
     respond_to do |format|
       format.html # index.html.erb
@@ -26,6 +32,13 @@ class <%= controller_class_name %>Controller < ApplicationController
   def new
     @<%= file_name %> = <%= class_name %>.new
 
+<% if gen_spec.belongs_to.length>0 -%>
+    # Form drop downs
+<% for bt in gen_spec.belongs_to -%>
+        @<%=bt[:name].pluralize%> = <%=bt[:model]%>.all
+<% end -%>
+
+<%end -%>
     respond_to do |format|
       format.html # new.html.erb
       format.xml  { render :xml => @<%= file_name %> }

data/rails_generators/static_scaffold/templates/model.rb

@@ -1,6 +1,6 @@
 class <%= class_name %> < ActiveRecord::Base
 
-<%if gen_spec.file_columns.length>0 -%>
+<%if gen_spec.file_columns and gen_spec.file_columns.length>0 -%>
 <%for column,options in gen_spec.file_columns -%>
 <%if options[:access]==:private -%>
   has_attached_file <%=column.inspect%>, 
@@ -21,13 +21,13 @@ class <%= class_name %> < ActiveRecord::Base
 
 <%end -%>
 <%if gen_spec.belongs_to.length>0 -%>
-<%for bt in gen_spec.belongs_to.sort {|a,b|a["name"]<=>b["name"]} -%>
+<%for bt in gen_spec.belongs_to -%>
   belongs_to <%=bt[:name].inspect%>, :class_name=><%=bt[:model].inspect%>, :foreign_key=><%=bt[:key].inspect%>
 <%end -%>
 
 <%end -%>
 <%if gen_spec.has_many.length>0 -%>
-<%for hm in gen_spec.has_many.sort {|a,b|a["name"]<=>b["name"]} -%>
+<%for hm in gen_spec.has_many -%>
   has_many <%=hm[:name].inspect%>, :class_name=><%=hm[:model].inspect%>, :foreign_key=><%=hm[:key].inspect%>
 <%end -%>
 

data/rails_generators/static_scaffold/templates/view_new.html.erb

@@ -21,7 +21,7 @@
 <% when :string -%>
     <%%= f.text_field :<%= attribute %> %>
 <% when :foreign_key -%>
-    <%%= f.text_field :<%= attribute %> %>
+    <%%= collection_select(:<%=gen_spec.singular_name%>, :<%= attribute %>, @<%=gen_spec.belongs_to_name(attribute).pluralize%>, :id, :short_name, options = {:prompt => "- Select a <%=gen_spec.belongs_to_name(attribute).titleize.downcase%>"}, html_options = {}) %>
 <% when :photo -%>
     <%%= f.file_field :<%= attribute %> %>
 <% when :datetime -%>

data/static-generators.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{static-generators}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeffrey Hicks"]
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = %q{Generate attractive interfaces that are easy to edit.}
   s.email = %q{jrhicks (at) gmail (dot) com}
   s.extra_rdoc_files = ["CHANGELOG", "lib/static_generators.rb", "LICENSE", "README.md", "tasks/deployment.rake", "TODO"]
-  s.files = ["CHANGELOG", "lib/static_generators.rb", "LICENSE", "rails_generators/static_app/static_app_generator.rb", "rails_generators/static_app/templates/application_helper.rb", "rails_generators/static_app/templates/jquery.js", "rails_generators/static_app/templates/layout.html.erb", "rails_generators/static_app/templates/layout_helper.rb", "rails_generators/static_app/templates/sorttable.js", "rails_generators/static_app/templates/static_style.css", "rails_generators/static_app/templates/uni-form-generic.css", "rails_generators/static_app/templates/uni-form.css", "rails_generators/static_app/templates/uni-form.jquery.js", "rails_generators/static_app/USAGE", "rails_generators/static_authorization/static_authorization_generator.rb", "rails_generators/static_authorization/templates/migration.rb", "rails_generators/static_authorization/USAGE", "rails_generators/static_gen_specs/static_gen_specs_generator.rb", "rails_generators/static_gen_specs/templates/generator_specs.rb", "rails_generators/static_gen_specs/templates/model_gen_specs.rb", "rails_generators/static_gen_specs/USAGE", "rails_generators/static_scaffold/static_scaffold_generator.rb", "rails_generators/static_scaffold/templates/controller.rb", "rails_generators/static_scaffold/templates/functional_test.rb", "rails_generators/static_scaffold/templates/helper.rb", "rails_generators/static_scaffold/templates/helper_test.rb", "rails_generators/static_scaffold/templates/layout.html.erb", "rails_generators/static_scaffold/templates/model.rb", "rails_generators/static_scaffold/templates/paperclip_tokens.rb", "rails_generators/static_scaffold/templates/view_edit.html.erb", "rails_generators/static_scaffold/templates/view_index.html.erb", "rails_generators/static_scaffold/templates/view_new.html.erb", "rails_generators/static_scaffold/templates/view_show.html.erb", "rails_generators/static_scaffold/USAGE", "Rakefile", "README.md", "static-generators.gemspec", "tasks/deployment.rake", "TODO", "USAGE", "Manifest"]
+  s.files = ["CHANGELOG", "lib/static_generators.rb", "LICENSE", "rails_generators/static_app/static_app_generator.rb", "rails_generators/static_app/templates/application_helper.rb", "rails_generators/static_app/templates/jquery.js", "rails_generators/static_app/templates/layout.html.erb", "rails_generators/static_app/templates/layout_helper.rb", "rails_generators/static_app/templates/sorttable.js", "rails_generators/static_app/templates/static_style.css", "rails_generators/static_app/templates/uni-form-generic.css", "rails_generators/static_app/templates/uni-form.css", "rails_generators/static_app/templates/uni-form.jquery.js", "rails_generators/static_app/USAGE", "rails_generators/static_authorization/static_authorization_generator.rb", "rails_generators/static_authorization/templates/migration.rb", "rails_generators/static_authorization/USAGE", "rails_generators/static_gen_specs/static_gen_specs_generator.rb", "rails_generators/static_gen_specs/templates/generator_specs.rb", "rails_generators/static_gen_specs/templates/model_gen_specs.rb", "rails_generators/static_gen_specs/USAGE", "rails_generators/static_scaffold/static_scaffold_generator.rb", "rails_generators/static_scaffold/templates/controller.rb", "rails_generators/static_scaffold/templates/functional_test.rb", "rails_generators/static_scaffold/templates/helper.rb", "rails_generators/static_scaffold/templates/helper_test.rb", "rails_generators/static_scaffold/templates/layout.html.erb", "rails_generators/static_scaffold/templates/model.rb", "rails_generators/static_scaffold/templates/paperclip_tokens.rb", "rails_generators/static_scaffold/templates/view_edit.html.erb", "rails_generators/static_scaffold/templates/view_index.html.erb", "rails_generators/static_scaffold/templates/view_new.html.erb", "rails_generators/static_scaffold/templates/view_show.html.erb", "rails_generators/static_scaffold/USAGE", "Rakefile", "README.md", "tasks/deployment.rake", "TODO", "USAGE", "Manifest", "static-generators.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/jrhicks/static-scaffolds}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Static-generators", "--main", "README.md"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jrhicks-static-generators
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Jeffrey Hicks
@@ -63,11 +63,11 @@ files:
 - rails_generators/static_scaffold/USAGE
 - Rakefile
 - README.md
-- static-generators.gemspec
 - tasks/deployment.rake
 - TODO
 - USAGE
 - Manifest
+- static-generators.gemspec
 has_rdoc: true
 homepage: http://github.com/jrhicks/static-scaffolds
 post_install_message: