coded_options 1.0.0 → 1.0.1

data/coded_options.gemspec

@@ -19,6 +19,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_dependency "activesupport"
+  s.add_dependency "i18n"
+
   s.add_development_dependency "rspec", "~>2.0.0"
   s.add_development_dependency "rr"
 end

data/lib/coded_options/base.rb

@@ -13,7 +13,18 @@ module CodedOptions
   module ClassMethods
     def coded_options *args
       case args.length
-        when 1 then args.first.each {|name, values| setup_coded_options name, values }
+        when 1 then
+          hash = args.first
+          if (new_initial_value = hash.delete(:initial_value))
+            old_initial_value = CodedOptions.initial_value
+            CodedOptions.initial_value = new_initial_value
+
+            hash.each {|name, values| setup_coded_options name, values }
+
+            CodedOptions.initial_value = old_initial_value
+          else
+            hash.each {|name, values| setup_coded_options name, values }
+          end
         when 2 then setup_coded_options *args
         else raise("Error in coded_options syntax, expecting name and values or a hash, got #{args.inspect}")
       end
@@ -43,7 +54,8 @@ module CodedOptions
       if values.is_a? Hash
         values.sort{|a,b| a.first <=> b.first}.map{|a| a.reverse}
       else
-        values.zip((CodedOptions.initial_value..values.length).to_a)
+        ids = (CodedOptions.initial_value..(CodedOptions.initial_value + values.length)).to_a
+        values.zip(ids)
       end
     end
   end

data/lib/coded_options/version.rb

@@ -1,3 +1,3 @@
 module CodedOptions
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/coded_options_spec.rb

@@ -4,7 +4,7 @@ require "active_support/inflector"
 describe CodedOptions do
 
   describe "changing initial value" do
-    it "should use the initial value given" do
+    it "should use the initial value given when set manually" do
       CodedOptions.initial_value = 1
       CodedOptions.initial_value.should == 1
 
@@ -17,6 +17,19 @@ describe CodedOptions do
       Foo::STATE_OPTIONS.should == [["initial", 1], ["active", 2], ["closed", 3]]
       CodedOptions.initial_value = 0
     end
+
+    it "should use the initial value given when set via the hash" do
+      class Foo
+        include CodedOptions
+        attr_accessor :state_id
+        coded_options :state         => %w(initial active closed),
+                      :initial_value => 42
+        coded_options :bar => %w(quux rand)
+      end
+
+      Foo::STATE_OPTIONS.should == [["initial", 42], ["active", 43], ["closed", 44]]
+      Foo::BAR_OPTIONS.should == [["quux", 0], ["rand", 1]]
+    end
   end
 
   describe "allow setting the *_id field via the value" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: coded_options
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Jason Dew
@@ -19,9 +19,37 @@ date: 2011-03-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: i18n
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -33,11 +61,11 @@ dependencies:
         - 0
         version: 2.0.0
   type: :development
-  version_requirements: *id001
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rr
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -47,7 +75,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id002
+  version_requirements: *id004
 description: A gem for making fields with coded values easier
 email: 
 - jason.dew@gmail.com