parse_p1 0.0.5 → 0.0.6

data/.gitignore

@@ -1,5 +1,4 @@
 *.gem
-.rvmrc
 .bundle
 Gemfile.lock
 pkg/*

data/.rvmrc

@@ -0,0 +1 @@
+rvm use 1.9.3@parse_p1 --create

data/CHANGELOG

@@ -1,3 +1,6 @@
+* 0.0.6
+  Added so called direct methods electra_import_normal, electra_import_low, electra_export_normal and electra_export_low
+
 * 0.0.5
   Bug fix: normal and low tariffs for electricity were changed!
 
@@ -11,5 +14,4 @@
   Parsing of electricity and gas values
 
 * 0.0.1
-
   Initial release

data/README.md

@@ -37,10 +37,16 @@ Usage
 =====
 
 <pre>
-p1 = ParseP1::Base.new(p1_string)  
+p1 = ParseP1::Base.new(p1_string)
+
 p1.electra_meter_id                                  #-> 1A123456789012345678901234567890
 p1.electricity(:type => :import, :tariff => :normal) #-> 116.34 (kWH)
 p1.electricity(:type => :import, :actual => :true)   #-> 1245   (watt)
+
+or with the direct methods: electra_import_normal, electra_import_low, electra_export_normal and electra_export_low
+
+and for gas:
+
 p1.gas_usage                                         #-> 91.224 (m3)
 </pre>
 

data/lib/parse_p1/electricity.rb

@@ -15,6 +15,26 @@ module ParseP1
       electricity('0-0:17.0.0')
     end
 
+    def electra_import_low
+      electricity(:type => :import, :tariff => :low)
+    end
+
+    def electra_import_normal
+      electricity(:type => :import, :tariff => :normal)
+    end
+
+    def electra_export_low
+      electricity(:type => :export, :tariff => :low)
+    end
+
+    def electra_export_normal
+      electricity(:type => :export, :tariff => :normal)
+    end
+
+    def actual_electra
+      electricity(:type => :import, :actual => true)
+    end
+
     def electricity(options)
       if options.is_a?(Hash)
         if options[:actual] == true

data/lib/parse_p1/version.rb

@@ -1,3 +1,3 @@
 module ParseP1
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/test/parse_p1_test.rb

@@ -52,23 +52,27 @@ class TestParseP1 < Test::Unit::TestCase
     end
 
     #F9 (3,3)
-    should 'return imported electricty with normal tarif' do
+    should 'return imported electricty with low tarif' do
       assert_equal 136.787, @p1.electricity(:type => :import, :tariff => :low)
+      assert_equal 136.787, @p1.electra_import_low
     end
 
     #F9 (3,3)
-    should 'return imported electricty with low tarif' do
+    should 'return imported electricty with normal tarif' do
       assert_equal 131.849, @p1.electricity(:type => :import, :tariff => :normal)
+      assert_equal 131.849, @p1.electra_import_normal
     end
 
     #F9 (3,3)
-    should 'return electricty produced by client normal tarif' do
+    should 'return electricty produced by client low tarif' do
       assert_equal 2.345, @p1.electricity(:type => :export, :tariff => :low)
+      assert_equal 2.345, @p1.electra_export_low
     end
 
     #F9 (3,3)
-    should 'return electricty produced by client low tarif' do
+    should 'return electricty produced by client normal tarif' do
       assert_equal 54.976, @p1.electricity(:type => :export, :tariff => :normal)
+      assert_equal 54.976, @p1.electra_export_normal
     end
 
     context 'Actual data' do
@@ -76,6 +80,7 @@ class TestParseP1 < Test::Unit::TestCase
       #F5 (3,3)
       should 'return actual power imported' do
         assert_equal 3200, @p1.electricity(:type => :import, :actual => true)
+        assert_equal 3200, @p1.actual_electra
       end
 
       #F5 (3,3)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parse_p1
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-29 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -71,6 +71,7 @@ extra_rdoc_files:
 - README.md
 files:
 - .gitignore
+- .rvmrc
 - .travis.yml
 - CHANGELOG
 - Gemfile
@@ -105,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1908051008069014212
+      hash: 2211038779225675190
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -114,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1908051008069014212
+      hash: 2211038779225675190
 requirements: []
 rubyforge_project: parse_p1
 rubygems_version: 1.8.24