lawrencepit-remarkable_paperclip 0.5.5 → 0.5.6

data/lib/en.yml

@@ -7,9 +7,12 @@ en:
           defined: "{{subject_name}} has {{attribute}} as an attached file"
           has_column: "table {{table_name}} to have column {{column_name}}, but it does not"
           styles_match: "{{subject_name}} to have attached file {{attribute}} with styles {{styles}}, got {{actual}}"
+          default_style_match: "{{subject_name}} to have attached file {{attribute}} with default style {{style}}, got {{actual}}"
         optionals:
           styles:
             positive: "with styles {{inspect}}"
+          default_style:
+            positive: "with default style {{value}}"
       validate_attachment_size:
         description: "validate size for attached file {{attribute}}"
         expectations:

data/lib/have_attached_file_matcher.rb

@@ -4,9 +4,9 @@ module Remarkable
       class HaveAttachedFileMatcher < Remarkable::ActiveRecord::Base
         arguments :attribute
 
-        optionals :styles
+        optionals :styles, :default_style
 
-        assertions :defined?, :has_column?, :styles_match?
+        assertions :defined?, :has_column?, :styles_match?, :default_style_match?
 
         protected
           def defined?
@@ -24,12 +24,22 @@ module Remarkable
             actuals = attachment_definition[:styles].clone
             match = @options[:styles].all? do |key, value|
               actual = actuals.delete(key)
-              (actual.instance_of?(Hash) ? actual[:geometry] : actual) == value
+              actual == value || case actual
+              when Hash then actual[:geometry]
+              when Array then actual[0]
+              else actual
+              end == value
             end
             return (match && actuals.size == 0),
                    :styles => @options[:styles].inspect, :actual => attachment_definition[:styles].inspect
           end
 
+          def default_style_match?
+            return true unless @options.key?(:default_style)
+            return @options[:default_style] == attachment_definition[:default_style],
+                   :style => @options[:default_style].inspect, :actual => attachment_definition[:default_style].inspect
+          end
+
         private
           def attachment_definition
             @subject.class.attachment_definitions[@attribute]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lawrencepit-remarkable_paperclip
 version: !ruby/object:Gem::Version 
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors: 
 - Lawrence Pit