bit_hash 0.1.0 → 0.1.1

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
-gem "to_insane", ">=0.2.1"
+gem "to_insane", ">=0.2.2"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do

data/Gemfile.lock

@@ -18,7 +18,7 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
     shoulda (2.11.3)
-    to_insane (0.2.1)
+    to_insane (0.2.2)
 
 PLATFORMS
   ruby
@@ -29,4 +29,4 @@ DEPENDENCIES
   rcov
   rspec
   shoulda
-  to_insane (>= 0.2.1)
+  to_insane (>= 0.2.2)

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bit_hash.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bit_hash}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Ong"]
@@ -44,14 +44,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<to_insane>, [">= 0.2.1"])
+      s.add_runtime_dependency(%q<to_insane>, [">= 0.2.2"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
     else
-      s.add_dependency(%q<to_insane>, [">= 0.2.1"])
+      s.add_dependency(%q<to_insane>, [">= 0.2.2"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -59,7 +59,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
-    s.add_dependency(%q<to_insane>, [">= 0.2.1"])
+    s.add_dependency(%q<to_insane>, [">= 0.2.2"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])

data/lib/bit_hash.rb

@@ -7,7 +7,11 @@ class BitHash
   # base is the base value you want to use. Defaults to a URL safe character base which is 63
   # character set can also be changed but not really necessary. read to_insane doc for more details
   def initialize(config_map=nil, *options)
-    load_options(options)
+    @options = {
+      :base     => :url_safe,
+      :char_set => nil,
+    }
+    @options = load_options(options)
     @config = Hash.new
     @default = Hash.new
     #validate mapping
@@ -144,10 +148,8 @@ class BitHash
   # takes a given config string and returns a mapped hash
   # please read to_insane doc for info on base and char_set
   def parse(config_string, *options)
-    load_options(options)
-    raise ArgumentError, "Prefix must be a string" if !@options[:prefix].nil? && !@options[:prefix].kind_of?(String)
-    config_string[0..@options[:prefix].size] = nil unless @options[:prefix].nil?
-    config_string = config_string.from_insane(@options[:base],@options[:char_set]).to_s(2)
+    options = load_options(options)
+    config_string = config_string.from_insane(options[:base],options[:char_set]).to_s(2)
     config_array = config_string.split('')
     new_config = @default.dup
     @config_map.each do |conf|
@@ -184,10 +186,9 @@ class BitHash
   # turns hash into a small compact string.
   # see to_insane rdoc for base, and char_set definitions
   def to_s(*options)
-    load_options(options)
+    options = load_options(options)
     str = ''
-    str << @options[:prefix] if @options[:prefix].kind_of? String
-    str << to_i.to_insane(@options[:base], @options[:char_set])
+    str << to_i.to_insane(options[:base], options[:char_set])
     str
   end
 
@@ -231,14 +232,14 @@ class BitHash
   end
   
   def load_options(options)
-    if options.kind_of? Array
-      @options = {:base => options[0], :char_set => options[1]}
-    elsif options.kind_of? Hash
-      @options = options
+    new_options = @options.dup
+    if options[0].kind_of? Hash
+      new_options.merge(options[0])
+    else
+      new_options[:base] = options[0] unless options[0].nil?
+      new_options[:char_set] = options[1] unless options[1].nil?
     end
-    @options[:base] ||= :url_safe
-    @options[:char_set] ||= nil
-    @options[:prefix] ||= nil
+    new_options
   end
 
   def get_check_config(key,conf)

data/spec/bit_hash_spec.rb

@@ -77,6 +77,10 @@ describe BitHash do
     @config.parse(@config.to_s).should eql(@config.to_hash)
   end
 
+  it "should have load same config" do
+    @config.parse(@config.to_s(20),20).should eql(@config.to_hash)
+  end
+
   it "should output equal it self after being converted and parsed" do
     str = @config.to_s
     bin = @config.to_bin

metadata

@@ -2,7 +2,7 @@
 name: bit_hash
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Ryan Ong
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.1
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -115,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 59358543
+      hash: 898955667
       segments: 
       - 0
       version: "0"