lib/massimo/javascript.rb in massimo-0.3.9 vs lib/massimo/javascript.rb in massimo-0.4.0

@@ -1,38 +1,20 @@
 module Massimo
-  class Javascript < Resource
+  class Javascript < Massimo::Resource::Base
+    processable!
+    
     # Concat the Javascript using Sprockets, then minify using JSmin
     def render
-      secretary = ::Sprockets::Secretary.new(
-        :assert_root  => self.site.output_dir,
+      secretary = Sprockets::Secretary.new(
+        :assert_root  => site.output_dir,
         :source_files => [ @source_path.to_s ]
       )
       # install assets if necessary
       secretary.install_assets
       
-      if self.site.production? or self.site.options[:minify]
-        # minify the concatenated javascript
-        ::JSMin.minify(secretary.concatenation.to_s)
-      else
-        secretary.concatenation.to_s
-      end
+      # Concatenate the scripts and minify if necessary
+      output = secretary.concatenation.to_s
+      output = JSMin.minify(output) if site.production? or site.options[:minify]
+      output
     end
-    
-    # Writes the rendered js to the output file.
-    def process!
-      # Make the full path to the directory of the output file
-      ::FileUtils.mkdir_p(self.output_path.dirname)
-      # write the filtered data to the output file
-      self.output_path.open("w") do |file|
-        file.write self.render
-      end
-    end
-    
-    protected
-      
-      # Determine the output file path
-      def output_path
-        @output_path ||= ::Pathname.new(@source_path.to_s.
-          sub(self.site.source_dir, self.site.output_dir)) # move to output dir
-      end
   end
 end