inline_forms 1.3.28 → 1.3.29

data/bin/inline_forms

@@ -4,11 +4,10 @@
 require 'fileutils'
 require 'pathname'
 require 'rbconfig'
+require 'rvm'
 
-RUBY = File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name']).sub(/.*\s.*/m, '"\&"')
-
-if RUBY.empty?
-  puts "ruby not found"
+if not RVM.current
+  puts "ruby or rvm not found"
   exit 2
 end
 
@@ -31,8 +30,6 @@ VERSION: #{InlineForms::VERSION}
 
 while true
   case arg_name = ARGV.shift
-#  when "--skip-db-setup"
-#    skip_db_setup = true
   when "--help"
     puts USAGE
     exit
@@ -48,18 +45,18 @@ if !ARGV.empty? || app_name.nil? || !/^[a-zA-Z][0-9a-zA-Z_-]+/.match(app_name) |
 end
 
 puts "\nGenerating Rails app '#{app_name}'...\n"
-system("#{RUBY} -S rails new #{app_name}")
+RVM.run "rails new #{app_name}"
 
-Dir.chdir(app_name)
-puts "\nWorking directory is now #{`pwd`}"
+RVM.chdir(app_name) do
+  puts "\nWorking directory is now #{`pwd`}"
 
-puts "\nInstalling Gemfile...\n"
+  puts "\nInstalling Gemfile...\n"
 
-gemfile_sources = "
+  gemfile_sources = "
 source 'http://rubygems.org'
 
-"
-gemfile_gems = "
+  "
+  gemfile_gems = "
 
 gem 'test-unit'
 gem 'rails'
@@ -82,8 +79,8 @@ gem 'rails-i18n'
 gem 'unicorn'
 gem 'rvm-capistrano'
 
-"
-gemfile_development_group ="
+  "
+  gemfile_development_group ="
 
 # Include everything needed to run rake, tests, features, etc.
 group :development do
@@ -95,8 +92,8 @@ group :development do
 #  gem 'rcov', '>= 0'
 end
 
-"
-gemfile_production_group ="
+  "
+  gemfile_production_group ="
 # these are just for production
 group :production do
   gem 'mysql2'
@@ -104,58 +101,60 @@ group :production do
   gem 'uglifier'
 end
 
-"
+  "
 
-File.open( 'Gemfile', 'w') {|f| f.write(gemfile_sources + gemfile_gems + gemfile_development_group + gemfile_production_group ) }
+  File.open( 'Gemfile', 'w') {|f| f.write(gemfile_sources + gemfile_gems + gemfile_development_group + gemfile_production_group ) }
 
-puts "\nCreating and trusting rvmrc...\n"
-system("echo rvm use `rvm current`@#{app_name} --create > .rvmrc")
-system("rvm rvmrc trust .rvmrc")
-system("rvm use `rvm current`@#{app_name} --create")
+  puts "\nCreating and trusting rvmrc...\n"
+  RVM.run "echo rvm use `rvm current`@#{app_name} --create > .rvmrc"
+  RVM.run "rvm rvmrc trust .rvmrc"
 
-puts "\nRunning bundle...\n"
-system('bundle install')
+end
+RVM.chdir "#{app_name}" do
 
-puts "\nDatabase setup: creating config/database.yml\n"
-development_stanza = "
+  puts "\nRunning bundle...\n"
+  RVM.run "bundle install"
+
+  puts "\nDatabase setup: creating config/database.yml\n"
+  development_stanza = "
 development:
   adapter: sqlite3
   database: db/development.sqlite3
   pool: 5
   timeout: 5000
-"
-production_stanza = "
+  "
+  production_stanza = "
 production:
   adapter: mysql2
   database: #{app_name}_p
   username: #{app_name}
   password: #{app_name}444
 
