uaeds 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b849867af133bd9bb166313fc73662dbf25cf5ed
-  data.tar.gz: 2dfdb9cf4d56f46d74f2b14603bf3b92448b68cb
+  metadata.gz: 360c26e4e040f658fcb0bdc374c0a75aa231e571
+  data.tar.gz: 77b9e3273861c6eba3765e8492394151b9c4fb1c
 SHA512:
-  metadata.gz: e94e522bd19724a65c6d08206085e04c86bc646412c91ad26f3261446d8303b43c20d5cce85bd22c8d3fe987a4c6df7620ddc52cb913ff5707ef52dac6ab652b
-  data.tar.gz: 742f3c771eb701d90454ec4b0b119299deb730787b5adf018af15b62b8c78f91fdbc677c935e358f8c2cef268371bef1861195114c89ab8a9a1783446cd637ec
+  metadata.gz: faa6d09b2927831efcb6c39cc27d3ec4247fdb26280314dbff86d7091a547793894570aae2b808dcf29800f373e429c084fd975e51aa33833678478bd0e85ade
+  data.tar.gz: 5053b713ee6cce2ee4949841064aad2aa0a1cf706e5cbfbd786bb960206b7175ff0b6d66219e0960abf9e4699cdb6e893f8c36f8cdb03fa347cf46e6b9f71233

data/README.md

@@ -15,7 +15,10 @@ You have a choice between `EdsDSML` and `EdsJSON`. The difference is that DSML r
 
 Either way, you need to provide an endpoint, EDS user, and access key for library to use.
 ```ruby
-eds = EdsDSML.new("https://<endpoint>", <user>, <key>)
+EdsDSML.eds_user = <user>
+EdsDSML.eds_key = <key>
+EdsDSML.eds_endpoint = "https://<endpoint>"
+eds = EdsDSML.instance
 person = eds.person_by_netid(<netid>)
 person.uaid
 person.uid

data/lib/uaeds/eds.rb

@@ -2,15 +2,28 @@
 
 module Uaeds
   class Eds
-    def initialize(url, user=nil, password=nil)
-      raise ArgumentError, "EDS URL required." unless (url && url.strip != "")
-      if(user && password)
-        @user = user
-        @password = password
+    @@eds_user = nil
+    @@eds_key = nil
+  
+    def initialize(url=nil, user=nil, password=nil)
+      if(url == nil)
+        raise ArgumentError, "EDS URL required." unless (self.class.eds_endpoint && self.class.eds_endpoint.strip != "")
+        if(@@eds_user && @@eds_key)
+            @user = @@eds_user
+            @password = @@eds_key
+        end
+        @url = self.class.eds_endpoint
+      else
+        raise ArgumentError, "EDS URL required." unless (url && url.strip != "")
+        if(user && password)
+            @user = user
+            @password = password
+        end
+        @url = url
       end
-      @url = url
     end
     
+    
     def person_by_uaid(uaid)
       return open_person(uaid)
     end
@@ -27,6 +40,22 @@ module Uaeds
       return open_person(identifier)
     end
     
+    def self.eds_user=(user=nil)
+      @@eds_user = user
+    end
+    
+    def self.eds_key=(key=nil)
+      @@eds_key = key
+    end
+    
+    def self.eds_user
+      @@eds_user
+    end
+    
+    def self.eds_key
+      @@eds_key
+    end
+    
     private
     
     def open_persion(idenfifier)

data/lib/uaeds/eds_dsml.rb

@@ -3,9 +3,21 @@ require 'open-uri'
 require 'nokogiri'
 require 'uaeds/eds'
 require 'uaeds/dsml_person'
+require 'singleton'
 
 module Uaeds
   class EdsDSML < Eds
+    include Singleton
+    
+    @@eds_dsml_endpoint = nil
+    
+    def self.eds_endpoint=(endpoint=nil)
+      @@eds_dsml_endpoint = endpoint
+    end
+    
+    def self.eds_endpoint
+      @@eds_dsml_endpoint
+    end
     
     private
     

data/lib/uaeds/eds_json.rb

@@ -3,11 +3,14 @@ require 'open-uri'
 require 'json'
 require 'uaeds/eds'
 require 'uaeds/json_person'
-
+require 'singleton'
 
 module Uaeds
   class EdsJSON < Eds
-  
+    include Singleton
+    
+    @@eds_json_endpoint = nil
+    
     def person_by_uaid(uaid)
       return open_person('uaId', uaid)
     end
@@ -23,7 +26,15 @@ module Uaeds
     def person(identifier)
       return open_person(nil, identifier)
     end
-  
+    
+    def self.eds_endpoint=(endpoint=nil)
+      @@eds_json_endpoint = endpoint
+    end
+    
+    def self.eds_endpoint
+      @@eds_json_endpoint
+    end
+    
     private
     
     def open_person(attribute=nil, value)

data/lib/uaeds/version.rb

@@ -1,3 +1,3 @@
 module Uaeds
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/uaeds_spec.rb

@@ -1,3 +1,4 @@
+require 'uaeds/eds'
 require 'uaeds/eds_dsml'
 require 'uaeds/eds_json'
 require 'highline/import'
@@ -74,13 +75,18 @@ module Uaeds
         expect(eds_json_ep).not_to be_empty
       end
       
+      Eds.eds_user = eds_user
+      Eds.eds_key = eds_key
+      EdsDSML.eds_endpoint = "https://#{eds_dsml_ep}"
+      EdsJSON.eds_endpoint = "https://#{eds_json_ep}"
+      
     end
         
         
     describe 'EdsDSML and EdsJSON retrieve the same results' do
     
-      eds0 = EdsDSML.new("https://#{eds_dsml_ep}", eds_user, eds_key)
-      eds1 = EdsJSON.new("https://#{eds_json_ep}", eds_user, eds_key)
+      eds0 = EdsDSML.instance
+      eds1 = EdsJSON.instance
       
       describe 'EdsDSML and EdsJSON should match when retrieved by NetId' do
         

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uaeds
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - dgsan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler