collectiveaccess 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da35ab42582e513072624516a334dbc2b45d8278
-  data.tar.gz: 2d23ab9571a04af4154a5c32d5c2e74e2fd4f8b0
+  metadata.gz: d00ccf45255fc0a19c4a7043b92a8e763176bf23
+  data.tar.gz: 3cd38501963b88a784a19bd391465c5651481689
 SHA512:
-  metadata.gz: 8e236602a2266223c46962c9814bc2ba27c8c3f9b018fab2778eaaa564e7875a85aa6669cf41728cc6724fa9c88d0ba13545a4abbff6dbbfbcf2869231d89105
-  data.tar.gz: cee02cdb1432ba1ec7ee96ca3e485bbe612ba8a581b2d00a535bacbd5cd908d19ccdff4dd478e837a7c41a700506f96f2b0c6c4d5e381673bf0beb82b8a827d0
+  metadata.gz: accc3a54849e185553cec9e58a534078140f88f33bbdb5cc6cadeae819e8c8de2e9e869f4188d625642dfa6aa04beaa4abb477e51b9349f5beef33b0b86de566
+  data.tar.gz: 8aa9868368e1f745584abb700948d3a507417154d2acf3f611afe0e2b347f6a382bf2ba10733a170a62cd9b398ee010784ded39f32441d1374d49379d5569483

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/collectiveaccess.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: collectiveaccess 0.2.1 ruby lib
+# stub: collectiveaccess 0.2.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "collectiveaccess"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["CollectiveAccess", "Stefan"]
-  s.date = "2015-08-17"
+  s.date = "2015-09-01"
   s.description = "This gem is a simple plain Ruby wrapper for the CollectiveAccess Web Service API. For more info see https://github.com/CollectiveAccessProject/collectiveaccess"
   s.email = "info@collectiveaccess.org"
   s.extra_rdoc_files = [

data/lib/collectiveaccess.rb

@@ -20,7 +20,8 @@ class CollectiveAccess
     endpoint: 'item',
     request_body: {},
     get_params: {},
-    url_string: ''
+    url_string: '',
+    verify: false
   }
 
 
@@ -95,21 +96,35 @@ class CollectiveAccess
   end
 
   def self.build_uri(opts)
+
+    uri_opts = { :host => opts[:hostname],
+                 :path => opts[:url_root]+opts[:script_name]+'/'+opts[:endpoint]+'/'+opts[:table_name]+'/'+opts[:url_string],
+                 :query => URI.encode_www_form(opts[:get_params].merge(authToken: stored_auth_token)) }
+
     # URI available params: scheme, userinfo, host, port, registry, path, opaque, query and fragment
-    url = URI::HTTP.build({ :scheme => opts[:protocol],
-                            :host => opts[:hostname],
-                            :path => opts[:url_root]+opts[:script_name]+'/'+opts[:endpoint]+'/'+opts[:table_name]+'/'+opts[:url_string],
-                            :query => URI.encode_www_form(opts[:get_params].merge(authToken: stored_auth_token)) })
+    if opts[:protocol] == 'http'
+      url = URI::HTTP.build uri_opts
+    else
+      url = URI::HTTPS.build uri_opts
+    end
+
     url.path.gsub! %r{/+}, '/'
+
     url
   end
 
   def self.build_simple_uri(opts)
     # URI available params: scheme, userinfo, host, port, registry, path, opaque, query and fragment
-    url = URI::HTTP.build({ :scheme => opts[:protocol],
-                            :host => opts[:hostname],
-                            :path => opts[:url_root]+opts[:script_name]+'/simple/'+opts[:endpoint],
-                            :query => URI.encode_www_form(opts[:get_params].merge(authToken: stored_auth_token)) })
+    uri_opts = { :host => opts[:hostname],
+                 :path => opts[:url_root]+opts[:script_name]+'/simple/'+opts[:endpoint],
+                 :query => URI.encode_www_form(opts[:get_params].merge(authToken: stored_auth_token)) }
+
+    if opts[:protocol] == 'http'
+      url = URI::HTTP.build uri_opts
+    else
+      url = URI::HTTPS.build uri_opts
+    end
+
     url.path.gsub! %r{/+}, '/'
     url
   end
@@ -121,10 +136,16 @@ class CollectiveAccess
   # authenticate with CA Web Service API and store auth token in a temporary file
   def self.authenticate(request_opts = {})
     opts = parse_options request_opts
-    auth_url = URI::HTTP.build({ :scheme => opts[:protocol],
-                                 :host => opts[:hostname],
-                                 :path => opts[:url_root] + '/service.php/auth/login',
-                                 :query => URI.encode_www_form(opts[:get_params]) })
+    uri_opts = { :host => opts[:hostname],
+                 :path => opts[:url_root] + '/service.php/auth/login',
+                 :query => URI.encode_www_form(opts[:get_params]) }
+
+    if opts[:protocol] == 'http'
+      auth_url = URI::HTTP.build uri_opts
+    else
+      auth_url = URI::HTTPS.build uri_opts
+    end
+
     auth_url.path.gsub! %r{/+}, '/'
 
     resp = HTTParty.get auth_url, basic_auth: @auth

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collectiveaccess
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - CollectiveAccess
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty