flexirest 1.2.16 → 1.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67924c36e94f6b5a9ad4cbdf09d7762c20b88ecd
-  data.tar.gz: 2ac29ea6fef0704c66d7af8105d7009bdeb0141b
+  metadata.gz: 74460a02097196ff9ac4e73815ad1be63f1664dd
+  data.tar.gz: 6b138a264aeb07a1012ccfbfbca944f0074f27bf
 SHA512:
-  metadata.gz: 682f4f180a66df72de50b82cd3263b5c3e9f6d2fc70c23b3ed49a5cf7e3242d8bf0526f0e4d2834e37f80f48915fe09d9907cf286ca60f7584703703d355d0b2
-  data.tar.gz: cb065db508aaf6ce615d42e353436b8da4b4c5cb17fd9d3f7b07f6dcb5cc7ee5d8e2da9d30efc9dc9ea6fc316c1179c32783160dddbefca589a2ecf129269c80
+  metadata.gz: cd6868bc4b2de02129bb7078fdd5742a32246ad7275af9d9811dc6f2c2ed005ead6bcc243eff491e6240f05852614dad1899ce529526e21a9c2a6ceb497081cd
+  data.tar.gz: 94548faeb9a21ce22b6227ef3f3ccf100357f090b71a177b393a893e19c37b7c8113a16f148fe5f26e6750ac5020a2b5b13e6e3a67b7416b7e09343c6ea8ac44

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.2.17
+
+Bugfixes:
+
+- Corrected parsing of dates/datetimes coming in responses (thanks to Matthias Neumayr)
+
 ## 1.2.16
 
 Feature:

data/Rakefile

@@ -5,9 +5,10 @@ RSpec::Core::RakeTask.new('spec')
 task :console do
   require 'irb'
   require 'irb/completion'
-  require 'flexirest'
+  require './lib/flexirest'
   ARGV.clear
   IRB.start
 end
+task :c => :console
 
 task :default => :spec

data/lib/flexirest/attribute_parsing.rb

@@ -0,0 +1,15 @@
+module Flexirest
+  module AttributeParsing
+    private
+
+    def parse_attribute_value(v)
+      if v.to_s[(/^(((19|20)\d\d[- \/.](0[1-9]|1[012]|[1-9])[- \/.](0[1-9]|[12][0-9]|3[01]|[1-9]))|((0[1-9]|1[012]|[1-9])[- \/.](0[1-9]|[12][0-9]|3[01]|[1-9])[- \/.](19|20)\d\d))$/)]
+        Date.parse(v)
+      elsif v.to_s[/^([\+-]?\d{4}(?!\d{2}\b))((-?)((0[1-9]|1[0-2])(\3([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6])))([T\s]((([01]\d|2[0-3])((:?)[0-5]\d)?|24\:?00)([\.,]\d+(?!:))?)?(\17[0-5]\d([\.,]\d+)?)?([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)?))$/]
+        DateTime.parse(v)
+      else
+        v
+      end
+    end
+  end
+end

data/lib/flexirest/base.rb

@@ -6,6 +6,7 @@ module Flexirest
     include Validation
     include Caching
     include Recording
+    include AttributeParsing
 
     attr_accessor :_status
     attr_accessor :_etag
@@ -24,13 +25,7 @@ module Flexirest
 
       attrs.each do |attribute_name, attribute_value|
         attribute_name = attribute_name.to_sym
-        if attribute_value.to_s[(/^(((19|20)\d\d[- \/.](0[1-9]|1[012]|[1-9])[- \/.](0[1-9]|[12][0-9]|3[01]|[1-9]))|((0[1-9]|1[012]|[1-9])[- \/.](0[1-9]|[12][0-9]|3[01]|[1-9])[- \/.](19|20)\d\d))$/)]
-          @attributes[attribute_name] = Date.parse(attribute_value)
-        elsif attribute_value.to_s[/^([\+-]?\d{4}(?!\d{2}\b))((-?)((0[1-9]|1[0-2])(\3([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6])))([T\s]((([01]\d|2[0-3])((:?)[0-5]\d)?|24\:?00)([\.,]\d+(?!:))?)?(\17[0-5]\d([\.,]\d+)?)?([zZ]|([\+-])([01]\d|2[0-3]):?([0-5]\d)?)?))$/]
-          @attributes[attribute_name] = DateTime.parse(attribute_value)
-        else
-          @attributes[attribute_name] = attribute_value
-        end
+        @attributes[attribute_name] = parse_attribute_value(attribute_value)
         @dirty_attributes << attribute_name
       end
     end

data/lib/flexirest/request.rb

@@ -6,6 +6,7 @@ require 'crack/xml'
 module Flexirest
 
   class Request
+    include AttributeParsing
     attr_accessor :post_params, :get_params, :url, :path, :headers, :method, :object, :body, :forced_url, :original_url
 
     def initialize(method, object, params = {})
@@ -448,11 +449,7 @@ module Flexirest
             end
           end
         else
-          if v.to_s[/\d{4}\-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(Z|[+-]\d{2}:\d{2})/]
-            object._attributes[k] = DateTime.parse(v)
-          else
-            object._attributes[k] = v
-          end
+          object._attributes[k] = parse_attribute_value(v)
         end
       end
       object.clean! unless object_is_class?

data/lib/flexirest/version.rb

@@ -1,3 +1,3 @@
 module Flexirest
-  VERSION = "1.2.16"
+  VERSION = "1.2.17"
 end

data/lib/flexirest.rb

@@ -1,5 +1,6 @@
 require 'active_support/all'
 require "flexirest/version"
+require "flexirest/attribute_parsing"
 require "flexirest/mapping"
 require "flexirest/caching"
 require "flexirest/logger"

data/spec/lib/attribute_parsing_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+class AttributeParsingExampleBase
+  include Flexirest::AttributeParsing
+
+  def test(v)
+    parse_attribute_value(v)
+  end
+end
+
+
+describe Flexirest::AttributeParsing do
+  let(:subject) { AttributeParsingExampleBase.new }
+
+  it "should parse datetimes" do
+    expect(subject.test("1980-12-24T00:00:00.000Z")).to be_a(DateTime)
+  end
+
+  it "should parse dates" do
+    expect(subject.test("1980-12-24")).to be_a(Date)
+  end
+
+  it "should return strings for string values" do
+    expect(subject.test("1980-12")).to eq("1980-12")
+  end
+
+  it "should return integers for integer values" do
+    expect(subject.test(1980)).to eq(1980)
+  end
+
+  it "should return floats for float values" do
+    expect(subject.test(1980.12)).to eq(1980.12)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexirest
 version: !ruby/object:Gem::Version
-  version: 1.2.16
+  version: 1.2.17
 platform: ruby
 authors:
 - Andy Jeffries
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -256,6 +256,7 @@ files:
 - doc/Flexirest Internals.png
 - flexirest.gemspec
 - lib/flexirest.rb
+- lib/flexirest/attribute_parsing.rb
 - lib/flexirest/base.rb
 - lib/flexirest/caching.rb
 - lib/flexirest/configuration.rb
@@ -276,6 +277,7 @@ files:
 - lib/flexirest/result_iterator.rb
 - lib/flexirest/validation.rb
 - lib/flexirest/version.rb
+- spec/lib/attribute_parsing_spec.rb
 - spec/lib/base_spec.rb
 - spec/lib/caching_spec.rb
 - spec/lib/configuration_spec.rb
@@ -323,6 +325,7 @@ summary: This gem is for accessing REST services in a flexible way.  ActiveResou
   Rails conventions, it doesn't have in-built caching and it's not as flexible in
   general.
 test_files:
+- spec/lib/attribute_parsing_spec.rb
 - spec/lib/base_spec.rb
 - spec/lib/caching_spec.rb
 - spec/lib/configuration_spec.rb