inline_forms 1.0.19 → 1.1.0

data/README.rdoc

@@ -1,14 +1,29 @@
 = inline_forms
 
-Ever tired of setting up forms to manage your data? Inline Forms aims at quick and easy setup of models, migrations and controllers and providing a user-friendly interface.
+Inline Forms is almost a complete admin application. You can try it out easily.
 
 = Usage
 
-Look in the generator files for a hint about usage. In short:
- rails g inline_forms Person first_name:string last_name:string age:dropdown_with_integers
-will create a model, a migration an a controller. In the model you would only have to add 
-values for the dropdown, for instance 12..45.
-In going to /persons you would see a nice form to add and edit persons.
+gem install inline_forms
+inline_forms MyAppName
+rails g inline_forms Picture \
+	name:string \
+	caption:string \
+	image:image_field \
+	description:text \
+	apartment:belongs_to \
+	_presentation:'#{name}' -f
+rails generate uploader Image
+rails g inline_forms Apartment \
+	name:string \
+	title:string \
+	description:text \
+	pictures:has_many \
+	pictures:associated \
+	_enabled:yes \
+	_presentation:'#{name}' -f
+rails s
+point your browser to http://localhost:3000/apartments (make sure JavaScript is enabled)
 
 It's work in progress.
 

data/bin/inline_forms

@@ -1,10 +1,8 @@
-THIS IS NOT YET A GOOD THING ITS A COPY OF THE HOBO BIN FILE
-
 #!/usr/bin/env ruby
+# copied from hobo and then modified. Some stuff is there because of that.
 
 require 'fileutils'
 require 'pathname'
-
 require 'rbconfig'
 
 RUBY = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']).sub(/.*\s.*/m, '"\&"')
@@ -16,28 +14,30 @@ end
 
 Signal.trap("INT") { puts; exit }
 
-hobo_src = File.join(File.dirname(__FILE__), "../hobo_files/plugin")
+src = File.join(File.dirname(__FILE__), "..")
+
 
-USAGE = "USAGE: hobo <options> <app-path>
+USAGE = "
+USAGE: inline_forms <options> <app-name>
+
+  'inline_forms MyApp' will create a rails app in directory MyApp. It will also
+  try to create a MyApp_development mysql database and grant permissions on that
+  database to user 'MyApp' identified by 'MyApp', unless you specify
+  --skip-db-setup
 
 Options:
-  --user-model <model-name-or-false>
-  --db-create                        # Run rake db:create:all
-  --hobo-src <path to hobo src>
-  -d | --database <database>         # e.g. mysql, sqlite
-  -r | --rails <version>             # rails version to use
-  -n | --no-rails                    # don't run 'rails'.  Assumes app-path=='.'
-  --invite-only                      # add features for an invite-only website (admin site, no signup)
-"
+  --skip-db-setup             # skip setup of mysql development database
+  --help                      # show this message
 
+"
 
 ### Nasty stuff needed for Windows :-( ###
-if Config::CONFIG["arch"] =~ /win32/
-  require "win32/registry"
-  def system(command)
-    win = Win32API.new("crtdll", "system", ['P'], 'L').Call(command)
-  end
-end
+#if Config::CONFIG["arch"] =~ /win32/
+#  require "win32/registry"
+#  def system(command)
+#    win = Win32API.new("crtdll", "system", ['P'], 'L').Call(command)
+#  end
+#end
 ### end nasty stuff ###
 
 
@@ -48,106 +48,118 @@ def command(*s)
   exit(1) unless ok
 end
 
-user_model = "user"
-create_db  = false
-run_rails  = true
-invite_only = ""
+skip_db_setup = false
 
 while true
   case arg_name = ARGV.shift
-  when "--user-model"
-    arg = ARGV.shift
-    user_model = arg == "false" ? nil : arg
-  when "--db-create"
-    create_db = true
-  when "--hobo-src"
-    hobo_src = ARGV.shift
-    hobo_src = "../" + hobo_src unless Pathname.new(hobo_src).absolute?
-  when "-d", "--database"
-    database_type = ARGV.shift
-  when "-r", "--rails"
-    rails_version = ARGV.shift
-  when "-n", "--no-rails"
-    run_rails = false
-  when "--invite-only"
-    invite_only = "--invite-only"
+  when "--skip-db-setup"
+    skip_db_setup = true
   when "--help"
     puts USAGE
     exit
   else
-    app_path = arg_name
+    app_name = arg_name
     break
   end
 end
 
-if run_rails==false && app_path.nil?
-  app_path = '.'
-end
-
-if !ARGV.empty? || app_path.nil?
+if !ARGV.empty? || app_name.nil? || !/^[a-zA-Z][0-9a-zA-Z_-]+/.match(app_name) || File.exists?(app_name)
   puts USAGE
   exit 1
 end
 
