inline_forms 1.3.34 → 1.3.35

data/bin/inline_forms

@@ -78,6 +78,7 @@ gem 'jquery_datepicker'
 gem 'yaml_db'
 gem 'rails-i18n'
 gem 'unicorn'
+gem 'rvm'
 gem 'rvm-capistrano'
 
 "

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

@@ -20,7 +20,7 @@ def dropdown_edit(object, attribute)
 end
 
 def dropdown_update(object, attribute)
-  foreign_key = object.association(attribute.to_sym).reflection.options[:foreign_key]
+  foreign_key = object.association(attribute.to_sym).reflection.options[:foreign_key] || attribute.to_s.foreign_key.to_sym
   object[foreign_key] = params[('_' + object.class.to_s.underscore).to_sym][attribute.to_s.foreign_key.to_sym]
 end
 

data/lib/generators/templates/deploy.rb

@@ -3,6 +3,11 @@
 require "bundler/capistrano"
 require "rvm/capistrano"
 
+load 'deploy/assets'
+
+set :rvm_ruby_string, ENV['GEM_HOME'].gsub(/.*\//,"") # Read from local system
+set :rvm_install_ruby_params, '--1.9'      # for jruby/rbx default to 1.9 mode https://github.com/wayneeseguin/rvm-capistrano/commit/663252851a9d6294439a9b501cebe66f8c3150f7
+
 set :application, "YOUR_APPLICATION_NAME"
 set :domain,      "YOUR_HOST_NAME"
 set :user,        "YOUR_USERNAME_ON_THE_HOST"
@@ -35,8 +40,6 @@ end
 before 'deploy:setup', 'rvm:install_rvm'
 before 'deploy:setup', 'rvm:install_ruby'
 after  "deploy:update_code", "deploy:fix_stuff"
-after  "deploy:update_code", "deploy:precompile_assets"
-
 
 
 namespace :deploy do
@@ -48,7 +51,7 @@ namespace :deploy do
   desc "Start unicorn"
   task :start, :except => { :no_release => true } do
     run "rvm rvmrc trust #{current_release}"
-    run "cd #{current_path} ; r193_unicorn -c config/unicorn.rb -D -E production"
+    run "cd #{current_path} ; bundle exec r193_unicorn -c #{current_path}/config/unicorn.rb -D -E production"
   end
 
   desc "Stop unicorn"
@@ -56,6 +59,11 @@ namespace :deploy do
     run "kill -s QUIT `cat #{shared_path}/pids/unicorn.pid`"
   end
 
+  desc "Kill unicorn"
+  task :kill, :except => { :no_release => true } do
+    run "kill -s KILL `cat #{shared_path}/pids/unicorn.pid`"
+  end
+
   desc "Fix Stuff."
   task :fix_stuff do
     run "cd #{shared_path} && mkdir -p log"
@@ -66,11 +74,4 @@ namespace :deploy do
   end
 
 
-  desc "Compile all the assets named in config.assets.precompile."
-  task :precompile_assets do
-    raise "Rails environment not set" unless rails_env
-    task = "assets:precompile"
-    run "cd #{release_path} && bundle exec rake #{task} RAILS_ENV=#{rails_env}"
-  end
-
 end

data/lib/inline_forms/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 1.3.34
+  version: 1.3.35
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-20 00:00:00.000000000 Z
+date: 2012-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rvm