acts-as-optionable 0.4.2 → 0.4.3

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/generators/option/templates/create_options.rb

@@ -6,6 +6,7 @@ class CreateOptions < ActiveRecord::Migration
       t.string :value
       t.string :kind
       t.string :category
+      t.integer :position, :default => 0
       t.references :optionable, :polymorphic => true
       t.timestamps
     end

data/generators/option/templates/option.rb

@@ -47,6 +47,7 @@ class Option < ActiveRecord::Base
     option_hash["default"] = default if default
     option_hash["kind"] = kind if kind
     option_hash["category"] = category if category
+    option_hash["position"] = position if position
     option_hash.dup
   end
     

data/lib/acts_as_optionable/acts_as_optionable.rb

@@ -17,7 +17,7 @@ module ActiveRecord
       module IntanceMethods
         # Store an option persistently and override default option
         def set_option(name, value, opts = {})
-          option = get_stored_option(name) || options.build(:name => name.to_s, :value => value, :kind => opts[:kind], :display_name => opts[:display_name], :category => opts[:category])
+          option = get_stored_option(name) || options.build(:name => name.to_s, :value => value, :kind => opts[:kind], :display_name => opts[:display_name], :category => opts[:category], :position => opts[:position])
           return if !opts[:force_set] && new_option_matches_current?(option, value)
           option.value = value
           ret = option.save!

data/lib/acts_as_optionable/specify_option.rb

@@ -6,7 +6,7 @@ module ActiveRecord
           # Setup a default value at the class level.
           def specify_option(option_name, opts = {})
             name = option_name.to_s
-            optionable_specified_options[name] = Option.new_readonly(:name => name, :default => opts[:default], :kind => opts[:kind], :display_name => opts[:display_name], :category => opts[:category])
+            optionable_specified_options[name] = Option.new_readonly(:name => name, :default => opts[:default], :kind => opts[:kind], :display_name => opts[:display_name], :category => opts[:category], :position => opts[:position])
           end
           
           # Returns a hash of options specified at the class level
@@ -40,7 +40,7 @@ module ActiveRecord
             @instance_specified_options = {}
             opts.each do |option_name, attributes|
               attributes.symbolize_keys!
-              @instance_specified_options[option_name.to_s] = Option.new_readonly(:name => option_name.to_s, :default => attributes[:default], :kind => attributes[:kind], :display_name => attributes[:display_name], :category => attributes[:category])
+              @instance_specified_options[option_name.to_s] = Option.new_readonly(:name => option_name.to_s, :default => attributes[:default], :kind => attributes[:kind], :display_name => attributes[:display_name], :category => attributes[:category], :position => attributes[:position])
             end
           end
         end

data/spec/acts_as_optionable_spec.rb

@@ -9,7 +9,7 @@ class SpecifiedMixin < Mixin
   acts_as_optionable
   
   specify_option :foo, :default => "FOOFOO"
-  specify_option :bar, :default => "BARBAR", :kind => "example", :display_name => "Bar Bar", :category => "tabs"
+  specify_option :bar, :default => "BARBAR", :kind => "example", :display_name => "Bar Bar", :category => "tabs", :position => 9
 end
 
 class NoSpecifiedMixin < Mixin
@@ -32,6 +32,7 @@ def setup_db
       t.string :value
       t.string :kind
       t.string :category
+      t.integer :position, :default => 0
       t.references :optionable, :polymorphic => true
       t.timestamps
     end
@@ -89,6 +90,10 @@ describe "ActsAsOptionable" do
       @optionable.get_option(:bar).category.should == "tabs"
     end
     
+    it "should be able to specify a position" do
+      @optionable.get_option(:bar).position.should == 9
+    end
+    
     it "should not mix specifications across unrelated classes" do
       class Foobar < Mixin
         acts_as_optionable
@@ -133,6 +138,11 @@ describe "ActsAsOptionable" do
       @optionable.get_option(:category_is_set).category.should == "tabs"
     end
     
+    it "should have the position if set" do
+      @optionable.instance_specified_options = @options_template.merge(:position_is_set => {:default => "position_is_set", :position => 99 })
+      @optionable.get_option(:position_is_set).position.should == 99
+    end
+    
     it "should have the display name if set" do
       @optionable.instance_specified_options = @options_template.merge(:display_name_is_set => {:default => "kind_is_set", :kind => "example_kind", :display_name => "Example Name" })
       @optionable.get_option(:display_name_is_set).display_name.should == "Example Name"
@@ -224,6 +234,11 @@ describe "ActsAsOptionable" do
         @optionable.get_option(@key).category.should == "tabs"
       end
       
+      it "should allow storing the option position" do
+        @optionable.set_option(@key, "foo", :position => 3)
+        @optionable.get_option(@key).position.should == 3
+      end
+      
       it "should not update the option if it already matches current" do
         @optionable.set_option(@key, "red", "color")
         timestamp = @optionable.get_option(@key).updated_at.dup
@@ -329,7 +344,7 @@ describe "ActsAsOptionable" do
   
   describe "getting options and defaults as a hash" do
     before(:each) do
-      @optionable.set_option("example_option", "example_value", :kind => "example", :display_name => "Example Name", :category => "tabs")
+      @optionable.set_option("example_option", "example_value", :kind => "example", :display_name => "Example Name", :category => "tabs", :position => 99)
       @options_and_defaults_hash = @optionable.options_and_defaults_hash
     end
     
@@ -355,6 +370,10 @@ describe "ActsAsOptionable" do
       @options_and_defaults_hash["example_option"]["category"].should == "tabs"
     end
     
+    it "should include the position" do
+      @options_and_defaults_hash["example_option"]["position"].should == 99
+    end
+    
     it "should include the display name" do
       @options_and_defaults_hash["example_option"]["display_name"].should == "Example Name"
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Brendon Murphy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-06 00:00:00 -07:00
+date: 2010-05-17 00:00:00 -07:00
 default_executable: 
 dependencies: []