Removes suppport for ActiveModel::Dirty and ::AttributeMethods for performance reasons
Removes commit d333133319
This commit is contained in:
parent
cc2b183946
commit
2ee92a5331
10 changed files with 123 additions and 331 deletions
|
@ -1,66 +1,17 @@
|
|||
module CouchRest
|
||||
module Model
|
||||
ReadOnlyPropertyError = Class.new(StandardError)
|
||||
|
||||
# Attributes Suffixes provide methods from ActiveModel
|
||||
# to hook into. See methods such as #attribute= and
|
||||
# #attribute? for their implementation
|
||||
AttributeMethodSuffixes = ['', '=', '?']
|
||||
|
||||
module Attributes
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
included do
|
||||
include ActiveModel::AttributeMethods
|
||||
attribute_method_suffix *AttributeMethodSuffixes
|
||||
end
|
||||
|
||||
module ClassMethods
|
||||
def attributes
|
||||
properties.map {|prop| prop.name}
|
||||
end
|
||||
end
|
||||
|
||||
def initialize(*args)
|
||||
self.class.attribute_method_suffix *AttributeMethodSuffixes
|
||||
super
|
||||
end
|
||||
|
||||
def attributes
|
||||
self.class.attributes
|
||||
end
|
||||
|
||||
## Reads the attribute value.
|
||||
# Assuming you have a property :title this would be called
|
||||
# by `model_instance.title`
|
||||
def attribute(name)
|
||||
read_attribute(name)
|
||||
end
|
||||
|
||||
## Sets the attribute value.
|
||||
# Assuming you have a property :title this would be called
|
||||
# by `model_instance.title = 'hello'`
|
||||
def attribute=(name, value)
|
||||
raise ReadOnlyPropertyError, 'read only property' if find_property!(name).read_only
|
||||
write_attribute(name, value)
|
||||
end
|
||||
|
||||
## Tests for both presence and truthiness of the attribute.
|
||||
# Assuming you have a property :title # this would be called
|
||||
# by `model_instance.title?`
|
||||
def attribute?(name)
|
||||
value = read_attribute(name)
|
||||
!(value.nil? || value == false)
|
||||
end
|
||||
|
||||
## Support for handling attributes
|
||||
#
|
||||
#
|
||||
# This would be better in the properties file, but due to scoping issues
|
||||
# this is not yet possible.
|
||||
#
|
||||
|
||||
def prepare_all_attributes(doc = {}, options = {})
|
||||
apply_all_property_defaults
|
||||
if options[:directly_set_attributes]
|
||||
directly_set_read_only_attributes(doc)
|
||||
directly_set_read_only_attributes(doc)
|
||||
else
|
||||
remove_protected_attributes(doc)
|
||||
end
|
||||
|
@ -69,7 +20,7 @@ module CouchRest
|
|||
|
||||
# Takes a hash as argument, and applies the values by using writer methods
|
||||
# for each key. It doesn't save the document at the end. Raises a NoMethodError if the corresponding methods are
|
||||
# missing. In case of error, no attributes are changed.
|
||||
# missing. In case of error, no attributes are changed.
|
||||
def update_attributes_without_saving(hash)
|
||||
# Remove any protected and update all the rest. Any attributes
|
||||
# which do not have a property will simply be ignored.
|
||||
|
@ -78,26 +29,11 @@ module CouchRest
|
|||
end
|
||||
alias :attributes= :update_attributes_without_saving
|
||||
|
||||
def read_attribute(property)
|
||||
prop = find_property!(property)
|
||||
self[prop.to_s]
|
||||
end
|
||||
|
||||
def write_attribute(property, value)
|
||||
prop = find_property!(property)
|
||||
self[prop.to_s] = prop.cast(self, value)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def read_only_attributes
|
||||
properties.select { |prop| prop.read_only }.map { |prop| prop.name }
|
||||
end
|
||||
|
||||
def directly_set_attributes(hash)
|
||||
r_o_a = read_only_attributes
|
||||
hash.each do |attribute_name, attribute_value|
|
||||
next if r_o_a.include? attribute_name
|
||||
if self.respond_to?("#{attribute_name}=")
|
||||
self.send("#{attribute_name}=", hash.delete(attribute_name))
|
||||
end
|
||||
|
@ -105,27 +41,27 @@ module CouchRest
|
|||
end
|
||||
|
||||
def directly_set_read_only_attributes(hash)
|
||||
r_o_a = read_only_attributes
|
||||
property_list = attributes
|
||||
property_list = self.properties.map{|p| p.name}
|
||||
hash.each do |attribute_name, attribute_value|
|
||||
next unless r_o_a.include? attribute_name
|
||||
next if self.respond_to?("#{attribute_name}=")
|
||||
if property_list.include?(attribute_name)
|
||||
write_attribute(attribute_name, hash.delete(attribute_name))
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
def set_attributes(hash)
|
||||
attrs = remove_protected_attributes(hash)
|
||||
directly_set_attributes(attrs)
|
||||
end
|
||||
|
||||
def check_properties_exist(attrs)
|
||||
property_list = attributes
|
||||
property_list = self.properties.map{|p| p.name}
|
||||
attrs.each do |attribute_name, attribute_value|
|
||||
raise NoMethodError, "Property #{attribute_name} not created" unless respond_to?("#{attribute_name}=") or property_list.include?(attribute_name)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -6,7 +6,7 @@ module CouchRest
|
|||
|
||||
include CouchRest::Model::Persistence
|
||||
include CouchRest::Model::Callbacks
|
||||
include CouchRest::Model::DocumentQueries
|
||||
include CouchRest::Model::DocumentQueries
|
||||
include CouchRest::Model::Views
|
||||
include CouchRest::Model::DesignDoc
|
||||
include CouchRest::Model::ExtendedAttachments
|
||||
|
@ -16,12 +16,11 @@ module CouchRest
|
|||
include CouchRest::Model::Attributes
|
||||
include CouchRest::Model::Associations
|
||||
include CouchRest::Model::Validations
|
||||
include CouchRest::Model::Dirty
|
||||
|
||||
def self.subclasses
|
||||
@subclasses ||= []
|
||||
end
|
||||
|
||||
|
||||
def self.inherited(subklass)
|
||||
super
|
||||
subklass.send(:include, CouchRest::Model::Properties)
|
||||
|
@ -35,16 +34,16 @@ module CouchRest
|
|||
EOS
|
||||
subclasses << subklass
|
||||
end
|
||||
|
||||
|
||||
# Accessors
|
||||
attr_accessor :casted_by
|
||||
|
||||
|
||||
|
||||
# Instantiate a new CouchRest::Model::Base by preparing all properties
|
||||
# using the provided document hash.
|
||||
#
|
||||
# Options supported:
|
||||
#
|
||||
#
|
||||
# * :directly_set_attributes: true when data comes directly from database
|
||||
#
|
||||
def initialize(doc = {}, options = {})
|
||||
|
@ -55,8 +54,8 @@ module CouchRest
|
|||
end
|
||||
after_initialize if respond_to?(:after_initialize)
|
||||
end
|
||||
|
||||
|
||||
|
||||
|
||||
# Temp solution to make the view_by methods available
|
||||
def self.method_missing(m, *args, &block)
|
||||
if has_view?(m)
|
||||
|
@ -70,9 +69,9 @@ module CouchRest
|
|||
end
|
||||
super
|
||||
end
|
||||
|
||||
|
||||
### instance methods
|
||||
|
||||
|
||||
# Gets a reference to the actual document in the DB
|
||||
# Calls up to the next document if there is one,
|
||||
# Otherwise we're at the top and we return self
|
||||
|
@ -80,14 +79,14 @@ module CouchRest
|
|||
return self if base_doc?
|
||||
@casted_by.base_doc
|
||||
end
|
||||
|
||||
|
||||
# Checks if we're the top document
|
||||
def base_doc?
|
||||
!@casted_by
|
||||
end
|
||||
|
||||
|
||||
## Compatibility with ActiveSupport and older frameworks
|
||||
|
||||
|
||||
# Hack so that CouchRest::Document, which descends from Hash,
|
||||
# doesn't appear to Rails routing as a Hash of options
|
||||
def is_a?(klass)
|
||||
|
@ -99,14 +98,14 @@ module CouchRest
|
|||
def persisted?
|
||||
!new?
|
||||
end
|
||||
|
||||
|
||||
def to_key
|
||||
new? ? nil : [id]
|
||||
new? ? nil : [id]
|
||||
end
|
||||
|
||||
alias :to_param :id
|
||||
alias :new_record? :new?
|
||||
alias :new_document? :new?
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
module CouchRest::Model
|
||||
module CastedModel
|
||||
|
||||
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
included do
|
||||
|
@ -12,28 +12,28 @@ module CouchRest::Model
|
|||
include CouchRest::Model::Validations
|
||||
attr_accessor :casted_by
|
||||
end
|
||||
|
||||
|
||||
def initialize(keys = {})
|
||||
raise StandardError unless self.is_a? Hash
|
||||
prepare_all_attributes(keys)
|
||||
super()
|
||||
end
|
||||
|
||||
|
||||
def []= key, value
|
||||
super(key.to_s, value)
|
||||
end
|
||||
|
||||
|
||||
def [] key
|
||||
super(key.to_s)
|
||||
end
|
||||
|
||||
|
||||
# Gets a reference to the top level extended
|
||||
# document that a model is saved inside of
|
||||
def base_doc
|
||||
return nil unless @casted_by
|
||||
@casted_by.base_doc
|
||||
end
|
||||
|
||||
|
||||
# False if the casted model has already
|
||||
# been saved in the containing document
|
||||
def new?
|
||||
|
@ -53,12 +53,12 @@ module CouchRest::Model
|
|||
end
|
||||
alias :to_key :id
|
||||
alias :to_param :id
|
||||
|
||||
|
||||
# Sets the attributes from a hash
|
||||
def update_attributes_without_saving(hash)
|
||||
hash.each do |k, v|
|
||||
raise NoMethodError, "#{k}= method not available, use property :#{k}" unless self.respond_to?("#{k}=")
|
||||
end
|
||||
end
|
||||
hash.each do |k, v|
|
||||
self.send("#{k}=",v)
|
||||
end
|
||||
|
|
|
@ -1,44 +0,0 @@
|
|||
# encoding: utf-8
|
||||
require 'active_model/dirty'
|
||||
|
||||
module CouchRest #:nodoc:
|
||||
module Model #:nodoc:
|
||||
|
||||
# Dirty Tracking support via ActiveModel
|
||||
# mixin methods include:
|
||||
# #changed?, #changed, #changes, #previous_changes
|
||||
# #<attribute>_changed?, #<attribute>_change,
|
||||
# #reset_<attribute>!, #<attribute>_will_change!,
|
||||
# and #<attribute>_was
|
||||
#
|
||||
# Please see the specs or the documentation of
|
||||
# ActiveModel::Dirty for more information
|
||||
module Dirty
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
included do
|
||||
include ActiveModel::Dirty
|
||||
after_save :clear_changed_attributes
|
||||
end
|
||||
|
||||
def initialize(*args)
|
||||
super
|
||||
@changed_attributes.clear if @changed_attributes
|
||||
end
|
||||
|
||||
def write_attribute(name, value)
|
||||
meth = :"#{name}_will_change!"
|
||||
__send__ meth if respond_to? meth
|
||||
super
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def clear_changed_attributes
|
||||
@previously_changed = changes
|
||||
@changed_attributes.clear
|
||||
true
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
|
@ -1,5 +1,4 @@
|
|||
# encoding: utf-8
|
||||
require 'set'
|
||||
module CouchRest
|
||||
module Model
|
||||
module Properties
|
||||
|
@ -23,6 +22,16 @@ module CouchRest
|
|||
self.class.properties
|
||||
end
|
||||
|
||||
def read_attribute(property)
|
||||
prop = find_property!(property)
|
||||
self[prop.to_s]
|
||||
end
|
||||
|
||||
def write_attribute(property, value)
|
||||
prop = find_property!(property)
|
||||
self[prop.to_s] = prop.cast(self, value)
|
||||
end
|
||||
|
||||
def apply_all_property_defaults
|
||||
return if self.respond_to?(:new?) && (new? == false)
|
||||
# TODO: cache the default object
|
||||
|
@ -85,7 +94,8 @@ module CouchRest
|
|||
type = [type] # inject as an array
|
||||
end
|
||||
property = Property.new(name, type, options)
|
||||
create_property_alias(property) if property.alias
|
||||
create_property_getter(property)
|
||||
create_property_setter(property) unless property.read_only == true
|
||||
if property.type_class.respond_to?(:validates_casted_model)
|
||||
validates_casted_model property.name
|
||||
end
|
||||
|
@ -93,15 +103,49 @@ module CouchRest
|
|||
property
|
||||
end
|
||||
|
||||
def create_property_alias(property)
|
||||
# defines the getter for the property (and optional aliases)
|
||||
def create_property_getter(property)
|
||||
# meth = property.name
|
||||
class_eval <<-EOS, __FILE__, __LINE__ + 1
|
||||
def #{property.alias.to_s}
|
||||
#{property.name}
|
||||
def #{property.name}
|
||||
read_attribute('#{property.name}')
|
||||
end
|
||||
EOS
|
||||
|
||||
if ['boolean', TrueClass.to_s.downcase].include?(property.type.to_s.downcase)
|
||||
class_eval <<-EOS, __FILE__, __LINE__
|
||||
def #{property.name}?
|
||||
value = read_attribute('#{property.name}')
|
||||
!(value.nil? || value == false)
|
||||
end
|
||||
EOS
|
||||
end
|
||||
|
||||
if property.alias
|
||||
class_eval <<-EOS, __FILE__, __LINE__ + 1
|
||||
alias #{property.alias.to_sym} #{property.name.to_sym}
|
||||
EOS
|
||||
end
|
||||
end
|
||||
|
||||
# defines the setter for the property (and optional aliases)
|
||||
def create_property_setter(property)
|
||||
property_name = property.name
|
||||
class_eval <<-EOS
|
||||
def #{property_name}=(value)
|
||||
write_attribute('#{property_name}', value)
|
||||
end
|
||||
EOS
|
||||
|
||||
if property.alias
|
||||
class_eval <<-EOS
|
||||
alias #{property.alias.to_sym}= #{property_name.to_sym}=
|
||||
EOS
|
||||
end
|
||||
end
|
||||
|
||||
end # module ClassMethods
|
||||
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue