resistor 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b380cd33929b8b61653a914b7979f718b6b28d12
-  data.tar.gz: 00071b06604e805d3abb8e061e1ad401ccab1413
+  metadata.gz: b1843455385e168419277b5628bade0ecafb8005
+  data.tar.gz: 0aa86e44feaf9e0e95f1e7612dd40dd1d95b9959
 SHA512:
-  metadata.gz: 7065ee63b363a8532a62118d77e0141c8cc3ad9d6ecd9521971a1465e3cd0895c31b6e3e717cbf91496147e81e6361a2038cd870b237a344fc0a747ec4931167
-  data.tar.gz: 07fd9e498c2d20579330312d566af7dd8e92cc7fee67d7f6d34b96746db148e4acf89abb194844ac9225e641148779a4e73ae2b93673a366e24a9e40f884461e
+  metadata.gz: 0ebb48ab4c70a33a07256c8832499ac1ac2b9236e0c0d6f6d85dceb19a087a6b271c4d7c5662f9de34b68403921e46e5acb4ffe447db88574535c3211d6d47f0
+  data.tar.gz: edd66c46793afb5b9c9553e360377ecb9d81befafca2dabe5e6cb697450c69e4966c9ba1dea4edf8751082dcf3a8ebfbd2b2e155503c29a328327dee82a91b2b

data/README.md

@@ -37,4 +37,13 @@ r4 = Resistor.new(ohm: 8)
 
 r5 = (r1 / r2) + r3 + (r4 / r4)
 r5.ohm # => 20.0
+
+# E Series Checker
+r1 = Resistor.new(ohm: 4700)
+r2 = Resistor.new(ohm: 62)
+
+r1.e12? # => true
+r1.e24? # => true
+r2.e12? # => false
+r2.e24? # => true
 ```

data/lib/resistor/basic_resistor.rb

@@ -37,5 +37,27 @@ module Resistor
     def /(other)
       Resistor::CombinedResistor.new(1 / (1 / @ohm + 1 / other.ohm))
     end
+
+    def e12?
+      num0 = Resistor::ColorCode::NUM[@code[0]]
+      num1 = Resistor::ColorCode::NUM[@code[1]]
+      Resistor::ColorCode::E12_SERIES.each do |key, val|
+        if num0 == key
+          return true if val.any? { |e| e == num1 }
+        end
+      end
+      return false
+    end
+
+    def e24?
+      num0 = Resistor::ColorCode::NUM[@code[0]]
+      num1 = Resistor::ColorCode::NUM[@code[1]]
+      Resistor::ColorCode::E24_SERIES.each do |key, val|
+        if num0 == key
+          return true if val.any? { |e| e == num1 }
+        end
+      end
+      return false
+    end
   end
 end

data/lib/resistor/color_code.rb

@@ -40,6 +40,30 @@ module Resistor
       :silver => 10.0
     }.freeze
 
+    # E12系列
+    E12_SERIES = {
+      1 => [0, 2, 5, 8],
+      2 => [2, 7],
+      3 => [3, 9],
+      4 => [7],
+      5 => [6],
+      6 => [8],
+      8 => [2],
+    }.freeze
+
+    # E24系列
+    E24_SERIES = {
+      1 => [0, 1, 2, 3, 5, 6, 8],
+      2 => [0, 2, 4, 7],
+      3 => [0, 3, 6, 9],
+      4 => [3, 7],
+      5 => [1, 6],
+      6 => [2, 8],
+      7 => [5],
+      8 => [2],
+      9 => [1]
+    }.freeze
+
     # 抵抗値 -> カラーコード
     def self.encode(ohm, error_range: 5.0)
       return [NUM.key(0)] if ohm == 0

data/lib/resistor/version.rb

@@ -1,3 +1,3 @@
 module Resistor
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/resistor.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["seinosuke.3606@gmail.com"]
   spec.summary       = %q{Resistor gem}
   spec.description   = %q{gem for resistor}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/seinosuke/resistor"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")

data/spec/basic_resistor_spec.rb

@@ -78,4 +78,36 @@ describe Resistor::BasicResistor do
       it { expect(resistor.error_range).to eq 1.0 }
     end
   end
+
+  describe '#e12?' do
+    context 'E12系列である場合' do
+      it { expect(Resistor.new(ohm: 0.12).e12?).to eq true }
+      it { expect(Resistor.new(ohm: 3.3).e12?).to eq true }
+      it { expect(Resistor.new(ohm: 47).e12?).to eq true }
+      it { expect(Resistor.new(ohm: 82_000_000).e12?).to eq true }
+    end
+
+    context 'E12系列でない場合' do
+      it { expect(Resistor.new(ohm: 0.13).e12?).to eq false }
+      it { expect(Resistor.new(ohm: 3.8).e12?).to eq false }
+      it { expect(Resistor.new(ohm: 55).e12?).to eq false }
+      it { expect(Resistor.new(ohm: 70_000_000).e12?).to eq false }
+    end
+  end
+
+  describe '#e24?' do
+    context 'E24系列である場合' do
+      it { expect(Resistor.new(ohm: 0.1).e24?).to eq true }
+      it { expect(Resistor.new(ohm: 3).e24?).to eq true }
+      it { expect(Resistor.new(ohm: 47_000).e24?).to eq true }
+      it { expect(Resistor.new(ohm: 10_000_000).e24?).to eq true }
+    end
+
+    context 'E24系列でない場合' do
+      it { expect(Resistor.new(ohm: 0.92).e24?).to eq false }
+      it { expect(Resistor.new(ohm: 8.3).e24?).to eq false }
+      it { expect(Resistor.new(ohm: 23_000).e24?).to eq false }
+      it { expect(Resistor.new(ohm: 52_000_000).e24?).to eq false }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resistor
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - seinosuke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-18 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,7 +74,7 @@ files:
 - spec/basic_resistor_spec.rb
 - spec/color_code_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/seinosuke/resistor
 licenses:
 - MIT
 metadata: {}