awesome-cheeba 1.0.2 → 1.0.3

data/cheeba.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cheeba}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["So Awesome Man"]

data/lib/cheeba/defaults.rb

@@ -6,6 +6,9 @@ module Cheeba
     SYMBOLIZE       = false
     SYMBOLIZE_KEYS  = false
     SYMBOLIZE_VALS  = false
+    SYM_STR         = false
+    SYM_STR_KEYS    = false
+    SYM_STR_VALS    = false
     AUTO_SYM        = true
     AUTO_SYM_KEYS   = false
     AUTO_SYM_VALS   = false
@@ -37,6 +40,9 @@ module Cheeba
         "strip"          => "strip keys & vals: \" both \" => \"both\"",
         "strip_keys"     => "strip keys: \" key \" => \"key\"",
         "strip_vals"     => "strip vals: \" val \" => \"val\"",
+        "sym_str"        => "conv str (no int) k & v: \"b\" => :b",
+        "sym_str_keys"   => "conv string keys(no int): \"key\" => :key",
+        "sym_str_vals"   => "conv string vals(no int): \"val\" => :val",
         "symbolize"      => "force conv keys & vals: \"both\" => :both",
         "symbolize_keys" => "force conv keys: \"key\" => :key",
         "symbolize_vals" => "force conv vals: \"val\" => :val",
@@ -50,6 +56,9 @@ module Cheeba
         :symbolize      => SYMBOLIZE, 
         :symbolize_keys => SYMBOLIZE_KEYS, 
         :symbolize_vals => SYMBOLIZE_VALS, 
+        :sym_str        => SYM_STR,
+        :sym_str_keys   => SYM_STR_KEYS,
+        :sym_str_vals   => SYM_STR_VALS, 
         :auto_sym       => AUTO_SYM,
         :auto_sym_keys  => AUTO_SYM_KEYS,
         :auto_sym_vals  => AUTO_SYM_VALS,

data/lib/cheeba/reader/format.rb

@@ -1,7 +1,7 @@
 module Cheeba
   module Reader
     module Format
-      ##
+      #
       # format datatypes in the parsed hash
       #
       def self.format(phs)
@@ -16,7 +16,7 @@ module Cheeba
         phs
       end
       
-      ##     
+      #     
       # strips keys and values     
       #     
       def self.stripper(phs)
@@ -27,7 +27,7 @@ module Cheeba
         phs[:val] = phs[:val].to_s.strip if psp or psv
       end
          
-      ##     
+      #     
       # adjusts options
       #     
       def self.adjust_options(phs)
@@ -37,7 +37,7 @@ module Cheeba
         end
       end
 
-      ##
+      #
       # true key
       #
       def self.key_to_true(phs)
@@ -52,7 +52,7 @@ module Cheeba
         end
       end
       
-      ##
+      #
       # true val
       #
       def self.val_to_true(phs)
@@ -67,31 +67,35 @@ module Cheeba
         end
       end
       
-      ##
+      #
       # symbolize key
       #
       def self.key_to_sym(phs)
-        x = []
         is_str = (phs[:key] =~ /^\d*$/).nil?
+        x = []
+        x << (phs[:opt][:sym_str] && is_str).is_a?(TrueClass)
+        x << (phs[:opt][:sym_str_keys] && is_str).is_a?(TrueClass)
         x << phs[:opt][:symbolize].is_a?(TrueClass)
         x << (phs[:ask] && phs[:opt][:auto_sym_keys] && is_str).is_a?(TrueClass)
         x << phs[:opt][:symbolize_keys].is_a?(TrueClass)
-        phs[:key] = phs[:key].to_sym if x.any?
+        phs[:key] = phs[:key].to_s.to_sym if x.any?
       end
       
-      ##
+      #
       # symbolize val
       #
       def self.val_to_sym(phs)
-        x = []
         is_str = (phs[:val] =~ /^\d*$/).nil?
+        x = []
+        x << (phs[:opt][:sym_str] && is_str).is_a?(TrueClass)
+        x << (phs[:opt][:sym_str_vals] && is_str).is_a?(TrueClass)
         x << phs[:opt][:symbolize].is_a?(TrueClass)
         x << (phs[:asv] && phs[:opt][:auto_sym_vals] && is_str).is_a?(TrueClass)
         x << phs[:opt][:symbolize_vals].is_a?(TrueClass)
-        phs[:val] = phs[:val].to_sym if x.any? && !phs[:val].to_s.strip.empty?
+        phs[:val] = phs[:val].to_s.to_sym if (x.any? && !phs[:val].to_s.strip.empty?)
       end
 
-      ##
+      #
       # key is parsed as string, so try to_i
       #
       def self.key_to_int(phs)
@@ -101,7 +105,7 @@ module Cheeba
         phs[:key] = self.string_to_int(phs[:key]) if x.any?
       end
 