-if run_rails
-  puts "\nGenerating Rails app...\n"
-  opts = []
-  if rails_version
-    opts << "_#{rails_version}_"
-  else
-    v=`#{RUBY} -S rails -v`.split[1].split(".")
-    unless v.length>=3
-      puts "rails not found!"
-      exit 2
-    end
-    unless v[0]=='2' && ['2', '3'].include?(v[1])
-      puts "Rails 2.2 or 2.3 required!"
-      puts "Rails 3 requires Hobo 1.1 or later."
-      exit 2
-    end
-  end
-  opts << "-d #{database_type}" if database_type
-  system("#{RUBY} -S rails #{opts * ' '} #{app_path}")
+puts "\nGenerating Rails app '#{app_name}'...\n"
+system("#{RUBY} -S rails new #{app_name}")
+
+Dir.chdir(app_name)
+puts "\nWorking directory is now #{`pwd`}"
+
+puts "\nInstalling Gemfile and running Bundle...\n"
+
+gemfile_sources = "
+source 'http://rubygems.org'
+
+"
+gemfile_gems = "
+
+gem 'rails', '~> 3.1.0'
+gem 'rake'
+gem 'jquery-rails'
+gem 'mysql2'
+gem 'capistrano'
+gem 'will_paginate', :git => 'git://github.com/acesuares/will_paginate.git', :branch => 'rails3'
+gem 'tabs_on_rails'
+gem 'ckeditor', :git => 'git://github.com/acesuares/ckeditor.git', :branch => 'master'
+gem 'carrierwave'
+gem 'remotipart', '~> 1.0'
+gem 'paper_trail'
+gem 'devise'
+gem 'cancan'
+gem 'inline_forms'
+
+"
+gemfile_development_group ="
+
+# Include everything needed to run rake, tests, features, etc.
+group :development do
+  gem 'rspec-rails'
+  gem 'shoulda', '>= 0'
+  gem 'bundler', '~> 1.0.0'
+  gem 'jeweler', '~> 1.5.2'
+  gem 'rcov', '>= 0'
 end
 
-Dir.chdir(app_path) do
-  gen = "#{RUBY} #{File.join('script', 'generate')}"
-  plugin = "#{RUBY} #{File.join('script', 'plugin')}"
+"
+File.open( 'Gemfile', 'w') {|f| f.write(gemfile_sources + gemfile_gems + gemfile_development_group) }
 
-  FileUtils.touch("public/stylesheets/application.css")
+system('bundle install')
 
-  puts "\nInitialising Hobo...\n"
-  command(gen, "hobo --add-gem --add-routes")
+if skip_db_setup
+  puts "\nDatabase setup skipped on your request!\n"
+else
+  puts "\nDatabase setup: creating config/database.yml\n"
+  development_stanza = "
+  development:
+    adapter: mysql2
+    database: #{app_name}_development
+    username: #{app_name}
+    password: #{app_name}
 
-  puts "\nInstalling Hobo Rapid and default theme...\n"
-  command("#{gen} hobo_rapid --import-tags #{invite_only}")
+  "
+  File.open( 'config/database.yml', 'w') {|f| f.write(development_stanza) }
 
-  if user_model
-    puts "\nCreating #{user_model} model and controller...\n"
-    command("#{gen} hobo_user_model #{user_model} #{invite_only}")
-    command("#{gen} hobo_user_controller #{user_model} #{invite_only}")
-  end
+  puts "CREATE #{app_name}_development database"
+  system("sudo mysqladmin create #{app_name}_development")
 
-  puts "\nCreating standard pages...\n"
-  command("#{gen} hobo_front_controller front --delete-index --add-routes #{invite_only}")
+  puts "GRANT ALL ON #{app_name}_development.* to '#{app_name}'@'localhost' identified by '#{app_name}'"
+  system("echo \"GRANT ALL ON #{app_name}_development.* to '#{app_name}'@'localhost' identified by '#{app_name}';\" | sudo mysql -v mysql")
+  system('echo "FLUSH PRIVILEGES;" | sudo mysql mysql')
 
-  if create_db
-    puts "\nCreating databases"
-    command("#{RUBY} -S rake db:create:all")
-  end
 end
 
-if !invite_only.empty?
-  puts %(
-Invite-only website
-  If you wish to prevent all access to the site to non-members, add 'before_filter :login_required'
-  to the relevant controllers, e.g. to prevent all access to the site, add
-  
-    include Hobo::AuthenticationSupport
-    before_filter :login_required
-  
-  to application_controller.rb (note that the include statement is not required for hobo_controllers)
-  
-  NOTE: You might want to sign up as the administrator before adding this!
-)
+puts "\nDevise install..."
+system('bundle exec rails g devise:install')
+puts "\nDevise User model install..."
+system('bundle exec rails g devise User')
+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}/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')
+
+
+if skip_db_setup
+  puts "Migrations skipped on your request!\n"
+else
+  puts "Migrating Devise and Versions"
+  system('bundle exec rake db:migrate')
 end
+
+puts "\n\nDone! Now make your tables.\n\n\n"
+

data/lib/inline_forms/version.rb

@@ -1,3 +1,3 @@
 module InlineForms
-  VERSION = "1.0.19"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inline_forms
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 19
-  version: 1.0.19
+  version: 1.1.0
 platform: ruby
 authors: 
 - Ace Suares
