selection_options_for 0.0.6 → 0.0.7

data/lib/selection_options_for/model_additions.rb

@@ -35,7 +35,7 @@ module SelectionOptionsFor
         end          
         case label.size
         when 2
-          letter, display_text = label[1].first,  label[1]
+          raise "Invalid number of items. 2 part definition is no longer supported.  Add the middle value for storage in the DB."
         when 3
           letter, display_text = label[1], label[2]
         else

data/lib/selection_options_for/version.rb

@@ -1,3 +1,3 @@
 module SelectionOptionsFor
-  VERSION = "0.0.6"  unless defined? SelectionOptionsFor::VERSION
+  VERSION = "0.0.7"  unless defined? SelectionOptionsFor::VERSION
 end

data/test/selection_options_for_ex_test.rb

@@ -1,4 +1,4 @@
-## ruby -Itest test/selection_options_for_ex_test.rb
+## ruby -Itest -Ilib test/selection_options_for_ex_test.rb
 require 'test_helper'
 
 #
@@ -6,26 +6,26 @@ require 'test_helper'
 #
 
 class ModelUnderTest < SuperModel::Base
-  extend ModelAdditions
+  extend SelectionOptionsFor::ModelAdditions
     
   begin  
     selection_options_for :price_option,
-            [:basic,  'Basic' ],
-            [:cash,   'Cash Account '],
-            [:cc, 'R','Credit Card Account'],
+            [:basic,  'B', 'Basic' ],
+            [:cash,   'C', 'Cash Account '],
+            [:cc,     'R','Credit Card Account'],
             123            
             
   rescue RuntimeError => ex
     @@exception_num = ex
   end
 
-   def self.exception_num
-     @@exception_num
-   end
+  def self.exception_num
+    @@exception_num
+  end
 
   begin  
     selection_options_for :status_option,
-            [:basic,  'Basic' ],
+            [:basic,  'B', 'Basic' ],
             'Cash Account',
             [:cc, 'R','Credit Card Account']
             
@@ -33,10 +33,22 @@ class ModelUnderTest < SuperModel::Base
     @@exception_string = ex
   end
 
-   def self.exception_string
-     @@exception_string
-   end
+  def self.exception_string
+    @@exception_string
+  end
 
+  begin  
+    selection_options_for :gender_option,
+            [:male,     'B', 'Male' ],
+            [:female,   'Female'],
+            [:unknown,  'U', 'unknown' ]            
+  rescue RuntimeError => ex
+    @@exception_deprecated = ex
+  end
+
+  def self.exception_deprecated
+    @@exception_deprecated
+  end
 
 end
 
@@ -57,5 +69,11 @@ class TranslateOptionsForExTest < Test::Unit::TestCase
                   ModelUnderTest.exception_string.message
   end
 
+  def test_deprecated_format
+    assert_equal RuntimeError, ModelUnderTest.exception_deprecated.class
+    assert_equal "Invalid number of items. 2 part definition is no longer supported.  Add the middle value for storage in the DB.",
+                  ModelUnderTest.exception_deprecated.message
+  end
+
 
 end

data/test/selection_options_for_test.rb

@@ -1,4 +1,4 @@
-## ruby -Itest test/selection_options_for_test.rb
+## ruby -Itest -Ilib test/selection_options_for_test.rb
 require 'test_helper'
 
 #
@@ -10,23 +10,23 @@ require 'test_helper'
 #
 
 class SiblingOfModelUnderTest < SuperModel::Base
-  extend ModelAdditions
+  extend SelectionOptionsFor::ModelAdditions
 end
 
 class ModelUnderTest < SuperModel::Base
-  extend ModelAdditions
+  extend SelectionOptionsFor::ModelAdditions
       
   selection_options_for :status_option,
-            [:partial,             'Partial Registration'],
-            [:active,              'Active'],
+            [:partial,        'P', 'Partial Registration'],
+            [:active,         'A', 'Active'],
             [:changing_email, 'E', 'Active, Changing Email'],  
-            [:inactive,            'Inactive'],
+            [:inactive,       'I',  'Inactive'],
             [:forgot_pw,      'F', 'Active, Forgot Password' ]
 
   selection_options_for :payment_method_option,
-            [:basic,    'Basic'],
-            [:cash,     'Cash Account'],
-            [:cc,   'R','Credit Card Account']
+            [:basic, 'B', 'Basic'],
+            [:cash,  'C',  'Cash Account'],
+            [:cc,    'R', 'Credit Card Account']
             
   selection_options_for :sorted_option,
             [:none,         'H', 'Honorary Member'],
@@ -39,8 +39,8 @@ class ModelUnderTest < SuperModel::Base
 
 class SubClassOfModel < ModelUnderTest
   selection_options_for :payment_method_option,
