carlosbrando-remarkable 2.2.4 → 2.2.5

data/Manifest.txt

@@ -42,7 +42,7 @@ lib/remarkable/controller/macros/metadata_matcher.rb
 lib/remarkable/controller/macros/render_with_layout_matcher.rb
 lib/remarkable/controller/macros/respond_with_content_type_matcher.rb
 lib/remarkable/controller/macros/respond_with_matcher.rb
-lib/remarkable/controller/macros/return_from_session_matcher.rb
+lib/remarkable/controller/macros/set_session_matcher.rb
 lib/remarkable/controller/macros/route_matcher.rb
 lib/remarkable/controller/macros/set_the_flash_to_matcher.rb
 lib/remarkable/dsl.rb

data/Rakefile

@@ -34,3 +34,9 @@ Dir['tasks/**/*.rake'].each { |t| load t }
 
 # TODO - want other tests/tasks run by default? Add them to the list
 task :default => [:spec, :features]
+require 'spec/rake/spectask'
+desc "Run the specs under spec/models"
+Spec::Rake::SpecTask.new do |t|
+  t.spec_opts = ['--options', "spec/spec.opts"]
+  t.spec_files = FileList['spec/**/*_spec.rb']
+end

data/lib/remarkable/active_record/macros/database/index_matcher.rb

@@ -28,7 +28,7 @@ module Remarkable # :nodoc:
 
         protected
 
-        def after_initialize!
+        def after_initialize
           @expected_uniqueness = @options[:unique] ? 'unique' : 'non-unique'
         end
 

data/lib/remarkable/active_record/macros/validations/validate_associated_matcher.rb

@@ -92,7 +92,7 @@ module Remarkable # :nodoc:
         # Before make the assertions, convert the subject into a instance, if
         # it's not already.
         #
-        def before_assert!
+        def before_assert
           @subject = get_instance_of(@subject)
         end
 

data/lib/remarkable/active_record/macros/validations/validate_confirmation_of_matcher.rb

@@ -18,7 +18,7 @@ module Remarkable # :nodoc:
         # Before make the assertions, convert the subject into a instance, if
         # it's not already.
         #
-        def before_assert!
+        def before_assert
           @subject = get_instance_of(@subject)
         end
 

data/lib/remarkable/active_record/macros/validations/validate_length_of_matcher.rb

@@ -59,7 +59,7 @@ module Remarkable # :nodoc:
         end
 
         # Reassign messages properly
-        def after_initialize!
+        def after_initialize
           # Set the values, for example:
           # send(:within, 0..10)
           send(@behavior, @range)

data/lib/remarkable/active_record/macros/validations/validate_uniqueness_of_matcher.rb

@@ -40,7 +40,7 @@ module Remarkable # :nodoc:
         # Before make the assertions, convert the subject into a instance, if
         # it's not already.
         #
-        def before_assert!
+        def before_assert
           @subject = get_instance_of(@subject)
         end
 
@@ -48,7 +48,7 @@ module Remarkable # :nodoc:
           { :message => :taken }
         end
 
-        def after_initialize!
+        def after_initialize
           if @options[:scoped_to] # TODO Deprecate scoped_to
             warn "[DEPRECATION] :scoped_to is deprecated. Use :scope instead."
             @options[:scope] = [*@options.delete(:scoped_to)].compact

data/lib/remarkable/controller/README.markdown

@@ -9,18 +9,19 @@ Macro that creates a test asserting that the controller assigned to each of the
 Options:
 
     * :class - The expected class of the instance variable being checked.
-    * :equals - A string which is evaluated and compared for equality with the instance variable being checked.
+    * :equals - A string or a proc which is evaluated and compared with the instance variable being checked.
 
 Example:
 
 <pre><code>  should_assign_to :user, :posts
   should_assign_to :user, :class => User
-  should_assign_to :user, :equals => '@user'
+  should_assign_to :user, :equals => proc { @user }
+  should_assign_to(:user){ @user }
   should_not_assign_to :user, :posts
 
   it { should assign_to(:user, :posts) }
   it { should assign_to(:user, :class => User) }
-  it { should assign_to(:user, :equals => '@user') }
+  it { should assign_to(:user, :equals => @user) }
   it { should_not assign_to(:user, :posts) }</code></pre>
 
 h2. filter_params
@@ -89,14 +90,15 @@ Example:
   it { should respond_with_content_type(:rss) }
   it { should respond_with_content_type(/rss/) }</code></pre>
 
-h2. return_from_session
+h2. set_session
 
-Macro that creates a test asserting that a value returned from the session is correct. The given string is evalued to produce the resulting redirect path. All of the instance variables set by the controller are available to the evalued string.
+Macro that creates a test asserting that a value returned from the session is correct. You can given a string to compare to or a proc which will be evaluated.
 
 Example:
 
-  should_return_from_session(:user_id, "@user.id")
-  it { should return_from_session(:message, '"Free stuff"') }
+  should_set_session(:user_id, proc { @user.id })
+  should_set_session(:user_id){ @user.id }
+  it { should set_session(:message, 'Free stuff') }
 
 h2. route
 
@@ -137,11 +139,9 @@ Macro that creates a test asserting that the controller returned a redirect to t
 
 Example:
 
-<pre><code>  should_redirect_to "user_post_url(@post.user, @post)"
-  should_redirect_to "user_url(@user)"
-  should_redirect_to "users_url"
+<pre><code>  should_redirect_to "http://test.host/users/1/post/1"
+  should_redirect_to { user_url(@user) }
 
   it { should redirect_to(user_post_url(@post.user, @post)) }
-  it { should redirect_to(user_url(@user)) }
   it { should redirect_to(users_url) }</code></pre>
 

data/lib/remarkable/controller/macros.rb

@@ -15,16 +15,32 @@ module Remarkable # :nodoc:
         end
       end
 
-      def should_redirect_to(url)
+      def should_redirect_to(url=nil, &block)
         it "should redirect to #{url.inspect}" do
-          redirect_url = self.instance_eval(url) rescue url
+          redirect_url = if block_given?
+            self.instance_eval &block
+          elsif url.is_a?(Proc)
+            self.instance_eval &url
+          else
+            warn "[DEPRECATION] Strings given to redirect_to won't be evaluated anymore. Give a proc or a block instead." if url.is_a?(String)
+            self.instance_eval(url) rescue url
+          end
+
           response.should redirect_to(redirect_url)
         end
       end
 
-      def should_not_redirect_to(url)
+      def should_not_redirect_to(url=nil, &block)
         it "should not redirect to #{url.inspect}" do
-          redirect_url = self.instance_eval(url) rescue url
+          redirect_url = if block_given?
+            self.instance_eval &block
+          elsif url.is_a?(Proc)
+            self.instance_eval &url
+          else
+            warn "[DEPRECATION] Strings given to redirect_to won't be evaluated anymore. Give a proc or a block instead." if url.is_a?(String)
+            self.instance_eval(url) rescue url
+          end
+
           response.should_not redirect_to(redirect_url)
         end
       end
@@ -35,11 +51,11 @@ module Remarkable # :nodoc:
 
       def method_missing_with_remarkable(method_id, *args, &block)
         if method_id.to_s =~ /^should_not_(.*)/
-          should_not_method_missing($1, *args)
+          should_not_method_missing($1, *args, &block)
         elsif method_id.to_s =~ /^should_(.*)/
-          should_method_missing($1, *args)
+          should_method_missing($1, *args, &block)
         elsif method_id.to_s =~ /^xshould_(not_)?(.*)/
-          pending_method_missing($2, $1, *args)
+          pending_method_missing($2, $1, *args, &block)
         else
           method_missing_without_remarkable(method_id, *args, &block)
         end
@@ -48,24 +64,24 @@ module Remarkable # :nodoc:
 
       private
 
-      def should_method_missing(method, *args)
-        matcher = send(method, *args)
+      def should_method_missing(method, *args, &block)
+        matcher = send(method, *args, &block)
         it "should #{matcher.description}" do
           matcher.spec(self)
           assert_accepts(matcher, subject_class)
         end
       end
 
-      def should_not_method_missing(method, *args)
-        matcher = send(method, *args)
+      def should_not_method_missing(method, *args, &block)
+        matcher = send(method, *args, &block)
         it "should not #{matcher.description}" do
           matcher.spec(self).negative
           assert_rejects(matcher, subject_class)
         end
       end
 
-      def pending_method_missing(method, negative, *args)
-        matcher = send(method, *args)
+      def pending_method_missing(method, negative, *args, &block)
+        matcher = send(method, *args, &block)
         matcher.negative if negative
         description = matcher.description
         xit "should #{'not ' if negative}#{description}"

data/lib/remarkable/controller/macros/assign_matcher.rb

@@ -4,9 +4,12 @@ module Remarkable # :nodoc:
       class AssignMatcher < Remarkable::Matcher::Base
         include Remarkable::Controller::Helpers
         
-        def initialize(*names)
-          @options = names.extract_options!
-          @names   = names
+        def initialize(*names, &block)
+          @options          = names.extract_options!
+          @names            = names
+          @options[:equals] = block if block_given?
+
+          warn "[DEPRECATION] Strings given in :equals to assign_to won't be evaluated anymore. You can give procs or use blocks instead." if @options[:equals].is_a?(String)
         end
 
         def matches?(subject)
@@ -58,6 +61,8 @@ module Remarkable # :nodoc:
 
           expected_value = if @options[:equals].is_a?(String)
             @spec.instance_eval(@options[:equals]) rescue @options[:equals]
+          elsif @options[:equals].is_a?(Proc)
+            @spec.instance_eval &@options[:equals]
           else
             @options[:equals]
           end
@@ -70,7 +75,7 @@ module Remarkable # :nodoc:
         def expectation
           expectation = "assign @#{@name}"
           expectation << " as class #{@options[:class]}" if @options[:class]
-          expectation << " which is equal to #{@options[:equals].inspect}" if @options[:equals]
+          expectation << " which is equal to #{@options[:equals].inspect}" if @options[:equals] && !@options[:equals].is_a?(Proc)
           expectation
         end
 

data/lib/remarkable/controller/macros/{return_from_session_matcher.rb → set_session_matcher.rb}

@@ -1,12 +1,13 @@
 module Remarkable # :nodoc:
   module Controller # :nodoc:
     module Matchers # :nodoc:
-      class ReturnFromSession < Remarkable::Matcher::Base
+      class SetSessionMatcher < Remarkable::Matcher::Base
         include Remarkable::Controller::Helpers
         
-        def initialize(key, expected)
+        def initialize(key, expected=nil, &block)
           @key      = key
           @expected = expected
+          @expected = block if block_given?
         end
 
         def matches?(subject)
@@ -30,7 +31,12 @@ module Remarkable # :nodoc:
         private
 
         def has_session_key?
-          expected_value = @spec.instance_eval(@expected) rescue @expected
+          expected_value = if @expected.is_a?(Proc)
+            @spec.instance_eval &@expected
+          else
+            warn "[DEPRECATION] Strings given to set_session won't be evaluated anymore. Give a block or a proc instead."
+            @spec.instance_eval(@expected) rescue @expected
+          end
           return true if @session[@key] == expected_value
 
           @missing = "Expected #{expected_value.inspect} but was #{@session[@key]}"
@@ -50,8 +56,13 @@ module Remarkable # :nodoc:
         end
       end
 
-      def return_from_session(key, expected)
-        ReturnFromSession.new(key, expected)
+      def set_session(key, expected=nil, &block)
+        SetSessionMatcher.new(key, expected, &block)
+      end
+
+      def return_from_session(*args, &block)
+        warn "[DEPRECATION] return_from_session is deprecated. Use set_session instead."
+        set_session(*args, &block)
       end
     end
   end

data/lib/remarkable/dsl.rb

@@ -157,7 +157,7 @@ def initialize(#{args})
   #{assignments}
   @options = default_options.merge(#{self.loop_argument}.extract_options!)
   @#{self.loop_argument} = #{self.loop_argument}
-  after_initialize!
+  after_initialize
 end
 END
           end
@@ -166,8 +166,7 @@ END
       def matches?(subject)
         @subject = subject
 
-        # Execute before_assert! callback
-        before_assert!
+        before_assert
 
         # Gets the loop_argument and loops it setting the singular name of
         # loop argument. For example, if loop_argument is :good_values, we
@@ -208,12 +207,12 @@ END
 
         # Callback called after initialization.
         #
-        def after_initialize!
+        def after_initialize
         end
 
         # Callback before begin assertions.
         #
-        def before_assert!
+        def before_assert
         end
 
     end

data/lib/remarkable/rails.rb

@@ -1,5 +1,7 @@
 if defined?(RAILS_ROOT)
 
+  require "remarkable/rails/extract_options"
+
   def create_macro_methods(macro)
     method_name = File.basename(macro, ".rb")
     Spec::Example::ExampleGroupMethods::send(:define_method, "should_#{method_name}") { instance_eval(IO.read(macro)) }

data/remarkable.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{remarkable}
-  s.version = "2.2.4"
+  s.version = "2.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Carlos Brando", "Jos\303\251 Valim", "Diego Carrion"]
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = %q{}
   s.email = ["eduardobrando@gmail.com", "jose.valim@gmail.com", "dc.rec1@gmail.com"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc"]
-  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "init.rb", "lib/remarkable.rb", "lib/remarkable/active_record/README.markdown", "lib/remarkable/active_record/active_record.rb", "lib/remarkable/active_record/helpers.rb", "lib/remarkable/active_record/macros.rb", "lib/remarkable/active_record/macros/associations/association_matcher.rb", "lib/remarkable/active_record/macros/callbacks/callback_matcher.rb", "lib/remarkable/active_record/macros/database/have_db_column_matcher.rb", "lib/remarkable/active_record/macros/database/index_matcher.rb", "lib/remarkable/active_record/macros/validations/allow_mass_assignment_of_matcher.rb", "lib/remarkable/active_record/macros/validations/ensure_value_in_list_matcher.rb", "lib/remarkable/active_record/macros/validations/ensure_value_in_range_matcher.rb", "lib/remarkable/active_record/macros/validations/have_class_methods_matcher.rb", "lib/remarkable/active_record/macros/validations/have_instance_methods_matcher.rb", "lib/remarkable/active_record/macros/validations/have_named_scope_matcher.rb", "lib/remarkable/active_record/macros/validations/have_readonly_attributes_matcher.rb", "lib/remarkable/active_record/macros/validations/protect_attributes_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_acceptance_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_associated_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_confirmation_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_exclusion_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_format_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_inclusion_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_length_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_numericality_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_presence_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_uniqueness_of_matcher.rb", "lib/remarkable/assertions.rb", "lib/remarkable/controller/README.markdown", "lib/remarkable/controller/controller.rb", "lib/remarkable/controller/helpers.rb", "lib/remarkable/controller/macros.rb", "lib/remarkable/controller/macros/assign_matcher.rb", "lib/remarkable/controller/macros/filter_params_matcher.rb", "lib/remarkable/controller/macros/metadata_matcher.rb", "lib/remarkable/controller/macros/render_with_layout_matcher.rb", "lib/remarkable/controller/macros/respond_with_content_type_matcher.rb", "lib/remarkable/controller/macros/respond_with_matcher.rb", "lib/remarkable/controller/macros/return_from_session_matcher.rb", "lib/remarkable/controller/macros/route_matcher.rb", "lib/remarkable/controller/macros/set_the_flash_to_matcher.rb", "lib/remarkable/dsl.rb", "lib/remarkable/example/example_methods.rb", "lib/remarkable/helpers.rb", "lib/remarkable/matcher_base.rb", "lib/remarkable/private_helpers.rb", "lib/remarkable/rails.rb", "rails/init.rb", "remarkable.gemspec", "script/console", "script/destroy", "script/generate", "tasks/rspec.rake"]
+  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "init.rb", "lib/remarkable.rb", "lib/remarkable/active_record/README.markdown", "lib/remarkable/active_record/active_record.rb", "lib/remarkable/active_record/helpers.rb", "lib/remarkable/active_record/macros.rb", "lib/remarkable/active_record/macros/associations/association_matcher.rb", "lib/remarkable/active_record/macros/callbacks/callback_matcher.rb", "lib/remarkable/active_record/macros/database/have_db_column_matcher.rb", "lib/remarkable/active_record/macros/database/index_matcher.rb", "lib/remarkable/active_record/macros/validations/allow_mass_assignment_of_matcher.rb", "lib/remarkable/active_record/macros/validations/ensure_value_in_list_matcher.rb", "lib/remarkable/active_record/macros/validations/ensure_value_in_range_matcher.rb", "lib/remarkable/active_record/macros/validations/have_class_methods_matcher.rb", "lib/remarkable/active_record/macros/validations/have_instance_methods_matcher.rb", "lib/remarkable/active_record/macros/validations/have_named_scope_matcher.rb", "lib/remarkable/active_record/macros/validations/have_readonly_attributes_matcher.rb", "lib/remarkable/active_record/macros/validations/protect_attributes_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_acceptance_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_associated_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_confirmation_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_exclusion_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_format_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_inclusion_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_length_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_numericality_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_presence_of_matcher.rb", "lib/remarkable/active_record/macros/validations/validate_uniqueness_of_matcher.rb", "lib/remarkable/assertions.rb", "lib/remarkable/controller/README.markdown", "lib/remarkable/controller/controller.rb", "lib/remarkable/controller/helpers.rb", "lib/remarkable/controller/macros.rb", "lib/remarkable/controller/macros/assign_matcher.rb", "lib/remarkable/controller/macros/filter_params_matcher.rb", "lib/remarkable/controller/macros/metadata_matcher.rb", "lib/remarkable/controller/macros/render_with_layout_matcher.rb", "lib/remarkable/controller/macros/respond_with_content_type_matcher.rb", "lib/remarkable/controller/macros/respond_with_matcher.rb", "lib/remarkable/controller/macros/set_session_matcher.rb", "lib/remarkable/controller/macros/route_matcher.rb", "lib/remarkable/controller/macros/set_the_flash_to_matcher.rb", "lib/remarkable/dsl.rb", "lib/remarkable/example/example_methods.rb", "lib/remarkable/helpers.rb", "lib/remarkable/matcher_base.rb", "lib/remarkable/private_helpers.rb", "lib/remarkable/rails.rb", "rails/init.rb", "remarkable.gemspec", "script/console", "script/destroy", "script/generate", "tasks/rspec.rake"]
   s.has_rdoc = true
   s.homepage = %q{http://www.nomedojogo.com/2008/11/18/shoulda-for-rspec-is-remarkable/}
   s.post_install_message = %q{PostInstall.txt}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: carlosbrando-remarkable
 version: !ruby/object:Gem::Version 
-  version: 2.2.4
+  version: 2.2.5
 platform: ruby
 authors: 
 - Carlos Brando
@@ -16,6 +16,7 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -25,6 +26,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -34,6 +36,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: newgem
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -43,6 +46,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -109,7 +113,7 @@ files:
 - lib/remarkable/controller/macros/render_with_layout_matcher.rb
 - lib/remarkable/controller/macros/respond_with_content_type_matcher.rb
 - lib/remarkable/controller/macros/respond_with_matcher.rb
-- lib/remarkable/controller/macros/return_from_session_matcher.rb
+- lib/remarkable/controller/macros/set_session_matcher.rb
 - lib/remarkable/controller/macros/route_matcher.rb
 - lib/remarkable/controller/macros/set_the_flash_to_matcher.rb
 - lib/remarkable/dsl.rb

data/tasks/rspec.rake

@@ -1,21 +0,0 @@
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems'
-  require 'spec'
-end
-begin
-  require 'spec/rake/spectask'
-rescue LoadError
-  puts <<-EOS
-To use rspec for testing you must install rspec gem:
-    gem install rspec
-EOS
-  exit(0)
-end
-
-desc "Run the specs under spec/models"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end