deac/couchrest_model
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

reunited some __FILE__, __LINE__ with their + 1

Browse source
This commit is contained in:
Peter Gumeson 2009-07-19 01:23:51 -07:00
parent 1e44302d1a
commit e87c543b0f
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/couchrest/mixins/callbacks.rb
View file

@ -226,7 +226,7 @@ module CouchRest
# end # end
name = "_conditional_callback_#{@kind}_#{next_id}" name = "_conditional_callback_#{@kind}_#{next_id}"
txt, line = <<-RUBY_EVAL, __LINE__ txt, line = <<-RUBY_EVAL, __LINE__ + 1
def #{name}(halted) def #{name}(halted)
#{@compiled_options[0] || "if true"} && !halted #{@compiled_options[0] || "if true"} && !halted
#{@filter} do #{@filter} do
@ -388,7 +388,7 @@ module CouchRest
body = send("_#{symbol}_callback"). body = send("_#{symbol}_callback").
compile(nil, :terminator => send("_#{symbol}_terminator")) compile(nil, :terminator => send("_#{symbol}_terminator"))
body, line = <<-RUBY_EVAL, __LINE__ body, line = <<-RUBY_EVAL, __LINE__ + 1
def _run_#{symbol}_callbacks(key = nil, &blk) def _run_#{symbol}_callbacks(key = nil, &blk)
if key if key
name = "_run__\#{self.class.name.hash.abs}__#{symbol}__\#{key.hash.abs}__callbacks" name = "_run__\#{self.class.name.hash.abs}__#{symbol}__\#{key.hash.abs}__callbacks"

6
lib/couchrest/mixins/properties.rb
View file

@ -27,7 +27,7 @@ module CouchRest
class IncludeError < StandardError; end class IncludeError < StandardError; end
def self.included(base) def self.included(base)
base.class_eval <<-EOS, __FILE__, __LINE__ base.class_eval <<-EOS, __FILE__, __LINE__ + 1
extlib_inheritable_accessor(:properties) unless self.respond_to?(:properties) extlib_inheritable_accessor(:properties) unless self.respond_to?(:properties)
self.properties ||= [] self.properties ||= []
EOS EOS
@ -144,14 +144,14 @@ module CouchRest
# defines the getter for the property (and optional aliases) # defines the getter for the property (and optional aliases)
def create_property_getter(property) def create_property_getter(property)
# meth = property.name # meth = property.name
class_eval <<-EOS, __FILE__, __LINE__ class_eval <<-EOS, __FILE__, __LINE__ + 1
def #{property.name} def #{property.name}
self['#{property.name}'] self['#{property.name}']
end end
EOS EOS
if property.alias if property.alias
class_eval <<-EOS, __FILE__, __LINE__ class_eval <<-EOS, __FILE__, __LINE__ + 1
alias #{property.alias.to_sym} #{property.name.to_sym} alias #{property.alias.to_sym} #{property.name.to_sym}
EOS EOS
end end

6
lib/couchrest/mixins/validation.rb
View file

@ -50,7 +50,7 @@ module CouchRest
def self.included(base) def self.included(base)
base.extlib_inheritable_accessor(:auto_validation) base.extlib_inheritable_accessor(:auto_validation)
base.class_eval <<-EOS, __FILE__, __LINE__ base.class_eval <<-EOS, __FILE__, __LINE__ + 1
# Callbacks # Callbacks
define_callbacks :validate define_callbacks :validate
@ -74,7 +74,7 @@ module CouchRest
EOS EOS
base.extend(ClassMethods) base.extend(ClassMethods)
base.class_eval <<-EOS, __FILE__, __LINE__ base.class_eval <<-EOS, __FILE__, __LINE__ + 1
define_callbacks :validate define_callbacks :validate
if method_defined?(:_run_save_callbacks) if method_defined?(:_run_save_callbacks)
set_callback :save, :before, :check_validations set_callback :save, :before, :check_validations
@ -210,7 +210,7 @@ module CouchRest
def create_context_instance_methods(context) def create_context_instance_methods(context)
name = "valid_for_#{context.to_s}?" # valid_for_signup? name = "valid_for_#{context.to_s}?" # valid_for_signup?
if !self.instance_methods.include?(name) if !self.instance_methods.include?(name)
class_eval <<-EOS, __FILE__, __LINE__ class_eval <<-EOS, __FILE__, __LINE__ + 1
def #{name} # def valid_for_signup? def #{name} # def valid_for_signup?
valid?('#{context.to_s}'.to_sym) # valid?('signup'.to_sym) valid?('#{context.to_s}'.to_sym) # valid?('signup'.to_sym)
end # end end # end

4
lib/couchrest/more/extended_document.rb
View file

@ -21,7 +21,7 @@ module CouchRest
def self.inherited(subklass) def self.inherited(subklass)
subklass.send(:include, CouchRest::Mixins::Properties) subklass.send(:include, CouchRest::Mixins::Properties)
subklass.class_eval <<-EOS, __FILE__, __LINE__ subklass.class_eval <<-EOS, __FILE__, __LINE__ + 1
def self.inherited(subklass) def self.inherited(subklass)
subklass.properties = self.properties.dup subklass.properties = self.properties.dup
end end
@ -76,7 +76,7 @@ module CouchRest
# on the document whenever saving occurs. CouchRest uses a pretty # on the document whenever saving occurs. CouchRest uses a pretty
# decent time format by default. See Time#to_json # decent time format by default. See Time#to_json
def self.timestamps! def self.timestamps!
class_eval <<-EOS, __FILE__, __LINE__ class_eval <<-EOS, __FILE__, __LINE__ + 1
property(:updated_at, :read_only => true, :cast_as => 'Time', :auto_validation => false) property(:updated_at, :read_only => true, :cast_as => 'Time', :auto_validation => false)
property(:created_at, :read_only => true, :cast_as => 'Time', :auto_validation => false) property(:created_at, :read_only => true, :cast_as => 'Time', :auto_validation => false)