ns-options 0.1.1 → 0.2.0

data/test/unit/ns-options/option_test.rb

@@ -27,6 +27,10 @@ class NsOptions::Option
     should "return true with a call to #required?" do
       assert_equal true, subject.required?
     end
+    should "allow setting the value to nil" do
+      subject.value = nil
+      assert_nil subject.value
+    end
   end
 
   class IsSetTest < BaseTest
@@ -40,22 +44,28 @@ class NsOptions::Option
 
       end
       @special = NsOptions::Option.new(:no_blank, @type_class)
+
+      @boolean = NsOptions::Option.new(:boolean, NsOptions::Boolean)
     end
 
-    should "return true/false appropriately for a boolean option with true or false" do
-      @option.value = true
-      assert_equal true, @option.is_set?
-      @option.value = false
+    should "return appropriately" do
+      @option.value = "abc"
       assert_equal true, @option.is_set?
       @option.value = nil
       assert_equal false, @option.is_set?
+      @boolean.value = true
+      assert_equal true, @boolean.is_set?
+      @boolean.value = false
+      assert_equal true, @boolean.is_set?
     end
-    should "return true/false based on type class's is_set method" do
+
+    should "use the type class's is_set method if available" do
       @special.value = "not blank"
       assert_equal true, @special.is_set?
       @special.value = " "
       assert_equal false, @special.is_set?
     end
+
   end
 
   class EqualityOperatorTest < BaseTest
@@ -101,30 +111,30 @@ class NsOptions::Option
     end
   end
 
-  class WithTypeClassFixnumTest < BaseTest
-    desc "with the Fixnum as a type class (happens through dynamic writers)"
+  class WithSymbolTypeClasstest < BaseTest
+    desc "with a Symbol as a type class"
     setup do
-      @option = NsOptions::Option.new(:something, Fixnum)
+      @option = NsOptions::Option.new(:something, Symbol)
     end
-    subject{ @option }
 
-    should "have used Integer for it's type class" do
-      assert_equal Integer, subject.type_class
-    end
-    should "allow setting it's value with an integer" do
-      new_value = 1
-      subject.value = new_value
-      assert_equal new_value, subject.value
-    end
-    should "allow setting it's value with a float and convert it" do
-      new_value = 12.5
-      subject.value = new_value
-      assert_equal new_value.to_i, subject.value
+    should "allow setting it with any object that responds to #to_sym" do
+      value = "amazing"
+      subject.value = value
+      assert_equal value.to_sym, subject.value
+      value = :another
+      subject.value = value
+      assert_equal value, subject.value
+      object_class = Class.new do
+        def to_sym; :object_sym; end
+      end
+      value = object_class.new
+      subject.value = value
+      assert_equal object_class.new.to_sym, subject.value
     end
-    should "allow setting it's value with a string and convert it" do
-      new_value = "13"
-      subject.value = new_value
-      assert_equal new_value.to_i, subject.value
+    should "error on anything that doesn't define #to_sym" do
+      assert_raises(NoMethodError) do
+        subject.value = true
+      end
     end
   end
 
@@ -156,26 +166,6 @@ class NsOptions::Option
     end
   end
 
-  class WithTrueFalseClassTest < BaseTest
-    desc "with a TrueClass/FalseClass as a type class (happens with dynamic writers)"
-    setup do
-      @true_option = NsOptions::Option.new(:something, TrueClass)
-      @true_option.value = true
-      @false_option = NsOptions::Option.new(:else, FalseClass)
-      @false_option.value = false
-    end
-    subject{ @true_option }
-
-    should "have used NsOptions::Option::Boolean for their type class" do
-      assert_equal NsOptions::Option::Boolean, @true_option.type_class
-      assert_equal NsOptions::Option::Boolean, @false_option.type_class
-    end
-    should "return the 'true' or 'false' value instead of the NsOptions::Option::Boolean object" do
-      assert_equal true, @true_option.value
-      assert_equal false, @false_option.value
-    end
-  end
-
   class WithoutTypeClassTest < BaseTest
     desc "without a type class provided"
     setup do
@@ -183,33 +173,33 @@ class NsOptions::Option
     end
     subject{ @option }
 
-    should "have default it to String" do
-      assert_equal String, subject.type_class
+    should "have default it to Object" do
+      assert_equal Object, subject.type_class
     end
   end
-  
+
   class WithAValueOfTheSameClassTest < BaseTest
     desc "with a value of the same class"
     setup do
       @class = Class.new
       @option = NsOptions::Option.new(:something, @class)
     end
