openwsman 2.3.2 → 2.3.4

data/ext/ruby/helpers.h

@@ -40,7 +40,21 @@
 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *****************************************************************************/
- 
+
+
+/*
+ * Get access to Ruby klass pointers
+ * 
+ */
+
+#if SWIGVERSION > 0x020004
+#define KLASS_DECL(k,t) swig_class *k = (swig_class *)(t->clientdata)
+#define KLASS_OF(x) x->klass
+#else
+#define KLASS_DECL(k,t) extern swig_class k
+#define KLASS_OF(x) x.klass
+#endif
+
 /* convert char* to string VALUE */
 static VALUE
 makestring( const char *s )
@@ -92,17 +106,16 @@ hash2value( hash_t *hash )
 }
 
 
-/* add key,value VALUE pair to hash_t*
+/* add key,value VALUE pair to hash_t* as char*
  *  (used as callback for value2hash)
  */
 static int
-add_i( VALUE key, VALUE value, hash_t *h )
+_add_str( VALUE key, VALUE value, hash_t *h )
 {
     if (key != Qundef) {
 	const char *k = as_string( key );
-        const char *v = as_string( value );
-
 	if (!hash_lookup( h, k ) ) {
+            const char *v = as_string( value );
 	    if ( !hash_alloc_insert( h, k, v ) ) {
 		rb_raise( rb_eException, "hash_alloc_insert failed" );
             }
@@ -112,9 +125,39 @@ add_i( VALUE key, VALUE value, hash_t *h )
 }
 
 
-/* create hash (h == NULL) or add to hash (h != NULL) from hash VALUE */
+/* add key,value VALUE pair to hash_t* as selector_entry*
+ *  (used as callback for value2hash)
+ */
+static int
+_add_selector( VALUE key, VALUE value, hash_t *h )
+{
+    if (key != Qundef) {
+	const char *k = as_string( key );
+	if (!hash_lookup( h, k ) ) {
+            selector_entry *entry = u_malloc(sizeof(selector_entry));
+            entry->type = 0;
+	    entry->entry.text = strdup(as_string( value ));
+	    if ( !hash_alloc_insert( h, k, entry ) ) {
+		rb_raise( rb_eException, "hash_alloc_insert failed" );
+            }
+	}
+    }
+    return 0;
+}
+
+
+/*
+ * Convert Ruby Hash to hash_t
+ * 
+ * create hash (h == NULL) or add to hash (h != NULL) from hash VALUE
+ *
+ * valuetype - type of hash values
+ *   0 - values are string (char *)
+ *   1 - values are selector_entry *
+ * 
+ */
 static hash_t *
-value2hash( hash_t *h, VALUE v )
+value2hash( hash_t *h, VALUE v, int valuetype )
 {
     if (NIL_P(v)) return NULL;
   
@@ -122,7 +165,7 @@ value2hash( hash_t *h, VALUE v )
 
     if (!h) h = hash_create(HASHCOUNT_T_MAX, 0, 0);
 
-    rb_hash_foreach( v, add_i, (unsigned long)h );
+    rb_hash_foreach( v, (valuetype==0)?_add_str:_add_selector, (unsigned long)h );
 
     return h;
 }
@@ -135,25 +178,12 @@ value2hash( hash_t *h, VALUE v )
 static void
 auth_request_callback( WsManClient *client, wsman_auth_type_t t, char **username, char **password )
 {
+    KLASS_DECL(SwigClassTransport,SWIGTYPE_p__WsManTransport);
 
-/*
- * Uhm, swig 1.3.40 (or earlier) renamed its internal class variables from
- * cFoo to SwigClassFoo
- * 1.3.36 certainly used cFoo
- *
- */
-
-#if SWIG_VERSION < 0x010340
-#define TRANSPORT_CLASS cTransport
-#else
-#define TRANSPORT_CLASS SwigClassTransport
-#endif
-  
-    extern swig_class TRANSPORT_CLASS;
     VALUE c = SWIG_NewPointerObj((void*) client, SWIGTYPE_p__WsManClient, 0);
 
     /* ruby callback */
-    VALUE result = rb_funcall( TRANSPORT_CLASS.klass, rb_intern( "auth_request_callback" ), 2, c, INT2NUM( t ) );
+    VALUE result = rb_funcall( KLASS_OF(SwigClassTransport), rb_intern( "auth_request_callback" ), 2, c, INT2NUM( t ) );
 
     if (CLASS_OF( result ) == rb_cArray) {
       if (RARRAY_LEN(result) == 2 ) {
@@ -167,4 +197,8 @@ auth_request_callback( WsManClient *client, wsman_auth_type_t t, char **username
     return;
 }
 
+static int associators_references( void *filter, int type, VALUE epr_v,
+  VALUE assocClass_v, VALUE resultClass_v, VALUE role_v, VALUE resultRole_v,
+  VALUE resultProp_v, VALUE propNum_v);
+
 #endif /* RUBY_HELPERS_H */

data/lib/openwsman/openwsman.rb

@@ -36,7 +36,7 @@ module Openwsman
   #
   def self.epr_prefix_for classname, namespace = nil
     prefix = Openwsman::uri_prefix classname
-    prefix += "/#{namespace}" if namespace
+    prefix += "/#{namespace}" if namespace && !namespace.empty?
     prefix
   end
   
@@ -44,7 +44,9 @@ module Openwsman
   def self.epr_uri_for namespace, classname
     raise "Namespace must not be nil" unless namespace
     raise "Classname must not be nil" unless classname
-    "#{self.epr_prefix_for(classname)}/#{namespace}/#{classname}"
+    epr = "#{self.epr_prefix_for(classname)}"
+    epr << "/#{namespace}" unless namespace.empty?
+    epr << "/#{classname}"
   end
   
   class EndPointReference

metadata

@@ -1,93 +1,126 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: openwsman
-version: !ruby/object:Gem::Version
-  version: 2.3.2
+version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: 
+  segments: 
+  - 2
+  - 3
+  - 4
+  version: 2.3.4
 platform: ruby
-authors:
-- Klaus Kämpf
+authors: 
+- "Klaus K\xC3\xA4mpf"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-16 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-05-28 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake-compiler
-  requirement: &5667040 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *5667040
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &5665920 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.9'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
+        version: "0.9"
   type: :development
-  prerelease: false
-  version_requirements: *5665920
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &5665240 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.5'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 0
+        - 5
+        version: "0.5"
   type: :development
-  prerelease: false
-  version_requirements: *5665240
-description: ! 'The openwsman gem provides a Ruby API to manage
-
-  systems using the WS-Management protocol.'
-email:
+  version_requirements: *id003
+description: |-
+  The openwsman gem provides a Ruby API to manage
+  systems using the WS-Management protocol.
+email: 
 - kkaempf@suse.de
 executables: []
-extensions:
+
+extensions: 
 - ext/openwsman/extconf.rb
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/openwsman.rb
-- lib/openwsman/xmlnode.rb
-- lib/openwsman/xmldoc.rb
 - lib/openwsman/openwsman.rb
 - lib/openwsman/version.rb
-- ext/openwsman/openwsman.h
+- lib/openwsman/xmlnode.rb
+- lib/openwsman/xmldoc.rb
 - ext/ruby/helpers.h
+- ext/openwsman/openwsman.h
 - ext/openwsman/openwsman_wrap.c
 - ext/openwsman/openwsman.c
 - ext/openwsman/extconf.rb
+has_rdoc: true
 homepage: http://www.github.com/openwsman/openwsman
 licenses: []
-post_install_message: ! "  ____\n/@    ~-.\n/ __ .- | remember to have fun! \n //
-  //  @  \n\n"
+
+post_install_message: "  ____\n\
+  /@    ~-.\n\
+  / __ .- | remember to have fun! \n // //  @  \n\n"
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Ruby client bindings for Openwsman
 test_files: []
-has_rdoc: 
+