parse_p1 0.1.0 → 0.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 385d560b817db7e1f0e047f3783d8908525cdd8d
+  data.tar.gz: 9b0be70a66a5ee4f991b80acc0ec7ee5aa9969fd
+SHA512:
+  metadata.gz: c70945d8d2cb78e3b6dc4401c8f0cb93ae6db1ed031614a0b31d25415b81bd68b2cc4624e3a7cda003862ecb2f33b2e125f6a4790831c8c4ba2c618d4c8809d2
+  data.tar.gz: 0d0a1f7e827738f43084f013a8978f9dcf11739228d63f396aad78b3b3e7ac3bd9d3126163e14ad3d25c61fedf05ce018dfe57edb3339f633f7d064d37875bd7

data/.ruby-gemset

@@ -0,0 +1 @@
+parse_p1

data/.ruby-version

@@ -0,0 +1 @@
+2.2.2

data/.travis.yml

@@ -1,10 +1,9 @@
 rvm:
-  - 1.9.3
-  - 1.9.2
-  - 1.8.7
+  - 2.1.6
+  - 2.2.2
 
 branches:
   only:
     - master
 
-script: "bundle exec rake test"
+script: "bundle exec rake test"

data/CHANGELOG

@@ -1,3 +1,6 @@
+* 0.1.1
+  Major refactor to simplify and increase robustness of parser, it now also handles the Landys & Gyr E350 meter
+
 * 0.1.0
   Parse Gas values with different OBIS codes because of RF module on Gas meter
 
@@ -9,7 +12,7 @@
 
 * 0.0.7
   Set encoding to UTF8
- 
+
 * 0.0.6
   Added so called direct methods electra_import_normal, electra_import_low, electra_export_normal and electra_export_low
 
@@ -26,4 +29,4 @@
   Parsing of electricity and gas values
 
 * 0.0.1
-  Initial release
+  Initial release

data/Gemfile

@@ -1,6 +1,7 @@
 source "http://rubygems.org"
 
 gem 'rake', '~>0.9.2.2'
+gem 'awesome_print'
 
 # Specify your gem's dependencies in parse_p1.gemspec
 gemspec

data/lib/parse_p1.rb

@@ -9,6 +9,7 @@ if RUBY_VERSION =~ /1.9/
 end
 
 require 'date'
+require 'awesome_print'
 require 'parse_p1/electricity'
 require 'parse_p1/gas'
 require 'parse_p1/base'

data/lib/parse_p1/base.rb

@@ -7,27 +7,53 @@ module ParseP1
     include ParseP1::Electricity
     include ParseP1::Gas
 
-    attr_reader :data
+    attr_reader :data, :device_id, :obis_records
 
     def initialize(data)
-      @data = data
+      @data = data.split('/').last.split('!').first.split
+      @obis_records = {}
+      extract_obis_records(@data)
     end
 
     def valid?
-      !data.match(/!/).nil? && !device_id.nil?
+      electra_meter_id.is_a?(String) && actual_electra.is_a?(Float) && gas_meter_id.is_a?(String) && gas_usage.is_a?(Float)
     end
 
     def device_id
-      match_within_one_p1_record('\/([a-zA-Z]{3}\d{1}.+[a-zA-Z]{2}\d{3}-\d{4})')
+      data.shift
     end
 
     private
 
-    def match_within_one_p1_record(pattern)
-      data.match(/[\W|\w]*#{pattern}[\W|\w]*!/)
+    def extract_obis_records(data)
+      data.each do |item|
+        obis_values     = item.split('(')
+        previous_values = []
+
+        key = extract_key(obis_values)
+
+        #Values without a key are associated with the last known key
+        if key.nil?
+          key = @obis_records.keys.last
+          previous_values = @obis_records[key] if key
+        end
+
+        @obis_records[key] = previous_values + cleanup(obis_values)
+      end
+    end
+
+    def extract_key(record)
+      record.first.match(obis_record_pattern)
       $1
     end
 
+    def cleanup(obis_values)
+      obis_values[1..-1].map {|value| value[-1] == ')' ? value.chop : value }
+    end
+
+    def obis_record_pattern
+      /(\d+-\d+:\d+\.\d+.\d+)/
+    end
   end
 
-end
+end

data/lib/parse_p1/electricity.rb

@@ -5,76 +5,63 @@ module ParseP1
   module Electricity
 
     def electra_meter_id
-      match_within_one_p1_record('0:96\.1\.1\S(\d{1}[A-Z]{1}\d{1,96})\S')
+      result = obis_records['0-0:96.1.1']
+      result.first if result
     end
 
     def electricity_tariff_indicator
-      result = match_within_one_p1_record('0-0:96\.14\.0\S(\d{1,9})\S')
-      result.to_i if result
+      get_electricity('0-0:96.14.0')
     end
 
     def electricity_actual_threshold
-      electricity('0-0:17\.0\.0')
+      get_electricity('0-0:17.0.0')
     end
 
     def electra_import_low
-      electricity(:type => :import, :tariff => :low)
+      get_electricity('1-0:1.8.1')
     end
 
     def electra_import_normal
-      electricity(:type => :import, :tariff => :normal)
+      get_electricity('1-0:1.8.2')
     end
 
     def electra_export_low
-      electricity(:type => :export, :tariff => :low)
+      get_electricity('1-0:2.8.1')
     end
 
     def electra_export_normal
-      electricity(:type => :export, :tariff => :normal)
+      get_electricity('1-0:2.8.2')
     end
 
+    #Only for backward compatibility
     def actual_electra
-      electricity(:type => :import, :actual => true)
+      electra_import_actual
+    end
+
+    def electra_import_actual
+      get_electricity('1-0:1.7.0') * 1000
+    end
+
+    def electra_export_actual
+      get_electricity('1-0:2.7.0') * 1000
     end
 
     def electricity(options)
-      if options.is_a?(Hash)
-        if options[:actual] == true
-          get_actual_electricity(options[:type])
-        else
-          get_electricity("1-0:#{first_electricity_code(options[:type])}.8.#{second_electricity_code(options[:tariff])}")
-        end
+      message = "electra_#{options[:type].to_s}_"
+      if options[:actual] == true
+        send(message + 'actual')
       else
-        get_electricity(options)
+        send(message + "#{options[:tariff].to_s}")
       end
     end
 
     private
 
     def get_electricity(obis_code)
-      data.match(/\/[\W|\w]*#{obis_code}\S(\d{1,9}\.\d{1,3})\S[\W|\w]*!/)
-      $1.to_f if $1
-    end
-
-    def get_actual_electricity(type)
-      power = get_electricity("1-0:#{first_electricity_code(type)}\.7\.0")
-      (power * 1000).to_i if power#Return as watts instead of kW
-    end
-
-    def first_electricity_code(code)
-      case code
-      when :import; '1'
-      when :export; '2'
-      end
-    end
-
-    def second_electricity_code(tariff)
-      case tariff
-      when :low; 1
-      when :normal; 2
-      end
+      result = obis_records[obis_code]
+      result ? result.first.to_f : 0.0
     end
 
   end
 
-end
+end

data/lib/parse_p1/gas.rb

@@ -5,24 +5,39 @@ module ParseP1
   module Gas
 
     def gas_meter_id
-      match_within_one_p1_record('[1|2]:96\.1\.0\S(\d{1,96})\S')
+      obis_records['0-1:96.1.0'].first
     end
 
     #Only 2 digits for year!
     def last_hourly_reading_gas
-      result = match_within_one_p1_record('0-[1|2]:24\.3\.0\S(\d{12})\S')
+      result = get_gas(0)
       DateTime.new(('20'+result[0..1]).to_i, result[2..3].to_i, result[4..5].to_i, result[6..7].to_i, result[8..9].to_i) if result
     end
 
+    #TODO remove this silly method?
     def measurement_unit_gas
-      match_within_one_p1_record('0-[1|2]:24\.2\.1\S\S(\w+)\S')
+      'm3'
     end
 
     def gas_usage
-      result = match_within_one_p1_record('\S0-[1|2]:24\.2\.1\S\S\w+\S\W{1,2}\S(\d{5}\.\d{3})\S')
+      result = get_gas(-1)
       result.to_f if result
     end
 
+    private
+
+    def get_gas(index_of_values)
+      gas_obis_codes.each do |obis_code|
+        @result = obis_records[obis_code]
+        break unless @result.nil?
+      end
+      @result[index_of_values] if @result
+    end
+
+    def gas_obis_codes
+      ['0-1:24.3.0', '0-1:24.2.1', '0-2:24.1.0', '0-2:24.3.0', '0-2:24.2.1', '0-2:24.4.0']
+    end
+
   end
 
-end
+end

data/lib/parse_p1/version.rb

@@ -1,3 +1,3 @@
 module ParseP1
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/parse_p1.gemspec

@@ -11,7 +11,6 @@ Gem::Specification.new do |s|
   s.summary     = %q{Parsing P1 Companion Standard used by Dutch Smart Meters}
   s.description = %q{Parsing P1 Companion Standard used by Dutch Smart Meters. Used in combination with a Nanode posting the P1 data to emonWeb.org}
   s.licenses    = ['MIT']
-  s.rubyforge_project = "parse_p1"
 
   s.extra_rdoc_files = [
      'CHANGELOG',
@@ -24,6 +23,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_development_dependency 'minitest'
   s.add_development_dependency 'shoulda'
   s.add_development_dependency 'guard'
   s.add_development_dependency 'guard-test'

data/test/helper.rb

@@ -7,6 +7,8 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
+
+require 'minitest'
 require 'test/unit'
 require 'shoulda'
 

data/test/parse_p1_IskraMT171_meter_test.rb

@@ -0,0 +1,99 @@
+# encoding: UTF-8
+
+require 'helper'
+
+class TestParseP1_IskraMT171Meter < Test::Unit::TestCase
+
+  setup do
+    @data = "/XMX5XMXABCE100085870\r\n\r\n0-0:96.1.1(31333836343734322020202020202020)\r\n1-0:1.8.1(00477.462*kWh)\r\n1-0:1.8.2(00546.069*kWh)\r\n1-0:2.8.1(00013.172*kWh)\r\n1-0:2.8.2(00031.349*kWh)\r\n0-0:96.14.0(0001)\r\n1-0:1.7.0(0000.23*kW)\r\n1-0:2.7.0(0000.00*kW)\r\n0-0:17.0.0(999*A)\r\n0-0:96.3.10(1)\r\n0-0:96.13.1()\r\n0-0:96.13.0()\r\n0-1:96.1.0(3238303131303038333134303934333133)\r\n0-1:24.1.0(03)\r\n0-1:24.3.0(131013140000)(08)(60)(1)(0-1:24.2.0)(m3)\r\n(00143.136)\r\n0-1:24.4.0(1)\r\n!"
+
+    @p1   = ParseP1::Base.new(@data)
+  end
+
+  should 'tell if string is P1 valid' do
+    assert_equal true, @p1.valid?
+  end
+
+  context 'Device identifiers' do
+
+    should 'return the device_id of the meter' do
+       assert_equal 'XMX5XMXABCE100085870', @p1.device_id
+    end
+
+    #Sn (n=0..96), octet string is NOT true
+    should 'return the electra meter identifier of the meter' do
+      assert_equal '31333836343734322020202020202020', @p1.electra_meter_id
+    end
+
+    #Sn (n=0..96) octet string
+    should 'return the gas meter identifier of the meter' do
+      assert_equal '3238303131303038333134303934333133', @p1.gas_meter_id
+    end
+
+  end
+
+  context 'Electricity data' do
+
+    #S4 tag 4 bit string is NOT true
+    should 'return the electricity tariff indicator' do
+      assert_equal 1, @p1.electricity_tariff_indicator
+    end
+
+    #F4(1,1)
+    should 'return the electricity actual threshold' do
+      assert_equal 999.0, @p1.electricity_actual_threshold
+    end
+
+    #F9 (3,3)
+    should 'return imported electricty with low tarif' do
+      assert_equal 477.462, @p1.electricity(:type => :import, :tariff => :low)
+      assert_equal 477.462, @p1.electra_import_low
+    end
+
+    #F9 (3,3)
+    should 'return imported electricty with normal tarif' do
+      assert_equal 546.069, @p1.electricity(:type => :import, :tariff => :normal)
+      assert_equal 546.069, @p1.electra_import_normal
+    end
+
+    #F9 (3,3)
+    should 'return electricty produced by client low tarif' do
+      assert_equal 13.172, @p1.electricity(:type => :export, :tariff => :low)
+      assert_equal 13.172, @p1.electra_export_low
+    end
+
+    #F9 (3,3)
+    should 'return electricty produced by client normal tarif' do
+      assert_equal 31.349, @p1.electricity(:type => :export, :tariff => :normal)
+      assert_equal 31.349, @p1.electra_export_normal
+    end
+
+    context 'Actual data' do
+
+      #F5 (3,3)
+      should 'return actual power imported' do
+        assert_equal 230, @p1.electricity(:type => :import, :actual => true)
+        assert_equal 230, @p1.actual_electra
+      end
+
+    end
+
+  end
+
+  context 'Gas data' do
+
+    should 'return the last hourly reading of gas usage' do
+      assert_equal DateTime.new(2013,10,13,14,0), @p1.last_hourly_reading_gas
+    end
+
+    should 'return the measurement unit of gas usage' do
+      assert_equal 'm3', @p1.measurement_unit_gas
+    end
+
+    should 'return the total usage of gas' do
+      assert_equal 143.136, @p1.gas_usage
+    end
+
+  end
+
+end

data/test/parse_p1_landisgyr_e350_test.rb

@@ -0,0 +1,99 @@
+# encoding: UTF-8
+
+require 'helper'
+
+class TestParseP1LandisGyrE350 < Test::Unit::TestCase
+
+  setup do
+    @data = "/ABA5LGAAGGB231007559\n\n1-3:0.2.8(40)\n0-0:1.0.0(150407214315S)\n0-0:96.1.1(4190303034303031356660323031353135)\n1-0:1.8.1(002622.819*kWh)\n1-0:2.8.1(000079.439*kWh)\n1-0:1.8.2(001693.579*kWh)\n1-0:2.8.2(000215.374*kWh)\n0-0:96.14.0(0002)\n1-0:1.7.0(00.524*kW)\n1-0:2.7.0(01.230*kW)\n0-0:17.0.0(999.9*kW)\n0-0:96.3.10(1)\n0-0:96.7.21(00003)\n0-0:96.7.9(00001)\n1-0:99.97.0(1)(0-0:96.7.19)(150327114234W)(0000007487*s)\n1-0:32.32.0(00000)\n1-0:32.36.0(00000)\n0-0:96.13.1()\n0-0:96.13.0()\n1-0:31.7.0(002*A)\n1-0:21.7.0(00.524*kW)\n1-0:22.7.0(00.000*kW)\n0-1:24.1.0(003)\n0-1:96.1.0(4736303136353631323035999235153337)\n0-1:24.2.1(150407210000S)(02638.655*m3)\n0-1:24.4.0(1)\n!"
+    @p1   = ParseP1::Base.new(@data)
+  end
+
+  context 'Device identifiers' do
+
+     should 'return the device_id of the meter' do
+        assert_equal 'ABA5LGAAGGB231007559', @p1.device_id
+     end
+
+     should 'return the electra meter identifier of the meter' do
+       assert_equal '4190303034303031356660323031353135', @p1.electra_meter_id
+     end
+
+    should 'return the gas meter identifier of the meter' do
+      assert_equal '4736303136353631323035999235153337', @p1.gas_meter_id
+    end
+
+   end
+
+   context 'Electricity data' do
+
+     #S4 tag 4 bit string is NOT true
+     should 'return the electricity tariff indicator' do
+       assert_equal 2, @p1.electricity_tariff_indicator
+     end
+
+     #F4(1,1)
+     should 'return the electricity actual threshold' do
+       assert_equal 999.9, @p1.electricity_actual_threshold
+     end
+
+     #F9 (3,3)
+     should 'return imported electricty with low tarif' do
+       assert_equal 2622.819, @p1.electricity(:type => :import, :tariff => :low)
+       assert_equal 2622.819, @p1.electra_import_low
+     end
+
+     #F9 (3,3)
+     should 'return imported electricty with normal tarif' do
+       assert_equal 1693.579, @p1.electricity(:type => :import, :tariff => :normal)
+       assert_equal 1693.579, @p1.electra_import_normal
+     end
+
+     #F9 (3,3)
+     should 'return electricty produced by client low tarif' do
+       assert_equal 79.439, @p1.electricity(:type => :export, :tariff => :low)
+       assert_equal 79.439, @p1.electra_export_low
+     end
+
+     #F9 (3,3)
+     should 'return electricty produced by client normal tarif' do
+       assert_equal 215.374, @p1.electricity(:type => :export, :tariff => :normal)
+       assert_equal 215.374, @p1.electra_export_normal
+     end
+
+     context 'Actual data' do
+
+       #F5 (3,3)
+       should 'return actual power imported' do
+         assert_equal 524, @p1.electricity(:type => :import, :actual => true)
+         assert_equal 524, @p1.actual_electra
+         assert_equal 524, @p1.electra_import_actual
+       end
+
+       #F5 (3,3)
+       should 'return actual power in case of a low tarif' do
+         assert_equal 1230, @p1.electricity(:type => :export, :actual => true)
+         assert_equal 1230, @p1.electra_export_actual
+       end
+
+     end
+
+   end
+
+   context 'Gas data' do
+
+     should 'return the last hourly reading of gas usage' do
+       assert_equal DateTime.new(2015,4,7,21,0), @p1.last_hourly_reading_gas
+     end
+
+     should 'return the measurement unit of gas usage' do
+       assert_equal 'm3', @p1.measurement_unit_gas
+     end
+
+     should 'return the total usage of gas' do
+       assert_equal 2638.655, @p1.gas_usage
+     end
+
+   end
+
+end

data/test/parse_p1_test.rb

@@ -11,10 +11,6 @@ class TestParseP1 < Test::Unit::TestCase
     @p1   = ParseP1::Base.new(@data)
   end
 
-  should 'return the p1_string' do
-    assert_equal @data, @p1.data
-  end
-
   should 'tell if string is P1 valid' do
     assert_equal true, @p1.valid?
   end
@@ -22,15 +18,16 @@ class TestParseP1 < Test::Unit::TestCase
   context 'Device identifiers' do
 
     should 'return the device_id of the meter' do
-       assert_equal 'ABc1\1AB123-4567', @p1.device_id
+      assert_equal 'ABc1\1AB123-4567', @p1.device_id
     end
 
     #Sn (n=0..96), octet string is NOT true
     should 'return the electra meter identifier of the meter' do
+                  #  '4530303034303031353330323031353134'
       assert_equal '1A123456789012345678901234567890', @p1.electra_meter_id
     end
 
-    #Sn (n=0..96) octet string 
+    #Sn (n=0..96) octet string
     should 'return the gas meter identifier of the meter' do
       assert_equal '1234567890123456789012345678901234', @p1.gas_meter_id
     end
@@ -49,11 +46,6 @@ class TestParseP1 < Test::Unit::TestCase
       assert_equal 999.0, @p1.electricity_actual_threshold
     end
 
-    #F9 (3,3)
-    should 'return electricity with a corresponding obis code' do
-      assert_equal 136.787, @p1.electricity('1-0:1.8.1')
-    end
-
     #F9 (3,3)
     should 'return imported electricty with low tarif' do
       assert_equal 136.787, @p1.electricity(:type => :import, :tariff => :low)
@@ -83,12 +75,14 @@ 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
+        assert_equal 3200, @p1.actual_electra #Still in use for backward compability
+        assert_equal 3200, @p1.electra_import_actual
       end
 
       #F5 (3,3)
       should 'return actual power in case of a low tarif' do
         assert_equal 120, @p1.electricity(:type => :export, :actual => true)
+        assert_equal 120, @p1.electra_export_actual
       end
 
     end
@@ -113,27 +107,15 @@ class TestParseP1 < Test::Unit::TestCase
 
   context 'Gas data send through RF (different OBIS codes)' do
 
-    setup do
-      #Different OBIS codes for RF gas measurement:
-      # => 0-2:24.1.0
-      # => 0-2:96.1.0
-      # => 0-2:24.3.0
-      # => 0-2:24.2.1
-      # => 0-2:24.4.0
-      data  = "sBs\u0012C\u0002\u0002\nK*r\"CKR[Wh)\r\n1-0:2.8.1(00000.000*kWh)\r\n1-0:2.8.2(00000.\r\n/ABc1\\1AB123-4567\r\n\r\n0-0:96.1.1(1A123456789012345678901234567890)\r\n1-0:1.8.1(00136.787*kWh)\r\n1-0:1.8.2(00131.849*kWh)\r\n1-0:2.8.1(00002.345*kWh)\r\n1-0:2.8.2(00054.976*kWh)\r\n0-0:96.14.0(0002)\r\n1-0:1.7.0(0003.20*kW)\r\n1-0:2.7.0(0000.12*kW)\r\n0-0:17.0.0(0999.00*kW)\r\n0-0:96.3.10(1)\r\n0-0:96.13.1()\r\n0-0:96.13.0()\r\n0-2:24.1.0(3)\r\n0-2:96.1.0(1234567890123456789012345678901234)\r\n0-2:24.3.0(120502150000)(00)(60)(1)(0-2:24.2.1)(m3)\r\n(00092.112)\r\n0-2:24.4.0(1)\r\n!"
-      @p2   = ParseP1::Base.new(@data)
-    end
-
-    should 'return the last hourly reading of gas usage' do
-      assert_equal DateTime.new(2012,5,2,15,0), @p2.last_hourly_reading_gas
-    end
-
-    should 'return the measurement unit of gas usage' do
-      assert_equal 'm3', @p2.measurement_unit_gas
-    end
-
     should 'return the total usage of gas' do
-      assert_equal 92.112, @p2.gas_usage
+      def p1_data(obis_code)
+        "sBs\u0012C\u0002\u0002\nK*r\"CKR[Wh)\r\n1-0:2.8.1(00000.000*kWh)\r\n1-0:2.8.2(00000.\r\n/ABc1\\1AB123-4567\r\n\r\n0-0:96.1.1(1A123456789012345678901234567890)\r\n1-0:1.8.1(00136.787*kWh)\r\n1-0:1.8.2(00131.849*kWh)\r\n1-0:2.8.1(00002.345*kWh)\r\n1-0:2.8.2(00054.976*kWh)\r\n0-0:96.14.0(0002)\r\n1-0:1.7.0(0003.20*kW)\r\n1-0:2.7.0(0000.12*kW)\r\n0-0:17.0.0(0999.00*kW)\r\n0-0:96.3.10(1)\r\n0-0:96.13.1()\r\n0-0:96.13.0()\r\n0-1:24.1.0(3)\r\n0-2:96.1.0(1234567890123456789012345678901234)\r\n" +obis_code + "(120502150000)(00)(60)(1)(0-2:24.2.1)(m3)\r\n(00092.112)\r\n0-1:24.4.0(1)\r\n!"
+      end
+
+      ['0-2:24.1.0', '0-2:24.3.0', '0-2:24.2.1', '0-2:24.4.0'].each do |obis_code|
+        p1 = ParseP1::Base.new(p1_data(obis_code))
+        assert_equal 92.112, p1.gas_usage
+      end
     end
 
   end
@@ -151,9 +133,9 @@ class TestParseP1 < Test::Unit::TestCase
     should 'tell if a very meshed string is P1 valid' do
       @irregular_data.each do |record|
         p1   = ParseP1::Base.new(record)
-        assert_equal true, p1.valid?
+        assert p1.valid?
         assert p1.gas_usage.is_a?(Float)
-        assert p1.actual_electra.is_a?(Integer)
+        assert p1.actual_electra.is_a?(Float)
         assert p1.device_id.is_a?(String)
         assert p1.electra_meter_id.is_a?(String)
         assert p1.gas_meter_id.is_a?(String)
@@ -166,4 +148,4 @@ class TestParseP1 < Test::Unit::TestCase
 
   end
 
-end
+end

metadata

@@ -1,62 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: parse_p1
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.1.1
 platform: ruby
 authors:
 - Frank Oxener
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-15 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Parsing P1 Companion Standard used by Dutch Smart Meters. Used in combination
@@ -70,9 +77,10 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- .gitignore
-- .rvmrc
-- .travis.yml
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - CHANGELOG
 - Gemfile
 - Guardfile
@@ -90,38 +98,35 @@ files:
 - lib/parse_p1/version.rb
 - parse_p1.gemspec
 - test/helper.rb
+- test/parse_p1_IskraMT171_meter_test.rb
+- test/parse_p1_landisgyr_e350_test.rb
 - test/parse_p1_test.rb
 homepage: http://github.com/dovadi/parse_p1
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1064997931082939182
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1064997931082939182
 requirements: []
-rubyforge_project: parse_p1
-rubygems_version: 1.8.25
+rubyforge_project: 
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Parsing P1 Companion Standard used by Dutch Smart Meters
 test_files:
 - test/helper.rb
+- test/parse_p1_IskraMT171_meter_test.rb
+- test/parse_p1_landisgyr_e350_test.rb
 - test/parse_p1_test.rb

data/.rvmrc

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