biola_web_services 0.1.3 → 1.0.0

data/lib/biola_web_services/configuration.rb

@@ -0,0 +1,14 @@
+module BiolaWebServices
+  class Configuration
+    attr_accessor :url
+    attr_accessor :cert_path
+    attr_accessor :key_path
+    attr_accessor :key_password
+    attr_accessor :verify_ssl
+    attr_accessor :ssl_version
+
+    # DEFAULTS
+    @url = 'https://ws.biola.edu'
+    @verify_ssl = true
+  end
+end

data/lib/biola_web_services/service.rb

@@ -1,7 +1,5 @@
 module BiolaWebServices
-
   class Service
-
     require 'json'
   
     @service_name = nil
@@ -10,42 +8,47 @@ module BiolaWebServices
       @service_name = service_name
     end
   
-    def call(method_name, args)
-      response = BiolaWebServices.connection(@service_name.to_s)[method_name.to_s].post(args)
+    def send(method_name, args)
+      request = Net::HTTP::Post.new request_path(method_name)
+      request.set_form_data args
+
+      response = BiolaWebServices.connection.start{|conn| conn.request(request)}
       begin
-        JSON.parse response
-      rescue
-        response
+        JSON.parse response.body
+      rescue JSON::ParserError
+        response.body # not all responses are JSON
       end
     end
   
     def method_missing(m, *args)
-
       method_name = ruby_to_ws_method_name(m)
       modifier = m.to_s[-1, 1]
       args = args[0] if args.length == 1
 
       case modifier
-        when '?'
-          response = call(method_name, args)
-          %w(true t yes y 1).include?(response.to_s.downcase.strip)
-        when '!'
-          call(method_name, args)
-        else
-          begin
-            call(method_name, args)
-          rescue
-            nil
-          end
+      when '?' # return true or false
+        response = send(method_name, args)
+        %w(true t yes y 1).include?(response.to_s.downcase.strip)
+      when '!' # raise errors
+        send(method_name, args)
+      else # return nil on error
+        begin
+          send(method_name, args)
+        rescue
+          nil
+        end
       end
-
     end
   
+    private
+    def request_path(method_name)
+      @uri ||= URI.parse(BiolaWebServices.config.url)
+      [@uri.path, @service_name, method_name].join('/')
+    end
+
     # Basically just a stripped down, customized version of Rails' camelize
     def ruby_to_ws_method_name(method_name)
       method_name.to_s.gsub(/(^|_)(.)/) { $2.upcase }.delete('?!')
     end
-
   end
-
-end
+end

data/lib/biola_web_services/version.rb

@@ -1,5 +1,3 @@
 module BiolaWebServices
-
-  VERSION = '0.1.3'
-
-end
+  VERSION = '1.0.0'
+end

data/lib/biola_web_services.rb

@@ -1,2 +1,42 @@
-require 'biola_web_services/service'
-require 'biola_web_services/biola_web_services'
+module BiolaWebServices
+  require 'biola_web_services/service'
+  require 'biola_web_services/configuration'
+  require 'net/http'
+
+  def self.configure
+    yield config
+  end
+
+  def self.config
+    @config ||= Configuration.new
+  end
+
+  public
+  
+  def self.connection
+    return @connection unless @connection.nil?
+
+    cert = OpenSSL::X509::Certificate.new(File.read(self.config.cert_path))    
+    key = OpenSSL::PKey::RSA.new(File.read(self.config.key_path), self.config.key_password)
+    uri = URI.parse(self.config.url)
+
+    @connection = Net::HTTP.new(uri.host, uri.port)
+    if uri.scheme == 'https'
+      @connection.use_ssl = true
+      @connection.cert = cert
+      @connection.key = key
+      @connection.verify_mode = self.config.verify_ssl ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
+      @connection.ssl_version = self.config.ssl_version unless self.config.ssl_version.nil?
+    end
+
+    @connection
+  end
+
+  def self.method_missing(m, *args)
+    if args.empty?
+      BiolaWebServices::Service.new(m)
+    else
+      super
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: biola_web_services
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,30 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-16 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: &82335240 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *82335240
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: &82334560 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *82334560
+date: 2012-04-13 00:00:00.000000000 Z
+dependencies: []
 description: Simple Ruby wrapper for Biola Web Services REST calls
 email: adam.crownoble@biola.edu
 executables: []
@@ -41,8 +19,8 @@ extra_rdoc_files: []
 files:
 - lib/biola_web_services.rb
 - lib/biola_web_services/version.rb
-- lib/biola_web_services/biola_web_services.rb
 - lib/biola_web_services/service.rb
+- lib/biola_web_services/configuration.rb
 homepage: http://biola.edu/it
 licenses: []
 post_install_message: 

data/lib/biola_web_services/biola_web_services.rb

@@ -1,133 +0,0 @@
-module BiolaWebServices
-
-  require 'rest_client'
-  require 'json'
-
-  def self.url
-    @@url ||= 'https://ws.biola.edu'
-  end
-
-  def self.url=(url)
-    @@url = url
-  end
-  
-  def self.auth_type
-    @@auth_type ||= :cert
-  end
-
-  def self.auth_type=(auth_type)
-    unless [:cert, :login].include? auth_type
-      raise ArgumentError, 'Valid types are :cert and :login'
-    end
-
-    @@auth_type = auth_type.to_sym
-  end
-  
-  def self.cert_path
-    @@cert_path.to_s
-  end
-
-  def self.cert_path=(cert_path)
-    @@cert_path = cert_path
-  end
-  
-  def self.key_path
-    @@key_path.to_s
-  end
-  
-  def self.key_path=(key_path)
-    @@key_path = key_path
-  end
-  
-  def self.key_password
-    @@key_password.to_s
-  end
-
-  def self.key_password=(key_password)
-    @@key_password = key_password
-  end
-  
-  def self.username
-    @@username.to_s
-  end
-  
-  def self.username=(username)
-    @@username = username
-  end
-  
-  def self.password
-    @@password.to_s
-  end
-
-  def self.password=(password)
-    @@pasword = password
-  end
-  
-  def self.verify_ssl
-    @@verify_ssl ||= true
-  end
-
-  def self.verify_ssl=(verify_ssl)
-    @@verify_ssl = verify_ssl
-  end
-
-  private
-  
-  def self.cert
-    @@cert ||= nil
-  end
-
-  def self.cert=(cert)
-    @@cert = cert
-  end
-  
-  def self.key
-    @@key ||= nil
-  end
-
-  def self.key=(key)
-    @@key = key
-  end
-
-  def self.connect_with_cert(service_name)
-  
-    if self.cert.nil?
-      self.cert = OpenSSL::X509::Certificate.new(File.read(self.cert_path))
-    end
-    
-    if self.key.nil?
-      self.key = OpenSSL::PKey::RSA.new(File.read(self.key_path), self.key_password)
-    end
-
-    return RestClient::Resource.new(
-      "#{self.url}/#{service_name}/rest",
-      :ssl_client_cert => self.cert,
-      :ssl_client_key => self.key,
-      :verify_ssl => self.verify_ssl
-    )
-  
-  end
-  
-  def self.connect_with_login(service_name)
-    return RestClient::Resource.new(
-      "#{self.url}/#{service_name}/rest",
-      :user=>self.username,
-      :password=>self.password
-    )
-  end
-
-  public
-  
-  def self.connection(service_name)
-    if self.auth_type == :cert
-      return self.connect_with_cert(service_name)
-    else
-      return self.connect_with_login(service_name)
-    end
-  end
-
-  def self.method_missing(m, *args)
-    BiolaWebServices::Service.new(m)
-  end
-
-end