flexirest 1.3.24 → 1.3.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14a35d637cc44c2743283d3c63c3072b5d46b43c
-  data.tar.gz: a5b9fa6ad5756255d0f7d7033fe7f82ff85927bf
+  metadata.gz: 47cf1c23a48bd2918fe49fd5470a9a3b0342e877
+  data.tar.gz: 5e217cfef265cbe32682ae8a6d1749b4be843428
 SHA512:
-  metadata.gz: e2e4b418eb542330bcc6223c05ed6335d0727d12a654facf6977e21c639082a066c3e48ffab1bd806a49a1d910a8752799ca351ac9df82dab0cc4331a9bed55b
-  data.tar.gz: 174b86be52593db6abd70544225a2775029c648e03eb4c971e52973a356a31fa304accd0281e7c14f4a167056b369f75843dda5c46fcd38755204360ed11a53b
+  metadata.gz: fc90cf108ae54f5ee86d6f884e35eecf4fe46e5f7f0b835f2fe5dd77759392f62e3a7cbf1582a749068332e757ddaa672a77894e1858eef88cedcfb621013584
+  data.tar.gz: 9245bc5bc022f899fb8db5a71339fac3d5ad33d19abb0d13d1dd60d97640f1d751757fd55f1395c24fe32be81dbeac372f2c745a2e75ab817879a6037fdbd9be

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.3.25
+
+Feature:
+
+- Improvements in performance due to date parsing (thanks to guanglunw for the PR)
+
 ## 1.3.24
 
 Bugfix:

data/README.md

@@ -702,7 +702,7 @@ would output the following url
 
 ### Automatic Conversion of Fields to Date/DateTime
 
-By default Flexirest will attempt to convert all fields to a Date or DateTime object if it's a string and the value matches a pair of regular expressions. However, on large responses this can be computationally expensive.  So, you can either disable this automatic conversion completely with:
+By default Flexirest will attempt to convert all fields to a Date or DateTime object if it's a string and the value matches a pair of regular expressions. However, on large responses this can be computationally expensive.  You can disable this automatic conversion completely with:
 
 ```ruby
 Flexirest::Base.disable_automatic_date_parsing = true
@@ -716,6 +716,21 @@ class Person < Flexirest::Base
 end
 ```
 
+It is also possible to whitelist fields should be parsed in your models, which is useful if you are instantiating these objects directly. The specified fields also apply automatically to request mapping.
+
+```ruby
+class Person < Flexirest::Base
+  parse_date :updated_at, :created_at
+end
+
+# to disable all mapping
+class Disabled < Flexirest::Base
+  parse_date :none
+end
+```
+
+This system respects `disable_automatic_date_parsing`, and will default to mapping everything - unless a `parse_date` whitelist is specified, or automatic parsing is globally disabled.
+
 ### Raw Requests
 
 Sometimes you have have a URL that you just want to force through, but have the response handled in the same way as normal objects or you want to have the callbacks run (say for authentication).  The easiest way to do that is to call `_request` on the class:

data/flexirest.gemspec

@@ -42,7 +42,9 @@ Gem::Specification.new do |spec|
     spec.add_runtime_dependency "activesupport", "< 5.0.0"
   end
   # JSON is an implicit dependency of something, but JSON v2+ requires Ruby 2+
+  # Same with "tins" which is a dependency of coveralls
   if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
     spec.add_runtime_dependency "json", "< 2.0.0"
+    spec.add_runtime_dependency "tins", "~> 1.6.0"
   end
 end

data/lib/flexirest/associations.rb

@@ -50,6 +50,19 @@ module Flexirest
           _attributes[key]
         end
       end
+
+      def parse_date(*keys)
+        keys.each { |key| @_date_fields << key }
+      end
+
+      def _date_fields
+        @_date_fields.uniq
+      end
+
+      def inherited(subclass)
+        subclass.instance_variable_set(:@_date_fields, [])
+        super
+      end
     end
 
     def self.included(base)

data/lib/flexirest/attribute_parsing.rb

@@ -3,6 +3,8 @@ module Flexirest
     private
 
     def parse_attribute_value(v)
+      return v if v.is_a?(Date) || v.is_a?(DateTime)
+
       if v.to_s[(/\A(((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))\Z/)]
         Date.parse(v)
       elsif v.to_s[/\A([\+-]?\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)?)?))\Z/]

data/lib/flexirest/base.rb

@@ -26,7 +26,7 @@ module Flexirest
 
       attrs.each do |attribute_name, attribute_value|
         attribute_name = attribute_name.to_sym
-        @attributes[attribute_name] = parse_attribute_value(attribute_value)
+        @attributes[attribute_name] = parse_date?(attribute_name) ? parse_attribute_value(attribute_value) : attribute_value
         @dirty_attributes << attribute_name
       end
     end
@@ -175,6 +175,12 @@ module Flexirest
       end
     end
 
+    def parse_date?(name)
+      return true if self.class._date_fields.include?(name)
+      return true if !Flexirest::Base.disable_automatic_date_parsing && self.class._date_fields.empty?
+      false
+    end
+
   end
 
   class NoAttributeException < StandardError ; end

data/lib/flexirest/request.rb

@@ -479,9 +479,11 @@ module Flexirest
             end
           end
         else
-          if @method[:options][:parse_fields] && @method[:options][:parse_fields].include?(k)
+          parse_fields = [ @method[:options][:parse_fields], @object._date_fields ].compact.reduce([], :|)
+          parse_fields = nil if parse_fields.empty?
+          if (parse_fields && parse_fields.include?(k))
             object._attributes[k] = parse_attribute_value(v)
-          elsif @method[:options][:parse_fields]
+          elsif parse_fields
             object._attributes[k] = v
           elsif Flexirest::Base.disable_automatic_date_parsing
             object._attributes[k] = v

data/lib/flexirest/version.rb

@@ -1,3 +1,3 @@
 module Flexirest
-  VERSION = "1.3.24"
+  VERSION = "1.3.25"
 end

data/spec/lib/associations_spec.rb

@@ -29,6 +29,16 @@ class DeepNestedHasManyExample < Flexirest::Base
   get :find, "/iterate", fake: hash.to_json
 end
 
+class WhitelistedDateExample < Flexirest::Base
+  parse_date :updated_at
+end
+
+class WhitelistedDateMultipleExample < Flexirest::Base
+  parse_date :updated_at, :created_at
+  parse_date :generated_at
+end
+
+
 describe "Has Many Associations" do
   let(:subject) {AssociationExampleBase.new}
 
@@ -108,3 +118,29 @@ describe "Has One Associations" do
     expect(subject.child.nested_child.test).to eq("foo")
   end
 end
+
+describe "whitelisted date fields" do
+  context "no whitelist specified" do
+    let(:subject) {AssociationExampleNested}
+
+    it "should show whitelist as empty array" do
+      expect(subject._date_fields).to eq([])
+    end
+  end
+
+  context "whitelist specified" do
+    let(:subject) {WhitelistedDateExample}
+
+    it "should contain whitelisted field" do
+      expect(subject._date_fields).to eq([:updated_at])
+    end
+  end
+
+  context "multiple attributes whitelisted" do
+    let(:subject) {WhitelistedDateMultipleExample}
+
+    it "should contain all fields" do
+      expect(subject._date_fields).to match_array([:updated_at, :created_at, :generated_at])
+    end
+  end
+end

data/spec/lib/base_spec.rb

@@ -42,6 +42,11 @@ class InstanceMethodExample < Flexirest::Base
   get :all, "/all"
 end
 
+class WhitelistedDateExample < Flexirest::Base
+  parse_date :updated_at
+end
+
+
 describe Flexirest::Base do
   it 'should instantiate a new descendant' do
     expect{EmptyExample.new}.to_not raise_error
@@ -431,4 +436,22 @@ describe Flexirest::Base do
     end
   end
 
+  describe "instantiating object" do
+    context "no whitelist specified" do
+      it "should convert dates automatically" do
+        client = EmptyExample.new(test: Time.now.iso8601)
+        expect(client["test"]).to be_an_instance_of(DateTime)
+      end
+    end
+
+    context "whitelist specified" do
+      it "should only convert specified dates" do
+        time = Time.now.iso8601
+        client = WhitelistedDateExample.new(updated_at: time, created_at: time)
+        expect(client["updated_at"]).to be_an_instance_of(DateTime)
+        expect(client["created_at"]).to be_an_instance_of(String)
+      end
+    end
+  end
+
 end

data/spec/lib/request_spec.rb

@@ -99,6 +99,12 @@ describe Flexirest::Request do
       }
     end
 
+    class WhitelistedDateClient < Flexirest::Base
+      base_url "http://www.example.com"
+      put :conversion, "/put/:id"
+      parse_date :converted
+    end
+
     allow_any_instance_of(Flexirest::Request).to receive(:read_cached_response)
   end
 
@@ -287,6 +293,13 @@ describe Flexirest::Request do
     expect(object.not_converted).to be_an_instance_of(String)
   end
 
+  it "should convert date times in JSON if whitelisted" do
+    expect_any_instance_of(Flexirest::Connection).to receive(:put).with("/put/1234", "debug=true", an_instance_of(Hash)).and_return(::FaradayResponseMock.new(OpenStruct.new(body:"{\"converted\":\"2012-03-04T01:02:03Z\", \"not_converted\":\"2012-03-04T01:02:03Z\"}", response_headers:{})))
+    object = WhitelistedDateClient.conversion id:1234, debug:true
+    expect(object.converted).to be_an_instance_of(DateTime)
+    expect(object.not_converted).to be_an_instance_of(String)
+  end
+
   it "should parse JSON and return a nice object for faked responses" do
     object = ExampleClient.fake id:1234, debug:true
     expect(object.result).to eq(true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexirest
 version: !ruby/object:Gem::Version
-  version: 1.3.24
+  version: 1.3.25
 platform: ruby
 authors:
 - Andy Jeffries
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler