crayfish 0.1.0 → 0.2.0

data/lib/crayfish/action_controller.rb

@@ -26,6 +26,10 @@ module Crayfish
   private
 
     def options
+      self.options
+    end
+
+    def self.options
       { :inline => true, :prawn => {} }
     end
 

data/lib/crayfish/action_view.rb

@@ -53,6 +53,8 @@ module Crayfish
       def paint template,raw=false
         begin
           html = raw ? template : eval(template)
+          return html if @options[:html]
+
           Html.new(self,@pdf).draw(html)
         rescue => e
            no = 0

data/lib/crayfish/rails/pdf.rb

@@ -29,9 +29,14 @@ module Crayfish
       attr_reader :options
 
       def initialize(controller)
-        @options = controller.send :options || {}
-
-        controller.response.content_type ||= Mime::PDF
+        controller_options = controller.send(:options) || {}
+        @options = Crayfish::ActionController.options.merge(Hash[*controller_options.map{ |k,v| [k.to_sym,v] }.flatten])
+
+        if options[:html]
+          controller.response.content_type ||= Mime::HTML
+        else
+          controller.response.content_type ||= Mime::PDF
+        end
 
         inline = options[:inline] ? 'inline' : 'attachment'
         filename = options[:filename] ? "filename=#{options[:filename]}" : nil

data/lib/crayfish/version.rb

@@ -21,5 +21,5 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module Crayfish
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/test/crayfish_test.rb

@@ -49,6 +49,10 @@ class CrayfishTest < ActiveSupport::TestCase
     def headers
       response.headers
     end
+
+    def options
+      Crayfish::ActionController.options
+    end
   end
 
   class ActionView

data/test/pdf_test.rb

@@ -0,0 +1,44 @@
+# Copyright (c) 2012 Bingoentreprenøren AS
+# Copyright (c) 2012 Patrick Hanevold
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'test_helper'
+
+class PDFTest < ActiveSupport::TestCase
+
+  test 'merge options' do
+    response = mock('Response')
+    response.expects(:content_type).returns(nil)
+    response.expects(:content_type=).with(Mime::PDF)
+
+    headers = mock('Headers')
+    headers.expects(:[]=).with('Content-Disposition', 'inline')
+
+    controller = stub('Controller')
+    controller.stubs(:options).returns(:controller => :options)
+    controller.stubs(:response).returns(response)
+    controller.stubs(:headers).returns(headers)
+
+    pdf = Crayfish::Rails::PDF.new(controller)
+    assert_equal pdf.options, :inline=>true, :prawn=>{}, :controller=>:options
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crayfish
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-15 00:00:00.000000000Z
+date: 2012-04-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70322535618780 !ruby/object:Gem::Requirement
+  requirement: &70342194319800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70322535618780
+  version_requirements: *70342194319800
 - !ruby/object:Gem::Dependency
   name: prawn
-  requirement: &70322535617400 !ruby/object:Gem::Requirement
+  requirement: &70342194318480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70322535617400
+  version_requirements: *70342194318480
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70322535615140 !ruby/object:Gem::Requirement
+  requirement: &70342194315580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70322535615140
+  version_requirements: *70342194315580
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70322535613040 !ruby/object:Gem::Requirement
+  requirement: &70342194313980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322535613040
+  version_requirements: *70342194313980
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70322535611060 !ruby/object:Gem::Requirement
+  requirement: &70342194311060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70322535611060
+  version_requirements: *70342194311060
 description: Crayfish - PDF templating for Rails
 email:
 - patrick.hanevold@gmail.com
@@ -116,6 +116,7 @@ files:
 - test/dummy/public/favicon.ico
 - test/dummy/script/rails
 - test/html_test.rb
+- test/pdf_test.rb
 - test/test_helper.rb
 homepage: http://github.com/patrickhno
 licenses: []
@@ -131,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1624713932211142251
+      hash: 122081209892541250
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -140,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1624713932211142251
+      hash: 122081209892541250
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15
@@ -180,4 +181,5 @@ test_files:
 - test/dummy/public/favicon.ico
 - test/dummy/script/rails
 - test/html_test.rb
+- test/pdf_test.rb
 - test/test_helper.rb