remarkable 3.1.13 → 4.0.0.alpha1

data/README

@@ -39,27 +39,6 @@ And it will show in your specs output:
 
   "Example disabled: require name to be set"
 
-== Pending macros
-
-In Rspec you can mark some examples as pending:
-
-  it "should have one manager" do
-    pending("create managers resource")
-  end
-
-  it "should validate associated manager" do
-    pending("create managers resource")
-  end
-
-To allow this to work with macros, we created the pending group:
-
-  pending "create managers resource" do
-    should_have_one :manager
-    should_validate_associated :manager
-  end
-
-This outputs the same as above.
-
 == I18n
 
 All matchers come with I18n support. You can find an example locale file under
@@ -85,9 +64,9 @@ Create a new matcher is easy. Let's create validate_inclusion_of matcher for
 ActiveRecord as an example. A first matcher version would be:
 
 module Remarkable
-  module ActiveRecord
+  module ActiveModel
     module Matchers
-      class ValidateInclusionOfMatcher < Remarkable::ActiveRecord::Base
+      class ValidateInclusionOfMatcher < Remarkable::ActiveModel::Base
         arguments :attribute
         assertion :is_valid?
 
@@ -131,7 +110,7 @@ As you noticed, the matcher doesn't have any message on it. You add them on I18n
 file. A file for this example would be:
 
   remarkable:
-    active_record:
+    active_model:
       validate_inclusion_of:
         description: "validate inclusion of {{attribute}}"
         expectations:

data/lib/remarkable.rb

@@ -8,11 +8,11 @@ require File.join(dir, 'remarkable', 'messages')
 
 require File.join(dir, 'remarkable', 'base')
 require File.join(dir, 'remarkable', 'macros')
-require File.join(dir, 'remarkable', 'pending')
+#require File.join(dir, 'remarkable', 'pending')
 require File.join(dir, 'remarkable', 'negative')
 require File.join(dir, 'remarkable', 'core_ext', 'array')
 
-if defined?(Spec)
+if defined?(Rspec)
   require File.join(dir, 'remarkable', 'rspec')
 end
 

data/lib/remarkable/matchers.rb

@@ -12,14 +12,13 @@ module Remarkable
   def self.include_matchers!(base, target=nil)
     if target.nil?
       if rspec_defined?
-        target = Spec::Example::ExampleGroup
+        target = Rspec::Matchers
       else
-        raise ArgumentError, "You haven't supplied the target to include_matchers! and RSpec is not loaded, so we cannot infer one."
+        raise ArgumentError, "You haven't supplied the target to include_matchers! and Rspec is not loaded, so we cannot infer one."
       end
     end
 
     metaclass = (class << target; self; end)
-    target.send :extend, Remarkable::Pending unless metaclass.ancestors.include?(Remarkable::Pending)
     target.send :extend, Remarkable::Macros  unless metaclass.ancestors.include?(Remarkable::Macros)
 
     if defined?(base::Matchers)
@@ -35,6 +34,6 @@ module Remarkable
   end
 
   def self.rspec_defined? #:nodoc:
-    defined?(Spec)
+    defined?(Rspec)
   end
 end

data/lib/remarkable/rspec.rb

@@ -1,4 +1,4 @@
-module Spec #:nodoc:
+module Rspec #:nodoc:
   module Matchers #:nodoc:
     # Overwrites to provide I18n on should and should_not.
     #
@@ -9,16 +9,23 @@ module Spec #:nodoc:
     end
   end
 
-  module Example #:nodoc:
-    module ExampleGroupMethods #:nodoc:
+  module Core #:nodoc:
+    class ExampleGroup #:nodoc:
       # Overwrites to provide I18n on example disabled message.
       #
-      def xexample(description=nil, opts={}, &block)
+      def _xexample(description=nil, opts={}, &block)
         disabled = Remarkable.t 'remarkable.core.example_disabled', :default => 'Example disabled'
         Kernel.warn("#{disabled}: #{description}")
       end
-      alias_method :xit, :xexample
-      alias_method :xspecify, :xexample
+      #alias_method :xit, :xexample
+      #alias_method :xspecify, :xexample
+      
+      # NOTE: Hack. Disabled examples is not the same as pending examples
+      # However, the rspec runner is monolithic and doesn't have a hook to process
+      # examples based on metadata
+      alias_example_to :xexample, :disabled => true, :pending => true
+      alias_example_to :xit, :disabled => true, :pending => true
+      alias_example_to :xspecify, :disabled => true, :pending => true
     end
   end
 end

data/lib/remarkable/version.rb

@@ -1,3 +1,3 @@
 module Remarkable
-  VERSION = '3.1.13' unless self.const_defined?(:VERSION)
+  VERSION = '4.0.0.alpha1' unless self.const_defined?(:VERSION)
 end

data/remarkable.gemspec

@@ -1,32 +1,61 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{remarkable}
-  s.version = "3.1.13"
+  s.version = "4.0.0.alpha1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Carlos Brando", "Jos\303\251 Valim"]
-  s.date = %q{2010-02-19}
-  s.description = %q{Remarkable: a framework for rspec matchers, with support to macros and I18n.}
-  s.email = ["eduardobrando@gmail.com", "jose.valim@gmail.com"]
-  s.extra_rdoc_files = ["README", "LICENSE", "CHANGELOG"]
-  s.files = ["README", "LICENSE", "CHANGELOG", "lib/remarkable", "lib/remarkable/base.rb", "lib/remarkable/core_ext", "lib/remarkable/core_ext/array.rb", "lib/remarkable/dsl", "lib/remarkable/dsl/assertions.rb", "lib/remarkable/dsl/callbacks.rb", "lib/remarkable/dsl/optionals.rb", "lib/remarkable/dsl.rb", "lib/remarkable/i18n.rb", "lib/remarkable/macros.rb", "lib/remarkable/matchers.rb", "lib/remarkable/messages.rb", "lib/remarkable/negative.rb", "lib/remarkable/pending.rb", "lib/remarkable/rspec.rb", "lib/remarkable/version.rb", "lib/remarkable.rb", "locale/en.yml", "remarkable.gemspec"]
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Ho-Sheng Hsiao", "Carlos Brando", "Jos\303\251 Valim"]
+  s.date = %q{2010-04-22}
+  s.description = %q{Remarkable: a framework for rspec matchers and macros, with support for I18n.}
+  s.email = ["hosh@sparkfly.com", "eduardobrando@gmail.com", "jose.valim@gmail.com"]
+  s.extra_rdoc_files = [
+    "CHANGELOG",
+     "LICENSE",
+     "README"
+  ]
+  s.files = [
+    "CHANGELOG",
+     "LICENSE",
+     "README",
+     "lib/remarkable.rb",
+     "lib/remarkable/base.rb",
+     "lib/remarkable/core_ext/array.rb",
+     "lib/remarkable/dsl.rb",
+     "lib/remarkable/dsl/assertions.rb",
+     "lib/remarkable/dsl/callbacks.rb",
+     "lib/remarkable/dsl/optionals.rb",
+     "lib/remarkable/i18n.rb",
+     "lib/remarkable/macros.rb",
+     "lib/remarkable/matchers.rb",
+     "lib/remarkable/messages.rb",
+     "lib/remarkable/negative.rb",
+     "lib/remarkable/rspec.rb",
+     "lib/remarkable/version.rb",
+     "locale/en.yml",
+     "remarkable.gemspec"
+  ]
   s.homepage = %q{http://github.com/carlosbrando/remarkable}
+  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{remarkable}
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Remarkable: a framework for rspec matchers, with support to macros and I18n.}
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Remarkable: a framework for rspec matchers and macros, with support for I18n.}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rspec>, [">= 1.2.0"])
+      s.add_runtime_dependency(%q<rspec>, [">= 2.0.0.alpha7"])
     else
-      s.add_dependency(%q<rspec>, [">= 1.2.0"])
+      s.add_dependency(%q<rspec>, [">= 2.0.0.alpha7"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 1.2.0"])
+    s.add_dependency(%q<rspec>, [">= 2.0.0.alpha7"])
   end
 end
+

metadata

@@ -1,30 +1,43 @@
 --- !ruby/object:Gem::Specification 
 name: remarkable
 version: !ruby/object:Gem::Version 
-  version: 3.1.13
+  prerelease: true
+  segments: 
+  - 4
+  - 0
+  - 0
+  - alpha1
+  version: 4.0.0.alpha1
 platform: ruby
 authors: 
+- Ho-Sheng Hsiao
 - Carlos Brando
 - "Jos\xC3\xA9 Valim"
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-02-19 00:00:00 +01:00
+date: 2010-04-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.0
-    version: 
-description: "Remarkable: a framework for rspec matchers, with support to macros and I18n."
+        segments: 
+        - 2
+        - 0
+        - 0
+        - alpha7
+        version: 2.0.0.alpha7
+  type: :runtime
+  version_requirements: *id001
+description: "Remarkable: a framework for rspec matchers and macros, with support for I18n."
 email: 
+- hosh@sparkfly.com
 - eduardobrando@gmail.com
 - jose.valim@gmail.com
 executables: []
@@ -32,28 +45,27 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README
-- LICENSE
 - CHANGELOG
-files: 
-- README
 - LICENSE
+- README
+files: 
 - CHANGELOG
+- LICENSE
+- README
+- lib/remarkable.rb
 - lib/remarkable/base.rb
 - lib/remarkable/core_ext/array.rb
+- lib/remarkable/dsl.rb
 - lib/remarkable/dsl/assertions.rb
 - lib/remarkable/dsl/callbacks.rb
 - lib/remarkable/dsl/optionals.rb
-- lib/remarkable/dsl.rb
 - lib/remarkable/i18n.rb
 - lib/remarkable/macros.rb
 - lib/remarkable/matchers.rb
 - lib/remarkable/messages.rb
 - lib/remarkable/negative.rb
-- lib/remarkable/pending.rb
 - lib/remarkable/rspec.rb
 - lib/remarkable/version.rb
-- lib/remarkable.rb
 - locale/en.yml
 - remarkable.gemspec
 has_rdoc: true
@@ -61,28 +73,32 @@ homepage: http://github.com/carlosbrando/remarkable
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 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 
-      version: "0"
-  version: 
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: remarkable
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: "Remarkable: a framework for rspec matchers, with support to macros and I18n."
+summary: "Remarkable: a framework for rspec matchers and macros, with support for I18n."
 test_files: []
 

data/lib/remarkable/pending.rb

@@ -1,68 +0,0 @@
-module Remarkable
-
-  module Pending
-
-    # We cannot put the alias method in the module because it's a Ruby 1.8 bug
-    # http://coderrr.wordpress.com/2008/03/28/alias_methodmodule-bug-in-ruby-18/
-    #
-    def self.extended(base) #:nodoc:
-      if base.respond_to?(:example)
-        class << base
-          alias_method :example_without_pending, :example
-          alias_method :example, :example_with_pending
-          alias :it :example
-          alias :specify :example
-        end
-      end
-    end
-
-    # Adds a pending block to your specs.
-    #
-    # == Examples
-    #
-    #   pending 'create manager resource' do
-    #     should_have_one :manager
-    #     should_validate_associated :manager
-    #   end
-    #
-    # By default, it executes the examples inside the pending block. So as soon
-    # as you add the has_one :manager relationship to your model, your specs
-    # will say that this was already fixed and there is no need to be treated
-    # as pending. To disable this behavior, you can give :execute => false:
-    #
-    #   pending 'create manager resource', :execute => false
-    #
-    def pending(*args, &block)
-      options = { :execute => true }.merge(args.extract_options!)
-
-      @_pending_group = true
-      @_pending_group_description = args.first || "TODO"
-      @_pending_group_execute = options.delete(:execute)
-
-      self.instance_eval(&block)
-
-      @_pending_group = false
-      @_pending_group_description = nil
-      @_pending_group_execute = nil
-    end
-
-    def example_with_pending(description=nil, options={}, backtrace=nil, &implementation) #:nodoc:
-      if block_given? && @_pending_group
-        pending_caller      = caller.detect{ |c| c !~ /method_missing'/ }
-        pending_description = @_pending_group_description
-
-        pending_block = if @_pending_group_execute
-          proc{ pending(pending_description){ self.instance_eval(&implementation) } }
-        else
-          proc{ pending(pending_description) }
-        end
-
-        example_without_pending(description, options, backtrace || pending_caller, &pending_block)
-      else
-        example_without_pending(description, options, backtrace || caller(0)[1], &implementation)
-      end
-    end
-
-  end
-
-end