moving frmo item to rule and clearing up whitespace

Author: ianwatsonrh

lib/openscap/xccdf/ident.rb

@@ -25,13 +25,8 @@ def system
       def id
         OpenSCAP.xccdf_ident_get_id(@raw)
       end
-
-
     end
   end
   attach_function :xccdf_ident_get_system, [:pointer], :string
   attach_function :xccdf_ident_get_id, [:pointer], :string
-end
-
-
-
+end

lib/openscap/xccdf/item.rb

@@ -62,18 +62,7 @@ def rationale(prefered_lang = nil)
         rationale = textlist.plaintext(prefered_lang)
         textlist.destroy
         rationale
-      end
-
-      def idents
-        idenss = []
-        idenss_it = OpenSCAP.xccdf_rule_get_idents(@raw)        
-        while OpenSCAP.xccdf_ident_iterator_has_more idenss_it          
-          idens = OpenSCAP::Xccdf::Ident.new(OpenSCAP.xccdf_ident_iterator_next(idenss_it))
-          idenss << idens
-        end
-        OpenSCAP.xccdf_ident_iterator_free idenss_it
-        idenss
-      end
+      end    
 
       def references
         refs = []
@@ -135,9 +124,4 @@ def sub_items_init
   attach_function :oscap_reference_iterator_has_more, [:pointer], :bool
   attach_function :oscap_reference_iterator_next, [:pointer], :pointer
   attach_function :oscap_reference_iterator_free, [:pointer], :void
-
-  attach_function :xccdf_rule_get_idents, [:pointer], :pointer
-  attach_function :xccdf_ident_iterator_has_more, [:pointer], :bool
-  attach_function :xccdf_ident_iterator_next, [:pointer], :pointer
-  attach_function :xccdf_ident_iterator_free, [:pointer], :void
 end

lib/openscap/xccdf/rule.rb

@@ -38,6 +38,17 @@ def fixes
         OpenSCAP.xccdf_fix_iterator_free items_it
         fixes
       end
+
+      def idents
+        idenss = []
+        idenss_it = OpenSCAP.xccdf_rule_get_idents(@raw)
+        while OpenSCAP.xccdf_ident_iterator_has_more idenss_it
+          idens = OpenSCAP::Xccdf::Ident.new(OpenSCAP.xccdf_ident_iterator_next(idenss_it))
+          idenss << idens
+        end
+        OpenSCAP.xccdf_ident_iterator_free idenss_it
+        idenss
+      end
     end
   end
   XccdfSeverity = enum(
@@ -53,4 +64,9 @@ def fixes
   attach_function :xccdf_fix_iterator_has_more, [:pointer], :bool
   attach_function :xccdf_fix_iterator_next, [:pointer], :pointer
   attach_function :xccdf_fix_iterator_free, [:pointer], :void
+
+  attach_function :xccdf_rule_get_idents, [:pointer], :pointer
+  attach_function :xccdf_ident_iterator_has_more, [:pointer], :bool
+  attach_function :xccdf_ident_iterator_next, [:pointer], :pointer
+  attach_function :xccdf_ident_iterator_free, [:pointer], :void
 end