inline_forms 1.3.34 → 1.3.35

Sign up to get free protection for your applications and to get access to all the features.
data/bin/inline_forms CHANGED
@@ -78,6 +78,7 @@ gem 'jquery_datepicker'
78
78
  gem 'yaml_db'
79
79
  gem 'rails-i18n'
80
80
  gem 'unicorn'
81
+ gem 'rvm'
81
82
  gem 'rvm-capistrano'
82
83
 
83
84
  "
@@ -20,7 +20,7 @@ def dropdown_edit(object, attribute)
20
20
  end
21
21
 
22
22
  def dropdown_update(object, attribute)
23
- foreign_key = object.association(attribute.to_sym).reflection.options[:foreign_key]
23
+ foreign_key = object.association(attribute.to_sym).reflection.options[:foreign_key] || attribute.to_s.foreign_key.to_sym
24
24
  object[foreign_key] = params[('_' + object.class.to_s.underscore).to_sym][attribute.to_s.foreign_key.to_sym]
25
25
  end
26
26
 
@@ -3,6 +3,11 @@
3
3
  require "bundler/capistrano"
4
4
  require "rvm/capistrano"
5
5
 
6
+ load 'deploy/assets'
7
+
8
+ set :rvm_ruby_string, ENV['GEM_HOME'].gsub(/.*\//,"") # Read from local system
9
+ set :rvm_install_ruby_params, '--1.9' # for jruby/rbx default to 1.9 mode https://github.com/wayneeseguin/rvm-capistrano/commit/663252851a9d6294439a9b501cebe66f8c3150f7
10
+
6
11
  set :application, "YOUR_APPLICATION_NAME"
7
12
  set :domain, "YOUR_HOST_NAME"
8
13
  set :user, "YOUR_USERNAME_ON_THE_HOST"
@@ -35,8 +40,6 @@ end
35
40
  before 'deploy:setup', 'rvm:install_rvm'
36
41
  before 'deploy:setup', 'rvm:install_ruby'
37
42
  after "deploy:update_code", "deploy:fix_stuff"
38
- after "deploy:update_code", "deploy:precompile_assets"
39
-
40
43
 
41
44
 
42
45
  namespace :deploy do
@@ -48,7 +51,7 @@ namespace :deploy do
48
51
  desc "Start unicorn"
49
52
  task :start, :except => { :no_release => true } do
50
53
  run "rvm rvmrc trust #{current_release}"
51
- run "cd #{current_path} ; r193_unicorn -c config/unicorn.rb -D -E production"
54
+ run "cd #{current_path} ; bundle exec r193_unicorn -c #{current_path}/config/unicorn.rb -D -E production"
52
55
  end
53
56
 
54
57
  desc "Stop unicorn"
@@ -56,6 +59,11 @@ namespace :deploy do
56
59
  run "kill -s QUIT `cat #{shared_path}/pids/unicorn.pid`"
57
60
  end
58
61
 
62
+ desc "Kill unicorn"
63
+ task :kill, :except => { :no_release => true } do
64
+ run "kill -s KILL `cat #{shared_path}/pids/unicorn.pid`"
65
+ end
66
+
59
67
  desc "Fix Stuff."
60
68
  task :fix_stuff do
61
69
  run "cd #{shared_path} && mkdir -p log"
@@ -66,11 +74,4 @@ namespace :deploy do
66
74
  end
67
75
 
68
76
 
69
- desc "Compile all the assets named in config.assets.precompile."
70
- task :precompile_assets do
71
- raise "Rails environment not set" unless rails_env
72
- task = "assets:precompile"
73
- run "cd #{release_path} && bundle exec rake #{task} RAILS_ENV=#{rails_env}"
74
- end
75
-
76
77
  end
@@ -1,4 +1,4 @@
1
1
  # -*- encoding : utf-8 -*-
2
2
  module InlineForms
3
- VERSION = "1.3.34"
3
+ VERSION = "1.3.35"
4
4
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: inline_forms
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.34
4
+ version: 1.3.35
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-05-20 00:00:00.000000000 Z
12
+ date: 2012-05-23 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rvm