Refactor to model more of the properties of the Attributes and Filter…

…s. [Closes #9]

lib/biomart/attribute.rb

@@ -2,13 +2,26 @@ module Biomart
   # Class representation for a biomart attribute. 
   # Will belong to a Biomart::Dataset.
   class Attribute
-    attr_reader :name, :display_name, :default
+    attr_reader :name, :display_name
 
     def initialize(args)
       @name         = args["internalName"]
       @display_name = args["displayName"]
       @default      = args["default"] ? true : false
+      @hidden       = args["hideDisplay"] ? true : false
     end
 
+    # Convenience method to see if this attribute is hidden from 
+    # the standard MartView interface.  Returns true/false.
+    def hidden?
+      @hidden
+    end
+
+    # Convenience method to see if this attribute would be 
+    # enabled by default in the standard MartView interface.
+    # Returns true/false.
+    def default?
+      @default
+    end
   end
 end

lib/biomart/database.rb

@@ -36,6 +36,12 @@ def datasets
       return @datasets
     end
 
+    # Returns true / false if this database is visbile in the 
+    # default MartView interface.
+    def visible?
+      @visible
+    end
+
     private
 
       # Utility method to do the webservice call to the biomart server 

lib/biomart/dataset.rb

@@ -129,7 +129,7 @@ def generate_xml( args={} )
             end
           else
             self.filters.each do |name,filter|
-              if filter.default
+              if filter.default?
                 xml.Filter( :name => name, :value => filter.default_value )
               end
             end
@@ -142,7 +142,7 @@ def generate_xml( args={} )
               end
             else
               self.attributes.each do |name,attribute|
-                if attribute.default
+                if attribute.default?
                   xml.Attribute( :name => name )
                 end
               end
@@ -202,7 +202,7 @@ def process_tsv( args, tsv )
           end
         else
           self.attributes.each do |name,attribute|
-            if attribute.default
+            if attribute.default?
               headers.push(name)
             end
           end

lib/biomart/filter.rb

@@ -2,14 +2,36 @@ module Biomart
   # Class representation for a biomart filter. 
   # Will belong to a Biomart::Dataset.
   class Filter
-    attr_reader :name, :display_name, :default, :default_value
+    attr_reader :name, :display_name, :default_value, :qualifier, :type
 
     def initialize(args)
-      @name          = args["internalName"]
-      @display_name  = args["displayName"]
-      @default       = args["defaultOn"] ? true : false
-      @default_value = args["defaultValue"]
+      @name            = args["internalName"]
+      @display_name    = args["displayName"]
+      @default         = args["defaultOn"] ? true : false
+      @default_value   = args["defaultValue"]
+      @hidden          = args["hideDisplay"] ? true : false
+      @qualifier       = args["qualifier"]
+      @type            = args["type"]
+      @multiple_values = args["multipleValues"] ? true : false
     end
 
+    # Convenience method to see if this filter is hidden from 
+    # the standard MartView interface.  Returns true/false.
+    def hidden?
+      @hidden
+    end
+
+    # Convenience method to see if this filter would be 
+    # enabled by default in the standard MartView interface.
+    # Returns true/false.
+    def default?
+      @default
+    end
+
+    # Convenience method to see if this filter allows multiple 
+    # values to be passed to it.
+    def multiple_values?
+      @multiple_values
+    end
   end
 end

lib/biomart/server.rb

@@ -73,9 +73,7 @@ def fetch_databases
         url = @url + '?type=registry'
         document = REXML::Document.new( request( :url => url ) )
         REXML::XPath.each( document, "//MartURLLocation" ) do |d|
-          if d.attributes["visible"] === "1"
-            @databases[ d.attributes["name"] ] = Database.new( @url, d.attributes )
-          end
+          @databases[ d.attributes["name"] ] = Database.new( @url, d.attributes )
         end
       end