lib/matchers/allow_attachment_content_type_for_matcher.rb spec/allow_attachment_content_type_for_matcher_spec.rb @@ -24,11 +24,11 @@ module Remarkable actuals = attachment_definition[:styles].clone match = @options[:styles].all? do |key, value| actual = actuals.delete(key) - actual == value || case actual + value == actual || value == case actual when Hash then actual[:geometry] when Array then actual[0] else actual - end == value + end end return (match && actuals.size == 0), :styles => @options[:styles].inspect, :actual => attachment_definition[:styles].inspect lib/matchers/have_attached_file_matcher.rb @@ -2,7 +2,7 @@ require 'paperclip/extension' require 'matchers/have_attached_file_matcher' require 'matchers/validate_attachment_size_matcher' require 'matchers/validate_attachment_presence_matcher' -require 'matchers/validate_attachment_content_type_matcher' +require 'matchers/allow_attachment_content_type_for_matcher' if defined?(Spec::Rails) Remarkable.include_matchers!(Remarkable::Paperclip, Spec::Rails::Example::ModelExampleGroup) lib/remarkable_paperclip.rb @@ -31,13 +31,7 @@ en: description: "validate attachment presence of attached file {{attribute}}" expectations: invalid_when_not_present: "{{subject_name}} to be invalid when attached file {{attribute}} is not present" - validate_attachment_content_type: - description: "validate attachment content type of attached file {{attribute}}" + allow_attachment_content_type_for: + description: "allow {{in}} as content type for attachment {{attribute}}" expectations: - allows_match: "{{subject_name}} to accept content types {{allows}} for attached file {{attribute}}" - rejects_match: "{{subject_name}} to reject content types {{rejects}} for attached file {{attribute}}" - optionals: - allows: - positive: "allowing {{inspect}}" - rejects: - positive: "rejecting {{inspect}}" \ No newline at end of file + is_valid: "{{subject_name}} to be valid when content type for attachment {{attribute}} is set to {{value}}" locale/en.yml @@ -1,11 +1,11 @@ Gem::Specification.new do |s| s.name = "remarkable_paperclip" - s.version = "0.6.2" + s.version = "0.6.3" s.author = "Lawrence Pit" s.email = "lawrence.pit@gmail.com" s.homepage = "http://github.com/lawrencepit/remarkable_paperclip" s.summary = "Remarkable matchers for Paperclip." - s.files = ["README.markdown", "MIT-LICENSE", "locale/en.yml", "lib/paperclip/extension.rb", "lib/remarkable_paperclip.rb", "lib/matchers/have_attached_file_matcher.rb", "lib/matchers/validate_attachment_presence_matcher.rb", "lib/matchers/validate_attachment_size_matcher.rb", "lib/matchers/validate_attachment_content_type_matcher.rb"] + s.files = ["README.markdown", "MIT-LICENSE", "locale/en.yml", "lib/paperclip/extension.rb", "lib/remarkable_paperclip.rb", "lib/matchers/have_attached_file_matcher.rb", "lib/matchers/validate_attachment_presence_matcher.rb", "lib/matchers/validate_attachment_size_matcher.rb", "lib/matchers/allow_attachment_content_type_for_matcher.rb"] s.require_path = "lib" s.has_rdoc = false end remarkable_paperclip.gemspec @@ -8,7 +8,6 @@ describe "have_attached_file" do describe "messages" do it "should contain a description" do @matcher = have_attached_file(:avatar) - @matcher.matches?(@subject) @matcher.description.should == 'have attached file :avatar' end @@ -27,7 +26,7 @@ describe "have_attached_file" do it "should set styles_match? message" do @matcher = have_attached_file(:avatar, :styles => { :ico => "16x16" }) @matcher.matches?(@subject) - @matcher.failure_message.should == 'Expected Person to have attached file :avatar with styles {:ico=>"16x16"}, got {:ico=>"16x16", :normal=>"48x48"}' + @matcher.failure_message.should =~ %r{Expected Person to have attached file :avatar with styles \{:ico=>\"16x16\"\}, got \{:ico=>.*, :normal=>.*\}} end it "should set default_style_match? message" do spec/have_attached_file_matcher_spec.rb @@ -9,7 +9,6 @@ describe "validate_attachment_presence" do describe "messages" do it "should contain a description" do @matcher = validate_attachment_presence(:avatar) - @matcher.matches?(@subject) @matcher.description.should == 'validate attachment presence of attached file :avatar' end spec/validate_attachment_presence_matcher_spec.rb @@ -9,7 +9,6 @@ describe "validate_attachment_size" do it "should contain a description when :in is used" do @matcher = validate_attachment_size(:avatar, :in => 100..110) - @matcher.matches?(@subject) @matcher.description.should == 'validate size for attached file :avatar to be in 100..110' end spec/validate_attachment_size_matcher_spec.rb lib/matchers/validate_attachment_content_type_matcher.rb spec/validate_attachment_content_type_matcher_spec.rb 83b19366ed465c987a9c4bc63dd29a4ad0f29438 Lawrence Pit lawrence.pit@gmail.com http://github.com/lawrencepit/remarkable_paperclip/commit/7606f2b48b5b3872d3a20d66a04b1b0435e83da2 7606f2b48b5b3872d3a20d66a04b1b0435e83da2 2009-05-30T00:00:30-07:00 2009-05-30T00:00:30-07:00 Refactored ValidateAttachmentContentTypeMatcher to AllowAttachmentContentTypeForMatcher. 77c001b8e6b0a85d33e17debceee7af10571ade7 Lawrence Pit lawrence.pit@gmail.com