lawrencepit-remarkable_paperclip 0.6.2 → 0.6.3

data/lib/matchers/allow_attachment_content_type_for_matcher.rb

@@ -0,0 +1,46 @@
+module Remarkable
+  module Paperclip
+    module Matchers
+      class AllowAttachmentContentTypeForMatcher < Remarkable::ActiveRecord::Base
+        arguments :attribute
+
+        optional :in, :splat => true
+
+        assertions :is_valid?
+
+        protected
+
+          def is_valid?
+            @options[:in].each do |value|
+              return false, :value => value.inspect unless allow?(value)
+            end
+            true
+          end
+
+          def interpolation_options
+            { :in => array_to_sentence(@options[:in].map{|i| i.inspect}) }
+          end
+
+        private
+
+          def allow?(content_types)
+            content_types.all? do |content_type|
+              file = StringIO.new
+              file.content_type = content_type
+              attachment = @subject.attachment_for(@attribute)
+              attachment.assign(file)
+              attachment.errors[:content_type].nil?
+            end
+          end
+
+      end
+
+      def allow_attachment_content_type_for(attribute, *args, &block)
+        options = args.extract_options!
+        AllowAttachmentContentTypeForMatcher.new(attribute, options.merge!(:in => args), &block).spec(self)
+      end
+      alias_method :validate_attachment_content_type, :allow_attachment_content_type_for
+
+    end
+  end
+end

data/lib/matchers/have_attached_file_matcher.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

data/lib/remarkable_paperclip.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)

data/locale/en.yml

@@ -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}}"
+          is_valid: "{{subject_name}} to be valid when content type for attachment {{attribute}} is set to {{value}}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lawrencepit-remarkable_paperclip
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors: 
 - Lawrence Pit
@@ -30,7 +30,7 @@ files:
 - 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
+- lib/matchers/allow_attachment_content_type_for_matcher.rb
 has_rdoc: false
 homepage: http://github.com/lawrencepit/remarkable_paperclip
 post_install_message: 

data/lib/matchers/validate_attachment_content_type_matcher.rb

@@ -1,47 +0,0 @@
-module Remarkable
-  module Paperclip
-    module Matchers
-      class ValidateAttachmentContentTypeMatcher < Remarkable::ActiveRecord::Base
-        arguments :attribute
-
-        optionals :allows, :rejects
-
-        assertions :allows_match?, :rejects_match?
-
-        protected
-
-          def allows_match?
-            return true unless @options.key?(:allows)
-            allow?(@options[:allows])
-          end
-
-          def rejects_match?
-            return true unless @options.key?(:rejects)
-            !allow?(@options[:rejects])
-          end
-
-          def interpolation_options
-            { :allows => @options[:allows].inspect, :rejects => @options[:rejects].inspect }
-          end
-
-        private
-
-          def allow?(content_types)
-            content_types.all? do |content_type|
-              file = StringIO.new
-              file.content_type = content_type
-              attachment = @subject.attachment_for(@attribute)
-              attachment.assign(file)
-              attachment.errors[:content_type].nil?
-            end
-          end
-
-      end
-
-      def validate_attachment_content_type(*args)
-        ValidateAttachmentContentTypeMatcher.new(*args).spec(self)
-      end
-
-    end
-  end
-end