reso_transport 1.2.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b45ccf4b5c9867e0b0321837c60b9d02132500287e4c7b8da0f4778055f187eb
-  data.tar.gz: 6bf1974a3a47e6992436a44189cec2d3b0d09111b5db8b9460962395699fd2d1
+  metadata.gz: 3d0f1d48b90a3fac473d2fc548626f619a1389814fe476db23bb0e12113ee84d
+  data.tar.gz: 0a61cdc9750832111812de93441beafe29bef47059841e7ea41105589c673373
 SHA512:
-  metadata.gz: 0b370d94911dc23c85ed636fa8ec498755e9f45dc1c9bbf881fad758f1441b68c166ead9e9011a31835437efcf2cb46b97a5b2ecc4ed1c45e4889ebf32b0e5b7
-  data.tar.gz: d0a446c18da53056591f581ec613d44727a01269fc8de44001611100c5208457168d89c6a882b4ba7c8aa3b1a8b2e84a77f7bd1e4597b4bc90f4b0fddf3f94e3
+  metadata.gz: 96b56e7e821e978b4ff48f9023d82901c4449eb820f3b0ab82e9faa187b8c7e547dbef679a396c6385202f713aeaf8c446e2d1338b46e2c09f32632ab6e04d6a
+  data.tar.gz: c054fa510a18b072a4e98505d48d73fb9bde7c06e3294aaafe9fcf7c28b94cd0ffb0e51019ea5b6b6630783584bcbde5e49a4abfa0d9fecebb45567bcab79308

data/.ruby-version

@@ -0,0 +1 @@
+2.7.1

data/Gemfile.lock

@@ -1,33 +1,33 @@
 PATH
   remote: .
   specs:
-    reso_transport (1.1.0)
-      faraday (~> 0.15.0)
+    reso_transport (1.5.1)
+      faraday (~> 1.0.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     byebug (11.0.1)
-    faraday (0.15.4)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
     minitest (5.13.0)
     minitest-rg (5.2.0)
       minitest (~> 5.0)
     multipart-post (2.1.1)
-    rake (10.5.0)
-    vcr (5.0.0)
+    rake (13.0.1)
+    vcr (6.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.17)
+  bundler (~> 2)
   byebug
   minitest (~> 5.0)
   minitest-rg (~> 5.0)
-  rake (~> 10.0)
+  rake (~> 13)
   reso_transport!
-  vcr (~> 5.0)
+  vcr (~> 6.0)
 
 BUNDLED WITH
-   1.17.2
+   2.1.4

data/README.md

@@ -30,6 +30,25 @@ This gem has been tested to work with:
 * [Bridge Interactive](https://www.bridgeinteractive.com)
 
 
+### Logging
+
+You can either set a global logger in an initializer file:
+
+```ruby
+ResoTransport.configure do |c|
+  c.logger = Logger.new("some_log_file")
+  # OR
+  c.logger = Rails.logger
+end
+
+```
+Or you can set a logger for each specific instance of a client which can be useful for debugging:
+
+```ruby
+@client = ResoTransport::Client.new(config.merge(logger: Logger.new("logfile")))
+```
+
+
 ### Getting Connected
 
 There are 2 strategies for authentication. 
@@ -189,6 +208,7 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/reso_transport. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/bin/console

@@ -22,9 +22,9 @@ require 'byebug'
 
 SECRETS = YAML.load_file("secrets.yml")
 
-@trestle = ResoTransport::Client.new(SECRETS[:trestle])
-@bridge = ResoTransport::Client.new(SECRETS[:bridge])
-@spark = ResoTransport::Client.new(SECRETS[:spark])
+@trestle = ResoTransport::Client.new(SECRETS[:trestle].merge(logger: Logger.new($stdout)))
+@bridge = ResoTransport::Client.new(SECRETS[:bridge].merge(logger: Logger.new($stdout)))
+# @spark = ResoTransport::Client.new(SECRETS[:spark])
 @crmls = ResoTransport::Client.new(SECRETS[:crmls])
 
 IRB.start(__FILE__)

data/lib/reso_transport.rb

@@ -21,17 +21,19 @@ require "reso_transport/query"
 
 
 
-module Faraday
-  module Utils
+# module Faraday
+#   module Utils
 
-    def escape(str)
-      str.to_s.gsub(ESCAPE_RE) do |match|
-        '%' + match.unpack('H2' * match.bytesize).join('%').upcase
-      end.gsub(" ","%20")
+#     def escape(str)
+#       str.to_s.gsub(ESCAPE_RE) do |match|
+#         '%' + match.unpack('H2' * match.bytesize).join('%').upcase
+#       end.gsub(" ","%20")
 
-    end
-  end
-end
+#     end
+#   end
+# end
+
+Faraday::Utils.default_space_encoding = "%20"
 
 module ResoTransport
   class Error < StandardError; end

data/lib/reso_transport/client.rb

@@ -8,10 +8,13 @@ module ResoTransport
       @authentication  = ensure_valid_auth_strategy(options.fetch(:authentication))
       @vendor          = options.fetch(:vendor, {})
       @faraday_options = options.fetch(:faraday_options, {})
+      @logger          = options.fetch(:logger, nil)
 
       @connection = Faraday.new(@endpoint, @faraday_options) do |faraday|
         faraday.request  :url_encoded
-        faraday.response :logger, ResoTransport.configuration.logger if ResoTransport.configuration.logger
+        # faraday.response :logger, ResoTransport.configuration.logger if ResoTransport.configuration.logger
+        # faraday.response :logger, @logger if @logger
+        faraday.response :logger
         #yield faraday if block_given?
         faraday.use Authentication::Middleware, @authentication
         faraday.adapter Faraday.default_adapter #unless faraday.builder.send(:adapter_set?)

data/lib/reso_transport/enum.rb

@@ -7,7 +7,7 @@ module ResoTransport
 
   Enum = Struct.new(:name, :type, :is_flags) do
     def self.from_stream(args)
-      new("#{args[:schema].namespace}.#{args["Name"]}", args["UnderlyingType"], args["IsFlags"])
+      new("#{args[:schema].namespace}.#{args["Name"]}", args["UnderlyingType"], args["IsFlags"].to_s.downcase == "true")
     end
     
     def members

data/lib/reso_transport/metadata.rb

@@ -23,7 +23,8 @@ module ResoTransport
         if File.exist?(client.md_file) && File.size(client.md_file) > 0
           File.new(client.md_file)
         else
-          File.open(client.md_file, "w") {|f| f.write(raw) }
+          raw_md = raw
+          File.open(client.md_file, "w") {|f| f.write(raw.force_encoding("UTF-8")) } unless raw_md.length == 0
           File.new(client.md_file)
         end
       else

data/lib/reso_transport/property.rb

@@ -21,9 +21,9 @@ module ResoTransport
     def parse_value(value)
       case data_type
       when "Edm.DateTimeOffset"
-        DateTime.parse(value)
+        DateTime.parse(value) rescue nil
       when "Edm.Date"
-        Date.parse(value)
+        Date.parse(value) rescue nil
       else
         value
       end

data/lib/reso_transport/query.rb

@@ -1,7 +1,7 @@
 module ResoTransport
   Query = Struct.new(:resource) do
 
-    def all(&block)
+    def all(*contexts, &block)
       new_query_context('and')
       instance_eval(&block)
       clear_query_context
@@ -59,6 +59,7 @@ module ResoTransport
     end
 
     def count
+      p compile_params
       limit(1).include_count
       resp = resource.get(compile_params)
       parsed_body = JSON.parse(resp.body)
@@ -117,17 +118,17 @@ module ResoTransport
       global = groups.delete(:global)
       filter_groups = groups.values
 
-      filter_string = ""
+      filter_chunks = []
 
       if global && global[:criteria]&.any?
-        filter_string << global[:criteria].join(" #{global[:context]} ")  
+        filter_chunks << global[:criteria].join(" #{global[:context]} ")  
       end
 
-      filter_string << filter_groups.map do |g|
+      filter_chunks << filter_groups.map do |g|
         "(#{g[:criteria].join(" #{g[:context]} ")})"
       end.join(" and ")
 
-      filter_string
+      filter_chunks.reject {|c| c == ""}.join(" and ")
     end
 
     def compile_params

data/lib/reso_transport/version.rb

@@ -1,3 +1,3 @@
 module ResoTransport
-  VERSION = "1.2.0"
+  VERSION = "1.5.1"
 end

data/reso_transport.gemspec

@@ -24,12 +24,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "faraday", "~> 0.15.0"
+  spec.add_dependency "faraday", "~> 1.0.1"
 
-  spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2"
+  spec.add_development_dependency "rake", "~> 13"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "minitest-rg", "~> 5.0"
-  spec.add_development_dependency "vcr", "~> 5.0"
+  spec.add_development_dependency "vcr", "~> 6.0"
   spec.add_development_dependency "byebug"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reso_transport
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Jon Druse
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +116,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -165,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A utility for consuming RESO Web API connections