sumatra-rails 0.0.5 → 0.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- sumatra-rails (0.0.5)
4
+ sumatra-rails (0.0.6)
5
5
  coffee-rails
6
6
  jquery-rails
7
7
  rails (~> 3.2)
@@ -1,5 +1,5 @@
1
1
  module Sumatra
2
2
  module Rails
3
- VERSION = "0.0.5"
3
+ VERSION = "0.0.6"
4
4
  end
5
5
  end
@@ -58,8 +58,11 @@ class @SumatraPlugin
58
58
 
59
59
  # Merge `options` hash with the `defaults` as set in the definition
60
60
  # of this object.
61
- mergeDefaultsWith: (options) ->
62
- _.extend @defaults, @options
61
+ mergeDefaultsWith: (passed_in_options) ->
62
+ if @defaults instanceof Function
63
+ _.extend @defaults.call(), passed_in_options
64
+ else
65
+ _.extend @defaults, passed_in_options
63
66
 
64
67
  # Run custom constructor code, but blocks instantiation if this method
65
68
  # returns `false`. This method was pretty much designed to be overridden.
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sumatra-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.5
4
+ version: 0.0.6
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -129,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
129
129
  version: '0'
130
130
  segments:
131
131
  - 0
132
- hash: 1720138496632790677
132
+ hash: -872142557039444658
133
133
  required_rubygems_version: !ruby/object:Gem::Requirement
134
134
  none: false
135
135
  requirements:
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
138
138
  version: '0'
139
139
  segments:
140
140
  - 0
141
- hash: 1720138496632790677
141
+ hash: -872142557039444658
142
142
  requirements: []
143
143
  rubyforge_project:
144
144
  rubygems_version: 1.8.23