lib/socialcastr.rb in socialcastr-0.1.0 vs lib/socialcastr.rb in socialcastr-0.1.1

@@ -28,17 +28,25 @@
 
   class MissingConfiguration < StandardError; end;
 
   class Configuration
     include Singleton
-    ATTRIBUTES = [:domain, :username, :password, :config_file]
+    ATTRIBUTES = [:domain, :username, :password, :format, :debug, :config_file]
     attr_accessor *ATTRIBUTES
 
     def ready?
-      [@domain, @username, @password].map(&:nil?).none?
+      (ATTRIBUTES - [:config_file]).map { |a| self.send a }.map(&:nil?).none?
     end
 
+    def format
+      @format ||= 'xml'
+    end
+
+    def debug
+      @debug ||= false
+    end
+
     def reset
       ATTRIBUTES.each do |attribute|
         send(attribute.to_s + "=", nil)
       end
       return self
@@ -51,17 +59,19 @@
       if Configuration.instance.config_file
         config = YAML::load_file(Configuration.instance.config_file)
         Configuration.instance.domain   = config['domain']
         Configuration.instance.username = config['username']
         Configuration.instance.password = config['password']
+        Configuration.instance.format   = config['format']
+        Configuration.instance.debug    = config['debug']
       end 
     end 
     Configuration.instance
   end 
 
   def self.api
     config = Configuration.instance
     raise MissingConfiguration unless config.username
-    API.new(config.username, config.password, config.domain)
+    API.new(config.username, config.password, config.domain, config.format, config.debug)
   end
   
 end