atdis 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 156b40028c933cc59a604386a05f8c893f79cf81
-  data.tar.gz: c53d84d1a1c21e40a782c758981070088a0031bd
+  metadata.gz: 569aa3967302c8529a9c74433f54fd105ebe45d7
+  data.tar.gz: 0eb50df65474e2d5bc5787994d58c8a282e87e4a
 SHA512:
-  metadata.gz: 861de4c29391b0ca955e65487197e4ba1590066d09fd2da8e10db4f98a1b3a00267b1c9dda21bdf4c9394c3141b69f3d1402a1a90d5bf697ef70114c2deb9899
-  data.tar.gz: ee2148c4ab7e514380056b133d3319beb2f09df8985e701a1edfcc83d0762a5acf2ca57d535669faa6d7df41abfa5e6b84562fd90ce5dec6a48ec80ffe451a9d
+  metadata.gz: b6aa7bae02ff0fa4a4a2776ef4bbb16f7438f2332f5b3e419f2281abebe8f25e8894a2beb50b325ca3ca24dce598b58f9c0580b5de408f1e4fe69f712dd4bd57
+  data.tar.gz: 029202949e54506691b3e5c6bb36f2bb73aafd14e707e4ff328b5f739c0a55762a6b35a2f801a5ccbe5d63c8233d23db6c575d40230bf453c2afc4760268f5e7

data/lib/atdis/feed.rb

@@ -4,7 +4,7 @@ require "rest-client"
 
 module ATDIS
   class Feed
-    attr_reader :base_url, :timezone
+    attr_reader :base_url, :timezone, :ignore_ssl_certificate
 
     VALID_OPTIONS = %i[page street suburb postcode lodgement_date_start
                        lodgement_date_end last_modified_date_start last_modified_date_end].freeze
@@ -18,9 +18,10 @@ module ATDIS
     # get interpreted in the given timezone)
     # See https://api.rubyonrails.org/classes/ActiveSupport/TimeZone.html for the
     # list of possible timezone strings
-    def initialize(base_url, timezone)
+    def initialize(base_url, timezone, ignore_ssl_certificate = false)
       @base_url = base_url
       @timezone = timezone
+      @ignore_ssl_certificate = ignore_ssl_certificate
     end
 
     def applications_url(options = {})
@@ -68,11 +69,11 @@ module ATDIS
     end
 
     def applications(options = {})
-      Models::Page.read_url(applications_url(options), timezone)
+      Models::Page.read_url(applications_url(options), timezone, ignore_ssl_certificate)
     end
 
     def application(id)
-      Models::Application.read_url(application_url(id), timezone)
+      Models::Application.read_url(application_url(id), timezone, ignore_ssl_certificate)
     end
 
     # Turn a query string of the form "foo=bar&hello=sir" to {foo: "bar", hello: sir"}

data/lib/atdis/model.rb

@@ -72,8 +72,15 @@ module ATDIS
       [used, unused]
     end
 
-    def self.read_url(url, timezone)
-      r = read_json(RestClient.get(url.to_s).to_str, timezone)
+    def self.read_url_raw(url, ignore_ssl_certificate = false)
+      RestClient::Resource.new(
+        url.to_s,
+        verify_ssl: (OpenSSL::SSL::VERIFY_NONE if ignore_ssl_certificate)
+      ).get.to_str
+    end
+
+    def self.read_url(url, timezone, ignore_ssl_certificate = false)
+      r = read_json(read_url_raw(url, ignore_ssl_certificate), timezone)
       r.url = url.to_s
       r
     end

data/lib/atdis/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Atdis
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/spec/atdis/feed_spec.rb

@@ -9,7 +9,8 @@ describe ATDIS::Feed do
   it "should return all the applications" do
     expect(ATDIS::Models::Page).to receive(:read_url).with(
       "http://www.council.nsw.gov.au/atdis/1.0/applications.json",
-      "UTC"
+      "UTC",
+      false
     ).and_return(page)
     expect(feed.applications).to eq page
   end
@@ -194,7 +195,8 @@ describe ATDIS::Feed do
       application = double
       expect(ATDIS::Models::Application).to receive(:read_url).with(
         "http://www.council.nsw.gov.au/atdis/1.0/27B%2F6.json",
-        "UTC"
+        "UTC",
+        false
       ).and_return(application)
       expect(feed.application("27B/6")).to eq application
     }

data/spec/atdis/models/page_spec.rb

@@ -301,9 +301,10 @@ describe ATDIS::Models::Page do
     ]
   }
         JSON
-        expect(RestClient).to receive(:get).with(
-          "http://www.council.nsw.gov.au/atdis/1.0/applications.json"
-        ).and_return(double(to_str: json))
+        expect(ATDIS::Model).to receive(:read_url_raw).with(
+          "http://www.council.nsw.gov.au/atdis/1.0/applications.json",
+          false
+        ).and_return(json)
       end
 
       let(:applications_results) do
@@ -365,9 +366,10 @@ describe ATDIS::Models::Page do
           }
         }
       JSON
-      expect(RestClient).to receive(:get).with(
-        "http://www.council.nsw.gov.au/atdis/1.0/applications.json?page=2"
-      ).and_return(double(to_str: json))
+      expect(ATDIS::Model).to receive(:read_url_raw).with(
+        "http://www.council.nsw.gov.au/atdis/1.0/applications.json?page=2",
+        false
+      ).and_return(json)
     end
 
     let(:applications_results) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atdis
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Matthew Landauer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-28 00:00:00.000000000 Z
+date: 2020-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -184,7 +184,7 @@ homepage: http://github.com/openaustralia/atdis
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -199,9 +199,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.5.1
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A ruby interface to the application tracking data interchange specification
   (ATDIS) API