flirt_checker 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4c857655e99f960134e2b60deae89cddb09d6ef
-  data.tar.gz: fa221bde24dbc79db48342dc30a5320ee9969ac9
+  metadata.gz: 125c56f68d11fc1b98238b555287dffcf4a4d90d
+  data.tar.gz: 6be73395db0eb26e98c924e7c155fbe6eac300d3
 SHA512:
-  metadata.gz: d3a783702a0aa66f365357fcd545f46726cf7eb69834f4f7aea4fe011c8428e0048ce70deea53ca767303010af31a4da60577f15e14325810b576b452b28f217
-  data.tar.gz: 99940678f7ba0e2460eb75885435d3df0e06cdd19edf7e676bdd41a14b32c22916191f7f344cc767de19a5b8c0285b80a965e409889b1b5727a130c965ceaf02
+  metadata.gz: 8a311e572781a760668e39382dd142996e1ba73b1d10a9bb7e10927f86ba93e40d23c9f0babf4f7d6a0c315c03f493f4f09b078053bcc6c615fcd3429b452de0
+  data.tar.gz: 3fedb98e08cded5173e6f01d121e954ab7fe3cad816ecae261bf17ba111b253933237ebb30cebcd5c3951f41ba9fa482ce8b002a0d4d458c025a62f1110bd942

data/lib/flirt_checker/blood.rb

@@ -1,5 +1,16 @@
 module FlirtChecker
+
+  module Pheno
+    refine String do
+      def to_phenotype
+        self[-1] == "O" ? self[0] : self.squeeze
+      end
+    end
+  end
+
   class Blood
+    using Pheno
+
     BLOOD_GROUP = {
       a: ["A","A","A","O"],
       b: ["B","B","B","O"],
@@ -15,31 +26,34 @@ module FlirtChecker
       @genotype = genotype
     end
 
+    def male
+      @male.downcase.to_sym
+    end
+
+    def female
+      @female.downcase.to_sym
+    end
+
     def combo
-      valid_blood_type?
-      collection = BLOOD_GROUP[@male].product(BLOOD_GROUP[@female]).map {|e|
-        e.sort.join
-      }.uniq
-      #phenotype
-      collection.map! { |e| to_phenotype(e) } unless @genotype
-      collection
+      combo_with_rate.keys
     end
 
     def combo_with_rate
-      valid_blood_type?
-      array = BLOOD_GROUP[@male].product(BLOOD_GROUP[@female]).map { |e| e.sort.join }
-      hash = array.reduce(Hash.new(0)) { |h,v| h[@genotype ? v : to_phenotype(v)] += 1; h }
-      hash.each_with_object({}) { |(k,v), h| h[k] = v.to_f / array.size.to_f }
+      c = combination
+      hash = c.reduce(Hash.new(0)){ |h,v| h[@genotype ? v : v.to_phenotype] += 1; h }
+      hash.each_with_object({}) { |(k,v), h| h[k] = v.to_f / c.size }
     end
 
-    private
+  private
 
-    def to_phenotype(string)
-      string[-1] == "O" ? string[0] : string
+    def combination
+      #parameterize
+      valid_blood_type?
+      BLOOD_GROUP[male].product(BLOOD_GROUP[female]).map { |e| e.sort.join }
     end
 
     def valid_blood_type?
-      raise ArgumentError, "Invalid Blood Type" unless BLOOD_GROUP.key?(@male) && BLOOD_GROUP.key?(@female)
+      raise ArgumentError, "Invalid Blood Type" unless BLOOD_GROUP.key?(male) && BLOOD_GROUP.key?(female)
     end
   end
 end

data/lib/flirt_checker/version.rb

@@ -1,3 +1,3 @@
 module FlirtChecker
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/flirt_checker_spec.rb

@@ -11,6 +11,12 @@ describe FlirtChecker do
     expect(blood.combo).to eql(expected)
   end
 
+  it 'returns a uniq combination in phenotype' do
+    expected = ["A", "O"]
+    blood = FlirtChecker.new(:a,:a)
+    expect(blood.combo).to eql(expected)
+  end
+
   it 'returns a combination in genotype' do
     expected = ["AB", "AO", "BO", "OO"]
     blood = FlirtChecker.new(:a, :b, genotype: true)
@@ -19,7 +25,7 @@ describe FlirtChecker do
 
   it 'returns a combination with rate in phenotype' do
     expected = {"AB"=>0.5625, "A"=>0.1875, "B"=>0.1875, "O"=>0.0625}
-    blood = FlirtChecker.new(:a, :b)
+    blood = FlirtChecker.new(:a, :b, genotype: false)
     expect(blood.combo_with_rate).to eql(expected)
   end
 
@@ -30,7 +36,7 @@ describe FlirtChecker do
   end
 
   it 'chenges the value of attributes' do
-    blood = FlirtChecker.new(:a, :b, genotype: true)
+    blood = FlirtChecker.new(:a, :B, genotype: true)
     expect(blood.male = :b).to eql(:b)
     expect(blood.female = :a).to eql(:a)
     expect(blood.genotype = false).to be_falsey
@@ -51,8 +57,42 @@ describe FlirtChecker do
     expect { blood.combo }.not_to raise_error
   end
 
-  it 'does not raises exception when combo_with_rate called' do
+  it 'does not raise exception when combo_with_rate called' do
     blood = FlirtChecker.new(:a, :b)
     expect { blood.combo_with_rate }.not_to raise_error
   end
+
+  it 'accepts upper case strings' do
+    expected = ["AB", "AO", "BO", "OO"]
+    blood = FlirtChecker.new("A", "B", genotype: true)
+    expect(blood.combo).to eql(expected)
+  end
+
+  it 'accepts lower case strings' do
+    expected = ["AB", "AO", "BO", "OO"]
+    blood = FlirtChecker.new("a", "b", genotype: true)
+    expect(blood.combo).to eql(expected)
+  end
+
+  it 'accepts upper case symbols' do
+    expected = ["AB", "AO", "BO", "OO"]
+    blood = FlirtChecker.new(:A, :B, genotype: true)
+    expect(blood.combo).to eql(expected)
+  end
+
+  it 'does not raise exception by colling combo when an attribute updated' do
+    expected = ["A", "O"]
+    blood = FlirtChecker.new(:a,:a) 
+    blood.male = :A
+    blood.female = :a
+    expect(blood.combo).to eql(expected)
+  end
+
+  it 'does not raise exception by colling combo_with_rate when an attribute updated' do
+    expected = {"B"=>0.9375, "O"=>0.0625}
+    blood = FlirtChecker.new(:b,:b) 
+    blood.male = "B"
+    blood.female = "b"
+    expect(blood.combo_with_rate).to eql(expected)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flirt_checker
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - tacyan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler