rename Option to OptionDefinition to be full Rails compliant

app/models/merged/card.rb

@@ -36,7 +36,7 @@ module Merged
     def save
       super
       data = Card.all.collect {|obj| obj.attributes}
-      File.write( Option.full_path , data.to_yaml)
+      File.write( OptionDefinition.full_path , data.to_yaml)
     end
 
     def set_index(index)

app/models/merged/card_style.rb

@@ -11,7 +11,7 @@ module Merged
     def options_definitions
       option_defs = []
       options.each do |name|
-        option = Option.find_by_name(name)
+        option = OptionDefinition.find_by_name(name)
         raise "no option for #{name}:#{name.class}" if option.blank?
         option_defs << option
       end if options

app/models/merged/option_definition.rb

@@ -1,5 +1,5 @@
 module Merged
-  class Option < ActiveYaml::Base
+  class OptionDefinition < ActiveYaml::Base
     set_root_path Engine.root + "config"
 
     fields :name , :default , :description , :values , :type

app/models/merged/section_style.rb

@@ -15,7 +15,7 @@ module Merged
     def options_definitions
       option_defs = []
       options.each do |name|
-        option = Option.find_by_name(name)
+        option = OptionDefinition.find_by_name(name)
         raise "no option for #{name}:#{name.class}" if option.blank?
         option_defs << option
       end if options