-    
+
     should "use the object passed to it instead of creating a new one" do
       value = @class.new
       @option.value = value
       assert_same value, @option.value
     end
   end
-  
+
   class WithAValueKindOfTest < BaseTest
-    desc "with a value is a kind of the class"
+    desc "with a value that is a kind of the class"
     setup do
       @class = Class.new
       @child_class = Class.new(@class)
       @option = NsOptions::Option.new(:something, @class)
     end
-    
+
     should "use the object passed to it instead of creating a new one" do
       value = @child_class.new
       @option.value = value
@@ -217,4 +207,107 @@ class NsOptions::Option
     end
   end
 
+  class ProcHandlingTests < BaseTest
+    setup do
+      class KindOfProc < Proc; end
+      @a_string      = "a string"
+      @direct_proc   = Proc.new { "I can haz eval: #{@a_string}" }
+      @subclass_proc = KindOfProc.new { 12345 }
+      @direct_opt    = NsOptions::Option.new(:direct, Proc)
+      @subclass_opt  = NsOptions::Option.new(:subclass, KindOfProc)
+    end
+
+  end
+
+  class WithProcTypeClassTests < ProcHandlingTests
+    desc "with Proc as a type class"
+    setup do
+      @direct_opt.value = @direct_proc
+      @subclass_opt.value = @subclass_proc
+    end
+
+    should "allow setting it with a proc" do
+      assert_kind_of Proc, @direct_opt.value
+      assert_kind_of KindOfProc, @subclass_opt.value
+      assert_equal @direct_proc, @direct_opt.value
+      assert_equal @subclass_proc, @subclass_opt.value
+    end
+
+  end
+
+  class WithLazyProcTests < ProcHandlingTests
+    desc "with a Proc value but no Proc-ancestor type class"
+    setup do
+      @string_opt = NsOptions::Option.new(:string, String)
+    end
+
+    should "set the Proc and coerce the Proc return val when read" do
+      @string_opt.value = @direct_proc
+      assert_kind_of String, @string_opt.value
+      assert_equal "I can haz eval: a string", @string_opt.value
+
+      @a_string = "a new string"
+      assert_equal "I can haz eval: a new string", @string_opt.value
+
+      @string_opt.value = @subclass_proc
+      assert_kind_of String, @string_opt.value
+      assert_equal "12345", @string_opt.value
+    end
+  end
+
+  class WithArgsTest < BaseTest
+    desc "with args rule"
+    setup do
+      @class = Class.new do
+        attr_accessor :args
+        def initialize(*args)
+          self.args = args
+        end
+      end
+      @value = "amazing"
+    end
+
+    class AsArrayTest < WithArgsTest
+      desc "as an array"
+      setup do
+        @args = [ true, false, { :hash => "yes" } ]
+        @option = NsOptions::Option.new(:something, @class, { :args => @args })
+        @option.value = @value
+      end
+
+      should "pass the args to the type class with the value" do
+        expected = @args.dup.insert(0, @value)
+        assert_equal expected, subject.value.args
+      end
+    end
+
+    class AsSingleValueTest < WithArgsTest
+      desc "as a single value"
+      setup do
+        @args = lambda{ "something" }
+        @option = NsOptions::Option.new(:something, @class, { :args => @args })
+        @option.value = @value
+      end
+
+      should "pass the single value to the type class with the value" do
+        expected = [*@args].insert(0, @value)
+        assert_equal expected, subject.value.args
+      end
+    end
+
+    class AsNilValueTest < WithArgsTest
+      desc "as a nil value"
+      setup do
+        @args = nil
+        @option = NsOptions::Option.new(:something, @class, { :args => @args })
+        @option.value = @value
+      end
+
+      should "just pass the value to the type class" do
+        expected = [@value]
+        assert_equal expected, subject.value.args
+      end
+    end
+  end
+
 end

data/test/unit/ns-options/options_test.rb

@@ -9,9 +9,9 @@ class NsOptions::Options
     end
     subject{ @options }
 
-    should have_accessors :key, :parent, :children
-    should have_instance_method :namespaces, :add, :del, :remove, :get, :set, :fetch, :is_defined?,
-      :parent_options
+    should have_accessors :key, :parent, :namespaces
+    should have_instance_method :add, :del, :remove, :get, :set, :fetch, :is_defined?,
+      :add_namespace, :get_namespace, :build_from
 
     should "be a kind of Hash" do
       assert_kind_of Hash, subject
@@ -31,7 +31,7 @@ class NsOptions::Options
       assert_nil subject.parent
     end
     should "return a kind of NsOption::Namespaces with a call to #children" do
