almost-happy 0.2.3 → 0.3.0

data/almost-happy.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{almost-happy}
-  s.version = "0.2.3"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Darcy Laycock"]

data/lib/almost_happy/convertable.rb

@@ -12,9 +12,14 @@ module AlmostHappy
 
     module ClassMethods
 
-      def validate_convertable_format
-        validates_presence_of :format
-        validates_with AlmostHappy::FormatValidator
+      def validate_convertable_format(*attrs)
+        if attrs.empty?
+          attrs = [:format]
+        else
+          attrs = attrs.map { |a| a.to_s.gsub(/(_format)?$/, '_format').to_sym }
+        end
+        validates_presence_of *attrs
+        validates_with AlmostHappy::FormatValidator, :attributes => attrs
       end
 
     end
@@ -23,6 +28,19 @@ module AlmostHappy
 
       protected
 
+      def format_field_for(field)
+        named_version = :"#{field}_format"
+        respond_to?(named_version) ? named_version : :format
+      end
+      
+      def format_for(field)
+        send format_field_for(field)
+      end
+      
+      def format_changed_for?(field)
+        send :"#{format_field_for(field)}_changed?"
+      end
+
       def process_convertable_sections
         convertable_fields.each do |field|
           AlmostHappy::Convertor.new(self, field).render if should_render?(field)
@@ -30,7 +48,7 @@ module AlmostHappy
       end
 
       def should_render?(field)
-        send(:"rendered_#{field}").blank? || format_changed? || send(:"#{field}_changed?")
+        send(:"rendered_#{field}").blank? || format_changed_for?(field) || send(:"#{field}_changed?")
       end
 
     end

data/lib/almost_happy/convertor.rb

@@ -72,7 +72,7 @@ module AlmostHappy
     end
 
     def to_html
-      conversion_from = @object.format rescue nil
+      conversion_from = @object.send(:format_for, @source_field) rescue nil
       self.class.render_for(conversion_from, original_content)
     end
 

data/lib/almost_happy/format_validator.rb

@@ -1,14 +1,11 @@
 module AlmostHappy
-  class FormatValidator < ActiveModel::Validator
+  class FormatValidator < ActiveModel::EachValidator
     
-    def validate(record)
-      if record && record.respond_to?(:format)
-        format = record.format
-        if format.present? && !AlmostHappy::Convertor.valid_format?(format)
-          record.errors.add :format, :invalid_format,
-            :default => 'is not a valid format (must be one of {{formats}})',
-            :formats => AlmostHappy::Convertor.format_names
-        end
+    def validate_each(record, attribute, value)
+      if value.present? && !AlmostHappy::Convertor.valid_format?(value)
+        record.errors.add attribute, :invalid_format,
+          :default => 'is not a valid format (must be one of %{formats})',
+          :formats => AlmostHappy::Convertor.format_names
       end
     end
     

data/lib/almost_happy.rb

@@ -4,7 +4,7 @@ require 'active_support/core_ext/class/attribute'
 require 'active_support/concern'
 
 module AlmostHappy
-  VERSION = '0.2.3'.freeze
+  VERSION = '0.3.0'.freeze
 
   extend ActiveSupport::Autoload
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: almost-happy
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
   - 3
-  version: 0.2.3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Darcy Laycock