-      ##
+      #
       # val is parsed as string, so try to_i
       #
       def self.val_to_int(phs)
@@ -111,7 +115,7 @@ module Cheeba
         phs[:val] = self.string_to_int(phs[:val]) if x.any?
       end
       
-      ##
+      #
       # returns int if string is convertable
       #
       def self.string_to_int(string)

data/lib/cheeba/version.rb

@@ -1,3 +1,3 @@
 module Cheeba
-  VERSION  = '1.0.2'
+  VERSION  = '1.0.3'
 end

data/test/test_reader_format.rb

@@ -41,6 +41,92 @@ class TestReaderFormat < MiniTest::Unit::TestCase
     assert !phs2[:opt][:auto_sym_vals]
   end
 
+  def test_format_symbolize_keys_number_in_string
+    opt1 = @opt.merge({:symbolize_keys => true})
+    opt2 = @opt.merge({:int => true, :symbolize_keys => true})
+    phs1 = @phs.merge({:key => "1", :val => "1", :opt => opt1})
+    phs2 = @phs.merge({:key => "1", :val => "1", :opt => opt2})
+    act1 = @format.format(phs1)  
+    act2 = @format.format(phs2)  
+    exp1 = "1".to_sym
+    exp2 = "1".to_sym
+    assert_equal exp1, act1[:key]
+    assert_equal exp2, act2[:key]
+  end
+
+  def test_format_sym_str
+    opt1 = @opt.merge({:sym_str => true})
+    opt2 = @opt.merge({:int => true, :sym_str => true})
+    opt3 = opt1
+    phs1 = @phs.merge({:key => "1", :val => "1", :opt => opt1})
+    phs2 = @phs.merge({:key => "1", :val => "1", :opt => opt2})
+    phs3 = @phs.merge({:key => "awesome", :val => "awesome", :opt => opt3})
+    act1 = @format.format(phs1)  
+    act2 = @format.format(phs2)  
+    act3 = @format.format(phs3)  
+    exp1 = "1"
+    exp2 = 1
+    exp3 = "awesome".to_sym
+    exp4 = "1"
+    exp5 = 1
+    exp6 = "awesome".to_sym
+    assert_equal exp1, act1[:key]
+    assert_equal exp2, act2[:key]
+    assert_equal exp3, act3[:key]
+    assert_equal exp4, act1[:val]
+    assert_equal exp5, act2[:val]
+    assert_equal exp6, act3[:val]
+  end
+
+  def test_format_sym_str_keys
+    opt1 = @opt.merge({:sym_str_keys => true})
+    opt2 = @opt.merge({:int => true, :sym_str_keys => true})
+    opt3 = opt1
+    phs1 = @phs.merge({:key => "1", :val => "1", :opt => opt1})
+    phs2 = @phs.merge({:key => "1", :val => "1", :opt => opt2})
+    phs3 = @phs.merge({:key => "awesome", :val => "awesome", :opt => opt3})
+    act1 = @format.format(phs1)  
+    act2 = @format.format(phs2)  
+    act3 = @format.format(phs3)  
+    exp1 = "1"
+    exp2 = 1
+    exp3 = "awesome".to_sym
+    exp4 = "1"
+    exp5 = 1
+    exp6 = "awesome"
+    assert_equal exp1, act1[:key]
+    assert_equal exp2, act2[:key]
+    assert_equal exp3, act3[:key]
+    assert_equal exp4, act1[:val]
+    assert_equal exp5, act2[:val]
+    assert_equal exp6, act3[:val]
+  end
+
+  def test_format_sym_str_vals
+    opt1 = @opt.merge({:sym_str_vals => true})
+    opt2 = @opt.merge({:int => true, :sym_str_vals => true})
+    opt3 = opt1
+    opt1 = @opt.merge({:sym_str_vals => true})
+    phs1 = @phs.merge({:key => "1", :val => "1", :opt => opt1})
+    phs2 = @phs.merge({:key => "1", :val => "1", :opt => opt2})
+    phs3 = @phs.merge({:key => "awesome", :val => "awesome", :opt => opt3})
+    act1 = @format.format(phs1)  
+    act2 = @format.format(phs2)  
+    act3 = @format.format(phs3)  
+    exp1 = "1"
+    exp2 = 1
+    exp3 = "awesome"
+    exp4 = "1"
+    exp5 = 1
+    exp6 = "awesome".to_sym
+    assert_equal exp1, act1[:key]
+    assert_equal exp2, act2[:key]
+    assert_equal exp3, act3[:key]
+    assert_equal exp4, act1[:val]
+    assert_equal exp5, act2[:val]
+    assert_equal exp6, act3[:val]
+  end
+
   #
   # strip different things
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: awesome-cheeba
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - So Awesome Man