sumatra-rails 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sumatra-rails (0.0.5)
+    sumatra-rails (0.0.6)
       coffee-rails
       jquery-rails
       rails (~> 3.2)

data/lib/sumatra/rails/version.rb

@@ -1,5 +1,5 @@
 module Sumatra
   module Rails
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/vendor/assets/javascripts/sumatra.js.coffee

@@ -58,8 +58,11 @@ class @SumatraPlugin
 
   # Merge `options` hash with the `defaults` as set in the definition
   # of this object.
-  mergeDefaultsWith: (options) ->
-    _.extend @defaults, @options
+  mergeDefaultsWith: (passed_in_options) ->
+    if @defaults instanceof Function
+      _.extend @defaults.call(), passed_in_options
+    else
+      _.extend @defaults, passed_in_options
 
   # Run custom constructor code, but blocks instantiation if this method
   # returns `false`. This method was pretty much designed to be overridden.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sumatra-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -129,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1720138496632790677
+      hash: -872142557039444658
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1720138496632790677
+      hash: -872142557039444658
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23