check for Hash by checking for to_hash

judofyr · Sep 23, 2012 · 2e976ae · 2e976ae
1 parent 0458dbc
commit 2e976ae
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/temple/mixins/engine_dsl.rb b/lib/temple/mixins/engine_dsl.rb
@@ -96,7 +96,7 @@ def chain_name(name)
       end
 
       def chain_class_constructor(filter, option_filter)
-        local_options = Hash === option_filter.last ? option_filter.pop : {}
+        local_options = option_filter.last.respond_to?(:to_hash) ? option_filter.pop.to_hash : {}
         raise(ArgumentError, 'Only symbols allowed in option filter') unless option_filter.all? {|o| Symbol === o }
         define_options(*option_filter) if respond_to?(:define_options)
         proc do |engine|

diff --git a/lib/temple/mixins/options.rb b/lib/temple/mixins/options.rb
@@ -20,17 +20,17 @@ def default_options
       end
 
       def define_options(*opts)
-        if opts.last.respond_to?(:keys)
+        if opts.last.respond_to?(:to_hash)
-          hash = opts.pop
+          hash = opts.pop.to_hash
           default_options.add_valid_keys(hash.keys)
           default_options.update(hash)
         end
         default_options.add_valid_keys(opts)
       end
 
       def define_deprecated_options(*opts)
-        if opts.last.respond_to?(:keys)
+        if opts.last.respond_to?(:to_hash)
-          hash = opts.pop
+          hash = opts.pop.to_hash
           default_options.add_deprecated_keys(hash.keys)
           default_options.update(hash)
         end