rupower 0.1.2 → 0.1.3

data/lib/rupower/version.rb

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

data/lib/rupower.rb

@@ -4,13 +4,8 @@ require_relative "rupower/version"
 module Rupower
 
   module Parser
-    VALUE =     Regexp.new( /(([0-9]{1,5}([.][0-9]{1,5}){0,1}).*|((\S)+))$/ )
     TIME =      Regexp.new( /\s+\([\s\w]*\)/ )
-    NUMBER =    Regexp.new( /\A[+-]?\d+?(\.\d+)?\Z/ )
-    UNITS =     Regexp.new( /(( .{1,2})|(%))$/ )
-    AFTER_KEY = Regexp.new( /\s*:\s+[\s\S]+$/ )
-    PARAGRAPH = Regexp.new( /^\s+/ )
-    VALUABLE =  Regexp.new( /\w+:\s+\S+/ )
+    NUMBER =    Regexp.new(/^\d+[.]?\d*(|[%]|\s+\w+)$/)  #( /\A[+-]?\d+?(\.\d+)?\Z/ )
   end
 
   class PowerDevice
@@ -26,44 +21,28 @@ module Rupower
     end
 
     private
-      def sym_gsub( sym, before, after )
-        sym.to_s.gsub( before, after ).to_sym
-      end
-
       def get_hash
-        @state.each_line.inject( {} ) do |hash, line|
-          key = line.gsub( Parser::AFTER_KEY, "" ).gsub( Parser::PARAGRAPH, "" ).to_sym
-          line[Parser::VALUABLE] ? hash.merge( key => get_value( line ) ) : hash
-        end
-      end
-
-      def get_value( line )
-        typize( line[Parser::VALUE].gsub( Parser::UNITS, "" ) )
+        state = @state.strip.split( /$/ ).map( &:strip ).reject{ |r| !r.include?( ':' ) }
+        state_key_value_array = state.map{ |r| r.split( ':', 2 ) }.flatten.map( &:strip )
+        symbolize_hash( Hash[*state_key_value_array.map{ |value| typize(value) }] )
       end
 
       def typize( value )
         res = value
         res = value[/^yes$/] ? true : false if value[/^(yes|no)$/]
-        res = to_number( value ) if number?( value )
-        res = to_datetime( value ) if time?( value )
+        res = value.to_f == value.to_i ? value.to_i : value.to_f  if value[Parser::NUMBER ]
+        res = DateTime.parse( value ) if value.match( Parser::TIME )
         res
       end
 
-      def time?( value )
-        value.match( Parser::TIME )
+      def symbolize_hash(hash)
+        hash.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
       end
 
-      def to_datetime( value )
-        DateTime.parse( value )
-      end
-
-      def number?( value )
-        value.match( Parser::NUMBER ) == nil ? false : true
+      def sym_gsub( sym, before, after )
+        sym.to_s.gsub( before, after ).to_sym
       end
 
-      def to_number( value )
-        value.to_f == value.to_i ? value.to_i : value.to_f
-      end
   end
 
   class Battery < PowerDevice
@@ -86,7 +65,11 @@ module Rupower
     end
 
     def charging?
-      get_all[:state]["discharging"] ? false : true
+      get_all[:state] == "charging"
+    end
+
+    def fully_charged?
+      get_all[:state] == "fully-charged"
     end
   end
 

data/test/functional/rupower_battery_test.rb

@@ -33,7 +33,7 @@ class RupowerBatteryTest < Test::Unit::TestCase
   end
 
   def test_updated_returns_correct_value
-    assert_equal( DateTime.parse("Sun Mar 25 20:12:15 2012"), @battery.updated )
+    assert_equal( DateTime.parse("Sun Mar 25 22:56:15 2012"), @battery.updated )
   end
 
   def test_has_history_returns_correct_value
@@ -60,7 +60,6 @@ class RupowerBatteryTest < Test::Unit::TestCase
     assert_equal( 62.9532, @battery.energy )
   end
 
-
   def test_energy_empty_returns_correct_value
     assert_equal( 0, @battery.energy_empty )
   end
@@ -93,5 +92,13 @@ class RupowerBatteryTest < Test::Unit::TestCase
     assert_equal( "lithium-ion", @battery.technology )
   end
 
+  def test_charging_returns_correct_value
+    assert_equal( false, @battery.charging? )
+  end
+
+  def test_fully_charged_returns_correct_value
+    assert_equal( true, @battery.fully_charged? )
+  end
+
 
 end

data/test/functional/rupower_line_ac_test.rb

@@ -22,7 +22,7 @@ class RupowerLineAcTest < Test::Unit::TestCase
   end
 
   def test_updated_returns_correct_value
-    assert_equal( DateTime.parse("Sat Mar 24 20:12:24 2012"), @line_ac.updated )
+    assert_equal( DateTime.parse("Sat Mar 24 23:47:24 2012"), @line_ac.updated )
   end
 
   def test_has_history_returns_correct_value

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rupower
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -55,6 +55,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2703598513085812831
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17