rack_dwsregistry 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10b94d01047396225f398735cae8d0fd8966589f
-  data.tar.gz: e71c151b3fc90386bcdd1c339532d6d747acf632
+  metadata.gz: fcc209a2c3d895602832ecde46dce63ccc85d0a2
+  data.tar.gz: 4ea0622c84423e2ac1ff486d88ba5dfa2482ec96
 SHA512:
-  metadata.gz: be5c0d287ba87cd179c40897ea4f0b62d2b175d3cf101d831a1fac2bb21a9766869f42c912d8a11aabbe60cb15e09e1326cc9a9b22b1d6a5f7b36079602b43c3
-  data.tar.gz: 367af7b964dfaded168fcd23fda7a60f5d8d6338774db778e2a02de14d79a9b2bc0723492a80b9ff333d5755c619244b0ac8d23bb96221fa28add0305c201a9e
+  metadata.gz: c2a4d5ef615b73a0ca098b9f80ef0a2b5f74ca81556e4b2aa00010fb1d7240665021b8f640e6eef6e7067459c7b79c9dcc6edcb95769f40972eb189b9a6d9f2a
+  data.tar.gz: cd35b3797bd93a0db3959cba8291a5afe847bbf4f4244d9062836d14e6a757c719c32027ce20efbffbff443bb2403c87eadf81133b602ea1bf7a47bb26f5b8a3

data/lib/rack_dwsregistry.rb

@@ -3,21 +3,23 @@
 # file: rack_dwsregistry.rb
 
 
+require 'drb'
 require 'json'
+require 'rexle'
 require 'app-routes'
-require 'dws-registry'
 
 
 class RackDwsRegistry
   include AppRoutes
 
 
-  def initialize(filename='registry.xml')
-
+  def initialize(host: 'localhost', port: '59500')
+    
     super() # required for app-routes initialize method to exectue
-    @filename = filename
-    load_reg()
+    DRb.start_service
 
+    # attach to the DRb server via a URI given on the command line
+    @reg = DRbObject.new nil, "druby://#{host}:#{port}"
   end
 
   def call(env)
@@ -57,13 +59,11 @@ class RackDwsRegistry
 
       xpath = params['xpath']
       
-      recordset = @reg.xpath(xpath)
+      r = @reg.xpath(xpath)
 
-      if recordset then
-        [recordset.to_doc(root: 'recordset').root.xml, 'application/xml'] 
-      else
-          [{xpath: 'empty'}.to_json, 'application/json']
-      end
+      return [{xpath: 'empty'}.to_json, 'application/json'] if r.empty?
+      
+      [r, 'application/xml'] 
       
     end         
     
@@ -94,8 +94,7 @@ class RackDwsRegistry
     #
     get /^\/(.*)\?action=delete_key$/ do |key|
 
-      r = @reg.delete_key(key)
-      msg = r ? 'key deleted' : 'key not found'
+      msg = @reg.delete_key(key)
       [{delete_key: msg}.to_json, 'application/json']
 
     end
@@ -103,13 +102,18 @@ class RackDwsRegistry
     # get_keys
     #
     get /^\/(.*)\?action=get_keys$/ do |key|
-        
-      recordset = @reg.get_keys(key)
 
-      if recordset then
-        [recordset.to_doc(root: 'recordset').root.xml, 'application/xml'] 
-      else
-          [{get_keys: 'empty'}.to_json, 'application/json']
+      begin
+        
+        r = @reg.get_keys(key)
+        return [{get_keys: 'empty'}.to_json, 'application/json'] unless r
+        
+        [r, 'application/xml']         
+      
+      rescue
+        
+        return [{get_keys: 'key not found'}.to_json, 'application/json'] unless r
+        
       end
   
     end        
@@ -135,19 +139,24 @@ class RackDwsRegistry
   
   private
   
-  def load_reg()
-    @reg = DWSRegistry.new(@filename)    
-  end
   
-  alias refresh load_reg
+  def refresh()
+    @reg.refresh
+  end
   
   def reg_get(key)
     
     begin
-      e = @reg.get_key(key)
-      [e.xml, 'application/xml'] 
+      
+      r = @reg.get_key(key)          
+      return [{get_key: 'key not found'}.to_json, 'application/json'] if r.empty?
+      
+      [r, 'application/xml']       
+      
     rescue
-      [{get_key: 'key not found'}.to_json, 'application/json']
+      
+      return [{get_key: 'key not found'}.to_json, 'application/json']
+      
     end
     
   end
@@ -156,15 +165,10 @@ class RackDwsRegistry
     
     val = params['v']
     
-    begin
-      e = @reg.set_key(key, val)
-    rescue
-      [{set_key: ($!)}.to_json, 'application/json']
-    end
-    
-    [e.xml, 'application/xml']
-    #{key: key, val: val}.inspect
+    r, status = @reg.set_key(key, val)    
+    return [{set_key: (status)}.to_json, 'application/json'] unless r
     
+    [r, 'application/xml']
     
   end  
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack_dwsregistry
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   9vQ5imvzK3l3JOAiHt6LLu2qJG5lTlmz1ku//St+TtMJDGc6ODmuEUkDv0pK9lSV
   /uKXP19xM99uGQ==
   -----END CERTIFICATE-----
-date: 2016-06-30 00:00:00.000000000 Z
+date: 2017-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -39,20 +39,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: app-routes
   requirement: !ruby/object:Gem::Requirement
@@ -74,25 +74,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.18
 - !ruby/object:Gem::Dependency
-  name: dws-registry
+  name: rexle
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 1.4.3
 description: 
 email: james@r0bertson.co.uk
 executables: []
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Provides dws-registry gem functionality from behind a Rack webserver.