schofield 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/generators/schofield/attribute.rb

@@ -63,10 +63,21 @@ module Schofield
       end
         
       def to_column
+        "'#{actual_name.humanize}', lambda { |x| " +
         case
-        when image?       then "'#{actual_name.humanize} ', lambda { |x| image_tag(x.#{@attachment_name}.url(:thumbnail), :alt => '', :class => 'thumbnail') }"
+        when image?       then "image_tag(x.#{@attachment_name}.url(:thumbnail), :alt => '', :class => 'thumbnail')"
         when attachment?  then "link_to('#{actual_name.humanize}', x.#{@attachment_name}.url)"
-        else                   "'#{actual_name.humanize}', lambda { |x| x.#{actual_name} }"
+        else                   "x.#{actual_name}"
+        end + ' }'
+      end
+      
+      def weight
+        case
+        when image?           then 1
+        when @name == 'name'  then 2
+        when @name == 'title' then 3
+        when reference?       then 4
+        else                       5
         end
       end
   

data/lib/generators/schofield/schofield_generator.rb

@@ -64,8 +64,7 @@ module Schofield
         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) }.map(&:to_column)
-          columns.shift if level.join?
+          columns = columns_level.attributes.select{ |a| columns_level.form_field?(a) }.sort{ |a,b| a.weight <=> b.weight }.map(&:to_column)
           if level.nested?
             tables << <<-STRING.gsub(/^ {12}/, '')
               def #{level.name.pluralize}_table

data/schofield.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{schofield}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marc Tauber"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: schofield
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Marc Tauber