-"
-File.open( 'config/database.yml', 'w') {|f| f.write(development_stanza + production_stanza) }
-
-puts "\nDevise install..."
-system('bundle exec rails g devise:install')
-puts "\nDevise User model install with added name field..."
-system('bundle exec rails g devise User name:string')
-puts "\nInstall ckeditor..."
-system('bundle exec rails g ckeditor:install')
-puts "Create config file in app/assets/javascripts/ckeditor/config.js"
-FileUtils.mkdir_p 'app/assets/javascripts/ckeditor'
-system("cp #{src}/lib/app/assets/javascripts/ckeditor/config.js app/assets/javascripts/ckeditor")
-puts "Add remotipart to app/assets/javascripts/application.js..."
-system('echo >> app/assets/javascripts/application.js')
-system('echo "//= require jquery.remotipart" >> app/assets/javascripts/application.js')
-system('echo >> app/assets/javascripts/application.js')
-puts "Paper_trail install..."
-system('bundle exec rails g paper_trail:install')
-
-
-puts "Migrating Devise and Versions"
-system('bundle exec rake db:migrate')
-
-puts "Creating header in app/views/inline_forms/_header.html.erb...\n"
-header_src = "
+  "
+  File.open( 'config/database.yml', 'w') {|f| f.write(development_stanza + production_stanza) }
+
+  puts "\nDevise install..."
+  system('bundle exec rails g devise:install')
+  puts "\nDevise User model install with added name field..."
+  system('bundle exec rails g devise User name:string')
+  puts "\nInstall ckeditor..."
+  system('bundle exec rails g ckeditor:install')
+  puts "Create config file in app/assets/javascripts/ckeditor/config.js"
+  FileUtils.mkdir_p 'app/assets/javascripts/ckeditor'
+  system("cp #{src}/lib/app/assets/javascripts/ckeditor/config.js app/assets/javascripts/ckeditor")
+  puts "Add remotipart to app/assets/javascripts/application.js..."
+  system('echo >> app/assets/javascripts/application.js')
+  system('echo "//= require jquery.remotipart" >> app/assets/javascripts/application.js')
+  system('echo >> app/assets/javascripts/application.js')
+  puts "Paper_trail install..."
+  system('bundle exec rails g paper_trail:install')
+
+
+  puts "Migrating Devise and Versions"
+  system('bundle exec rake db:migrate')
+
+  puts "Creating header in app/views/inline_forms/_header.html.erb...\n"
+  header_src = "
 <div id='Header'>
   <div id='title'>
     #{app_name} v<%= inline_forms_version -%>
@@ -167,12 +166,12 @@ header_src = "
   <% end -%>
   <div style='clear: both;'></div>
 </div>
-"
-FileUtils.mkdir_p 'app/views/inline_forms'
-File.open( 'app/views/inline_forms/_header.html.erb', 'w') {|f| f.write(header_src) }
+  "
+  FileUtils.mkdir_p 'app/views/inline_forms'
+  File.open( 'app/views/inline_forms/_header.html.erb', 'w') {|f| f.write(header_src) }
 
-puts "Set application_name and _title in ApplicationHelper...\n"
-app_helper = "
+  puts "Set application_name and _title in ApplicationHelper...\n"
+  app_helper = "
 module ApplicationHelper
   def application_name
     #{app_name}
@@ -181,12 +180,12 @@ module ApplicationHelper
     #{app_name}
   end
 end
-"
-File.open( 'app/helpers/application_helper.rb', 'w') {|f| f.write(app_helper) }
+  "
+  File.open( 'app/helpers/application_helper.rb', 'w') {|f| f.write(app_helper) }
 
 
-puts "Injecting precompile assets stuff in production.rb...\n"
-precomp = "
+  puts "Injecting precompile assets stuff in production.rb...\n"
+  precomp = "
   \n
   \n
   # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
@@ -194,26 +193,27 @@ precomp = "
     config.assets.precompile += %w( inline_forms_application.js inline_forms_application.css devise.css )
   end
   \n"
-File.open( 'config/environments/production.rb', 'a') {|f| f.write(precomp) }
+  File.open( 'config/environments/production.rb', 'a') {|f| f.write(precomp) }
 
-puts "Capify...\n"
-system('capify .')
-system("cp #{src}/lib/generators/templates/deploy.rb config/deploy.rb")
+  puts "Capify...\n"
+  system('capify .')
+  system("cp #{src}/lib/generators/templates/deploy.rb config/deploy.rb")
 
-puts "Unicorn Config...\n"
-system("cp #{src}/lib/generators/templates/unicorn.rb config/unicorn.rb")
+  puts "Unicorn Config...\n"
+  system("cp #{src}/lib/generators/templates/unicorn.rb config/unicorn.rb")
 
-puts "Initializing git...\n"
-system('git init')
-system('echo >> .gitignore')
-system('echo "nbproject" >> .gitignore')
-system('echo "public/uploads" >> .gitignore')
-system('echo  >> .gitignore')
-system('git add .')
-system('git commit -a -m " * Initial"')
+  puts "Initializing git...\n"
+  system('git init')
+  system('echo >> .gitignore')
+  system('echo "nbproject" >> .gitignore')
+  system('echo "public/uploads" >> .gitignore')
+  system('echo  >> .gitignore')
+  system('git add .')
+  system('git commit -a -m " * Initial"')
 
-puts "\n\nDone! Now make your tables with 'rails g inline_forms ...\n"
-puts "\nDon't forget: edit .rvmrc, config/{routes.rb, deploy.rb}, .git/config, delete public/index.html\n\n"
+  puts "\n\nDone! Now make your tables with 'rails g inline_forms ...\n"
+  puts "\nDon't forget: edit .rvmrc, config/{routes.rb, deploy.rb}, .git/config, delete public/index.html\n\n"
 
 
 
