merb-core 0.9.13 → 1.0

data/lib/merb-core/test.rb

@@ -1,18 +1,18 @@
-# begin
-#   require "hpricot"
-#   require 'merb-core/test/test_ext/hpricot'
-# rescue
-# end
-
 require 'merb-core/test/test_ext/object'
 require 'merb-core/test/test_ext/string'
 
 module Merb; module Test; end; end
 
 require 'merb-core/test/helpers'
-require 'merb-core/test/webrat'
+
+begin
+  require 'webrat'
+  require 'webrat/merb'
+rescue LoadError => e
+  Merb.fatal! "Couldn't load Webrat. You should run: sudo gem install webrat", e
+end
 
 if Merb.test_framework.to_s == "rspec"
   require 'merb-core/test/test_ext/rspec'
   require 'merb-core/test/matchers'
-end
+end

data/lib/merb-core/test/helpers.rb

@@ -7,4 +7,4 @@ require "merb-core/test/helpers/mock_request_helper"
 require "merb-core/test/helpers/route_helper"
 require "merb-core/test/helpers/request_helper"
 require "merb-core/test/helpers/multipart_request_helper"
-require "merb-core/test/helpers/controller_helper"
+require "merb-core/test/helpers/controller_helper"

data/lib/merb-core/test/helpers/cookie_jar.rb

@@ -4,8 +4,10 @@ module Merb
   module Test
     class Cookie
       
+      # :api: private
       attr_reader :name, :value
       
+      # :api: private
       def initialize(raw, default_host)
         # separate the name / value pair from the cookie options
         @name_value_raw, options = raw.split(/[;,] */n, 2)
@@ -18,39 +20,48 @@ module Merb
         @options["domain"] ||= default_host
       end
       
+      # :api: private
       def raw
         @name_value_raw
       end
       
+      # :api: private
       def empty?
         @value.nil? || @value.empty?
       end
       
+      # :api: private
       def domain
         @options["domain"]
       end
-      
+
+      # :api: private
       def path
         @options["path"] || "/"
       end
       
+      # :api: private
       def expires
         Time.parse(@options["expires"]) if @options["expires"]
       end
       
+      # :api: private
       def expired?
         expires && expires < Time.now
       end
       
+      # :api: private
       def valid?(uri)
         uri.host =~ Regexp.new("#{Regexp.escape(domain)}$") &&
         uri.path =~ Regexp.new("^#{Regexp.escape(path)}")
       end
       
+      # :api: private
       def matches?(uri)
         ! expired? && valid?(uri)
       end
       
+      # :api: private
       def <=>(other)
         # Orders the cookies from least specific to most
         [name, path, domain.reverse] <=> [other.name, other.path, other.domain.reverse]
@@ -60,10 +71,12 @@ module Merb
 
     class CookieJar
       
+      # :api: private
       def initialize
         @jars = {}
       end
       
+      # :api: private
       def update(jar, uri, raw_cookies)
         return unless raw_cookies
         # Initialize all the the received cookies
@@ -85,6 +98,7 @@ module Merb
         @jars[jar].sort!
       end
       
+      # :api: private
       def for(jar, uri)
         cookies = {}
         
@@ -103,4 +117,4 @@ module Merb
       
     end
   end
-end
+end

data/lib/merb-core/test/helpers/mock_request_helper.rb

@@ -74,7 +74,7 @@ module Merb
       # ==== Notes
       # If you pass a post body, the content-type will be set to URL-encoded.
       #
-      # @api public
+      # :api: public
       # @deprecated
       def fake_request(env = {}, opt = {})
         if opt[:post_body]
@@ -111,7 +111,7 @@ module Merb
       # ==== Notes
       # Does not use routes.
       #
-      # @api public
+      # :api: public
       # @deprecated
       def dispatch_to(controller_klass, action, params = {}, env = {}, &blk)
         params = merge_controller_and_action(controller_klass, action, params)
@@ -125,7 +125,7 @@ module Merb
       # *controller_classes:: Controller classes to operate on in the context of the block.
       # &blk:: The context to operate on; optionally accepts the cookie jar as an argument.
       #
-      # @api public
+      # :api: public
       # @deprecated
       def with_cookies(*controller_classes, &blk)
         cookie_jar = CookieJar.new
@@ -169,7 +169,7 @@ module Merb
       # ==== Notes
       # Does not use routes.
       #
-      # @api public
+      # :api: public
       # @deprecated
       def dispatch_with_basic_authentication_to(controller_klass, action, username, password, params = {}, env = {}, &blk)
         env["X_HTTP_AUTHORIZATION"] = "Basic #{Base64.encode64("#{username}:#{password}")}"
@@ -178,7 +178,7 @@ module Merb
         dispatch_request(build_request(params, env), controller_klass, action.to_s, &blk)
       end
       
-      # @api private
+      # :api: private
       def merge_controller_and_action(controller_klass, action, params)
         params[:controller] = controller_klass.name.to_const_path
         params[:action]     = action.to_s
@@ -207,7 +207,7 @@ module Merb
       # ==== Notes
       # Does not use routes.
       #
-      # @api public    
+      # :api: public    
       # @deprecated  
       def build_request(params = {}, env = {})
         params             = Merb::Parse.params_to_query_string(params)
@@ -232,7 +232,7 @@ module Merb
       #   The controller is yielded to the block provided for actions *prior* to
       #   the action being dispatched.
       #
-      # @api public  
+      # :api: public  
       # @deprecated    
       def get(path, params = {}, env = {}, &block)
         env[:request_method] = "GET"
@@ -252,7 +252,7 @@ module Merb
       #   The controller is yielded to the block provided for actions *prior* to
       #   the action being dispatched.
       #
-      # @api public  
+      # :api: public  
       # @deprecated    
       def post(path, params = {}, env = {}, &block)
         env[:request_method] = "POST"
@@ -272,7 +272,7 @@ module Merb
       #   The controller is yielded to the block provided for actions *prior* to
       #   the action being dispatched.
       #
-      # @api public      
+      # :api: public      
       def put(path, params = {}, env = {}, &block)
         env[:request_method] = "PUT"
         mock_request(path, params, env, &block)
@@ -291,7 +291,7 @@ module Merb
       #   The controller is yielded to the block provided for actions *prior* to
       #   the action being dispatched.
       #
-      # @api public
+      # :api: public
       # @deprecated
       def delete(path, params = {}, env = {}, &block)
         env[:request_method] = "DELETE"
@@ -320,7 +320,7 @@ module Merb
       # ==== Notes
       # Uses Routes.
       #
-      # @api plugin
+      # :api: plugin
       # @deprecated
       def mock_request(path, params = {}, env= {}, &block)
         env[:request_method] ||= "GET"
@@ -359,7 +359,7 @@ module Merb
       # ==== Notes
       # Does not use routes.
       #
-      # @api public
+      # :api: public
       # @deprecated
       def dispatch_request(request, controller_klass, action, &blk)
         controller = controller_klass.new(request)
@@ -385,7 +385,7 @@ module Merb
       # ==== Returns
       # Hash:: The parameters built based on the matching route.
       #
-      # @api plugin
+      # :api: plugin
       # @deprecated
       def check_request_for_route(request)
         match =  ::Merb::Router.match(request)

data/lib/merb-core/test/helpers/request_helper.rb

@@ -78,4 +78,4 @@ module Merb
       def response_for(*args) request(*args) end
     end
   end
-end
+end

data/lib/merb-core/test/helpers/route_helper.rb

@@ -56,7 +56,7 @@ module Merb
       #
       # url(:articles, 2008, 10, "test_article")
       #
-      # @api public
+      # :api: public
       def url(*args)
         args << (@request_params || {})
         Merb::Router.url(*args)
@@ -90,4 +90,4 @@ module Merb
       end
     end
   end
-end
+end

data/lib/merb-core/test/matchers.rb

@@ -2,12 +2,12 @@ module Merb::Test::Rspec; end
 
 require "merb-core/test/matchers/controller_matchers"
 require "merb-core/test/matchers/route_matchers"
-require "merb-core/test/matchers/view_matchers"
 require "merb-core/test/matchers/request_matchers"
 
 Merb::Test::ControllerHelper.send(:include, Merb::Test::Rspec::ControllerMatchers)
 Merb::Test::RouteHelper.send(:include, Merb::Test::Rspec::RouteMatchers)
 
 module Merb::Test::ViewHelper
-  include Merb::Test::Rspec::ViewMatchers
-end
+  include ::Webrat::Matchers
+  include ::Webrat::HaveTagMatcher
+end

data/lib/merb-core/test/matchers/request_matchers.rb

@@ -123,4 +123,4 @@ Spec::Matchers.create(:redirect_to) do
       "<#{location}>, but it redirected to <#{rack.headers["Location"]}>"
     end
   end
-end
+end

data/lib/merb-core/test/run_spec.rb

@@ -37,4 +37,4 @@ def run_spec(spec, base_dir)
   exit!(failure ? -1 : 0)
 end
 
-run_spec(ARGV[0], File.expand_path(File.join(File.dirname(__FILE__), "..", "..", ".."))) if ENV["NOW"]
+run_spec(ARGV[0], File.expand_path(File.join(File.dirname(__FILE__), "..", "..", ".."))) if ENV["NOW"]

data/lib/merb-core/test/tasks/spectasks.rb

@@ -75,4 +75,4 @@ namespace :spec do
     t.rcov = true
     t.rcov_opts = ["--exclude 'config,spec,#{Gem::path.join(',')}'"]    
   end
-end
+end

data/lib/merb-core/test/test_ext/hpricot.rb

@@ -29,4 +29,4 @@ class Hpricot::Elem
       child.is_a?(Hpricot::Text) ? child.content : ((child.respond_to?("inner_text") && child.inner_text) || "")
     end.join.strip
   end
-end
+end

data/lib/merb-core/test/test_ext/rspec.rb

@@ -40,11 +40,11 @@ module Merb
     end
     
     class ExampleGroup < Spec::Example::ExampleGroup
-
       include ::Merb::Test::Matchers
       include ::Merb::Test::RouteHelper
       include ::Merb::Test::ControllerHelper
-
+      include ::Webrat::Methods
+      
       class << self
         # This is a copy of the method in rspec, so we can have
         # describe "...", :when => "logged in", and the like

data/lib/merb-core/test/test_ext/string.rb

@@ -11,4 +11,4 @@ class String
   
   alias_method :matches?, :match?
   
-end
+end

data/lib/merb-core/version.rb

@@ -1,3 +1,3 @@
 module Merb
-  VERSION = '0.9.13' unless defined?(Merb::VERSION)
+  VERSION = '1.0' unless defined?(Merb::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-core
 version: !ruby/object:Gem::Version 
-  version: 0.9.13
+  version: "1.0"
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-03 00:00:00 -08:00
+date: 2008-11-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,24 +83,24 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: hpricot
+  name: thor
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.9.7
     version: 
 - !ruby/object:Gem::Dependency 
-  name: thor
-  type: :runtime
+  name: webrat
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.7
+        version: 0.3.1
     version: 
 description: Merb. Pocket rocket web framework.
 email: ez@engineyard.com
@@ -220,7 +220,6 @@ files:
 - lib/merb-core/test/matchers/controller_matchers.rb
 - lib/merb-core/test/matchers/request_matchers.rb
 - lib/merb-core/test/matchers/route_matchers.rb
-- lib/merb-core/test/matchers/view_matchers.rb
 - lib/merb-core/test/matchers.rb
 - lib/merb-core/test/run_spec.rb
 - lib/merb-core/test/run_specs.rb
@@ -231,20 +230,7 @@ files:
 - lib/merb-core/test/test_ext/object.rb
 - lib/merb-core/test/test_ext/rspec.rb
 - lib/merb-core/test/test_ext/string.rb
-- lib/merb-core/test/webrat.rb
 - lib/merb-core/test.rb
-- lib/merb-core/vendor
-- lib/merb-core/vendor/nokogiri
-- lib/merb-core/vendor/nokogiri/css
-- lib/merb-core/vendor/nokogiri/css/generated_parser.rb
-- lib/merb-core/vendor/nokogiri/css/generated_tokenizer.rb
-- lib/merb-core/vendor/nokogiri/css/node.rb
-- lib/merb-core/vendor/nokogiri/css/parser.rb
-- lib/merb-core/vendor/nokogiri/css/parser.y
-- lib/merb-core/vendor/nokogiri/css/tokenizer.rb
-- lib/merb-core/vendor/nokogiri/css/tokenizer.rex
-- lib/merb-core/vendor/nokogiri/css/xpath_visitor.rb
-- lib/merb-core/vendor/nokogiri/css.rb
 - lib/merb-core/version.rb
 - lib/merb-core.rb
 has_rdoc: true
@@ -264,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.0
   version: 
 requirements: 
 - install the json gem to get faster json parsing

data/lib/merb-core/test/matchers/view_matchers.rb

@@ -1,231 +0,0 @@
-module Merb::Test::Rspec::ViewMatchers
-  
-  class HaveXpath
-    def initialize(expected, &block)
-      # Require nokogiri and fall back on rexml
-      begin
-        require "nokogiri"
-      rescue LoadError => e
-        if require "rexml/document"
-          require "merb-core/vendor/nokogiri/css"
-          warn("Standard REXML library is slow. Please consider installing nokogiri.\nUse \"sudo gem install nokogiri\"")
-        end
-      end
-      
-      @expected = expected
-      @block    = block
-    end
-    
-    def matches?(stringlike)
-      if defined?(Nokogiri::XML)
-        matches_nokogiri?(stringlike)
-      else
-        matches_rexml?(stringlike)
-      end
-    end
-    
-    def matches_rexml?(stringlike)
-      stringlike = stringlike.body.to_s if stringlike.respond_to?(:body)
-      
-      @document = case stringlike
-      when REXML::Document
-        stringlike.root
-      when REXML::Node
-        stringlike
-      when StringIO, String
-        begin
-          REXML::Document.new(stringlike.to_s).root
-        rescue REXML::ParseException => e
-          if e.message.include?("second root element")
-            REXML::Document.new("<fake-root-element>#{stringlike}</fake-root-element>").root
-          else
-            raise e
-          end
-        end
-      end
-      
-      query.all? do |q|
-        matched = REXML::XPath.match(@document, q)
-        matched.any? && (!block_given? || matched.all?(&@block))
-      end
-    end
-    
-    def matches_nokogiri?(stringlike)
-      stringlike = stringlike.body.to_s if stringlike.respond_to?(:body)
-      
-      @document = case stringlike
-      when Nokogiri::HTML::Document, Nokogiri::XML::NodeSet
-        stringlike
-      when StringIO
-        Nokogiri::HTML(stringlike.string)
-      else
-        Nokogiri::HTML(stringlike.to_s)
-      end
-      @document.xpath(*query).any?
-    end
-    
-    def query
-      [@expected].flatten.compact
-    end
-    
-    # ==== Returns
-    # String:: The failure message.
-    def failure_message
-      "expected following text to match xpath #{@expected}:\n#{@document}"
-    end
-
-    # ==== Returns
-    # String:: The failure message to be displayed in negative matches.
-    def negative_failure_message
-      "expected following text to not match xpath #{@expected}:\n#{@document}"
-    end    
-  end
-  
-  class HaveSelector < HaveXpath
-
-    # ==== Returns
-    # String:: The failure message.
-    def failure_message
-      "expected following text to match selector #{@expected}:\n#{@document}"
-    end
-    
-    # ==== Returns
-    # String:: The failure message to be displayed in negative matches.
-    def negative_failure_message
-      "expected following text to not match selector #{@expected}:\n#{@document}"
-    end
-    
-    def query
-      Nokogiri::CSS::Parser.parse(*super).map { |ast| ast.to_xpath }
-    end
-  
-  end
-  
-  class HaveTag < HaveSelector
-    
-    # ==== Returns
-    # String:: The failure message.
-    def failure_message
-      "expected following output to contain a #{tag_inspect} tag:\n#{@document}"
-    end
-    
-    # ==== Returns
-    # String:: The failure message to be displayed in negative matches.
-    def negative_failure_message
-      "expected following output to omit a #{tag_inspect}:\n#{@document}"
-    end
-    
-    def tag_inspect
-      options = @expected.last.dup
-      content = options.delete(:content)
-      
-      html = "<#{@expected.first}"
-      options.each do |k,v|
-        html << " #{k}='#{v}'"
-      end
-      
-      if content
-        html << ">#{content}</#{@expected.first}>"
-      else
-        html << "/>"
-      end
-      
-      html
-    end
-    
-    def query
-      options  = @expected.last.dup
-      selector = @expected.first.to_s
-      
-      selector << ":contains('#{options.delete(:content)}')" if options[:content]
-      
-      options.each do |key, value|
-        selector << "[#{key}='#{value}']"
-      end
-      
-      Nokogiri::CSS::Parser.parse(selector).map { |ast| ast.to_xpath }
-    end
-    
-  end
-
-  class HasContent
-    def initialize(content)
-      @content = content
-    end
-
-    def matches?(element)
-      element = element.body.to_s if element.respond_to?(:body)
-      @element = element
-      
-      case @content
-      when String
-        @element.contains?(@content)
-      when Regexp
-        @element.matches?(@content)
-      end
-    end
-    
-    # ==== Returns
-    # String:: The failure message.
-    def failure_message
-      "expected the following element's content to #{content_message}:\n#{@element.inner_text}"
-    end
-
-    # ==== Returns
-    # String:: The failure message to be displayed in negative matches.
-    def negative_failure_message
-      "expected the following element's content to not #{content_message}:\n#{@element.inner_text}"
-    end
-    
-    def content_message
-      case @content
-      when String
-        "include \"#{@content}\""
-      when Regexp
-        "match #{@content.inspect}"
-      end
-    end
-  end
-
-  # Matches HTML content against a CSS 3 selector.
-  #
-  # ==== Parameters
-  # expected<String>:: The CSS selector to look for.
-  #
-  # ==== Returns
-  # HaveSelector:: A new have selector matcher.
-  # ---
-  # @api public
-  def have_selector(expected)
-    HaveSelector.new(expected)
-  end
-  alias_method :match_selector, :have_selector
-
-  # Matches HTML content against an XPath query
-  #
-  # ==== Parameters
-  # expected<String>:: The XPath query to look for.
-  #
-  # ==== Returns
-  # HaveXpath:: A new have xpath matcher.
-  # ---
-  # @api public
-  def have_xpath(expected)
-    HaveXpath.new(expected)
-  end
-  alias_method :match_xpath, :have_xpath
-  
-  def have_tag(name, attributes = {})
-    HaveTag.new([name, attributes])
-  end
-  alias_method :match_tag, :have_tag
-  
-  # Matches the contents of an HTML document with
-  # whatever string is supplied
-  #
-  # ---
-  # @api public
-  def contain(content)
-    HasContent.new(content)
-  end
-end