acts-as-optionable 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/generators/option/templates/option.rb

@@ -40,6 +40,14 @@ class Option < ActiveRecord::Base
     name.humanize.titleize
   end
   
+  def to_h
+    option_hash = {}
+    option_hash["value"] = value
+    option_hash["default"] = default if default
+    option_hash["kind"] = kind if kind
+    option_hash.dup
+  end
+  
   # def default_value
   #   @config['default']
   # end

data/lib/acts_as_optionable/acts_as_optionable.rb

@@ -48,17 +48,12 @@ module ActiveRecord
         # Return a pure hash filled from the options.  Use this if you want access to the data
         # as a hash without interfacing with Option methods
         def options_and_defaults_hash
-          options = {}
-          options_and_defaults.each do |name, option| 
-            key = name.to_s
-            options[key] = {}
-            options[key]["value"] = option.value
-            options[key]["default"] = option.default if option.default
-            options[key]["kind"] = option.kind if option.kind
+          options_and_defaults.inject({}) do |memo, option|
+            memo[option[0]] = option[1].to_h 
+            memo
           end
-          options
         end
-        
+                
         # Returns an instance of options where option names are callable as methods
         #
         # Example:
@@ -69,8 +64,9 @@ module ActiveRecord
         def options_values_struct
           options = {}
           options_and_defaults.each do |name, option|
-            options[name.to_s] = option.value
-            options["#{name.to_s}_kind"] = option.kind
+            opt_key = name.to_s
+            options[opt_key] = option.value
+            options["#{opt_key}_kind"] = option.kind
           end        
           OpenStruct.new(options)
         end

data/lib/acts_as_optionable/specify_option.rb

@@ -5,7 +5,8 @@ module ActiveRecord
         module ClassMethods
           # Setup a default value at the class level.
           def specify_option(option_name, opts = {})
-            optionable_specified_options[option_name.to_s] = Option.new_readonly(:name => option_name.to_s, :default => opts[:default], :kind => opts[:kind])
+            name = option_name.to_s
+            optionable_specified_options[name] = Option.new_readonly(:name => name, :default => opts[:default], :kind => opts[:kind])
           end
           
           # Returns a hash of options specified at the class level

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Brendon Murphy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-28 00:00:00 -07:00
+date: 2010-04-29 00:00:00 -07:00
 default_executable: 
 dependencies: []