+end

data/lib/app/helpers/form_elements/devise_password_field.rb

@@ -2,11 +2,11 @@
 InlineForms::SPECIAL_COLUMN_TYPES[:devise_password_field]=:string
 
 def devise_password_field_show(object, attribute)
-  link_to_inline_edit object, attribute, (object.send attribute.to_sym)
+  link_to_inline_edit object, attribute, ''
 end
 
 def devise_password_field_edit(object, attribute)
-  password_field_tag attribute, (object.send attribute.to_sym), :class => 'input_devise_password_field'
+  password_field_tag attribute, '', :class => 'input_devise_password_field'
 end
 
 def devise_password_field_update(object, attribute)

data/lib/app/helpers/inline_forms_helper.rb

@@ -15,18 +15,18 @@ module InlineFormsHelper
 
   # used as class name
   def has_validations(object, attribute)
-    "has_validations " unless object.class.validators_on(attribute).empty?
+    not object.class.validators_on(attribute).empty?
   end
 
   def validation_help_as_list_for(object, attribute)
-    "" and return if object.class.validators_on(attribute).empty?
+    "" and return unless has_validations(object, attribute)
     content_tag(:ul, validation_help_for(object, attribute).map { |help_message| content_tag(:li, help_message ) }.to_s.html_safe )
   end
 
   # validation_help_for(object, attribute) extracts the help messages for
   # attribute of object.class (in an Array)
   def validation_help_for(object, attribute)
-    "" and return if object.class.validators_on(attribute).empty?
+    "" and return unless has_validations(object, attribute)
     object.class.validators_on(attribute).map do |v|
       t("inline_forms.validators.help.#{ActiveModel::Name.new(v.class).i18n_key.to_s.gsub(/active_model\/validations\//, '')}")
     end.compact

data/lib/app/views/inline_forms/_new.html.erb

@@ -30,7 +30,7 @@
             <% css_class_id = "attribute_#{attribute}_#{@object.id}" -%>
             <tr>
               <td valign="top">
-                <div class='<%= has_validations(@object, attribute) -%><%= "attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
+                <div class='<%= "has_validations " if has_validations(@object, attribute) -%><%= "attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
                   <%= translated_attribute(@object, attribute) -%>
                 </div>
                 <% if has_validations(@object, attribute) %>

data/lib/app/views/inline_forms/_show.html.erb

@@ -16,7 +16,7 @@
     <% css_class_id = "#{@object.class.name.underscore}_#{@object.id}_#{attribute}" -%>
     <tr>
       <td valign="top">
-        <div class='<%= has_validations(@object, attribute) -%><%= "attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
+        <div class='<%= "has_validations " if _has_validations(@object, attribute) -%><%= "attribute_name attribute_#{attribute} form_element_#{form_element}" -%>' >
           <%= translated_attribute(@object, attribute) -%>
         </div>
         <% if has_validations(@object, attribute) %>

data/lib/generators/inline_forms_generator.rb

@@ -99,6 +99,10 @@ module InlineForms
         @has_attached_files       = "\n"
         @presentation             = "\n"
         @order                    = "\n"
+        @order_by_clause          = "  def self.order_by_clause\n" +
+                                    "    \"#{attribute.type}\"\n" +
+                                    "  end\n" +
+                                    "\n"
         @carrierwave_mounters     = "\n"
         @inline_forms_attribute_list  = String.new
 
@@ -130,10 +134,14 @@ module InlineForms
                               "\n"
           end
           if attribute.name == '_order'
-            @order <<  "  def <=>(other)\n" +
+            @order <<         "  def <=>(other)\n" +
                               "    self.#{attribute.type} <=> other.#{attribute.type}\n" +
                               "  end\n" +
                               "\n"
+            @order_by_clause = "  def self.order_by_clause\n" +
+                               "    \"#{attribute.type}\"\n" +
+                               "  end\n" +
+                               "\n"
           end
           if attribute.attribute?
             attribute.attribute_type == :unknown ? commenter = '#' : commenter = ' '

data/lib/generators/templates/model.erb

@@ -17,8 +17,6 @@ class <%= name %> < ActiveRecord::Base
     <%= @flag_not_accessible_through_html %>
   end
 
-  def self.order_by_clause
-    "name"
-  end
+<%= @order_by_clause -%>
 
 end

data/lib/inline_forms/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module InlineForms
-  VERSION = "1.3.28"
+  VERSION = "1.3.29"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 1.3.28
+  version: 1.3.29
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-13 00:00:00.000000000 Z
+date: 2012-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails