resistor 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ba5f3aa26c28e62800c94ee3bea8eab62b9295b
-  data.tar.gz: 78e020b33d5eaed94e1956a0732626c16189e510
+  metadata.gz: dcdef3b21d2be6f436c54df25801ddfbf7d8997a
+  data.tar.gz: 97822e8388112ffcecf9dc616f0a2459132c7712
 SHA512:
-  metadata.gz: 4d45490081759694cdd282f3bcc59c00777d6c512149efac8ef79806c606ca461008ef541c178133bf527b279a5dedca60a2a3f0203af2047bc49730ed2aa0c4
-  data.tar.gz: 8b952ccbbe8da1a138ed560f8a4e0a1719f09e651f39881d9fd86fda3c91ccda5f91c5e85da785bc7a487d319af32095006c8a682c2244df1c6345390d70a890
+  metadata.gz: c2895a20f52a76fc9ee2f2d9c8a770dca0ddeb9586958d9ad4617990f7073ae0f219e977e78292c34f4544de0f9268132ddd942af56b0bc67103cf29f2740bb0
+  data.tar.gz: 1cce63a88b3b75a6a4428433e5e5c0490f292b8817f20733eb74f8c147e8eb9a0356e9ad62d2e96cacaae12d7aea77f0516fb748da5d90f45d5c1c3771d92c2b

data/README.md

@@ -1,6 +1,7 @@
 # Resistor
 [![Gem Version](https://badge.fury.io/rb/resistor.svg)](http://badge.fury.io/rb/resistor)  
 Resistor is a gem for the resistor unit.  
+For more details, please see [http://qiita.com/seinosuke/items/d527b0e591d6d69c7471](http://qiita.com/seinosuke/items/d527b0e591d6d69c7471).
 
 ## Installation
 
@@ -21,8 +22,9 @@ Or install it yourself as:
 ## Usage
 
 ###Resistor Color Code Converter
-`Resistor::ColorCode.encode` **Converts a resistance value to a color code.**  
-`Resistor::ColorCode.decode` **Converts a color code to a resistance value.**  
+You can calculate a resistance value from a color code. The contrary is possible.  
+`Resistor::ColorCode.encode` Converts a resistance value to a color code.  
+`Resistor::ColorCode.decode` Converts a color code to a resistance value.  
 
 ```ruby
 require 'resistor'
@@ -34,10 +36,11 @@ Resistor::ColorCode.decode([:yellow, :purple, :red, :gold])
 ```
 
 ### Combined Resistor Calculator
-`Resistor::BasicReisistor#+` **Calculates a series combined resistance value.**  
-`Resistor::BasicReisistor#/` **Calculates a parallel combined resistance value.**  
+You can calculate a combined resistance value.  
+`Resistor::BasicReisistor#+` Calculates a series combined resistance value.  
+`Resistor::BasicReisistor#/` Calculates a parallel combined resistance value.  
 
-`Resistor.new` is an alias for `Resistor::BasicResistor.new`
+`Resistor.new` is an alias for `Resistor::BasicResistor.new`  
 
 ```ruby
 require 'resistor'
@@ -54,9 +57,33 @@ r5 = (r1 / r2) + r3 + (r4 / r4)
 r5.ohm # => 20.0
 ```
 
+### 5-Band Color Code
+Selects a number of color bands. By dafault, the number is 4.  
+`Resistor::Options.set_band_number` Sets a combination of options that is usually used.  
+
+```ruby
+require 'resistor'
+
+Resistor::Options.set_band_number 5
+Resistor.new(976)
+# => #<Resistor::BasicResistor:0x0000000295fb58 @ohm=976.0, @code=[:white, :purple, :blue, :black, :brown], @tolerance=1.0>
+Resistor::ColorCode.encode(100)
+# => [:brown, :black, :black, :black, :brown]
+
+Resistor::Options.set_band_number 4
+Resistor.new(4700)
+# => #<Resistor::BasicResistor:0x0000000295ee10 @ohm=4700.0, @code=[:yellow, :purple, :red, :gold], @tolerance=5.0>
+Resistor::ColorCode.encode(100)
+# => [:brown, :black, :brown, :gold]
+```
+
+
 ### E Series
-`Resistor::BasicReisistor#e12?` **Whether or not the resistance value is the E12 series.**  
-`Resistor::BasicReisistor#e24?` **Whether or not the resistance value is the E24 series.**  
+`Resistor::BasicReisistor#e12?` Whether or not the resistance value is the E12 series.  
+`Resistor::BasicReisistor#e24?` Whether or not the resistance value is the E24 series.  
+`Resistor::BasicReisistor#e48?` Whether or not the resistance value is the E48 series.  
+`Resistor::BasicReisistor#e96?` Whether or not the resistance value is the E96 series.  
+`#48?` and `#96?` always return false if the number of bands is 4.  
 
 ```ruby
 require 'resistor'
@@ -68,4 +95,14 @@ r1.e12? # => true
 r1.e24? # => true
 r2.e12? # => false
 r2.e24? # => true
+
+Resistor::Options.set_band_number 5
+
+r3 = Resistor.new(105)
+r4 = Resistor.new(4.99)
+
+r3.e48? # => true
+r3.e96? # => true
+r4.e48? # => false
+r4.e96? # => true
 ```

data/lib/resistor.rb

@@ -1,4 +1,5 @@
 require "resistor/version"
+require "resistor/options"
 require "resistor/color_code"
 require "resistor/basic_resistor"
 require "resistor/combined_resistor"
@@ -11,8 +12,8 @@ module Resistor
     # @see Resistor::BasicResistor
     # @return [Resistor::BasicResistor]
     # @example Create a Resistor::BasicResistor object.
-    #   r1 = Resistor.new(ohm: 20)
-    #   r2 = Resistor.new(code: ['yellow', 'purple', 'red', 'gold'])
+    #   r1 = Resistor.new(20)
+    #   r2 = Resistor.new(['yellow', 'purple', 'red', 'gold'])
     def new(arg, options = {})
       Resistor::BasicResistor.new(arg, options)
     end

data/lib/resistor/basic_resistor.rb

@@ -8,26 +8,28 @@ module Resistor
     # but at least one of them must be supplied.
     #
     # @overload initialize(arg, options = {})
-    #   @param arg [Integer, Float] A resistance value.
+    #   @param arg [Integer, Float] A resistance value
     # @overload initialize(arg, options = {})
-    #   @param arg [Array<Symbol>, Array<String>] A color code.
+    #   @param arg [Array<Symbol>, Array<String>] A color code
     # @option options [Integer, Float] :tolerance(5.0)
+    # @option options [Integer] :band_number(4)
     # @raise [ArgumentError] The ohm or code parameter must be supplied.
     #   Error raised if neither parameter is supplied.
     # @return [Resistor::BasicResistor]
     def initialize(arg, options = {})
-      options[:tolerance] ||= 5.0
-      opt = {:tolerance => options[:tolerance]}
+      default = Resistor::Options.new
+      options[:tolerance] ||= default.tolerance
+      options[:band_number] ||= default.band_number
 
       case arg
       when Integer, Float
         @ohm = arg.to_f
-        @code = Resistor::ColorCode.encode(@ohm, opt)
+        @code = Resistor::ColorCode.encode(@ohm, options)
         @tolerance = options[:tolerance]
       when Array
         @code = arg.map(&:to_sym)
-        @ohm = Resistor::ColorCode.decode(@code)
-        @tolerance = Resistor::ColorCode::TOLERANCE[@code[3].to_sym]
+        @ohm = Resistor::ColorCode.decode(@code, options)
+        @tolerance = Resistor::ColorCode::TOLERANCE[@code[-1].to_sym]
       else
         raise ArgumentError
       end
@@ -71,7 +73,9 @@ module Resistor
     end
     alias_method :|, :/
 
-    # @return [Boolean] Whether or not the resistance value is the E12 series.
+    # Whether or not the resistance value is the E12 series.
+    #
+    # @return [Boolean]
     def e12?
       num0 = Resistor::ColorCode::DIGIT[@code[0]]
       num1 = Resistor::ColorCode::DIGIT[@code[1]]
@@ -83,7 +87,9 @@ module Resistor
       return false
     end
 
-    # @return [Boolean] Whether or not the resistance value is the E24 series.
+    # Whether or not the resistance value is the E24 series.
+    #
+    # @return [Boolean]
     def e24?
       num0 = Resistor::ColorCode::DIGIT[@code[0]]
       num1 = Resistor::ColorCode::DIGIT[@code[1]]
@@ -94,5 +100,33 @@ module Resistor
       end
       return false
     end
+
+    # Whether or not the resistance value is the E48 series.
+    # Always returns false if the number of bands is 4.
+    #
+    # @return [Boolean]
+    def e48?
+      return false if @code.size == 4
+      num = [
+        Resistor::ColorCode::DIGIT[@code[0]],
+        Resistor::ColorCode::DIGIT[@code[1]],
+        Resistor::ColorCode::DIGIT[@code[2]],
+      ].join.to_i
+      Resistor::ColorCode::E48_SERIES.any?{|n| n == num }
+    end
+
+    # Whether or not the resistance value is the E96 series.
+    # Always returns false if the number of bands is 4.
+    #
+    # @return [Boolean]
+    def e96?
+      return false if @code.size == 4
+      num = [
+        Resistor::ColorCode::DIGIT[@code[0]],
+        Resistor::ColorCode::DIGIT[@code[1]],
+        Resistor::ColorCode::DIGIT[@code[2]],
+      ].join.to_i
+      Resistor::ColorCode::E96_SERIES.any?{|n| n == num }
+    end
   end
 end

data/lib/resistor/color_code.rb

@@ -1,6 +1,8 @@
 module Resistor
   module ColorCode
 
+    # [4-Band-Code] The 1st and 2nd digit of a resistance value
+    # [5-Band-Code] The 1st, 2nd and 3rd digit of a resistance value
     DIGIT = {
       :black  => 0,
       :brown  => 1,
@@ -14,6 +16,8 @@ module Resistor
       :white  => 9
     }.freeze
 
+    # [4-Band-Code] The 3rd color band indicates the multiplier.
+    # [5-Band-Code] The 4th color band indicates the multiplier.
     MULTIPLIER = {
       :black  => 0,
       :brown  => 1,
@@ -26,6 +30,8 @@ module Resistor
       :silver => -2
     }.freeze
 
+    # [4-Band-Code] The 4th color band indicates the tolerance.
+    # [5-Band-Code] The 5th color band indicates the tolerance.
     TOLERANCE = {
       :brown  => 1.0,
       :red    => 2.0,
@@ -59,51 +65,140 @@ module Resistor
       9 => [1]
     }.freeze
 
+    E48_SERIES = [
+      100, 105, 110, 115, 121, 127, 133, 140, 147, 154, 162, 169, 178, 187, 196, 205,
+      215, 226, 237, 249, 261, 274, 287, 301, 316, 332, 348, 365, 383, 402, 422, 442,
+      464, 487, 511, 536, 562, 590, 619, 649, 681, 715, 750, 787, 825, 866, 909, 953
+    ].freeze
+
+    E96_SERIES = [
+      100, 102, 105, 107, 110, 113, 115, 118, 121, 124, 127, 130, 133, 137, 140, 143,
+      147, 150, 154, 158, 162, 165, 169, 174, 178, 182, 187, 191, 196, 200, 205, 210,
+      215, 221, 226, 232, 237, 243, 249, 255, 261, 267, 274, 280, 287, 294, 301, 309,
+      316, 324, 332, 340, 348, 357, 365, 374, 383, 392, 402, 412, 422, 432, 442, 453,
+      464, 475, 487, 499, 511, 523, 536, 549, 562, 576, 590, 604, 619, 634, 649, 665,
+      681, 698, 715, 732, 750, 768, 787, 806, 825, 845, 866, 887, 909, 931, 953, 976
+    ].freeze
+
+    module_function
 
     # Converts a resistance value to a color code.
     # The value must be between 0.1 and 99_000_000.
     #
     # @param ohm [Integer, Float] resistance value
     # @option options [Integer, Float] :tolerance(5.0)
+    # @option options [Integer] :band_number(4)
     # @raise [ArgumentError] Error raised
     #   when the supplied resistance value is less than 0.1.
     # @return [Array<Symbol>] color code
-    def self.encode(ohm, options = {:tolerance => 5.0})
+    def encode(ohm, options = {})
       return [DIGIT.key(0)] if ohm == 0
       raise ArgumentError if ohm < 0.1
 
+      default = Resistor::Options.new
+      options[:tolerance] ||= default.tolerance
+      options[:band_number] ||= default.band_number
+
+      case options[:band_number]
+      when 4 then four_band_encode(ohm, options)
+      when 5 then five_band_encode(ohm, options)
+      else raise ArgumentError
+      end
+    end
+
+    # This method is used by the `Colorcode.encode` method
+    # when `options[:band_number]` is 4.
+    def four_band_encode(ohm, options = {})
       if ohm < 1
         ohm_str = (ohm*100).to_s.split('')
-        [DIGIT.key(ohm_str[0].to_i), DIGIT.key(ohm_str[1].to_i),
-         MULTIPLIER.key(-2), TOLERANCE.key(options[:tolerance])]
+        [DIGIT.key(ohm_str[0].to_i),
+         DIGIT.key(ohm_str[1].to_i),
+         MULTIPLIER.key(-2),
+         TOLERANCE.key(options[:tolerance])]
 
       elsif ohm < 10
         ohm_str = (ohm*10).to_s.split('')
-        [DIGIT.key(ohm_str[0].to_i), DIGIT.key(ohm_str[1].to_i),
-         MULTIPLIER.key(-1), TOLERANCE.key(options[:tolerance])]
+        [DIGIT.key(ohm_str[0].to_i),
+         DIGIT.key(ohm_str[1].to_i),
+         MULTIPLIER.key(-1),
+         TOLERANCE.key(options[:tolerance])]
 
       else
         ohm_str = ohm.to_i.to_s.split('')
-        [DIGIT.key(ohm_str[0].to_i), DIGIT.key(ohm_str[1].to_i),
-         MULTIPLIER.key(ohm_str.size - 2), TOLERANCE.key(options[:tolerance])]
+        [DIGIT.key(ohm_str[0].to_i),
+         DIGIT.key(ohm_str[1].to_i),
+         MULTIPLIER.key(ohm_str.size - 2),
+         TOLERANCE.key(options[:tolerance])]
+      end
+    end
+
+    # This method is used by the `Colorcode.encode` method
+    # when `options[:band_number]` is 5.
+    def five_band_encode(ohm, options = {})
+      if ohm < 10
+        ohm_str = (ohm*100).to_s.split('')
+        [DIGIT.key(ohm_str[0].to_i),
+         DIGIT.key(ohm_str[1].to_i),
+         DIGIT.key(ohm_str[2].to_i),
+         MULTIPLIER.key(-2),
+         TOLERANCE.key(options[:tolerance])]
+
+      elsif ohm < 100
+        ohm_str = (ohm*10).to_s.split('')
+        [DIGIT.key(ohm_str[0].to_i), 
+         DIGIT.key(ohm_str[1].to_i),
+         DIGIT.key(ohm_str[2].to_i),
+         MULTIPLIER.key(-1),
+         TOLERANCE.key(options[:tolerance])]
+
+      else
+        ohm_str = ohm.to_i.to_s.split('')
+        [DIGIT.key(ohm_str[0].to_i), 
+         DIGIT.key(ohm_str[1].to_i),
+         DIGIT.key(ohm_str[2].to_i),
+         MULTIPLIER.key(ohm_str.size - 3),
+         TOLERANCE.key(options[:tolerance])]
       end
     end
 
     # Converts a color code to a resistance value.
     #
     # @param code [Array<Symbol>, Array<String>] color code
+    # @option options [Integer] :band_number(4)
     # @raise [ArgumentError] Error raised
     #   when the supplied color code is not an array,
     #   or when the color of the first band is black.
     # @return [Float] resistance value
-    def self.decode(code)
+    def decode(code, options = {})
       raise ArgumentError unless code.is_a? Array
       code = code.map(&:to_sym)
       return 0.0 if code == [:black]
       raise ArgumentError if code[0] == :black
 
-      ohm = (DIGIT[code[0]]*10 + DIGIT[code[1]]) * 10**MULTIPLIER[code[2]]
-      return ohm.to_f
+      default = Resistor::Options.new
+      options[:band_number] ||= default.band_number
+
+      case options[:band_number]
+      when 4 then four_band_decode(code)
+      when 5 then five_band_decode(code)
+      else raise ArgumentError
+      end
+    end
+
+    # This method is used by the `Colorcode.decode` method
+    # when `options[:band_number]` is 4.
+    def four_band_decode(code)
+      (DIGIT[code[0]]*10 + DIGIT[code[1]]) *
+      10**MULTIPLIER[code[2]]
+      .to_f
+    end
+
+    # This method is used by the `Colorcode.decode` method
+    # when `options[:band_number]` is 5.
+    def five_band_decode(code)
+      (DIGIT[code[0]]*100 + DIGIT[code[1]]*10 + DIGIT[code[2]]) *
+      10**MULTIPLIER[code[3]]
+      .to_f
     end
   end
 end

data/lib/resistor/options.rb

@@ -0,0 +1,52 @@
+module Resistor
+  class Options
+
+    @defaults = {
+      :band_number => 4,
+      :tolerance   => 5.0
+    }
+
+    attr_reader :band_number, :tolerance
+
+    class << self
+       # The default option values.
+       # `@defaults` is a hash of the default options.
+       #
+       # @yield You can set the options in a block too.
+       # @return [Hash]
+       # @example Sets the options in a block.
+       #   Resistor::Options.defaults do |d|
+       #     d[:tolerance] = 0.5
+       #     d[:band_number] = 5
+       #   end
+      def defaults(&block)
+        yield @defaults if block_given?
+        @defaults
+      end
+
+      # Sets a combination of options that is usually used.
+      #
+      # @param num [Integer] The number of the color bands
+      def set_band_number(num)
+        case num
+        when 4
+          @defaults[:band_number] = 4
+          @defaults[:tolerance] = 5.0
+        when 5
+          @defaults[:band_number] = 5
+          @defaults[:tolerance] = 1.0
+        end
+      end
+    end
+
+    # Initializes a new BasicResistor object.
+    # The default option values is stored in the instance variables.
+    #
+    # @return [Resistor::BasicResistor]
+    def initialize
+      self.class.defaults.each do |key, val|
+        instance_variable_set("@#{key}", val)
+      end
+    end
+  end
+end

data/lib/resistor/version.rb

@@ -1,3 +1,3 @@
 module Resistor
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/resistor.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["seinosuke"]
   spec.email         = ["seinosuke.3606@gmail.com"]
   spec.summary       = %q{Resistor gem}
-  spec.description   = %q{Gem for resistor}
+  spec.description   = %q{Resistor is a gem for the resistor unit.}
   spec.homepage      = "https://github.com/seinosuke/resistor"
   spec.license       = "MIT"
 

data/spec/basic_resistor_spec.rb

@@ -9,7 +9,6 @@ describe Resistor::BasicResistor do
 
     context '抵抗値を指定した場合' do
       let(:arg) { 4700 }
-
       it { expect(resistor.ohm).to eq 4700.0 }
       it { expect(resistor.code).to eq [:yellow, :purple, :red, :gold] }
       it { expect(resistor.tolerance).to eq 5.0 }
@@ -17,7 +16,6 @@ describe Resistor::BasicResistor do
 
     context '抵抗値を指定した場合' do
       let(:arg) { ['brown', 'black', 'blue', 'silver'] }
-
       it { expect(resistor.ohm).to eq 10_000_000 }
       it { expect(resistor.code).to eq [:brown, :black, :blue, :silver] }
       it { expect(resistor.tolerance).to eq 10.0 }
@@ -25,7 +23,6 @@ describe Resistor::BasicResistor do
 
     context 'どちらも指定しなかった場合' do
       let(:arg) { nil }
-
       it { expect { is_expected }.to raise_error(ArgumentError) }
     end
 
@@ -34,6 +31,46 @@ describe Resistor::BasicResistor do
       it { expect(resistor.code[3]).to eq :purple }
       it { expect(resistor.tolerance).to eq 0.1 }
     end
+
+    context 'オプションで5本帯を指定した場合' do
+      # 許容差は変更されない
+      resistor = Resistor.new(6.04, band_number: 5)
+      it { expect(resistor.code).to eq [:blue, :black, :yellow, :silver, :gold] }
+      it { expect(resistor.tolerance).to eq 5.0 }
+    end
+
+    context 'メソッドで5本帯を指定した場合' do
+      # 許容差まで変更される
+      Resistor::Options.set_band_number 5
+      resistor = Resistor.new(123)
+      it { expect(resistor.code).to eq [:brown, :red, :orange, :black, :brown] }
+      it { expect(resistor.tolerance).to eq 1.0 }
+      Resistor::Options.set_band_number 4
+    end
+
+    context 'メソッドで5本帯と許容差を指定した場合' do
+      # 許容差まで指定できる
+      Resistor::Options.defaults do |d|
+        d[:band_number] = 5
+        d[:tolerance] = 0.5
+      end
+      resistor = Resistor.new(49900)
+      it { expect(resistor.code).to eq [:yellow, :white, :white, :red, :green] }
+      it { expect(resistor.tolerance).to eq 0.5 }
+      Resistor::Options.set_band_number 4
+    end
+
+    context 'メソッドで5本帯を指定してさらにオプションを渡した場合' do
+      # オプションで渡されたものに上書きされる
+      Resistor::Options.defaults do |d|
+        d[:band_number] = 5
+        d[:tolerance] = 0.5
+      end
+      resistor = Resistor.new(84.5, tolerance:0.1)
+      it { expect(resistor.code).to eq [:gray, :yellow, :green, :gold, :purple] }
+      it { expect(resistor.tolerance).to eq 0.1 }
+      Resistor::Options.set_band_number 4
+    end
   end
 
   describe '#+, #/' do
@@ -41,7 +78,6 @@ describe Resistor::BasicResistor do
       r1 = Resistor.new(100)
       r2 = Resistor.new(200)
       r3 = Resistor.new(300)
-
       it { expect((r1 + r2 + r3).ohm).to eq 600.0 }
     end
 
@@ -49,7 +85,6 @@ describe Resistor::BasicResistor do
       r1 = Resistor.new(30)
       r2 = Resistor.new(15)
       r3 = Resistor.new(10)
-
       it { expect((r1 / r2 / r3).ohm).to eq 5.0 }
     end
 
@@ -58,7 +93,6 @@ describe Resistor::BasicResistor do
       r2 = Resistor.new(30)
       r3 = Resistor.new(4)
       r4 = Resistor.new(8)
-
       it { expect(((r1 / r2) + r3 + (r4 / r4)).ohm).to eq 20.0 }
     end
 
@@ -66,7 +100,6 @@ describe Resistor::BasicResistor do
       r1 = Resistor.new(100)
       original_name = (r1 + r1 + r1).ohm
       new_name = (r1 - r1 - r1).ohm
-
       it { expect(original_name == new_name).to be_truthy }
     end
 
@@ -74,7 +107,6 @@ describe Resistor::BasicResistor do
       r1 = Resistor.new(100)
       original_name = (r1 / r1 / r1).ohm
       new_name = (r1 | r1 | r1).ohm
-
       it { expect(original_name == new_name).to be_truthy }
     end
   end
@@ -83,7 +115,6 @@ describe Resistor::BasicResistor do
     context '抵抗値を変更する場合' do
       resistor = Resistor.new(100)
       resistor.ohm = 4.7
-
       it { expect(resistor.ohm).to eq 4.7 }
       it { expect(resistor.code).to eq [:yellow, :purple, :gold, :gold] }
     end
@@ -91,7 +122,6 @@ describe Resistor::BasicResistor do
     context 'カラーコードを変更する場合' do
       resistor = Resistor.new(100)
       resistor.code = ['green', 'brown', 'silver', 'brown']
-
       it { expect(resistor.ohm).to eq 0.51 }
       it { expect(resistor.code).to eq [:green, :brown, :silver, :brown] }
       it { expect(resistor.tolerance).to eq 1.0 }
@@ -129,4 +159,50 @@ describe Resistor::BasicResistor do
       it { expect(Resistor.new(52_000_000).e24?).to eq false }
     end
   end
+
+  describe '#e48?' do
+    before do
+      Resistor::Options.set_band_number 5
+    end
+    after do
+      Resistor::Options.set_band_number 4
+    end
+
+    context 'E48系列である場合' do
+      it { expect(Resistor.new(1.69).e48?).to eq true }
+      it { expect(Resistor.new(28.7).e48?).to eq true }
+      it { expect(Resistor.new(402).e48?).to eq true }
+      it { expect(Resistor.new(90_900_000).e48?).to eq true }
+    end
+
+    context 'E48系列でない場合' do
+      it { expect(Resistor.new(1.68).e48?).to eq false }
+      it { expect(Resistor.new(28.6).e48?).to eq false }
+      it { expect(Resistor.new(403).e48?).to eq false }
+      it { expect(Resistor.new(91_900_000).e48?).to eq false }
+    end
+  end
+
+  describe '#e96?' do
+    before do
+      Resistor::Options.set_band_number 5
+    end
+    after do
+      Resistor::Options.set_band_number 4
+    end
+
+    context 'E96系列である場合' do
+      it { expect(Resistor.new(1.91).e96?).to eq true }
+      it { expect(Resistor.new(45.3).e96?).to eq true }
+      it { expect(Resistor.new(715).e96?).to eq true }
+      it { expect(Resistor.new(10_000_000).e96?).to eq true }
+    end
+
+    context 'E96系列でない場合' do
+      it { expect(Resistor.new(1.92).e96?).to eq false }
+      it { expect(Resistor.new(45.4).e96?).to eq false }
+      it { expect(Resistor.new(716).e96?).to eq false }
+      it { expect(Resistor.new(11_100_000).e96?).to eq false }
+    end
+  end
 end

data/spec/color_code_spec.rb

@@ -5,65 +5,128 @@ require_relative "spec_helper"
 describe Resistor::ColorCode do
 
   describe '::encode' do
-    subject { Resistor::ColorCode.encode(ohm) }
+    subject { Resistor::ColorCode.encode(ohm, options) }
 
     context '0Ωの場合' do
       let(:ohm) { 0 }
+      let(:options) { {} }
       it { is_expected.to eq [:black] }
     end
 
     context '0.1Ω以上1Ωより小さい場合' do
       let(:ohm) { 0.24 }
+      let(:options) { {} }
       it { is_expected.to eq [:red, :yellow, :silver, :gold] }
     end
 
     context '1Ω以上10Ωより小さい場合' do
       let(:ohm) { 2 }
+      let(:options) { {} }
       it { is_expected.to eq [:red, :black, :gold, :gold] }
     end
 
     context '10Ω以上の場合' do
       let(:ohm) { 3300 }
+      let(:options) { {} }
       it { is_expected.to eq [:orange, :orange, :red, :gold] }
     end
 
     context '0Ωより小さい場合' do
       let(:ohm) { -10 }
+      let(:options) { {} }
       it { expect { is_expected }.to raise_error(ArgumentError) }
     end
 
     context '0.1Ωより小さい場合' do
       let(:ohm) { 0.01 }
+      let(:options) { {} }
       it { expect { is_expected }.to raise_error(ArgumentError) }
     end
+
+    context 'オプションで5本帯を指定した場合' do
+      # 許容差は変更されない
+      let(:ohm) { 4320 }
+      let(:options) { {:band_number => 5} }
+      it { is_expected.to eq [:yellow, :orange, :red, :brown, :gold] }
+    end
+
+    context 'メソッドで5本帯を指定した場合' do
+      # 許容差まで変更される
+      Resistor::Options.set_band_number 5
+      code = Resistor::ColorCode.encode(511)
+      it { expect(code).to eq [:green, :brown, :brown, :black, :brown] }
+      Resistor::Options.set_band_number 4
+    end
+
+    context 'メソッドで5本帯と許容差を指定した場合' do
+      # 許容差まで指定できる
+      Resistor::Options.defaults do |d|
+        d[:band_number] = 5
+        d[:tolerance] = 0.5
+      end
+      code = Resistor::ColorCode.encode(3.92)
+      it { expect(code).to eq [:orange, :white, :red, :silver, :green] }
+      Resistor::Options.set_band_number 4
+    end
+
+    context 'メソッドで5本帯を指定してさらにオプションを渡した場合' do
+      # オプションで渡されたものに上書きされる
+      Resistor::Options.defaults do |d|
+        d[:band_number] = 5
+        d[:tolerance] = 0.5
+      end
+      code = Resistor::ColorCode.encode(20.5, tolerance:0.1)
+      it { expect(code).to eq [:red, :black, :green, :gold, :purple] }
+      Resistor::Options.set_band_number 4
+    end
   end
 
   describe '::decode' do
-    subject { Resistor::ColorCode.decode(code) }
+    subject { Resistor::ColorCode.decode(code, options) }
 
     context '0Ωの場合' do
       let(:code) { [:black] }
+      let(:options) { {} }
       it { is_expected.to eq 0 }
     end
 
     context '0.1Ω以上1Ωより小さい場合' do
       let(:code) { [:blue, :red, :silver, :gold] }
+      let(:options) { {} }
       it { is_expected.to eq 0.62 }
     end
 
     context '1Ω以上10Ωより小さい場合' do
       let(:code) { [:white, :brown, :gold, :gold] }
+      let(:options) { {} }
       it { is_expected.to eq 9.1 }
     end
 
     context '10Ω以上の場合' do
       let(:code) { [:brown, :black, :blue, :gold] }
+      let(:options) { {} }
       it { is_expected.to eq 10_000_000 }
     end
 
     context '1本目に黒が指定された場合' do
       let(:code) { [:black, :blue, :blue, :gold] }
+      let(:options) { {} }
       it { expect { is_expected }.to raise_error(ArgumentError) }
     end
+
+    context 'オプションで5本帯を指定した場合' do
+      # 許容差は変更されない
+      let(:code) { [:yellow, :orange, :red, :brown, :gold] }
+      let(:options) { {:band_number => 5} }
+      it { is_expected.to eq 4320.0 }
+    end
+
+    context 'メソッドで5本帯を指定した場合' do
+      # 許容差まで変更される
+      Resistor::Options.set_band_number 5
+      ohm = Resistor::ColorCode.decode([:green, :brown, :brown, :black, :brown])
+      it { expect(ohm).to eq 511.0 }
+      Resistor::Options.set_band_number 4
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resistor
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - seinosuke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-11 00:00:00.000000000 Z
+date: 2015-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,7 +24,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-description: Gem for resistor
+description: Resistor is a gem for the resistor unit.
 email:
 - seinosuke.3606@gmail.com
 executables: []
@@ -42,6 +42,7 @@ files:
 - lib/resistor/basic_resistor.rb
 - lib/resistor/color_code.rb
 - lib/resistor/combined_resistor.rb
+- lib/resistor/options.rb
 - lib/resistor/version.rb
 - resistor.gemspec
 - spec/basic_resistor_spec.rb
@@ -67,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Resistor gem