r2corba 1.6.2 → 1.7.1

data/lib/corba/common/Object.rb

@@ -11,13 +11,13 @@
 #--------------------------------------------------------------------
 module R2CORBA
   module CORBA
-
     def CORBA.is_nil(obj)
       if obj.nil?
         return true
       elsif obj.is_a?(R2CORBA::CORBA::Object) || obj.respond_to?(:_is_nil?)
-        return obj._is_nil?()
+        return obj._is_nil?
       end
+
       false
     end
 
@@ -39,11 +39,13 @@ module R2CORBA
 
       def self._wrap_native(nobj)
         raise ArgumentError, 'Expected org.omg.CORBA.Object' unless nobj.nil? || nobj.is_a?(Native::Object)
+
         (nobj.nil? || (nobj.respond_to?(:_is_nil) && nobj._is_nil)) ? nil : @@wrapper_klass.new(nobj)
       end
 
       def self._narrow(obj)
         raise CORBA::BAD_PARAM.new('not an object reference', 0, CORBA::COMPLETED_NO) unless obj.nil? || obj.is_a?(CORBA::Object) || obj.is_a?(Native::Object)
+
         obj = self._wrap_native(obj) if obj.is_a?(Native::Object)
         obj
       end
@@ -71,18 +73,19 @@ module R2CORBA
       end
 
       # ret InterfaceDef
-      def _get_interface()
+      def _get_interface
         raise ::CORBA::NO_IMPLEMENT
       end
 
       # ret boolean
-      def _is_nil?()
+      def _is_nil?
         self.objref_.nil? || (self.objref_.respond_to?(:_is_nil) && self.objref_._is_nil)
       end
 
       # ret ::CORBA::Object
-      def _duplicate()
-        return nil if self._is_nil?()
+      def _duplicate
+        return nil if self._is_nil?
+
         begin
           self._wrap_native(self.objref_._duplicate)
         rescue ::NativeException
@@ -91,7 +94,7 @@ module R2CORBA
       end
 
       # ret void
-      def _release()
+      def _release
         self.objref_._release unless self.objref_.nil?
         @objref_ = nil
       end
@@ -99,7 +102,8 @@ module R2CORBA
       # ::String logical_type_id
       # ret boolean
       def _is_a?(logical_type_id)
-        return false if self._is_nil?()
+        return false if self._is_nil?
+
         begin
           self.objref_._is_a(logical_type_id)
         rescue ::NativeException
@@ -108,8 +112,9 @@ module R2CORBA
       end
 
       # ret boolean
-      def _non_existent?()
-        raise CORBA::INV_OBJREF.new if self._is_nil?()
+      def _non_existent?
+        raise CORBA::INV_OBJREF.new if self._is_nil?
+
         begin
           self.objref_._non_existent
         rescue ::NativeException
@@ -120,7 +125,8 @@ module R2CORBA
       # ::CORBA::Object other_object
       # ret boolean
       def _is_equivalent?(other_object)
-        raise CORBA::INV_OBJREF.new if self._is_nil?()
+        raise CORBA::INV_OBJREF.new if self._is_nil?
+
         begin
           self.objref_._is_equivalent(other_object)
         rescue ::NativeException
@@ -131,7 +137,8 @@ module R2CORBA
       # Integer(ulong) maximum
       # ret unsigned long
       def _hash(maximum)
-        raise CORBA::INV_OBJREF.new if self._is_nil?()
+        raise CORBA::INV_OBJREF.new if self._is_nil?
+
         begin
           self.objref_._hash(maximum)
         rescue ::NativeException
@@ -140,13 +147,14 @@ module R2CORBA
       end
 
       # ret ::String
-      def _repository_id()
-        raise CORBA::INV_OBJREF.new if self._is_nil?()
+      def _repository_id
+        raise CORBA::INV_OBJREF.new if self._is_nil?
         ## if this object ref has already been narrowed
         return self._interface_repository_id if self.respond_to?(:_interface_repository_id)
+
         ## ask the remote side
         begin
-          self.objref_._repository_id()
+          self.objref_._repository_id
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
@@ -178,18 +186,20 @@ module R2CORBA
       end
 
       # ret ::CORBA::Object
-      def _get_component()
-        raise CORBA::INV_OBJREF.new if self._is_nil?()
+      def _get_component
+        raise CORBA::INV_OBJREF.new if self._is_nil?
+
         begin
-          CORBA::Object._wrap_native(self.objref_._get_component())
+          CORBA::Object._wrap_native(self.objref_._get_component)
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
       end
 
       # ret CORBA::ORB
-      def _get_orb()
-        raise CORBA::INV_OBJREF.new if self._is_nil?()
+      def _get_orb
+        raise CORBA::INV_OBJREF.new if self._is_nil?
+
         begin
           CORBA::ORB._wrap_native(self.objref_._get_orb)
         rescue ::NativeException
@@ -198,14 +208,14 @@ module R2CORBA
       end
 
       def _request(operation)
-        raise CORBA::INV_OBJREF.new if self._is_nil?()
+        raise CORBA::INV_OBJREF.new if self._is_nil?
+
         begin
           self.objref_._request(operation.to_s)
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
       end
-
     end # Object
   end # CORBA
 end # R2CORBA

data/lib/corba/common/Request.rb

@@ -11,9 +11,7 @@
 #--------------------------------------------------------------------
 module R2CORBA
   module CORBA
-
     module Request
     end
-
   end # CORBA
 end # R2CORBA

data/lib/corba/common/Servant.rb

@@ -11,14 +11,11 @@
 #--------------------------------------------------------------------
 
 module R2CORBA
-
   module PortableServer
-
     class Servant
-
       module Intf
         Id  = 'IDL:omg.org/CORBA/Object:1.0'.freeze
-        Ids = [ Id ].freeze
+        Ids = [Id].freeze
         Operations = {}.freeze
       end
 
@@ -46,21 +43,21 @@ module R2CORBA
       end
 
       def Servant.include_srv(srv)
-        if !self.const_defined?('Id')
+        unless self.const_defined?('Id')
           if self.superclass == R2CORBA::PortableServer::Servant || !self.constants.include?('Id')
             self.const_set('Id', srv::Id.dup.freeze)
           else
             self.const_set('Id', self::Id.dup.freeze)
           end
         end
-        if !self.const_defined?('Ids')
+        unless self.const_defined?('Ids')
           if self.superclass == R2CORBA::PortableServer::Servant || !self.constants.include?('Ids')
             self.const_set('Ids', [])
           else
             self.const_set('Ids', self::Ids.dup)
           end
         end
-        if !self.const_defined?('Operations')
+        unless self.const_defined?('Operations')
           if self.superclass == R2CORBA::PortableServer::Servant || !self.constants.include?('Operations')
             self.const_set('Operations', {})
           else
@@ -101,7 +98,5 @@ module R2CORBA
         end
       end
     end
-
   end
-
 end

data/lib/corba/common/Stub.rb

@@ -13,18 +13,18 @@ module R2CORBA
   module CORBA
     module Portable
       module Stub
-
         def self.included(klass)
           klass.class_eval do
 
-            def init()
-              init_corba_portable_stub()
+            def init
+              init_corba_portable_stub
             end
 
             def self.create_stub(obj)
               raise CORBA::INV_OBJREF.new unless obj.is_a?(CORBA::Object)
+
               obj.extend(self) unless obj.is_a?(self)
-              obj.init()
+              obj.init
               return obj
             end
 
@@ -32,10 +32,10 @@ module R2CORBA
         end
 
         Id  = 'IDL:omg.org/CORBA/Object:1.0'.freeze
-        Ids = [ Id ].freeze
+        Ids = [Id].freeze
 
         protected
-        def init_corba_portable_stub()
+        def init_corba_portable_stub
           @ids ||= ['IDL:omg.org/CORBA/Object:1.0']
         end
 
@@ -49,6 +49,7 @@ module R2CORBA
         def _narrow!(klass)
           raise CORBA::OBJECT_NOT_EXIST.new('Nil object narrowed!') if self._is_nil?
           raise(TypeError, "invalid object narrowed: #{self.class}") unless self.is_a?(CORBA::Stub) && self._is_a?(klass::Id)
+
           self.extend klass
           _append_ids(*klass::Ids)
           return self
@@ -57,6 +58,7 @@ module R2CORBA
         def _unchecked_narrow!(klass)
           raise CORBA::OBJECT_NOT_EXIST.new('Nil object narrowed!') if self._is_nil?
           raise(TypeError, "invalid object narrowed: #{self.class}") unless self.is_a?(CORBA::Stub)
