rghost_rails 0.3.1 → 0.3.2

data/lib/rghost_rails.rb

@@ -6,29 +6,36 @@ end
 
 class ActionController::Base
   def rghost_render(format, options)
-    v=case options[:report]
+    report = options.delete(:report)
+
+    template = case report
     when Hash
-      File.join(view_paths, options[:report][:controller] ||self.controller_name, options[:report][:action])
-    when String,Symbol
-      File.join(view_paths, controller_path, options[:report].to_s)
+      File.join(report[:controller] || controller_name, report[:action])
+    when String, Symbol
+      File.join(controller_path, report.to_s)
     when NilClass
-      File.join(view_paths, controller_path, self.action_name)
+      File.join(controller_path, action_name)
+    end
+
+    template = view_paths.find_template(template, "rghost.rb", false)
+
+    ActionView::Helpers.included_modules.each do |m|
+      extend m
     end
- 
-    ActionView::Helpers.included_modules.each{|m| extend m}
-    r=File.readlines("#{v}.rghost.rb")
-    @__rgdoc__=nil
-    eval("@__rgdoc__=#{r}")
-    #instance_eval("@__doc__=#{r}")
-    options.delete(:report)
-    filename=options.delete(:filename)
-    disposition=options.delete(:disposition)
- 
-    rg=@__rgdoc__.render(format,options)
-    out=rg.output
-    raise "RGhost::Error #{rg.errors} - #{out}" if rg.error?
-    data=out.readlines.join
-    rg.clear_output
-    send_data(data, :filename => filename, :disposition => disposition, :type => Mime::Type.lookup_by_extension(format.to_s))
-  end  
-end
+
+    lines = File.readlines(template.filename)
+    doc = eval(lines.join)
+
+    filename = options.delete(:filename)
+    rghost = doc.render(format, options)
+    output = rghost.output
+
+    raise "RGhost::Error #{rghost.errors} - #{output}" if rghost.error?
+
+    data = output.readlines.join
+    rghost.clear_output
+
+    send_data(data, :filename => filename, :type => Mime::Type.lookup_by_extension(format.to_s))
+  end
+end
+

metadata

@@ -1,29 +1,38 @@
 --- !ruby/object:Gem::Specification 
 name: rghost_rails
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
-- Shairon Toledo
+- Shairon Toledo, Gabriel Sobrinho
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-03-06 00:00:00 -05:00
+date: 2010-06-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rghost
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 8
+        - 7
         version: 0.8.7
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: 
-email: shairon.toledo@gmail.com
+email: shairon.toledo@gmail.com, gabriel.sobrinho@gmail.com
 executables: []
 
 extensions: []
@@ -45,18 +54,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: An Rails adapter to work with RGhost in the view layer
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A Rails adapter to work with RGhost in the view layer