options for cards and new card styles

app/models/merged/card.rb

@@ -4,6 +4,8 @@ module Merged
     include ActiveModel::Conversion
     extend  ActiveModel::Naming
 
+    include Optioned
+
     cattr_reader :all
     @@all = {}
 
@@ -24,6 +26,10 @@ module Merged
       @@all[self.id] = self
     end
 
+    def template_style
+      @section.card_template
+    end
+
     def destroy
       @section.remove_card( self)
     end

app/models/merged/optioned.rb

@@ -0,0 +1,28 @@
+module Merged
+  #relies only on @content["options"]
+  #and a method template_style
+  module Optioned
+    def has_option?(option)
+      options.has_key?(option)
+    end
+
+    def option_definitions
+      template_style.options
+    end
+
+    def option(name)
+      options[name]
+    end
+
+    def options
+      @content["options"] || {}
+    end
+
+    def set_option( option , value)
+      puts "#{template_style} setting option #{option}=#{value.class}"
+      @content["options"] = {} if @content["options"].nil?
+      options[option] = value
+    end
+
+  end
+end

app/models/merged/section.rb

@@ -3,6 +3,7 @@ module Merged
     include ActiveModel::API
     include ActiveModel::Conversion
     extend  ActiveModel::Naming
+    include Optioned
 
     cattr_reader :all
     @@all = {}
@@ -24,39 +25,12 @@ module Merged
       end
     end
 
-    [:template , :card_template , :id , :text , :header, :image, :options].each do |meth|
+    [:template , :card_template , :id , :text , :header, :image].each do |meth|
       define_method(meth) do
         @content[meth.to_s]
       end
     end
 
-    [:button_link , :button_text ].each do |meth|
-      define_method(meth) do
-        @content["options"][meth.to_s]
-      end
-    end
-
-    def has_option?(option)
-      options.has_key?(option)
-    end
-
-    def option_definitions
-      template_style.options
-    end
-
-    def option(name)
-      options[name]
-    end
-
-    def options
-      @content["options"] || {}
-    end
-
-    def set_option( option , value)
-      puts "#{template} setting option #{option}=#{value.class}"
-      @content["options"] = {} if @content["options"].nil?
-      options[option] = value
-    end
 
     def set_template(new_template)
       @content["template"] = new_template
@@ -77,6 +51,7 @@ module Merged
     def template_style
       Style.sections[ template ]
     end
+
     def allowed_fields
       template_style.fields
     end