easybill 0.2.22 → 0.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7de497b23a234c45715ca9631c86faa14639761e
-  data.tar.gz: 3f530737b1893119d3f2efb48ff8264a42375a13
+  metadata.gz: 4a20a6e41d851f9da4cebe2894c5ac9de32a7bb4
+  data.tar.gz: 5d2e4fb5d06e35dbf401af95c1dac13c5fde6774
 SHA512:
-  metadata.gz: 72b3c422836b5207212d3c5d7d40fde229f09dc3f74a2caaac741ca1ecce6e44e9170ea0b3b20919d24c4d69e4259704235cbfcb11fa613d42d22a15bb08897f
-  data.tar.gz: e25b2c7594fe262072360d35e141bb7f8017e5cc67bed27878a92e88c853f16c6b3ee9e46320d52b0ac722502855462c515c6aa1e9ad41dd9bd936567896cb5d
+  metadata.gz: 708e8e109062f5980559fd875cf5e7123bfd893d43bf6daa0cfed4ee964d3c964a3ced0fc099f2b3377e4cd46369b45c621217e7c5d416f9267f87ab5a4c27ed
+  data.tar.gz: 6d142049619a75bec92bac79c187b226a2c3d74c8e10612536f655852464b7de206f8d5703efa9360d4c933faf87f4eff2dc34dab10e6b0f31798435b1e751f5

data/.rubocop_todo.yml

@@ -1,5 +1,6 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-04-27 16:05:46 +0200 using RuboCop version 0.30.1.
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2015-10-05 10:47:47 +0200 using RuboCop version 0.34.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -18,10 +19,10 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 7
 
-# Offense count: 21
+# Offense count: 19
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
-  Max: 197
+  Max: 143
 
 # Offense count: 2
 # Configuration parameters: CountComments.

data/lib/easybill/document.rb

@@ -1,3 +1,4 @@
+require 'json'
 require 'php_serialize'
 
 module Easybill
@@ -5,16 +6,13 @@ module Easybill
     class ParseError < StandardError; end
 
     def service_period
-      plain_service_date = PHP.unserialize(service_date)
+      parsed = parse_service_date
+      return '' if parsed.nil?
 
-      if plain_service_date.nil?
-        ''
+      if parsed.key?('serviceDateFrom')
+        "#{parse_date(parsed['serviceDateFrom'])} - #{parse_date(parsed['serviceDateThru'])}"
       else
-        if plain_service_date.key?('serviceDateFrom')
-          "#{parse_date(plain_service_date['serviceDateFrom'])} - #{parse_date(plain_service_date['serviceDateThru'])}"
-        else
-          plain_service_date['serviceDateString']
-        end
+        parsed['serviceDateString']
       end
     rescue TypeError => e
       raise ParseError, e
@@ -34,5 +32,12 @@ module Easybill
     def parse_date(date)
       Date.parse(date).strftime('%d.%m.%Y')
     end
+
+    def parse_service_date
+      return nil if service_date.nil?
+      JSON.parse(service_date)
+    rescue JSON::ParserError
+      PHP.unserialize(service_date)
+    end
   end
 end

data/lib/easybill/version.rb

@@ -1,3 +1,3 @@
 module Easybill
-  VERSION = '0.2.22'.freeze
+  VERSION = '0.2.23'.freeze
 end

data/spec/easybill/document_spec.rb

@@ -2,46 +2,75 @@ require 'spec_helper'
 
 describe Easybill::Document do
   describe '#service_period' do
-    subject { document.service_period }
+    subject { described_class.new('service_date' => service_date).service_period }
 
     context 'when a valid serviceDateString was returned' do
-      let(:document) { described_class.new('service_date' => "a:1:{s:17:\"serviceDateString\";s:23:\"01.05.2014 - 15.05.2014\";}") }
+      context 'PHP-serialized object' do
+        let(:service_date) { 'a:1:{s:17:"serviceDateString";s:23:"01.05.2014 - 15.05.2014";}' }
 
-      it { is_expected.to eq('01.05.2014 - 15.05.2014') }
+        it { is_expected.to eq('01.05.2014 - 15.05.2014') }
+      end
+
+      context 'JSON' do
+        let(:service_date) do
+          '{"serviceDateType":"1","serviceDateString":"01.08.2015 - 31.08.2015"}'
+        end
+
+        it { is_expected.to eq('01.08.2015 - 31.08.2015') }
+      end
     end
 
     context 'when serviceDateString includes a date range' do
-      let(:document) { described_class.new('service_date' => "a:3:{s:15:\"serviceDateType\";s:1:\"1\";s:15:\"serviceDateFrom\";s:10:\"2014-07-01\";s:15:\"serviceDateThru\";s:10:\"2014-07-04\";}") }
+      context 'PHP-serialized object' do
+        let(:service_date) do
+          'a:3:{s:15:"serviceDateType";s:1:"1";s:15:"serviceDateFrom";s:10:"2014-07-01";s:15:"serviceDateThru";s:10:"2014-07-04";}'
+        end
+
+        it { is_expected.to eq('01.07.2014 - 04.07.2014') }
+      end
 
-      it { is_expected.to eq('01.07.2014 - 04.07.2014') }
+      context 'JSON' do
+        let(:service_date) do
+          '{"serviceDateType":"1","serviceDateFrom":"2014-07-01","serviceDateThru":"2014-07-04"}'
+        end
+
+        it { is_expected.to eq('01.07.2014 - 04.07.2014') }
+      end
+    end
+
+    context 'when a nil serviceDateString was returned' do
+      let(:service_date) { nil }
+
+      it { is_expected.to eq('') }
     end
 
     context 'when a null serviceDateString was returned' do
-      let(:document) { described_class.new('service_date' => 'N;') }
+      let(:service_date) { 'N;' }
 
       it { is_expected.to eq('') }
     end
 
     context 'when parsing data is malformed' do
-      let(:document) { described_class.new('service_date' => '{}') }
+      let(:service_date) { '{invalid' }
 
       it 'throws Easybill::Document::ParseError exception' do
-        expect { subject }.to raise_error(Easybill::Document::ParseError, 'Unable to unserialize type \'{\'')
+        expect { subject }
+          .to raise_error(Easybill::Document::ParseError, 'Unable to unserialize type \'{\'')
       end
     end
   end
 
   describe '#service_period_end' do
-    subject { document.service_period_end }
+    subject { described_class.new('service_date' => service_date).service_period_end }
 
     context 'when a valid serviceDateString was returned' do
-      let(:document) { described_class.new('service_date' => "a:1:{s:17:\"serviceDateString\";s:23:\"01.05.2014 - 15.05.2014\";}") }
+      let(:service_date) { 'a:1:{s:17:"serviceDateString";s:23:"01.05.2014 - 15.05.2014";}' }
 
       it { is_expected.to eq(Date.new(2014, 5, 15)) }
     end
 
     context 'when a null serviceDateString was returned' do
-      let(:document) { described_class.new('service_date' => 'N;') }
+      let(:service_date) { 'N;' }
 
       it { is_expected.to be_nil }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easybill
 version: !ruby/object:Gem::Version
-  version: 0.2.22
+  version: 0.2.23
 platform: ruby
 authors:
 - ad2games GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sekken