slide_rule 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15b535d71c03e3343c521cd0558bdff9c398bb9d
-  data.tar.gz: b520ab84e2f9dccfda40499ea471abcdf4f8ac2b
+  metadata.gz: 7118aaafe84fdcdf36f2186bfe731f935576e2d2
+  data.tar.gz: e2aa86ba48acbaea385c76ee188e15795ce6fb7d
 SHA512:
-  metadata.gz: 960910993780635fb5c8be9a347a8d2d8932a1a70255af019cb30bba25181ca5e0905f25ff1c1fe4e7c701c49f0204c447229a4365188e0e2fd158abcf0c4b4d
-  data.tar.gz: 883bdb53e7575cd4ce3b2d24fa89fe05bb97898573b5351f239ec52d803a6dfcabe7f250e61b3f37753ecc31b61c2c2fc32bb07663ec87f07a58e78e38a18c8c
+  metadata.gz: f3892833589520f1ad3bbcfe83d1c4c18240cedc522ce45101d34a28cb7ba4e4ccb611f38e49a08cfba839b3ce750e63146d2286eea9d534b14554dcbed5deea
+  data.tar.gz: 1d01a8617ac75abf8ef2d388472f243bb695924c0492ffbf358d4323d6b1b2c8af113dacd1ab92222ae036d7cc43871367f8c09bc6281cc1ca2e6b706434bc88

data/lib/slide_rule/distance_calculator.rb

@@ -81,7 +81,11 @@ module SlideRule
       return calculator.new if calculator.is_a?(Class)
 
       klass_name = "#{calculator.to_s.split('_').collect(&:capitalize).join}"
-      klass = ::SlideRule::DistanceCalculators.const_get(klass_name)
+      klass = begin
+        ::SlideRule::DistanceCalculators.const_get(klass_name)
+      rescue(::NameError)
+        nil
+      end
 
       fail ArgumentError, "Unable to find calculator #{klass_name}" if klass.nil?
 
@@ -106,19 +110,30 @@ module SlideRule
       end
     end
 
+    # Prepares a duplicate of given rules hash with normalized weights and calculator instances
+    #
     def prepare_rules(rules)
-      prepared_rules = rules.dup
-      prepared_rules = normalize_weights(prepared_rules)
-      prepared_rules.each do |_attr, rule|
+      prepared_rules = rules.each_with_object({}) do |(attribute, rule), copy|
+        rule = copy[attribute] = safe_dup(rule)
+
         if rule[:type]
           puts 'Rule key `:type` is deprecated. Use `:calculator` instead.'
           rule[:calculator] = rule[:type]
         end
 
         rule[:calculator] = get_calculator(rule[:calculator])
+
+        copy
       end
+      prepared_rules = normalize_weights(prepared_rules)
 
       prepared_rules
     end
+
+    def safe_dup(obj)
+      obj.dup
+    rescue
+      obj
+    end
   end
 end

data/lib/slide_rule/version.rb

@@ -1,3 +1,3 @@
 module SlideRule
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/spec/slide_rule/distance_calculator_spec.rb

@@ -147,25 +147,49 @@ describe ::SlideRule::DistanceCalculator do
       end
     end
 
-    context 'validates rules on initialize' do
-      it 'should allow :type' do
-        ::SlideRule::DistanceCalculator.new(
-          description: {
-            weight: 1.00,
-            type: CustomCalc
-          }
-        )
-      end
-
-      it 'should raise error if not valid calculator' do
-        expect do
+    describe '#initialize' do
+      context 'validates rules on initialize' do
+        it 'should allow :type' do
           ::SlideRule::DistanceCalculator.new(
             description: {
               weight: 1.00,
-              calculator: :some_junk
+              type: CustomCalc
             }
           )
-        end.to raise_error
+        end
+
+        it 'should not modify input rule hash' do
+          rules = {
+            description: {
+              weight: 1.0,
+              calculator: CustomCalc
+            },
+            name: {
+              weight: 1.0,
+              type: CustomCalc
+            }
+          }
+          ::SlideRule::DistanceCalculator.new(rules)
+          # Run a second time to ensure that no calculator instance is in rules. Will currently throw an error.
+          ::SlideRule::DistanceCalculator.new(rules)
+
+          # :type should still be in original hash
+          expect(rules[:name].key?(:calculator)).to eq(false)
+
+          # :weight should not be normalized in original hash
+          expect(rules[:name][:weight]).to eq(1.0)
+        end
+
+        it 'should raise error if not valid calculator' do
+          expect do
+            ::SlideRule::DistanceCalculator.new(
+              description: {
+                weight: 1.00,
+                calculator: :some_junk
+              }
+            )
+          end.to raise_error(::ArgumentError, 'Unable to find calculator SomeJunk')
+        end
       end
     end
   end

data/spec/slide_rule/distance_calculators/levenshtein_spec.rb

@@ -1,11 +1,19 @@
 require 'spec_helper'
 
 describe ::SlideRule::DistanceCalculators::Levenshtein do
+  let(:subject) { described_class.new }
+
   it 'should calculate perfect match' do
-    expect(described_class.new.calculate('this is a test', 'this is a test')).to eq(0.0)
+    expect(subject.calculate('this is a test', 'this is a test')).to eq(0.0)
   end
 
   it 'should calculate distance as distance divided by length of longest string' do
-    expect(described_class.new.calculate('this is a test', 'this is a test!').round(4)).to eq((1.0 / 15).round(4))
+    expect(subject.calculate('this is a test', 'this is a test!').round(4)).to eq((1.0 / 15).round(4))
+  end
+
+  it 'should handle nils' do
+    expect(subject.calculate(nil, nil)).to eq(0.0)
+    expect(subject.calculate(nil, 'goodbye')).to eq(1.0)
+    expect(subject.calculate('hello', nil)).to eq(1.0)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slide_rule
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - mattnichols
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vladlev