electric 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35f89c80c18ec3cc1bb84c36880b42c2ab55c0a0
-  data.tar.gz: 050c9b402d0b7a7448664818684edd1c5b7446b5
+  metadata.gz: 6e5e899ace0fa71416ddd00da6fdbc80381b669e
+  data.tar.gz: e9c95ce9bfe4c5e1015280d85896fb6ed93cd1be
 SHA512:
-  metadata.gz: faf6ba1905bf0c341b0962c814bc3b396874c4e84a3b99678738481b014da3fdfff690d69a062ef3aafdaf759d515fdf9073f76e24bcf66b0208b7423caf87f6
-  data.tar.gz: d10ed648975f54ab0b746a8b1334f40c4ddc84652750cca713d011ce99afc1c34173f8663966a1ab8726b2e8a62b112e143ac78b9eae374768023444119c8ae8
+  metadata.gz: 381903b6d0d603e639cc9ec2feedbd17b79b7f7f62d1895f3b2860a3a09e19ab9aa7cd8a0bf0890ce1b023d033c5785754ebc97eee2b8d15431eab037681dbe0
+  data.tar.gz: 1008154b07de3d0c1b551224fc12837a38c655b8954aef67c8868099d4679a1db928939476a39c187fdfaef636135bfe7f215d4e31c8c7f4961e45c9f3456dd4

data/README.md

@@ -1,16 +1,25 @@
 ## Ruby Library for electronics
 
+### Setup
+
+    gem install electric
+
+    irb
+
+    require 'electric'
+
 ### Resistor Color Code Calculator
 
 Accepts 4 arguments (first 3 bands determine resistor value, 4th band is for tolerance %), though none are required to return a value of 0 ohms. You must preserve order of bands as arguments.
 
-resistor = Electric::Resistor.new("red", "black", "brown")
-resistor.value
-=> 200
-resistor.tolerance
-=> "5%"
-resistor.human_readable
-=> "200 ohms, +/- 5%"
+    resistor = Electric::Resistor.new("red", "black", "brown")
+
+    resistor.value
+    => 200
+    resistor.tolerance
+    => "5%"
+    resistor.human_readable
+    => "200 ohms, +/- 5%"
 
 ### Ohm's Law Calculator
 
@@ -18,14 +27,16 @@ Accepts 4 named arguments: "volts", "ohms", "amps", and "watts" in any order. Yo
 
 There are 4 methods that can be called to run calculations: "resistance", "power", "voltage", and "current"
 
-Electric::Ohm.new(:volts => 5, :ohms => 330).voltage
-=> 5.0
-Electric::Ohm.new(:volts => 5, :ohms => 330).resistance
-=> 330.0
-Electric::Ohm.new(:volts => 5, :ohms => 330).current
-=> 0.015151515151515152
-Electric::Ohm.new(:volts => 5, :ohms => 330).power
-=> 0.07575757575757576
+    ohm = Electric::Ohm.new(:volts => 5, :ohms => 330)
+
+    ohm.voltage
+    => 5.0
+    ohm.resistance
+    => 330.0
+    ohm.current
+    => 0.015151515151515152
+    ohm.power
+    => 0.07575757575757576
 
 
 More documentation on the way...

data/lib/electric/ohm.rb

@@ -4,10 +4,15 @@ module Electric
     attr_accessor :ohms, :volts, :amps, :watts
 
     def initialize(options={})
-      @ohms = options[:ohms].to_f if options[:ohms]
-      @volts = options[:volts].to_f if options[:volts]
-      @amps = options[:amps].to_f if options[:amps]
-      @watts = options[:watts].to_f if options[:watts]
+      ohms = options["ohms"] || options[:ohms] || options["resistance"] || options[:resistance]
+      @ohms = ohms.to_f if ohms.present?
+      volts = options["volts"] || options[:volts] || options["voltage"] || options[:voltage]
+      @volts = volts.to_f if volts.present?
+      amps = options["amps"] || options[:amps] || options["current"] || options[:current] || options["amperage"] || options[:amperage]
+      @amps = amps.to_f if amps.present?
+      watts = options["watts"] || options[:watts] || options["power"] || options[:power]
+      @watts = watts.to_f if watts.present?
+      calculate
     end
 
     def resistance
@@ -26,6 +31,13 @@ module Electric
       watts ? watts : get_power
     end
 
+    def calculate
+      @ohms = get_resistance unless @ohms
+      @volts = get_voltage unless @volts
+      @amps = get_current unless @amps
+      @watts = get_power unless @watts
+    end
+
     private
 
     def get_resistance
@@ -52,7 +64,7 @@ module Electric
         watts / amps
       elsif ohms && watts
         # sq_root(P * R)
-        sqrt(watts * ohms)
+        Math.sqrt(watts * ohms)
       else
         volts if volts
       end
@@ -67,7 +79,7 @@ module Electric
         volts / ohms
       elsif watts && ohms
         # sq_root(P) / R
-        sqrt(watts) / ohms
+        Math.sqrt(watts) / ohms
       else
         amps if amps
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: electric
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - JD Warren
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-08-17 00:00:00.000000000 Z
 dependencies: []
 description: Ruby library for calculating things like ohms law, resistor values, etc..
 email:
@@ -17,14 +17,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.md
+- Rakefile
+- lib/electric.rb
 - lib/electric/base.rb
 - lib/electric/ohm.rb
 - lib/electric/resistor.rb
-- lib/electric.rb
 - lib/tasks/edmunds_ruby_tasks.rake
-- MIT-LICENSE
-- Rakefile
-- README.md
 homepage: https://github.com/johndavid400/electric
 licenses: []
 metadata: {}
@@ -44,7 +44,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Electronics formulas