@@ -171,14 +171,6 @@ files:
 - app/views/layouts/inline_forms.html.erb
 - bin/inline_forms
 - inline_forms.gemspec
-- lib/appcreator/Gemfile
-- lib/appcreator/database.yml
-- lib/appcreator/mk31-app
-- lib/appcreator/otherstuff/add_roles.sql
-- lib/appcreator/otherstuff/bump
-- lib/appcreator/otherstuff/diffie
-- lib/appcreator/otherstuff/mkrole
-- lib/appcreator/otherstuff/roles_users.sql
 - lib/generators/inline_forms/USAGE
 - lib/generators/inline_forms/inline_forms_generator.rb
 - lib/generators/inline_forms/templates/_inline_forms_tabs.html.erb
@@ -187,6 +179,11 @@ files:
 - lib/generators/inline_forms/templates/model.erb
 - lib/inline_forms.rb
 - lib/inline_forms/version.rb
+- lib/otherstuff/add_roles.sql
+- lib/otherstuff/bump
+- lib/otherstuff/diffie
+- lib/otherstuff/mkrole
+- lib/otherstuff/roles_users.sql
 - test/helper.rb
 - test/test_inline_forms.rb
 has_rdoc: true

data/lib/appcreator/Gemfile

@@ -1,42 +0,0 @@
-source 'http://rubygems.org'
-
-gem 'rails', "~> 3.1.0"
-
-gem 'rake'
-
-gem 'jquery-rails'
-
-gem 'mysql2'
-
-gem 'capistrano'
-
-gem 'will_paginate', :git => 'git://github.com/acesuares/will_paginate.git', :branch => 'rails3'
-
-gem 'tabs_on_rails'
-
-gem 'ckeditor', :git => 'git://github.com/acesuares/ckeditor.git', :branch => 'master'
-
-gem 'carrierwave'
-
-gem "remotipart", "~> 1.0"
-
-gem "paper_trail"
-
-gem 'devise'
-
-gem 'cancan'
-
-gem 'inline_forms'
-
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "rspec-rails"
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
-end
-
-
-
-

data/lib/appcreator/database.yml

@@ -1,32 +0,0 @@
-# MySQL.  Versions 4.1 and 5.0 are recommended.
-#
-#
-# Be sure to use new-style password hashing:
-#   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
-development:
-  adapter: mysql2
-  database: APPNAME_development
-  username: APPNAME
-  password: APPNAME
-
-# Warning: The database defined as 'test' will be erased and
-# re-generated from your development database when you run 'rake'.
-# Do not set this db to the same as development or production.
-test:
-  adapter: mysql2
-  database: APPNAME_test
-  username: APPNAME
-  password: APPNAME
-
-# Warning: The database defined as 'test' will be erased and
-# re-generated from your development database when you run 'rake'.
-# Do not set this db to the same as development or production.
-production:
-  adapter: mysql2
-  database: APPNAME_production
-  username: APPNAME
-  password: APPNAME
-
-# Warning: The database defined as 'test' will be erased and
-# re-generated from your development database when you run 'rake'.
-# Do not set this db to the same as development or production.

data/lib/appcreator/mk31-app

@@ -1,38 +0,0 @@
-#/bin/bash
-APPNAME=$1
-echo "Creating Rails app: $1..."
-echo "Working directory: `pwd`."
-rails new $APPNAME
-echo "Create $APPNAME/config/databse.yml..."
-cat database.yml | sed "s/APPNAME/$APPNAME/g" > $APPNAME/config/database.yml
-echo "Create Gemfile in $APPNAME..."
-cp -v Gemfile $APPNAME
-cd $APPNAME
-echo "Working directory: `pwd`."
-echo "Bundle install..."
-bundle install
-echo "Devise install..."
-rails g devise:install
-echo "Devise User model..."
-rails g devise User
-echo "Install ckeditor..."
-rails g ckeditor:install
-echo "Create config file in app/assets/javascripts/ckeditor/config.js"
-mkdir app/assets/javascripts/ckeditor
-cp ../config.js app/assets/javascripts/ckeditor
-echo "Add remotipart to app/assets/javascripts/application.js..."
-echo >> app/assets/javascripts/application.js
-echo "//= require jquery.remotipart" >> app/assets/javascripts/application.js
-echo >> app/assets/javascripts/application.js
-echo "Paper_trail install..."
-bundle exec rails generate paper_trail:install
-echo "DROP ${APPNAME}_development database"
-sudo mysqladmin drop ${APPNAME}_development
-echo "CREATE ${APPNAME}_development database"  
-sudo mysqladmin create ${APPNAME}_development
-echo "GRANT permissions"
-echo "GRANT ALL ON ${APPNAME}_development.* to '${APPNAME}'@'localhost' identified by '${APPNAME}';" | sudo mysql -v mysql
-echo "FLUSH PRIVILEGES;" | sudo mysql mysql
-echo "Migrating Devise and Versions"
-bundle exec rake db:migrate
-echo "Done! Now make your tables."