WWT 0.0.2 → 0.0.3

data/.gitignore

@@ -1,4 +1,5 @@
 *.gem
 .bundle
 Gemfile.lock
+tmp/*
 pkg/*

data/WWT.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"
   s.add_dependency "rest-client"
-  s.add_dependency "hpricot"
+#  s.add_dependency "hpricot"
   
 end

data/lib/WWT/WWTClient.rb

@@ -1,7 +1,9 @@
 require 'rest_client'
-require 'Hpricot'
+require 'rexml/document'
 require 'WWT/WWT_layer'
 
+include REXML
+
 class WWTClient 
   
   attr_accessor :url, :port
@@ -28,6 +30,8 @@ class WWTClient
   end
   
   def call_command(args_list,data="")
+    puts "#{@url}:#{@port}/layerApi.aspx?#{args_list}"
+    puts "data is #{data}"
     parse_responce(RestClient.post "#{@url}:#{@port}/layerApi.aspx?#{args_list}", data)
     
   end
@@ -50,10 +54,10 @@ class WWTClient
   end
   
   def parse_responce(responce)
-      
-      parse = Hpricot(responce)
+      puts responce
       raise "WWT error #{parse.search('h2').inner_html}"if responce.match(/Error/)
-      parse.search("layerapi").collect{|l| l.children.map{|c| {c.name =>{:content=>c.inner_html, :properties=>c.attributes}}}}.first
+      parse = Document.new responce
+      parse.elements.to_a("/LayerApi/*") {|el| el.children.map{|c| {c.name =>{:content=>c.text, :properties=>c.attributes}}}}.first
   end
     
 end

data/lib/WWT/WWT_layer.rb

@@ -12,6 +12,7 @@ class WWT_layer
   end
   
   def get_property(property_name)
+    puts "running get property"
     name = WWT_layer.sanitize_property_name(property_name.to_s) 
     puts "#{name}"
     result = @telescope.getprop :id=>layer_id, :propname => name
@@ -19,10 +20,15 @@ class WWT_layer
   end
   
   def set_property(property_name,args)
+    puts "running set property"
     name = WWT_layer.sanitize_property_name(property_name.to_s)
     @telescope.setprop :id => layer_id, :propname => name, :propvalue=>args
   end
   
+  def update(args)
+    @telescope.update args.merge(:id=>layer_id)
+  end
+  
   def self.sanitize_property_name(name)
     name.split("_").map{|w| w.capitalize}.join("")
   end

data/lib/WWT/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: WWT
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-14 00:00:00.000000000Z
+date: 2011-09-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70242630577740 !ruby/object:Gem::Requirement
+  requirement: &70128588440780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,18 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70242630577740
-- !ruby/object:Gem::Dependency
-  name: hpricot
-  requirement: &70242630577320 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70242630577320
+  version_requirements: *70128588440780
 description: ! "This gem exposes the WWT remote API(or at least most of it) to ruby.
   It works by sending given commands to an open port on the \n    machine running
   WWT."