Fix jim plugin

quirkey · Oct 2, 2011 · 336b750 · 336b750
1 parent 3ffcb5b
commit 336b750
Show file tree

Hide file tree

Showing 4 changed files with 8,552 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -11,9 +11,9 @@ gem 'mustache', '~>0.99'
 gem 'coffee-script', '~>2.2'
 
 group :development do
-    gem 'rake'
-    gem 'jeweler'
+  gem 'rake'
+  gem 'jeweler'
 end
 group :test do
-    gem "shoulda", ">= 0"
+  gem "shoulda", ">= 0"
 end
diff --git a/lib/soca/plugins/jim.rb b/lib/soca/plugins/jim.rb
@@ -11,6 +11,8 @@ def before_build
         ::Jim.logger = logger
         logger.debug "bundling js"
         bundler = ::Jim::Bundler.new(File.read(jimfile), ::Jim::Index.new(app_dir))
+        # set the base dir relative to the app
+        bundler.bundle_dir = app_dir + bundler.bundle_dir
         bundler.bundle!
       end
 

diff --git a/lib/soca/pusher.rb b/lib/soca/pusher.rb
@@ -137,7 +137,9 @@ def plugins
         @plugins = config['plugins'].map do |plugin_config|
           plugin_name, plugin_options = [plugin_config].flatten
           require "soca/plugins/#{plugin_name}"
-          [plugin_name, Soca::Plugin.plugins[plugin_name].new(self, plugin_options || {})]
+          plugin_options ||= {}
+          plugin_options.each {|k, v| plugin_options[k.to_sym] = v }
+          [plugin_name, Soca::Plugin.plugins[plugin_name].new(self, plugin_options)]
         end
       else
         @plugins = []