-      assert_kind_of NsOptions::Namespaces, subject.children
+      assert_kind_of NsOptions::Namespaces, subject.namespaces
     end
   end
 
@@ -44,20 +44,20 @@ class NsOptions::Options
     end
     subject{ @options }
 
-    should "have added a string option on itself when adding :my_string" do
+    should "have added a object option on itself when adding :my_string" do
       assert(option = subject[:my_string])
-      assert_equal String, option.type_class
-      assert_equal({}, option.rules)
+      assert_equal Object, option.type_class
+      assert_equal({ :args => [] }, option.rules)
     end
     should "have added an integer option on itself when adding :my_integer" do
       assert(option = subject[:my_integer])
       assert_equal Integer, option.type_class
-      assert_equal({}, option.rules)
+      assert_equal({ :args => [] }, option.rules)
     end
     should "have added a float option on itself when adding :my_float" do
       assert(option = subject[:my_float])
       assert_equal Float, option.type_class
-      assert_equal({ :default => 1.0 }, option.rules)
+      assert_equal(1.0, option.rules[:default])
     end
   end
 
@@ -86,21 +86,6 @@ class NsOptions::Options
     should "have returned the option's value" do
       assert_equal @value, subject
     end
-
-    class WithParentTest < GetTest
-      desc "with a parent"
-      setup do
-        @parent = NsOptions::Namespace.new(:child)
-        @parent.options = @options
-        @options = NsOptions::Options.new(:child, @parent)
-        @result = @options.get(:my_string)
-      end
-      subject{ @result }
-
-      should "have returned the parent's option's value" do
-        assert_equal @value, subject
-      end
-    end
   end
 
   class SetTest < BaseTest
@@ -116,36 +101,6 @@ class NsOptions::Options
     end
   end
 
-  class FetchTest < BaseTest
-    desc "fetch method"
-    setup do
-      option = @options.add(:my_string)
-      @result = @options.fetch(:my_string)
-    end
-    subject{ @result }
-
-    should "return the option definition for my_string" do
-      assert_kind_of NsOptions::Option, subject
-      assert_equal "my_string", subject.name
-    end
-
-    class WithAParentTest < FetchTest
-      desc "with a parent"
-      setup do
-        @parent = NsOptions::Namespace.new(:child)
-        @parent.options = @options
-        @options = NsOptions::Options.new(:child, @parent)
-        @result = @options.fetch(:my_string)
-      end
-      subject{ @result }
-
-      should "return the option definition for my_string from it's parent" do
-        assert_kind_of NsOptions::Option, subject
-        assert_equal "my_string", subject.name
-      end
-    end
-  end
-
   class IsDefinedTest < BaseTest
     desc "fetch method"
     setup do
@@ -159,41 +114,6 @@ class NsOptions::Options
     should "return false for an undefined option" do
       assert_equal false, subject.is_defined?(:undefined)
     end
-
-    class WithAParentTest < IsDefinedTest
-      desc "with a parent"
-      setup do
-        @parent = NsOptions::Namespace.new(:child)
-        @parent.options = @options
-        @options = NsOptions::Options.new(:child, @parent)
-      end
-
-      should "return true for an option defined on it's parent" do
-        assert_equal true, subject.is_defined?(:my_string)
-      end
-    end
-  end
-
-  class ParentOptionsTest < BaseTest
-    desc "parent_options method"
-    subject{ @options }
-
-    should "return nil" do
-      assert_nil subject.parent_options
-    end
-
-    class WithAParentTest < ParentOptionsTest
-      desc "with a parent"
-      setup do
-        @parent = NsOptions::Namespace.new(:child)
-        @parent.options = @options
-        @options = NsOptions::Options.new(:child, @parent)
-      end
-
-      should "return it's parent's options" do
-        assert_equal @parent.options, subject.parent_options
-      end
-    end
   end
 
   class RequiredSetTest < BaseTest
@@ -223,5 +143,79 @@ class NsOptions::Options
       assert_equal true, subject.required_set?
     end
   end
