slide_rule 0.2.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad1a7e41a1a14345029655bb3ede3e7c274fc885
-  data.tar.gz: f164640543e98e706e5067abca94133350abe771
+  metadata.gz: 66f0ba46303354b7b468dcc13103acffe6e53b65
+  data.tar.gz: 92334c787512fe9b2b6b3b7406d7709d6de27c16
 SHA512:
-  metadata.gz: 29f83acc7009c6473696870459120a1348074d960d7e053191153dd539c2d428545111a881f06838c84193765504b7855e79f8b703c45fb894fa1d65e4de260b
-  data.tar.gz: ae9223f7203d59dd3f8e511c06579c93c8c520b5c7f184bddb7ae4eb991e1f40d13c3e6c88d59b8ca45ae7f1eb7fe344064d0c1262c48e2553d2c7202ccbf82b
+  metadata.gz: 85b76abcb7b43301d8a16a5200e69ba2a9f734dac717e983e930da2fdc258261a61936481672bdf2f9523f0270254fb5e81010c0d8a764151f8a1f9525e713fa
+  data.tar.gz: 29f0fa854708b4abb50c5ba563abf9334f6a3b410fa4bea7d85f320ac86d9ddaa12b1ab0ac22481cf0537bfc3ccea8b480af64c37d273aeb70ed0a306a0b3903

data/lib/slide_rule/distance_calculator.rb

@@ -58,6 +58,7 @@ module SlideRule
     #   :attribute_name => {
     #     :weight => 0.90,
     #     :calculator => :distance_calculator,
+    #     :threshold => 30
     #   }
     # }
     def calculate_distance(i1, i2)
@@ -69,11 +70,11 @@ module SlideRule
     private
 
     def calculate_weighted_distances(i1, i2)
-      distances = @rules.map do |attribute, rule|
+      distances = @rules.map do |attribute, options|
         val1 = i1.send(attribute)
         val2 = i2.send(attribute)
-        distance = rule[:calculator].calculate(val1, val2)
-        next { distance: distance.to_f, weight: rule[:weight] } unless distance.nil?
+        distance = options[:calculator].calculate(val1, val2, options)
+        next { distance: distance.to_f, weight: options[:weight] } unless distance.nil?
 
         nil
       end

data/lib/slide_rule/distance_calculators/day_of_month.rb

@@ -7,7 +7,7 @@ module SlideRule
       # Calculates distance using 15 as the max point.
       #   Does not take into account the number of days in the actual month being considered.
       #
-      def calculate(first, second)
+      def calculate(first, second, options={})
         return nil if first.nil? || second.nil?
         first = cleanse_date(first)
         second = cleanse_date(second)

data/lib/slide_rule/distance_calculators/day_of_year.rb

@@ -3,15 +3,15 @@ module SlideRule
     class DayOfYear
       DAYS_IN_YEAR = 365
 
-      def calculate(date_1, date_2)
+      def calculate(date_1, date_2, options={})
         date_1 = cleanse_date(date_1)
         date_2 = cleanse_date(date_2)
-
+        threshold = options[:threshold] || DAYS_IN_YEAR
         days_apart = (date_1.mjd - date_2.mjd).abs
+        
+        return 1 if days_apart >= threshold
 
-        return 1 if days_apart >= DAYS_IN_YEAR
-
-        distance = days_apart.to_f / DAYS_IN_YEAR
+        distance = days_apart.to_f / threshold
         distance.round(2)
       end
 

data/lib/slide_rule/distance_calculators/levenshtein.rb

@@ -1,7 +1,7 @@
 module SlideRule
   module DistanceCalculators
     class Levenshtein
-      def calculate(first, second)
+      def calculate(first, second, options={})
         ::Vladlev.get_normalized_distance(first, second).to_f
 
         # Lower bound is difference in length

data/lib/slide_rule/version.rb

@@ -1,3 +1,3 @@
 module SlideRule
-  VERSION = '0.2.2'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/slide_rule.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version       = ::SlideRule::VERSION
   s.authors       = %w(mattnichols fergmastaflex)
   s.email         = ['dev@mx.com']
-  s.homepage      = 'https://github.com/mattnichols/slide_rule'
+  s.homepage      = 'https://github.com/mxenabled/slide_rule'
   s.summary       = 'Ruby object distance calculator'
   s.description   = 'Calculates the distance between 2 arbitrary objects using specified fields and algorithms.'
   s.license       = 'MIT'

data/spec/slide_rule/distance_calculator_spec.rb

@@ -14,13 +14,13 @@ describe ::SlideRule::DistanceCalculator do
   end
 
   class CustomCalc
-    def calculate(_first, _second)
+    def calculate(_first, _second, _options)
       0.9
     end
   end
 
   class NilCalc
-    def calculate(_first, _second)
+    def calculate(_first, _second, _options)
       nil
     end
   end

data/spec/slide_rule/distance_calculators/day_of_year_spec.rb

@@ -22,4 +22,17 @@ describe ::SlideRule::DistanceCalculators::DayOfYear do
       expect(described_class.new.calculate('2015-10-8', '2015-11-8')).to eq(0.08)
     end
   end
+
+  context 'when there is a threshold' do
+     it 'should return a 1 distance when there are too many days apart' do
+      expect(described_class.new.calculate('2016-02-03', '2016-03-09', :threshold => 30)).to eq(1)
+     end
+
+     it 'should return a more sane number' do
+      result_with_threshold = described_class.new.calculate('2016-02-03', '2016-02-10', :threshold => 30)
+      result_without_threshold = described_class.new.calculate('2016-02-03', '2016-02-10')
+      
+      expect(result_with_threshold).to be > result_without_threshold
+     end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slide_rule
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 1.0.0
 platform: ruby
 authors:
 - mattnichols
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ files:
 - spec/slide_rule/distance_calculators/day_of_year_spec.rb
 - spec/slide_rule/distance_calculators/levenshtein_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/mattnichols/slide_rule
+homepage: https://github.com/mxenabled/slide_rule
 licenses:
 - MIT
 metadata: {}