fume 0.3.0 → 0.3.1

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :build: 
 :minor: 3
-:patch: 0
+:patch: 1
 :major: 0

data/fume.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fume}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sunteya"]
-  s.date = %q{2009-12-28}
+  s.date = %q{2010-01-11}
   s.email = %q{Sunteya@gmail.com}
   s.extra_rdoc_files = [
     "README"
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
      "generators/fume/capify/templates/config/deploy.rb",
      "generators/fume/fume_generator.rb",
      "generators/fume/rspec/rspec_gen.rb",
+     "generators/fume/rspec/templates/spec/support/erb_macros.rb",
      "generators/fume/rspec/templates/spec/support/fume_controller_macros.rb",
      "generators/fume/simple_theme/simple_theme_gen.rb",
      "generators/fume/simple_theme/templates/public/demo.html",

data/generators/fume/rspec/templates/spec/support/erb_macros.rb

@@ -0,0 +1,18 @@
+module ErbMacros
+  def self.included(base)
+    base.send :extend, ClassMethods
+    base.send :include, InstanceMethods
+  end
+
+  module ClassMethods
+  end
+  
+  module InstanceMethods
+    def render_template(template)
+      erb = ERB.new(template.read)
+      tmp_file = Tempfile.new("erb")
+      File.open(tmp_file.path, "wb") { |f| f.write(erb.result(binding)) } 
+      tmp_file
+    end
+  end
+end

data/generators/fume/rspec/templates/spec/support/fume_controller_macros.rb

@@ -24,22 +24,29 @@ module FumeControllerMacros
       end
     end
     
+    
     %w{ be_success be_redirect be_invalid }.each do |be_method|
-      define_method "it_should_#{be_method}_for" do |action_methods, &block|
+      eval %Q[
+      def it_should_#{be_method}_for(*args, &block)
+        options = args.extract_options!() || {}
+        action_methods = args.flatten
         action_methods.each do |action_method|
-          it "should #{be_method} for #{action_method.method} :#{action_method.action} action" do
+          it "should #{be_method} for \#{action_method.method} :\#{action_method.action} action \#{options[:message]}" do
+            params = {}
             if block_given?
               result = self.instance_exec(&block)
               params = result if result.is_a? Hash
-    
-              self.instance_exec(params, &action_method)
-              response.should send(be_method)
             end
+
+            self.instance_exec(params, &action_method)
+            response.should #{be_method}
           end
         end
       end
+      ]
     end
     
+    
     def it_should_be_like_restful_resources(options = {}, &block)
       actions = [ :index, :new, :create, :show, :edit, :update, :destroy ]
       actions &= [ options[:only] ].flatten if options[:only]
@@ -50,6 +57,12 @@ module FumeControllerMacros
           params = instance_exec(&block)
         end
       end
+      
+      if actions.include?(:show)
+        it_should_be_success_for get(:show) do
+          params = instance_exec(&block)
+        end
+      end
 
       if actions.include?(:new)
         it_should_be_success_for get(:new) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fume
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Sunteya
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-28 00:00:00 +08:00
+date: 2010-01-11 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -32,6 +32,7 @@ files:
 - generators/fume/capify/templates/config/deploy.rb
 - generators/fume/fume_generator.rb
 - generators/fume/rspec/rspec_gen.rb
+- generators/fume/rspec/templates/spec/support/erb_macros.rb
 - generators/fume/rspec/templates/spec/support/fume_controller_macros.rb
 - generators/fume/simple_theme/simple_theme_gen.rb
 - generators/fume/simple_theme/templates/public/demo.html