+
           self.extend klass
           _append_ids(*klass::Ids)
           return self
@@ -66,7 +68,7 @@ module R2CORBA
           _ids.include?(str) || super(str)
         end
 
-        def inspect()
+        def inspect
           s = ''
           s << self.class.name.to_s << "\n" <<
                "type_id: \n" <<

data/lib/corba/common/Typecode.rb

@@ -28,7 +28,8 @@ module R2CORBA
 
       def self._wrap_native(ntc)
         raise ArgumentError, 'Expected org.omg.CORBA.TypeCode' unless ntc.nil? || ntc.is_a?(Native::TypeCode)
-        ntc.nil?() ? ntc : @@wrapper_klass.new(ntc)
+
+        ntc.nil? ? ntc : @@wrapper_klass.new(ntc)
       end
 
       def TypeCode._tc
@@ -188,6 +189,7 @@ module R2CORBA
 
       def equal?(tc)
         raise ArgumentError, 'expected CORBA::TypeCode' unless tc.is_a?(CORBA::TypeCode)
+
         begin
           self.tc_.equal(tc.tc_)
         rescue ::NativeException
@@ -197,6 +199,7 @@ module R2CORBA
 
       def equivalent?(tc)
         raise ArgumentError, 'expected CORBA::TypeCode' unless tc.is_a?(CORBA::TypeCode)
+
         begin
           self.tc_.equivalent(tc.tc_)
         rescue ::NativeException
@@ -206,7 +209,7 @@ module R2CORBA
 
       def id
         begin
-          self.tc_.id()
+          self.tc_.id
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
@@ -214,7 +217,7 @@ module R2CORBA
 
       def name
         begin
-          self.tc_.name()
+          self.tc_.name
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
@@ -222,7 +225,7 @@ module R2CORBA
 
       def member_count
         begin
-          self.tc_.member_count()
+          self.tc_.member_count
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
@@ -254,7 +257,7 @@ module R2CORBA
 
       def default_index
         begin
-          self.tc_.default_index()
+          self.tc_.default_index
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
@@ -262,7 +265,7 @@ module R2CORBA
 
       def length
         begin
-          self.tc_.length()
+          self.tc_.length
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
@@ -274,7 +277,7 @@ module R2CORBA
 
       def fixed_digits
         begin
-          self.tc_.fixed_digits()
+          self.tc_.fixed_digits
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
@@ -282,7 +285,7 @@ module R2CORBA
 
       def fixed_scale
         begin
-          self.tc_.fixed_scale()
+          self.tc_.fixed_scale
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
@@ -298,7 +301,7 @@ module R2CORBA
 
       def type_modifier
         begin
-          self.tc_.type_modifier()
+          self.tc_.type_modifier
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end
@@ -391,7 +394,6 @@ module R2CORBA
       end
 
       class Recursive < CORBA::TypeCode
-
         def initialize(id)
           raise 'overload required'
         end
@@ -424,7 +426,6 @@ module R2CORBA
       end # Recursive
 
       class String < CORBA::TypeCode
-
         def initialize(*args)
           raise 'overload required'
         end
@@ -435,6 +436,7 @@ module R2CORBA
 
         def validate(val)
           return val if val.nil?
+
           super(val) unless ::String === val || val.respond_to?(:to_str)
           val = ::String === val ? val : val.to_str
           raise ::CORBA::MARSHAL.new(
@@ -449,7 +451,6 @@ module R2CORBA
       end # String
 
       class WString < CORBA::TypeCode
-
         def initialize(*args)
           raise 'overload required'
         end
@@ -460,6 +461,7 @@ module R2CORBA
 
         def validate(val)
           return val if val.nil?
+
           super(val) unless ::Array === val || val.respond_to?(:to_str) || val.respond_to?(:to_ary)
           val = if ::Array === val
             val
@@ -495,7 +497,6 @@ module R2CORBA
       end # WString
 
       class Fixed < CORBA::TypeCode
-
         def initialize(*args)
           raise 'overload required'
         end
@@ -506,6 +507,7 @@ module R2CORBA
 
         def validate(val)
           return val if val.nil?
+
           super(val) unless ::BigDecimal === val || val.respond_to?(:to_str)
           val = ::BigDecimal === val ? val : BigDecimal(val.to_str)
           val
@@ -517,7 +519,6 @@ module R2CORBA
       end # Fixed
 
       class Sequence < CORBA::TypeCode
-
         def initialize(*args)
           raise 'overload required'
         end
@@ -528,6 +529,7 @@ module R2CORBA
 
         def validate(val)
           return val if val.nil?
+
           super(val) unless val.respond_to?(:to_str) || val.respond_to?(:to_ary)
           val = if self.content_type.kind == TK_OCTET || self.content_type.kind == TK_CHAR
             if val.respond_to?(:to_str)
@@ -574,7 +576,6 @@ module R2CORBA
       end
 
       class Array < CORBA::TypeCode
-
         def initialize(*args)
           raise 'overload required'
         end
@@ -585,6 +586,7 @@ module R2CORBA
 
         def validate(val)
           return val if val.nil?
+
           super(val)
           raise ::CORBA::MARSHAL.new(
             "array size exceeds bound: #{self.length.to_s}",
@@ -601,7 +603,6 @@ module R2CORBA
       end # Array
 
       class IdentifiedTypeCode < CORBA::TypeCode
-
         def initialize(id)
           CORBA::TypeCode.register_id_type(id.to_s, self)
         end
@@ -637,6 +638,7 @@ module R2CORBA
 
         def add_member(name, tc, access)
           raise ArgumentError, 'expected CORBA::TypeCode' unless tc.is_a?(CORBA::TypeCode)
+
           @members << [name, tc, access]
         end
 
@@ -674,6 +676,7 @@ module R2CORBA
 
         def validate(val)
           return val if val.nil?
+
           super(val)
           if needs_conversion(val)
             vorg = val
@@ -687,6 +690,7 @@ module R2CORBA
 
         def needs_conversion(val)
           return false if val.nil?
+
           @members.any? { |name, tc| tc.needs_conversion(val.__send__(name.intern)) }
         end
 
@@ -696,11 +700,13 @@ module R2CORBA
 
         def member_name(index)
           raise ::CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
+
           @members[index][0]
         end
 
         def member_type(index)
           raise ::CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
+
           @members[index][1]
         end
 
@@ -741,6 +747,7 @@ module R2CORBA
 
         def validate(val)
           return val if val.nil?
+
           if CORBA::Portable::BoxedValueBase === val
             super(val)
             val.value = self.content_type.validate(val.value)
@@ -752,6 +759,7 @@ module R2CORBA
 
         def needs_conversion(val)
           return false if val.nil?
+
           if CORBA::Portable::BoxedValueBase === val
             self.content_type.needs_conversion(val.value)
           else
@@ -788,6 +796,7 @@ module R2CORBA
 
         def add_member(name, tc)
           raise ArgumentError, 'expected CORBA::TypeCode' unless tc.is_a?(CORBA::TypeCode)
+
           @members << [name, tc]
         end
 
@@ -798,7 +807,7 @@ module R2CORBA
                 @@tc_#{tc.name} ||= TypeCode.typecode_for_id('#{tc.id}')
               end
               def initialize(*param_)
-                #{tc.members.collect {|n, t| "@#{n}"}.join(', ')} = param_
+                #{tc.members.collect { |n, t| "@#{n}" }.join(', ')} = param_
               end
             end
             #{tc.name}
@@ -816,6 +825,7 @@ module R2CORBA
 
         def validate(val)
           return val if val.nil?
+
           super(val)
           if needs_conversion(val)
             vorg = val
@@ -837,11 +847,13 @@ module R2CORBA
 
         def member_name(index)
           raise ::CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
+
           @members[index][0]
         end
 
         def member_type(index)
           raise ::CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
+
           @members[index][1]
         end
 
@@ -875,7 +887,7 @@ module R2CORBA
                 @@tc_#{tc.name} ||= TypeCode.typecode_for_id('#{tc.id}')
               end
               def initialize(*param_)
-                #{tc.members.collect {|n, t| "@#{n}"}.join(',')} = param_
+                #{tc.members.collect { |n, t| "@#{n}" }.join(',')} = param_
               end
             end
             #{tc.name}
@@ -914,6 +926,7 @@ module R2CORBA
 
         def add_member(label, name, tc)
           raise ArgumentError, 'expected CORBA::TypeCode' unless tc.is_a?(CORBA::TypeCode)
+
           @switchtype.validate(label) unless label == :default
           @labels[label] = @members.size
           @members << [label, name.to_s, tc]
@@ -952,12 +965,13 @@ module R2CORBA
 
         def validate(val)
           return val if val.nil?
+
           super(val)
           @switchtype.validate(val._disc) unless val._disc == :default
           # raise CORBA::MARSHAL.new(
           #  "invalid discriminator value (#{val._disc.to_s}) for union #{name}",
           #  1, CORBA::COMPLETED_NO) unless @labels.has_key?(val._disc)
-          if @labels.has_key?(val._disc)  # no need to check for implicit defaults
+          if @labels.has_key?(val._disc) # no need to check for implicit defaults
             if needs_conversion(val)
               vorg = val
               val = vorg.class.new
@@ -980,16 +994,19 @@ module R2CORBA
 
         def member_name(index)
           raise CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
+
           @members[index][1]
         end
 
         def member_type(index)
           raise CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
+
           @members[index][2]
         end
 
         def member_label(index)
           raise CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
+
           @members[index][0]
         end
 
@@ -1011,6 +1028,7 @@ module R2CORBA
 
         def label_member(val)
           return nil unless (lbl_ix = label_index(val))
+
           member_name(lbl_ix)
         end
 
@@ -1032,7 +1050,7 @@ module R2CORBA
         end
 
         def validate(val)
-          super(val) if !val.respond_to?(:to_int)
+          super(val) unless val.respond_to?(:to_int)
           raise CORBA::MARSHAL.new(
             "value (#{val}) out of range (#{@range}) for enum: #{name}",
             1, CORBA::COMPLETED_NO) unless @range === (::Integer === val ? val : val.to_int)
@@ -1049,6 +1067,7 @@ module R2CORBA
 
         def member_name(index)
           raise CORBA::TypeCode::Bounds.new if (index < 0) || (index >= @members.size)
+
           @members[index]
         end
       end # Enum
@@ -1077,18 +1096,17 @@ module R2CORBA
 
         BadKind._tc
       end
-
     end # TypeCode
 
     # define typecode constants for primitive types
-    [ 'null', 'void',
+    ['null', 'void',
       'short', 'long', 'ushort', 'ulong', 'longlong', 'ulonglong',
       'float', 'double', 'longdouble',
       'boolean',
       'char', 'octet',
       'wchar',
       'any',
-    ].each do |tck|
+].each do |tck|
       CORBA.module_eval %Q{
         def CORBA._tc_#{tck}
           @@tc_#{tck} ||= TypeCode.get_primitive_tc(CORBA::TK_#{tck.upcase})
@@ -1097,11 +1115,11 @@ module R2CORBA
     end
 
     def CORBA._tc_string
-      @@tc_string ||= TypeCode::String.new()
+      @@tc_string ||= TypeCode::String.new
     end
 
     def CORBA._tc_wstring
-      @@tc_wstring ||= TypeCode::WString.new()
+      @@tc_wstring ||= TypeCode::WString.new
     end
 
     # define special typecode constants
@@ -1130,7 +1148,7 @@ module R2CORBA
 
     def CORBA._tc_CompletionStatus
       @@tc_CompletionStatus ||= TypeCode::Enum.new('IDL:omg.org/CORBA/CompletionStatus:1.0', 'CompletionStatus',
-                                                   CORBA::COMPLETED_TXT.collect {|t| "COMPLETED_#{t}"})
+                                                   CORBA::COMPLETED_TXT.collect { |t| "COMPLETED_#{t}" })
     end
 
     class LongDouble
@@ -1142,6 +1160,5 @@ module R2CORBA
         CORBA._tc_longdouble
       end
     end
-
   end ## module CORBA
 end ## module R2CORBA

data/lib/corba/common/Values.rb

@@ -79,14 +79,13 @@ module R2CORBA
     VM_TRUNCATABLE = 3
 
     VT_MODIFIERS = {
-      :none => VM_NONE,
-      :abstract => VM_ABSTRACT,
-      :truncatable => VM_TRUNCATABLE,
-      :custom => VM_CUSTOM
+      none: VM_NONE,
+      abstract: VM_ABSTRACT,
+      truncatable: VM_TRUNCATABLE,
+      custom: VM_CUSTOM
     }.freeze
 
     PRIVATE_MEMBER = 0
     PUBLIC_MEMBER = 1
-
   end # CORBA
 end # R2CORBA