+  
+  class WithNamespaceTest < BaseTest
+    setup do
+      @namespace = @options.add_namespace(:something, :something)
+    end
+  end
+
+  class AddNamespaceTest < WithNamespaceTest
+    desc "add_namespace method"
+    subject{ @options }
+
+    should "create a new namespace and add it to the options namespaces collection" do
+      assert_instance_of NsOptions::Namespace, @namespace
+      assert_equal @namespace, subject.namespaces[:something]
+    end
+  end
+
+  class GetNamespaceTest < WithNamespaceTest
+    desc "get_namespace method"
+    setup do
+      @got_namespace = @options.get_namespace(:something)
+    end
+    subject{ @got_namespace }
+
+    should "allow retrieving a namespace without having to access the namespaces directly" do
+      assert_equal @namespace, subject
+    end
+  end
+  
+  class IsNamespaceDefinedTest < WithNamespaceTest
+    desc "is_namespace_defined? method"
+    setup do
+      @has_something = @options.is_namespace_defined?(:something)
+      @has_nothing = @options.is_namespace_defined?(:nothing)
+    end
+
+    should "return a boolean of whether or not the namespace is defined" do
+      assert_equal true, @has_something
+      assert_equal false, @has_nothing
+    end
+  end
+
+  class BuildFromTest < BaseTest
+    desc "build_from method"
+    setup do
+      @namespace = NsOptions::Namespace.new("something")
+      @from = NsOptions::Options.new(:something)
+      @from.add(:root)
+      @from.add_namespace(:else) do
+        option :stage
+      end
+      @options = @namespace.options
+      @options.build_from(@from, @namespace)
+    end
+    subject{ @options }
+
+    should "have copied the options" do
+      @from.each do |key, from_option|
+        option = subject[key]
+        assert_equal from_option.name, option.name
+        assert_equal from_option.type_class, option.type_class
+        assert_equal from_option.rules, option.rules
+        assert_not_same from_option, option
+      end
+    end
+    should "have copied the namespaces" do
+      @from.namespaces.each do |name, from_namespace|
+        namespace = subject.get_namespace(name)
+        assert_equal from_namespace.options.key, namespace.options.key
+        assert_equal from_namespace.options.parent, namespace.options.parent
+        assert_not_same from_namespace, namespace
+      end
+    end
+  end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ns-options
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Collin Redding
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-26 00:00:00 Z
+date: 2011-11-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -25,11 +25,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 0
-        - 6
-        version: "0.6"
+        - 7
+        version: "0.7"
   version_requirements: *id001
   name: assert
 - !ruby/object:Gem::Dependency 
@@ -62,25 +62,30 @@ files:
 - README.markdown
 - Rakefile
 - lib/ns-options.rb
+- lib/ns-options/boolean.rb
+- lib/ns-options/errors/invalid_name.rb
 - lib/ns-options/has_options.rb
 - lib/ns-options/helper.rb
+- lib/ns-options/helper/advisor.rb
 - lib/ns-options/namespace.rb
 - lib/ns-options/namespaces.rb
 - lib/ns-options/option.rb
-- lib/ns-options/option/boolean.rb
 - lib/ns-options/options.rb
 - lib/ns-options/version.rb
+- log/.gitkeep
 - ns-options.gemspec
 - test/helper.rb
 - test/integration/app_test.rb
 - test/integration/user_test.rb
+- test/irb.rb
 - test/support/app.rb
 - test/support/user.rb
+- test/unit/ns-options/boolean_test.rb
 - test/unit/ns-options/has_options_test.rb
+- test/unit/ns-options/helper/advisor_test.rb
 - test/unit/ns-options/helper_test.rb
 - test/unit/ns-options/namespace_test.rb
 - test/unit/ns-options/namespaces_test.rb
-- test/unit/ns-options/option/boolean_test.rb
 - test/unit/ns-options/option_test.rb
 - test/unit/ns-options/options_test.rb
 homepage: 
@@ -120,12 +125,14 @@ test_files:
 - test/helper.rb
 - test/integration/app_test.rb
 - test/integration/user_test.rb
+- test/irb.rb
 - test/support/app.rb
 - test/support/user.rb
+- test/unit/ns-options/boolean_test.rb
 - test/unit/ns-options/has_options_test.rb
+- test/unit/ns-options/helper/advisor_test.rb
 - test/unit/ns-options/helper_test.rb
 - test/unit/ns-options/namespace_test.rb
 - test/unit/ns-options/namespaces_test.rb
-- test/unit/ns-options/option/boolean_test.rb
 - test/unit/ns-options/option_test.rb
 - test/unit/ns-options/options_test.rb

data/lib/ns-options/option/boolean.rb

@@ -1,27 +0,0 @@
-module NsOptions
-  class Option
-
-    class Boolean
-      attr_accessor :actual
-
-      def initialize(value)
-        self.actual = value
-      end
-
-      def actual=(new_value)
-        @actual = self.convert(new_value)
-      end
-
-      protected
-
-      def convert(value)
-        if [ nil, 0, '0', false, 'false' ].include?(value)
-          false
-        elsif value
-          true
-        end
-      end
-    end
-
-  end
-end