Clarify config attribute names and overload to_s

zachallaun · zachallaun · commit bbcf86c38e7f · 2012-07-05T13:03:04.000-04:00
Replace Config.config attribute with Config.opts. Config.opts was
previously a Hash of valid keys and potential values for config; that
role is now played by Config.valid_opts.

Also, overload Config.to_s to call Config.opts_string, which returns the
valid clojure options string, so that the Compiler can simply
interpolate #{Config}, instead of having to call Config.opts_string
directly.
diff --git a/lib/clojurescript_rails/compiler.rb b/lib/clojurescript_rails/compiler.rb
@@ -15,7 +15,7 @@ def self.prepare_ng
     end
 
     def compile(file)
-      `#{@@ng_path} clojure.main #{COMPILER} #{file} #{Config.config_string}`
+      `#{@@ng_path} clojure.main #{COMPILER} #{file} #{Config}`
     end
   end
 end
diff --git a/lib/clojurescript_rails/config.rb b/lib/clojurescript_rails/config.rb
@@ -3,27 +3,27 @@ module ClojurescriptRails
   class Config
 
     class << self
-      attr_reader :config, :opts
+      attr_reader :opts, :valid_opts
     end
 
     # Valid clojurescript compiler config options
-    @opts = {
+    @valid_opts = {
       :optimizations => [:simple, :whitespace, :advanced],
       :pretty_print => [true, false]
     }
 
-    # Default configuration
-    @config = { :optimizations => :advanced }
+    # Default configuration options
+    @opts = { :optimizations => :advanced }
 
     ##
-    # config setter
+    # opts setter
     #
     # Raises an ArgumentError unless configuration options and values are
-    # present in Config.opts
+    # present in Config.valid_opts
 
-    def self.config=(config)
-      invalid = config.reject do |k, v|
-        @opts.has_key?(k) and @opts[k].include?(v)
+    def self.opts=(opts)
+      invalid = opts.reject do |k, v|
+        @valid_opts.has_key?(k) and @valid_opts[k].include?(v)
       end
 
       unless invalid.empty?
@@ -32,29 +32,34 @@ def self.config=(config)
         raise ArgumentError.new(msg)
       end
 
-      @config = config
+      @opts = opts
     end
 
+    def self.to_s
+      opts_string
+    end
+
+  private
+
     ##
-    # Returns the clojure map string representation of @config
+    # Returns the clojure map string representation of @opts
 
-    def self.config_string
-      kvs = config_to_clj().reduce("") { |s, kv| "#{s} #{kv[0]} #{kv[1]}" }
+    def self.opts_string
+      kvs = opts_to_clj().reduce("") { |s, kv| "#{s} #{kv[0]} #{kv[1]}" }
       "\"{#{kvs} }\""
     end
 
     ##
     # Returns a Hash with keys and values converted to strings represented
     # as clojure literals
 
-    def self.config_to_clj
-      @config.reduce({}) do |coll, kv|
+    def self.opts_to_clj
+      @opts.reduce({}) do |coll, kv|
         k, v = kv.map { |x| item_to_clj x }
         coll.merge k => v
       end
     end
 
-  private
     def self.item_to_clj(item)
       item.inspect.gsub /_/, "-"
     end