-            [:advanced, 'Advanced'],
-            [:ecash,    'ECash Account']
+            [:advanced, 'A', 'Advanced'],
+            [:ecash,    'E', 'ECash Account']
 end
 
 class SelectionOptionsForTest < Test::Unit::TestCase
@@ -49,7 +49,7 @@ class SelectionOptionsForTest < Test::Unit::TestCase
   end  
 
   def test_should_provide_symbols
-    expected = {"Basic"=>:basic, "Cash Account"=>:cash, "R"=>:cc}
+    expected = {"B"=>:basic, "C"=>:cash, "R"=>:cc}
     assert_equal expected, ModelUnderTest.payment_method_option_symbols
   end
 
@@ -94,40 +94,35 @@ class SelectionOptionsForTest < Test::Unit::TestCase
         flunk "wrong exception thrown"
   end
 
-  def test_each_subclass_has_own_symbols
-    
-    assert_equal [["Advanced", "Advanced"], ["ECash Account", "ECash Account"]].sort ,
+  def test_each_subclass_has_own_symbols    
+    assert_equal [["Advanced", "A"], ["ECash Account", "E"]] ,
                   SubClassOfModel.payment_method_options.sort 
   end
 
   def test_payment_method_option_array
-    
-    assert_equal [["Basic", "Basic"],
-                  ["Cash Account", "Cash Account"],
-                  ["Credit Card Account", "R"]].sort ,  
-                @model.payment_method_options.sort 
+    assert_equal [["Basic", "B"], ["Cash Account", "C"], ["Credit Card Account", "R"]],
+                  @model.payment_method_options.sort 
   end
 
   def test_default_status
     target =  @model.new
     target.status_option_forgot_pw!
     assert_equal 'Active, Forgot Password', target.status_option_label
-    target.status_option = 'Active'
+    target.status_option = 'A'
     assert_equal 'Active', target.status_option_label
   end
 
-  def test_status_option_array
-    
-    assert_equal [["Active", "Active"],
+  def test_status_option_array    
+    assert_equal [["Active", 'A'],
      ["Active, Changing Email", "E"],
      ["Active, Forgot Password", "F"],
-     ["Inactive", "Inactive"],
-     ["Partial Registration", "Partial Registration"]].sort ,  
+     ["Inactive", "I"],
+     ["Partial Registration", 'P']].sort ,  
      @model.status_options.sort    
   end
 
   def test_default_payment_method_option_hash
-    expected = {"Cash Account"=>"Cash Account", "R"=>"Credit Card Account", "Basic"=>"Basic"}
+    expected = {"B"=>"Basic", "C"=>"Cash Account", "R"=>"Credit Card Account"}
     assert_equal expected, @model.payment_method_option_hash
   end
   

metadata

@@ -1,60 +1,62 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: selection_options_for
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 0.0.7
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 6
-  version: 0.0.6
 platform: ruby
-authors: 
+authors:
 - Mark Windholtz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: supermodel
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-description: "\n   This code allows you to keep the display labels in the model \n   when the DB holds only a 1 character flag.\n   and when the code requires symbolic references to the value to use in algorithms\n   \n   element 0 of the array passed in is always the logical symbol\n   If a 2-element Array is passed in, [key, label] and the first letter of label is the DB value\n   If a 3-element Array is passed in, [key, DB value, label] \n   Any other type passed in throws an error\n   \n   Limitations: Don't use this if you will run reports directly against the DB \n   In that case, the reports will not have access to the display labels    \n  "
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! "\n   This code allows you to keep the display labels in the model
+  \n   when the DB holds only a 1 character flag.\n   and when the code requires symbolic
+  references to the value to use in algorithms\n   \n   element 0 of the array passed
+  in is always the logical symbol\n   If a 2-element Array is passed in, [key, label]
+  and the first letter of label is the DB value\n   If a 3-element Array is passed
+  in, [key, DB value, label] \n   Any other type passed in throws an error\n   \n
+  \  Limitations: Don't use this if you will run reports directly against the DB \n
+  \  In that case, the reports will not have access to the display labels    \n  "
+email:
 - mark@agiledna.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .DS_Store
 - CHANGELOG.md
 - Gemfile
@@ -66,45 +68,37 @@ files:
 - lib/selection_options_for/railtie.rb
 - lib/selection_options_for/version.rb
 - pkg/selection_options_for-0.0.5.gem
+- pkg/selection_options_for-0.0.6.gem
+- pkg/selection_options_for-0.0.7.gem
 - selection_options_for.gemspec
 - test/selection_options_for_ex_test.rb
 - test/selection_options_for_test.rb
 - test/test_helper.rb
 homepage: https://github.com/mwindholtz/selection_options_for
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Display labels and symbolic references
-test_files: 
+test_files:
 - test/selection_options_for_ex_test.rb
 - test/selection_options_for_test.rb
 - test/test_helper.rb
-has_rdoc: