hyper-mesh 1.0.0.lap27 → 1.0.0.lap28

data/lib/reactive_record/active_record/error.rb

@@ -1,26 +1,31 @@
 module ActiveModel
-  
   class Error
-    
+
     attr_reader :messages
-    
-    def initialize(msgs = {})
-      @messages = msgs || {}
-      @messages.each { |attribute, messages| @messages[attribute] = messages.uniq }
+
+    def initialize(initial_msgs = {})
+      @messages = Hash.new { |h, k| h[k] = [] }
+      initial_msgs.each { |attr, msgs| @messages[attr] = msgs.uniq }
     end
-    
+
     def [](attribute)
       messages[attribute]
     end
-    
+
     def delete(attribute)
       messages.delete(attribute)
     end
-    
+
     def empty?
       messages.empty?
     end
-    
+
+    def clear
+      @messages.clear
+    end
+
+    def add(attribute, message:)
+      @messages[attribute] << message unless @messages[attribute].include? message
+    end
   end
-  
-end
+end

data/lib/reactive_record/active_record/errors.rb

@@ -0,0 +1,374 @@
+require 'active_support/core_ext/string/inflections'
+
+module ActiveModel
+  class Errors
+    include Enumerable
+
+    CALLBACKS_OPTIONS = [:if, :unless, :on, :allow_nil, :allow_blank, :strict]
+    MESSAGE_OPTIONS = [:message]
+
+    attr_reader :messages, :details
+
+    # Pass in the instance of the object that is using the errors object.
+    #
+    #   class Person
+    #     def initialize
+    #       @errors = ActiveModel::Errors.new(self)
+    #     end
+    #   end
+    def initialize(base = {})
+      @base = base
+      @messages = apply_default_array({})
+      @details = apply_default_array({})
+      reactive_empty! true
+    end
+
+    # When passed a symbol or a name of a method, returns an array of errors
+    # for the method.
+    #
+    #   person.errors[:name]  # => ["cannot be nil"]
+    #   person.errors['name'] # => ["cannot be nil"]
+    def [](attribute)
+      messages[attribute]
+    end
+
+    # Iterates through each error key, value pair in the error messages hash.
+    # Yields the attribute and the error for that attribute. If the attribute
+    # has more than one error message, yields once for each error message.
+    #
+    #   person.errors.add(:name, :blank, message: "can't be blank")
+    #   person.errors.each do |attribute, error|
+    #     # Will yield :name and "can't be blank"
+    #   end
+    #
+    #   person.errors.add(:name, :not_specified, message: "must be specified")
+    #   person.errors.each do |attribute, error|
+    #     # Will yield :name and "can't be blank"
+    #     # then yield :name and "must be specified"
+    #   end
+    def each
+      messages.each_key do |attribute|
+        messages[attribute].each { |error| yield attribute, error }
+      end
+    end
+
+    # Delete messages for +key+. Returns the deleted messages.
+    #
+    #   person.errors[:name]        # => ["cannot be nil"]
+    #   person.errors.delete(:name) # => ["cannot be nil"]
+    #   person.errors[:name]        # => []
+    def delete(attribute)
+      details.delete(attribute)
+      messages.delete(attribute)
+    end
+
+    # Returns the number of error messages.
+    #
+    #   person.errors.add(:name, :blank, message: "can't be blank")
+    #   person.errors.size # => 1
+    #   person.errors.add(:name, :not_specified, message: "must be specified")
+    #   person.errors.size # => 2
+    def size
+      values.flatten.size
+    end
+    alias :count :size
+
+    # Returns all message keys.
+    #
+    #   person.errors.messages # => {:name=>["cannot be nil", "must be specified"]}
+    #   person.errors.keys     # => [:name]
+    def keys
+      messages.select do |key, value|
+        !value.empty?
+      end.keys
+    end
+
+    # Returns all message values.
+    #
+    #   person.errors.messages # => {:name=>["cannot be nil", "must be specified"]}
+    #   person.errors.values   # => [["cannot be nil", "must be specified"]]
+    def values
+      messages.select do |key, value|
+        !value.empty?
+      end.values
+    end
+
+    # NOTE: Doesn't use i18n
+    #
+    # Returns a full message for a given attribute.
+    #
+    #   person.errors.full_message(:name, 'is invalid') # => "Name is invalid"
+    def full_message(attribute, message)
+      return message if attribute == :base
+      # TODO: When opal_activesupport 0.3.2 is released, use `humanize`
+      # attr_name = attribute.to_s.tr('.', '_').humanize
+      attr_name =
+        attribute.to_s.tr('.', '_').tr('_', ' ').gsub(/_id$/, '').capitalize
+      # attr_name = @base.class.human_attribute_name(attribute, default: attr_name)
+      # if @base.class.respond_to?(:human_attribute_name)
+        attr_name = @base.class.human_attribute_name(attribute, default: attr_name)
+      # end
+      # I18n.t(:"errors.format",
+      #   default:  "%{attribute} %{message}",
+      #   attribute: attr_name,
+      #   message:   message)
+      "#{attr_name} #{message}"
+    end
+
+    # Returns all the full error messages in an array.
+    #
+    #   class Person
+    #     validates_presence_of :name, :address, :email
+    #     validates_length_of :name, in: 5..30
+    #   end
+    #
+    #   person = Person.create(address: '123 First St.')
+    #   person.errors.full_messages
+    #   # => ["Name is too short (minimum is 5 characters)", "Name can't be blank", "Email can't be blank"]
+    def full_messages
+      map { |attribute, message| full_message(attribute, message) }
+    end
+    alias :to_a :full_messages
+
+    # Returns all the full error messages for a given attribute in an array.
+    #
+    #   class Person
+    #     validates_presence_of :name, :email
+    #     validates_length_of :name, in: 5..30
+    #   end
+    #
+    #   person = Person.create()
+    #   person.errors.full_messages_for(:name)
+    #   # => ["Name is too short (minimum is 5 characters)", "Name can't be blank"]
+    def full_messages_for(attribute)
+      messages[attribute].map { |message| full_message(attribute, message) }
+    end
+
+    # Returns a Hash of attributes with their error messages. If +full_messages+
+    # is +true+, it will contain full messages (see +full_message+).
+    #
+    #   person.errors.to_hash       # => {:name=>["cannot be nil"]}
+    #   person.errors.to_hash(true) # => {:name=>["name cannot be nil"]}
+    def to_hash(full_messages = false)
+      if full_messages
+        messages.each_with_object({}) do |(attribute, array), messages|
+          messages[attribute] = array.map { |message| full_message(attribute, message) }
+        end
+      else
+        without_default_proc(messages)
+      end
+    end
+
+    # Returns a Hash that can be used as the JSON representation for this
+    # object. You can pass the <tt>:full_messages</tt> option. This determines
+    # if the json object should contain full messages or not (false by default).
+    #
+    #   person.errors.as_json                      # => {:name=>["cannot be nil"]}
+    #   person.errors.as_json(full_messages: true) # => {:name=>["name cannot be nil"]}
+    def as_json(options = nil)
+      to_hash(options && options[:full_messages])
+    end
+
+    # NOTE: Doesn't actually do any of the below i18n lookups
+    #
+    # Translates an error message in its default scope
+    # (<tt>activemodel.errors.messages</tt>).
+    #
+    # Error messages are first looked up in <tt>activemodel.errors.models.MODEL.attributes.ATTRIBUTE.MESSAGE</tt>,
+    # if it's not there, it's looked up in <tt>activemodel.errors.models.MODEL.MESSAGE</tt> and if
+    # that is not there also, it returns the translation of the default message
+    # (e.g. <tt>activemodel.errors.messages.MESSAGE</tt>). The translated model
+    # name, translated attribute name and the value are available for
+    # interpolation.
+    #
+    # When using inheritance in your models, it will check all the inherited
+    # models too, but only if the model itself hasn't been found. Say you have
+    # <tt>class Admin < User; end</tt> and you wanted the translation for
+    # the <tt>:blank</tt> error message for the <tt>title</tt> attribute,
+    # it looks for these translations:
+    #
+    # * <tt>activemodel.errors.models.admin.attributes.title.blank</tt>
+    # * <tt>activemodel.errors.models.admin.blank</tt>
+    # * <tt>activemodel.errors.models.user.attributes.title.blank</tt>
+    # * <tt>activemodel.errors.models.user.blank</tt>
+    # * any default you provided through the +options+ hash (in the <tt>activemodel.errors</tt> scope)
+    # * <tt>activemodel.errors.messages.blank</tt>
+    # * <tt>errors.attributes.title.blank</tt>
+    # * <tt>errors.messages.blank</tt>
+    def generate_message(attribute, type = :invalid, options = {})
+      options.delete(:message) || type
+    end
+
+    # Returns +true+ if no errors are found, +false+ otherwise.
+    # If the error message is a string it can be empty.
+    #
+    #   person.errors.full_messages # => ["name cannot be nil"]
+    #   person.errors.empty?        # => false
+    def empty?
+      size.zero?
+    end
+    alias :blank? :empty?
+
+    def reactive_empty?
+      React::State.get_state(self, 'ERRORS?')
+    end
+
+    # Clear the error messages.
+    #
+    #   person.errors.full_messages # => ["name cannot be nil"]
+    #   person.errors.clear
+    #   person.errors.full_messages # => []
+    def clear
+      messages.clear
+      details.clear.tap { reactive_empty! true }
+    end
+
+    # Merges the errors from <tt>other</tt>.
+    #
+    # other - The ActiveModel::Errors instance.
+    #
+    # Examples
+    #
+    #   person.errors.merge!(other)
+    def merge!(other)
+      @messages.merge!(other.messages) { |_, ary1, ary2| ary1 + ary2 }
+      @details.merge!(other.details) { |_, ary1, ary2| ary1 + ary2 }.tap { reactive_empty! }
+    end
+
+    # Returns +true+ if the error messages include an error for the given key
+    # +attribute+, +false+ otherwise.
+    #
+    #   person.errors.messages        # => {:name=>["cannot be nil"]}
+    #   person.errors.include?(:name) # => true
+    #   person.errors.include?(:age)  # => false
+    def include?(attribute)
+      attribute = attribute.to_sym
+      messages.key?(attribute) && messages[attribute].present?
+    end
+    alias :has_key? :include?
+    alias :key? :include?
+
+    # NOTE: strict option isn't ported yet
+    #
+    # Adds +message+ to the error messages and used validator type to +details+ on +attribute+.
+    # More than one error can be added to the same +attribute+.
+    # If no +message+ is supplied, <tt>:invalid</tt> is assumed.
+    #
+    #   person.errors.add(:name)
+    #   # => ["is invalid"]
+    #   person.errors.add(:name, :not_implemented, message: "must be implemented")
+    #   # => ["is invalid", "must be implemented"]
+    #
+    #   person.errors.messages
+    #   # => {:name=>["is invalid", "must be implemented"]}
+    #
+    #   person.errors.details
+    #   # => {:name=>[{error: :not_implemented}, {error: :invalid}]}
+    #
+    # If +message+ is a symbol, it will be translated using the appropriate
+    # scope (see +generate_message+).
+    #
+    # If +message+ is a proc, it will be called, allowing for things like
+    # <tt>Time.now</tt> to be used within an error.
+    #
+    # If the <tt>:strict</tt> option is set to +true+, it will raise
+    # ActiveModel::StrictValidationFailed instead of adding the error.
+    # <tt>:strict</tt> option can also be set to any other exception.
+    #
+    #   person.errors.add(:name, :invalid, strict: true)
+    #   # => ActiveModel::StrictValidationFailed: Name is invalid
+    #   person.errors.add(:name, :invalid, strict: NameIsInvalid)
+    #   # => NameIsInvalid: Name is invalid
+    #
+    #   person.errors.messages # => {}
+    #
+    # +attribute+ should be set to <tt>:base</tt> if the error is not
+    # directly associated with a single attribute.
+    #
+    #   person.errors.add(:base, :name_or_email_blank,
+    #     message: "either name or email must be present")
+    #   person.errors.messages
+    #   # => {:base=>["either name or email must be present"]}
+    #   person.errors.details
+    #   # => {:base=>[{error: :name_or_email_blank}]}
+    def add(attribute, message = :invalid, options = {})
+      message = message.call if message.respond_to?(:call)
+      detail  = normalize_detail(message, options)
+      message = normalize_message(attribute, message, options)
+      # if exception = options[:strict]
+      #   exception = ActiveModel::StrictValidationFailed if exception == true
+      #   raise exception, full_message(attribute, message)
+      # end
+      details[attribute.to_sym]  << detail
+      (messages[attribute.to_sym] << message).tap { reactive_empty! false }
+    end
+
+    # NOTE: Due to Opal not supporting Symbol this isn't identical,
+    # but probably still works fine in most cases.
+    #
+    # Returns +true+ if an error on the attribute with the given message is
+    # present, or +false+ otherwise. +message+ is treated the same as for +add+.
+    #
+    #   person.errors.add :name, :blank
+    #   person.errors.added? :name, :blank           # => true
+    #   person.errors.added? :name, "can't be blank" # => true
+    #
+    # If the error message requires an option, then it returns +true+ with
+    # the correct option, or +false+ with an incorrect or missing option.
+    #
+    #  person.errors.add :name, :too_long, { count: 25 }
+    #  person.errors.added? :name, :too_long, count: 25                     # => true
+    #  person.errors.added? :name, "is too long (maximum is 25 characters)" # => true
+    #  person.errors.added? :name, :too_long, count: 24                     # => false
+    #  person.errors.added? :name, :too_long                                # => false
+    #  person.errors.added? :name, "is too long"                            # => false
+    def added?(attribute, message = :invalid, options = {})
+      # if message.is_a? Symbol
+      #   self.details[attribute].map { |e| e[:error] }.include? message
+      # else
+      #   message = message.call if message.respond_to?(:call)
+      #   message = normalize_message(attribute, message, options)
+      #   self[attribute].include? message
+      # end
+      return true if details[attribute].map { |e| e[:error] }.include? message
+      message = message.call if message.respond_to?(:call)
+      message = normalize_message(attribute, message, options)
+      self[attribute].include? message
+    end
+
+    private
+
+    def apply_default_array(hash)
+      hash.default_proc = proc { |h, key| h[key] = [] }
+      hash
+    end
+
+    def normalize_message(attribute, message, options)
+      # case message
+      # when Symbol
+      #   generate_message(attribute, message, options.except(*CALLBACKS_OPTIONS))
+      # else
+      #   message
+      # end
+      generate_message(
+        attribute, message, options.reject { |k, _| CALLBACKS_OPTIONS.include?(k) }
+      )
+    end
+
+    def normalize_detail(message, options)
+      # { error: message }.merge(options.except(*CALLBACKS_OPTIONS + MESSAGE_OPTIONS))
+      ignore = (CALLBACKS_OPTIONS + MESSAGE_OPTIONS)
+      { error: message }.merge(options.reject { |k, _| ignore.include?(k) })
+    end
+
+    def without_default_proc(hash)
+      hash.dup.tap do |new_h|
+        new_h.default_proc = nil
+      end
+    end
+
+    def reactive_empty!(state = empty?)
+      React::State.set_state(self, 'ERRORS?', state) unless ReactiveRecord::Base.data_loading?
+    end
+  end
+end

data/lib/reactive_record/active_record/instance_methods.rb

@@ -1,7 +1,5 @@
 module ActiveRecord
-
   module InstanceMethods
-
     def inspect
       "<#{model_name}:#{ReactiveRecord::Operations::Base::FORMAT % to_key} "\
       "(#{ReactiveRecord::Operations::Base::FORMAT % object_id}) "\
@@ -14,25 +12,36 @@ module ActiveRecord
       @backing_record.attributes
     end
 
-    def initialize(hash = {})
+    def changed_attributes
+      backing_record.changed_attributes_and_values
+    end
+
+    def changes
+      backing_record.changes
+    end
 
+    def initialize(hash = {})
       if hash.is_a? ReactiveRecord::Base
         @backing_record = hash
       else
         # standard active_record new -> creates a new instance, primary key is ignored if present
         # we have to build the backing record first then initialize it so associations work correctly
         @backing_record = ReactiveRecord::Base.new(self.class, {}, self)
+        if self.class.inheritance_column && !hash.key?(self.class.inheritance_column)
+          hash[self.class.inheritance_column] = self.class.name
+        end
         @backing_record.instance_eval do
-          h = Hash.new
-          hash.each { |a, v| h[a] = convert(a, v).itself }
+          h = {}
+          hash.each do |a, v|
+            a = model._dealias_attribute(a)
+            h[a] = convert(a, v).itself
+          end
           self.class.load_data do
             h.each do |attribute, value|
-              unless attribute == primary_key
-                reactive_set!(attribute, value)
-                changed_attributes << attribute
-              end
+              next if attribute == primary_key
+              @ar_instance[attribute] = value
+              changed_attributes << attribute
             end
-            #changed_attributes << primary_key # insures that changed attributes has at least one element
           end
         end
       end
@@ -42,22 +51,18 @@ module ActiveRecord
       self.class.primary_key
     end
 
-    def type
-      @backing_record.reactive_get!(:type, nil)
-    end
-
-    def type=(val)
-      @backing_record.reactive_set!(:type, backing_record.convert(:type, val))
-    end
-
     def id
-      @backing_record.reactive_get!(primary_key)
+      @backing_record.get_primary_key_value
     end
 
     def id=(value)
       @backing_record.id = value
     end
 
+    def id?
+      id.present?
+    end
+
     def model_name
       # in reality should return ActiveModel::Name object, blah blah
       self.class.model_name
@@ -87,61 +92,22 @@ module ActiveRecord
       send("#{attr}=", val)
     end
 
-    def method_missing_warning(name)
-      @backing_record.deprecation_warning("Server side method #{name} must be defined using the 'server_method' macro.")
-    end
-
-    def method_missing(name, *args, &block)
-      original_name = name
-
-      if name.end_with?('!')
-        name = name.chop # remove '!'
-        force_update = true
-      end
-
-      chopped_name = name.end_with?('=') ? name.chop : name
-      is_server_method = self.class.server_methods.has_key?(chopped_name)
-      chopped_name = chopped_name.end_with?('?') ? chopped_name.chop : name
-      is_attribute = attributes.has_key?(chopped_name)
-
-      unless is_server_method || is_attribute
-        if ReactiveRecord::Base.public_columns_hash.has_key?(self.class.name) && ReactiveRecord::Base.public_columns_hash[self.class.name].has_key?(chopped_name)
-          is_attribute = true
-        end
-        method_missing_warning("#{original_name}(#{args})") unless is_attribute
-      end
-
-      if name.end_with?('_changed?')
-        @backing_record.changed?(name[0...-9]) # remove '_changed?'
-      elsif args.count == 1 && name.end_with?('=') && !block
-        attribute_name = name.chop # remove '='
-        # for rails auto generated methods for booleans, remove '?' to get the attribute
-        attribute_name = attribute_name.chop if !is_server_method && is_attribute && attribute_name.end_with?('?')
-        @backing_record.reactive_set!(attribute_name, backing_record.convert(attribute_name, args[0]))
-      elsif args.count.zero? && !block
-        # for rails auto generated methods for booleans, remove '?' to get the attribute
-        name = name.chop if !is_server_method && is_attribute && name.end_with?('?')
-        @backing_record.reactive_get!(name, force_update)
-      elsif !block
-        # for rails auto generated methods for booleans, remove '?' to get the attribute
-        name = name.chop if !is_server_method && is_attribute && name.end_with?('?')
-        @backing_record.reactive_get!([[name]+args], force_update)
-      else
-        super
-      end
-    end
-
     def itself
       # this is useful when you just want to get a handle on record instance
       # in the ReactiveRecord.load method
       id # force load of id...
-      self
+      # if self.class.columns_hash.keys.include?(self.class.inheritance_column) &&
+      #    (klass = self[self.class.inheritance_column]).loaded?
+      #   Object.const_get(klass).new(attributes)
+      # else
+        self
+      # end
     end
 
     def load(*attributes, &block)
       first_time = true
       ReactiveRecord.load do
-        results = attributes.collect { |attr| @backing_record.reactive_get!(attr, first_time) }
+        results = attributes.collect { |attr| send("#{attr}#{'!' if first_time}") }
         results = yield(*results) if block
         first_time = false
         block.nil? && results.count == 1 ? results.first : results
@@ -149,7 +115,21 @@ module ActiveRecord
     end
 
     def save(opts = {}, &block)
-      @backing_record.save(opts.has_key?(:validate) ? opts[:validate] : true, opts[:force], &block)
+      @backing_record.save_or_validate(true, opts.has_key?(:validate) ? opts[:validate] : true, opts[:force], &block)
+    end
+
+    def validate(opts = {}, &block)
+      @backing_record.save_or_validate(false, true, opts[:force]).then do
+        if block
+          yield @backing_record.ar_instance
+        else
+          @backing_record.ar_instance
+        end
+      end
+    end
+
+    def valid?
+      errors.reactive_empty?
     end
 
     def saving?
@@ -191,6 +171,17 @@ module ActiveRecord
       id.to_i <=> other.id.to_i
     end
 
-  end
+    def becomes(klass)
+      klass._new_without_sti_type_cast(backing_record)
+    end
+
+    def becomes!(klass)
+      self[self.class.inheritance_column] = klass.name
+      becomes(klass)
+    end
 
+    def cast_to_current_sti_type
+      @backing_record.set_ar_instance!
+    end
+  end
 end