Skip to content

Add copy#3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jroesch wants to merge 9 commits into
base:master
Choose a base branch
from
Open

Add copy #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a13f18a
Initial refactor of attr_default to support copy
jroesch Jul 15, 2014
e3db97d
Fix versioning based on Rails not Ruby
jroesch Jul 15, 2014
d011a8e
had flipped the conditional by accident
jroesch Jul 15, 2014
7650431
properly pass arguments to the super invocation
jroesch Jul 16, 2014
53c4b68
fix misconception about how attr_default clone had worked before
jroesch Jul 16, 2014
4366cc0
fix issue with super dispatch
jroesch Jul 16, 2014
4bbb87d
modify attr_default to perform the behavior that was actually expecte…
jroesch Jul 18, 2014
1483858
clean up method aliasing
jroesch Jul 18, 2014
958abe8
Fix issue in reasoning about situtation pre Ruby 2
jroesch Jul 21, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 33 additions & 21 deletions lib/attr_default.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,32 +88,44 @@ def write_attribute_with_fixups(attr_name, args)
def needs_time_zone_fixup?(attr_name)
self.class.send(:create_time_zone_conversion_attribute?, attr_name, self.class.columns_hash[attr_name])
end

def copy(opts = {})
if opts.key? :new_record
if opts[:new_record]
result = if defined?(super)
super(opts)
else
copy_new_record_true
end

result.created_at = nil unless !result.class.columns_hash.has_key?('created_at')
result.updated_at = nil unless !result.class.columns_hash.has_key?('updated_at')
if self.new_record?
result.instance_variable_set(:@_attr_default_set, self._attr_default_set.dup)
else
result.instance_variable_set(:@_attr_defaults_set_from_dup, true)
end

if Gem.loaded_specs['activesupport'].version >= Gem::Version.new('3.1')
def dup
result = super
result.created_at = nil unless !result.class.columns_hash.has_key?('created_at')
result.updated_at = nil unless !result.class.columns_hash.has_key?('updated_at')
if self.new_record?
result.instance_variable_set(:@_attr_default_set, self._attr_default_set.dup)
result
else
result.instance_variable_set(:@_attr_defaults_set_from_dup, true)
if defined?(super)
super(opts)
else
copy_new_record_false # self.dup # what kind of default logic do we wire in
end
end
result
else
# eventually phase this out with required keywords in ruby 2.0
raise ArgumentError, "Ambiguous call to copy please provide :new_record => (true|false)"
end
alias_method(:clone, :dup)
end

if Gem.loaded_specs['activesupport'].version >= Gem::Version.new('3.1')
alias :copy_new_record_true :dup
alias :copy_new_record_false :clone
else
def clone
result = super
result.created_at = nil unless !result.class.columns_hash.has_key?('created_at')
result.updated_at = nil unless !result.class.columns_hash.has_key?('updated_at')
if self.new_record?
result.instance_variable_set(:@_attr_default_set, self._attr_default_set.dup)
else
result.instance_variable_set(:@_attr_defaults_set_from_dup, true)
end
result
end
alias :copy_new_record_true :clone
alias :copy_new_record_false :dup
end
end
end
Expand Down
28 changes: 11 additions & 17 deletions test/attr_default_test.rb
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,14 +24,7 @@
false
end

DUP_METHODS =
if Gem.loaded_specs['activesupport'].version >= Gem::Version.new('4.0')
[:dup]
elsif Gem.loaded_specs['activesupport'].version >= Gem::Version.new('3.1')
[:dup, :clone]
else
[:clone]
end
COPY_METHODS = [:copy]

File.unlink('test.sqlite3') rescue nil
ActiveRecord::Base.logger = Logger.new(STDERR)
Expand DownExpand Up@@ -220,27 +213,28 @@ def test_use_default_when_saved_if_not_touched
assert_equal "initial.com", domain.domain
end

def test_dup_and_clone_touched_state_when_duped_or_cloned_before_save_new_record_true
DUP_METHODS.each do |dup|
def test_copy_touched_state_when_copied_before_save_new_record_true
COPY_METHODS.each do |copy|
u = TestUser.new :first_name => 'John', :last_name => 'Doe'
u.last_name = 'overridden'
u2 = u.send(dup)
u2 = u.send(copy, :new_record => true)
assert_equal 'overridden', u2.read_attribute(:last_name)
assert_equal 'overridden', u2.last_name
end
end

def test_dup_and_clone_touched_state_when_duped_or_cloned_after_save_new_record_false
DUP_METHODS.each do |dup|
# This test is referring to the record itself returning false from #new_record? after being "cloned" i.e copy(new_record: true)
def test_copy_touched_state_when_copied_after_save_new_record_false
COPY_METHODS.each do |copy|
u = TestUser.new(:first_name => 'John', :last_name => 'Doe')
u.last_name = 'overridden'
u2 = u.send(dup)
u2 = u.send(copy, :new_record => true)
u2.save!
u.save!
assert u.send(dup).instance_variable_get(:@_attr_defaults_set_from_dup)
assert_equal 'overridden', u.send(dup).last_name
assert u.send(copy, :new_record => true).instance_variable_get(:@_attr_defaults_set_from_dup)

@jroeschjroeschJul 21, 2014

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Vocab change from dup to copy!

assert_equal 'overridden', u.send(copy, :new_record => true).last_name
ufind = TestUser.find(u.id)
u3 = ufind.send(dup)
u3 = ufind.send(copy, :new_record => true)
assert_equal 'overridden', u3.read_attribute(:last_name), u3.attributes.inspect
assert_equal 'overridden', u3.last_name
u3.save!
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Add copy by jroesch · Pull Request #3 · Invoca/attr_default · GitHub
Skip to content
Add copy#3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

jroesch
wants to merge
9
commits into

base:master
Choose a base branch

from

 Open


Add copy
#3
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
a13f18a

Initial refactor of attr_default to support copy


jroesch Jul 15, 2014
e3db97d

Fix versioning based on Rails not Ruby


jroesch Jul 15, 2014
d011a8e

had flipped the conditional by accident


jroesch Jul 15, 2014
7650431

properly pass arguments to the super invocation


jroesch Jul 16, 2014
53c4b68

fix misconception about how attr_default clone had worked before


jroesch Jul 16, 2014
4366cc0

fix issue with super dispatch


jroesch Jul 16, 2014
4bbb87d

modify attr_default to perform the behavior that was actually expecte…


jroesch Jul 18, 2014
1483858

clean up method aliasing


jroesch Jul 18, 2014
958abe8

Fix issue in reasoning about situtation pre Ruby 2


jroesch Jul 21, 2014

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


54 changes: 33 additions & 21 deletions
lib/attr_default.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,32 +88,44 @@ def write_attribute_with_fixups(attr_name, args)
 def needs_time_zone_fixup?(attr_name)
 self.class.send(:create_time_zone_conversion_attribute?, attr_name, self.class.columns_hash[attr_name])
 end

 def copy(opts = {})
 if opts.key? :new_record
 if opts[:new_record]
 result = if defined?(super)
 super(opts)
 else
 copy_new_record_true
 end

 result.created_at = nil unless !result.class.columns_hash.has_key?('created_at')
 result.updated_at = nil unless !result.class.columns_hash.has_key?('updated_at')
 if self.new_record?
 result.instance_variable_set(:@_attr_default_set, self._attr_default_set.dup)
 else
 result.instance_variable_set(:@_attr_defaults_set_from_dup, true)
 end

 if Gem.loaded_specs['activesupport'].version >= Gem::Version.new('3.1')
 def dup
 result = super
 result.created_at = nil unless !result.class.columns_hash.has_key?('created_at')
 result.updated_at = nil unless !result.class.columns_hash.has_key?('updated_at')
 if self.new_record?
 result.instance_variable_set(:@_attr_default_set, self._attr_default_set.dup)
 result
 else
 result.instance_variable_set(:@_attr_defaults_set_from_dup, true)
 if defined?(super)
 super(opts)
 else
 copy_new_record_false # self.dup # what kind of default logic do we wire in
 end
 end
 result
 else
 # eventually phase this out with required keywords in ruby 2.0
 raise ArgumentError, "Ambiguous call to copy please provide :new_record => (true|false)"
 end
 alias_method(:clone, :dup)
 end

 if Gem.loaded_specs['activesupport'].version >= Gem::Version.new('3.1')
 alias :copy_new_record_true :dup
 alias :copy_new_record_false :clone
 else
 def clone
 result = super
 result.created_at = nil unless !result.class.columns_hash.has_key?('created_at')
 result.updated_at = nil unless !result.class.columns_hash.has_key?('updated_at')
 if self.new_record?
 result.instance_variable_set(:@_attr_default_set, self._attr_default_set.dup)
 else
 result.instance_variable_set(:@_attr_defaults_set_from_dup, true)
 end
 result
 end
 alias :copy_new_record_true :clone
 alias :copy_new_record_false :dup
 end
 end
end
Expand Down

28 changes: 11 additions & 17 deletions
test/attr_default_test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,14 +24,7 @@
 false
 end

DUP_METHODS =
 if Gem.loaded_specs['activesupport'].version >= Gem::Version.new('4.0')
 [:dup]
 elsif Gem.loaded_specs['activesupport'].version >= Gem::Version.new('3.1')
 [:dup, :clone]
 else
 [:clone]
 end
COPY_METHODS = [:copy]

File.unlink('test.sqlite3') rescue nil
ActiveRecord::Base.logger = Logger.new(STDERR)
Expand DownExpand Up@@ -220,27 +213,28 @@ def test_use_default_when_saved_if_not_touched
 assert_equal "initial.com", domain.domain
 end

 def test_dup_and_clone_touched_state_when_duped_or_cloned_before_save_new_record_true
DUP_METHODS.each do |dup|
 def test_copy_touched_state_when_copied_before_save_new_record_true
COPY_METHODS.each do |copy|
 u = TestUser.new :first_name => 'John', :last_name => 'Doe'
 u.last_name = 'overridden'
 u2 = u.send(dup)
 u2 = u.send(copy, :new_record => true)
 assert_equal 'overridden', u2.read_attribute(:last_name)
 assert_equal 'overridden', u2.last_name
 end
 end

 def test_dup_and_clone_touched_state_when_duped_or_cloned_after_save_new_record_false
 DUP_METHODS.each do |dup|
 # This test is referring to the record itself returning false from #new_record? after being "cloned" i.e copy(new_record: true)
 def test_copy_touched_state_when_copied_after_save_new_record_false
 COPY_METHODS.each do |copy|
 u = TestUser.new(:first_name => 'John', :last_name => 'Doe')
 u.last_name = 'overridden'
 u2 = u.send(dup)
 u2 = u.send(copy, :new_record => true)
 u2.save!
 u.save!
 assert u.send(dup).instance_variable_get(:@_attr_defaults_set_from_dup)
 assert_equal 'overridden', u.send(dup).last_name
 assert u.send(copy, :new_record => true).instance_variable_get(:@_attr_defaults_set_from_dup)
@jroeschjroeschJul 21, 2014

Copy link


Copy Markdown

Author
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Vocab change from dup to copy!
 assert_equal 'overridden', u.send(copy, :new_record => true).last_name
 ufind = TestUser.find(u.id)
 u3 = ufind.send(dup)
 u3 = ufind.send(copy, :new_record => true)
 assert_equal 'overridden', u3.read_attribute(:last_name), u3.attributes.inspect
 assert_equal 'overridden', u3.last_name
 u3.save!
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add copy by jroesch · Pull Request #3 · Invoca/attr_default · GitHub
Skip to content
Add copy#3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

jroesch
wants to merge
9
commits into

base:master
Choose a base branch

from

 Open


Add copy
#3
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
a13f18a

Initial refactor of attr_default to support copy


jroesch Jul 15, 2014
e3db97d

Fix versioning based on Rails not Ruby


jroesch Jul 15, 2014
d011a8e

had flipped the conditional by accident


jroesch Jul 15, 2014
7650431

properly pass arguments to the super invocation


jroesch Jul 16, 2014
53c4b68

fix misconception about how attr_default clone had worked before


jroesch Jul 16, 2014
4366cc0

fix issue with super dispatch


jroesch Jul 16, 2014
4bbb87d

modify attr_default to perform the behavior that was actually expecte…


jroesch Jul 18, 2014
1483858

clean up method aliasing


jroesch Jul 18, 2014
958abe8

Fix issue in reasoning about situtation pre Ruby 2


jroesch Jul 21, 2014

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


54 changes: 33 additions & 21 deletions
lib/attr_default.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,32 +88,44 @@ def write_attribute_with_fixups(attr_name, args)
 def needs_time_zone_fixup?(attr_name)
 self.class.send(:create_time_zone_conversion_attribute?, attr_name, self.class.columns_hash[attr_name])
 end

 def copy(opts = {})
 if opts.key? :new_record
 if opts[:new_record]
 result = if defined?(super)
 super(opts)
 else
 copy_new_record_true
 end

 result.created_at = nil unless !result.class.columns_hash.has_key?('created_at')
 result.updated_at = nil unless !result.class.columns_hash.has_key?('updated_at')
 if self.new_record?
 result.instance_variable_set(:@_attr_default_set, self._attr_default_set.dup)
 else
 result.instance_variable_set(:@_attr_defaults_set_from_dup, true)
 end

 if Gem.loaded_specs['activesupport'].version >= Gem::Version.new('3.1')
 def dup
 result = super
 result.created_at = nil unless !result.class.columns_hash.has_key?('created_at')
 result.updated_at = nil unless !result.class.columns_hash.has_key?('updated_at')
 if self.new_record?
 result.instance_variable_set(:@_attr_default_set, self._attr_default_set.dup)
 result
 else
 result.instance_variable_set(:@_attr_defaults_set_from_dup, true)
 if defined?(super)
 super(opts)
 else
 copy_new_record_false # self.dup # what kind of default logic do we wire in
 end
 end
 result
 else
 # eventually phase this out with required keywords in ruby 2.0
 raise ArgumentError, "Ambiguous call to copy please provide :new_record => (true|false)"
 end
 alias_method(:clone, :dup)
 end

 if Gem.loaded_specs['activesupport'].version >= Gem::Version.new('3.1')
 alias :copy_new_record_true :dup
 alias :copy_new_record_false :clone
 else
 def clone
 result = super
 result.created_at = nil unless !result.class.columns_hash.has_key?('created_at')
 result.updated_at = nil unless !result.class.columns_hash.has_key?('updated_at')
 if self.new_record?
 result.instance_variable_set(:@_attr_default_set, self._attr_default_set.dup)
 else
 result.instance_variable_set(:@_attr_defaults_set_from_dup, true)
 end
 result
 end
 alias :copy_new_record_true :clone
 alias :copy_new_record_false :dup
 end
 end
end
Expand Down

28 changes: 11 additions & 17 deletions
test/attr_default_test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,14 +24,7 @@
 false
 end

DUP_METHODS =
 if Gem.loaded_specs['activesupport'].version >= Gem::Version.new('4.0')
 [:dup]
 elsif Gem.loaded_specs['activesupport'].version >= Gem::Version.new('3.1')
 [:dup, :clone]
 else
 [:clone]
 end
COPY_METHODS = [:copy]

File.unlink('test.sqlite3') rescue nil
ActiveRecord::Base.logger = Logger.new(STDERR)
Expand DownExpand Up@@ -220,27 +213,28 @@ def test_use_default_when_saved_if_not_touched
 assert_equal "initial.com", domain.domain
 end

 def test_dup_and_clone_touched_state_when_duped_or_cloned_before_save_new_record_true
DUP_METHODS.each do |dup|
 def test_copy_touched_state_when_copied_before_save_new_record_true
COPY_METHODS.each do |copy|
 u = TestUser.new :first_name => 'John', :last_name => 'Doe'
 u.last_name = 'overridden'
 u2 = u.send(dup)
 u2 = u.send(copy, :new_record => true)
 assert_equal 'overridden', u2.read_attribute(:last_name)
 assert_equal 'overridden', u2.last_name
 end
 end

 def test_dup_and_clone_touched_state_when_duped_or_cloned_after_save_new_record_false
 DUP_METHODS.each do |dup|
 # This test is referring to the record itself returning false from #new_record? after being "cloned" i.e copy(new_record: true)
 def test_copy_touched_state_when_copied_after_save_new_record_false
 COPY_METHODS.each do |copy|
 u = TestUser.new(:first_name => 'John', :last_name => 'Doe')
 u.last_name = 'overridden'
 u2 = u.send(dup)
 u2 = u.send(copy, :new_record => true)
 u2.save!
 u.save!
 assert u.send(dup).instance_variable_get(:@_attr_defaults_set_from_dup)
 assert_equal 'overridden', u.send(dup).last_name
 assert u.send(copy, :new_record => true).instance_variable_get(:@_attr_defaults_set_from_dup)
@jroeschjroeschJul 21, 2014

Copy link


Copy Markdown

Author
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Vocab change from dup to copy!
 assert_equal 'overridden', u.send(copy, :new_record => true).last_name
 ufind = TestUser.find(u.id)
 u3 = ufind.send(dup)
 u3 = ufind.send(copy, :new_record => true)
 assert_equal 'overridden', u3.read_attribute(:last_name), u3.attributes.inspect
 assert_equal 'overridden', u3.last_name
 u3.save!
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add copy by jroesch · Pull Request #3 · Invoca/attr_default · GitHub
Skip to content
Add copy#3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

jroesch
wants to merge
9
commits into

base:master
Choose a base branch

from

 Open


Add copy
#3
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
a13f18a

Initial refactor of attr_default to support copy


jroesch Jul 15, 2014
e3db97d

Fix versioning based on Rails not Ruby


jroesch Jul 15, 2014
d011a8e

had flipped the conditional by accident


jroesch Jul 15, 2014
7650431

properly pass arguments to the super invocation


jroesch Jul 16, 2014
53c4b68

fix misconception about how attr_default clone had worked before


jroesch Jul 16, 2014
4366cc0

fix issue with super dispatch


jroesch Jul 16, 2014
4bbb87d

modify attr_default to perform the behavior that was actually expecte…


jroesch Jul 18, 2014
1483858

clean up method aliasing


jroesch Jul 18, 2014
958abe8

Fix issue in reasoning about situtation pre Ruby 2


jroesch Jul 21, 2014

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


54 changes: 33 additions & 21 deletions
lib/attr_default.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,32 +88,44 @@ def write_attribute_with_fixups(attr_name, args)
 def needs_time_zone_fixup?(attr_name)
 self.class.send(:create_time_zone_conversion_attribute?, attr_name, self.class.columns_hash[attr_name])
 end

 def copy(opts = {})
 if opts.key? :new_record
 if opts[:new_record]
 result = if defined?(super)
 super(opts)
 else
 copy_new_record_true
 end

 result.created_at = nil unless !result.class.columns_hash.has_key?('created_at')
 result.updated_at = nil unless !result.class.columns_hash.has_key?('updated_at')
 if self.new_record?
 result.instance_variable_set(:@_attr_default_set, self._attr_default_set.dup)
 else
 result.instance_variable_set(:@_attr_defaults_set_from_dup, true)
 end

 if Gem.loaded_specs['activesupport'].version >= Gem::Version.new('3.1')
 def dup
 result = super
 result.created_at = nil unless !result.class.columns_hash.has_key?('created_at')
 result.updated_at = nil unless !result.class.columns_hash.has_key?('updated_at')
 if self.new_record?
 result.instance_variable_set(:@_attr_default_set, self._attr_default_set.dup)
 result
 else
 result.instance_variable_set(:@_attr_defaults_set_from_dup, true)
 if defined?(super)
 super(opts)
 else
 copy_new_record_false # self.dup # what kind of default logic do we wire in
 end
 end
 result
 else
 # eventually phase this out with required keywords in ruby 2.0
 raise ArgumentError, "Ambiguous call to copy please provide :new_record => (true|false)"
 end
 alias_method(:clone, :dup)
 end

 if Gem.loaded_specs['activesupport'].version >= Gem::Version.new('3.1')
 alias :copy_new_record_true :dup
 alias :copy_new_record_false :clone
 else
 def clone
 result = super
 result.created_at = nil unless !result.class.columns_hash.has_key?('created_at')
 result.updated_at = nil unless !result.class.columns_hash.has_key?('updated_at')
 if self.new_record?
 result.instance_variable_set(:@_attr_default_set, self._attr_default_set.dup)
 else
 result.instance_variable_set(:@_attr_defaults_set_from_dup, true)
 end
 result
 end
 alias :copy_new_record_true :clone
 alias :copy_new_record_false :dup
 end
 end
end
Expand Down

28 changes: 11 additions & 17 deletions
test/attr_default_test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,14 +24,7 @@
 false
 end

DUP_METHODS =
 if Gem.loaded_specs['activesupport'].version >= Gem::Version.new('4.0')
 [:dup]
 elsif Gem.loaded_specs['activesupport'].version >= Gem::Version.new('3.1')
 [:dup, :clone]
 else
 [:clone]
 end
COPY_METHODS = [:copy]

File.unlink('test.sqlite3') rescue nil
ActiveRecord::Base.logger = Logger.new(STDERR)
Expand DownExpand Up@@ -220,27 +213,28 @@ def test_use_default_when_saved_if_not_touched
 assert_equal "initial.com", domain.domain
 end

 def test_dup_and_clone_touched_state_when_duped_or_cloned_before_save_new_record_true
DUP_METHODS.each do |dup|
 def test_copy_touched_state_when_copied_before_save_new_record_true
COPY_METHODS.each do |copy|
 u = TestUser.new :first_name => 'John', :last_name => 'Doe'
 u.last_name = 'overridden'
 u2 = u.send(dup)
 u2 = u.send(copy, :new_record => true)
 assert_equal 'overridden', u2.read_attribute(:last_name)
 assert_equal 'overridden', u2.last_name
 end
 end

 def test_dup_and_clone_touched_state_when_duped_or_cloned_after_save_new_record_false
 DUP_METHODS.each do |dup|
 # This test is referring to the record itself returning false from #new_record? after being "cloned" i.e copy(new_record: true)
 def test_copy_touched_state_when_copied_after_save_new_record_false
 COPY_METHODS.each do |copy|
 u = TestUser.new(:first_name => 'John', :last_name => 'Doe')
 u.last_name = 'overridden'
 u2 = u.send(dup)
 u2 = u.send(copy, :new_record => true)
 u2.save!
 u.save!
 assert u.send(dup).instance_variable_get(:@_attr_defaults_set_from_dup)
 assert_equal 'overridden', u.send(dup).last_name
 assert u.send(copy, :new_record => true).instance_variable_get(:@_attr_defaults_set_from_dup)
@jroeschjroeschJul 21, 2014

Copy link


Copy Markdown

Author
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Vocab change from dup to copy!
 assert_equal 'overridden', u.send(copy, :new_record => true).last_name
 ufind = TestUser.find(u.id)
 u3 = ufind.send(dup)
 u3 = ufind.send(copy, :new_record => true)
 assert_equal 'overridden', u3.read_attribute(:last_name), u3.attributes.inspect
 assert_equal 'overridden', u3.last_name
 u3.save!
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Add copy by jroesch · Pull Request #3 · Invoca/attr_default · GitHub
Skip to content
Add copy#3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

jroesch
wants to merge
9
commits into

base:master
Choose a base branch

from

 Open


Add copy
#3
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
a13f18a

Initial refactor of attr_default to support copy


jroesch Jul 15, 2014
e3db97d

Fix versioning based on Rails not Ruby


jroesch Jul 15, 2014
d011a8e

had flipped the conditional by accident


jroesch Jul 15, 2014
7650431

properly pass arguments to the super invocation


jroesch Jul 16, 2014
53c4b68

fix misconception about how attr_default clone had worked before


jroesch Jul 16, 2014
4366cc0

fix issue with super dispatch


jroesch Jul 16, 2014
4bbb87d

modify attr_default to perform the behavior that was actually expecte…


jroesch Jul 18, 2014
1483858

clean up method aliasing


jroesch Jul 18, 2014
958abe8

Fix issue in reasoning about situtation pre Ruby 2


jroesch Jul 21, 2014

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


54 changes: 33 additions & 21 deletions
lib/attr_default.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,32 +88,44 @@ def write_attribute_with_fixups(attr_name, args)
 def needs_time_zone_fixup?(attr_name)
 self.class.send(:create_time_zone_conversion_attribute?, attr_name, self.class.columns_hash[attr_name])
 end

 def copy(opts = {})
 if opts.key? :new_record
 if opts[:new_record]
 result = if defined?(super)
 super(opts)
 else
 copy_new_record_true
 end

 result.created_at = nil unless !result.class.columns_hash.has_key?('created_at')
 result.updated_at = nil unless !result.class.columns_hash.has_key?('updated_at')
 if self.new_record?
 result.instance_variable_set(:@_attr_default_set, self._attr_default_set.dup)
 else
 result.instance_variable_set(:@_attr_defaults_set_from_dup, true)
 end

 if Gem.loaded_specs['activesupport'].version >= Gem::Version.new('3.1')
 def dup
 result = super
 result.created_at = nil unless !result.class.columns_hash.has_key?('created_at')
 result.updated_at = nil unless !result.class.columns_hash.has_key?('updated_at')
 if self.new_record?
 result.instance_variable_set(:@_attr_default_set, self._attr_default_set.dup)
 result
 else
 result.instance_variable_set(:@_attr_defaults_set_from_dup, true)
 if defined?(super)
 super(opts)
 else
 copy_new_record_false # self.dup # what kind of default logic do we wire in
 end
 end
 result
 else
 # eventually phase this out with required keywords in ruby 2.0
 raise ArgumentError, "Ambiguous call to copy please provide :new_record => (true|false)"
 end
 alias_method(:clone, :dup)
 end

 if Gem.loaded_specs['activesupport'].version >= Gem::Version.new('3.1')
 alias :copy_new_record_true :dup
 alias :copy_new_record_false :clone
 else
 def clone
 result = super
 result.created_at = nil unless !result.class.columns_hash.has_key?('created_at')
 result.updated_at = nil unless !result.class.columns_hash.has_key?('updated_at')
 if self.new_record?
 result.instance_variable_set(:@_attr_default_set, self._attr_default_set.dup)
 else
 result.instance_variable_set(:@_attr_defaults_set_from_dup, true)
 end
 result
 end
 alias :copy_new_record_true :clone
 alias :copy_new_record_false :dup
 end
 end
end
Expand Down

28 changes: 11 additions & 17 deletions
test/attr_default_test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,14 +24,7 @@
 false
 end

DUP_METHODS =
 if Gem.loaded_specs['activesupport'].version >= Gem::Version.new('4.0')
 [:dup]
 elsif Gem.loaded_specs['activesupport'].version >= Gem::Version.new('3.1')
 [:dup, :clone]
 else
 [:clone]
 end
COPY_METHODS = [:copy]

File.unlink('test.sqlite3') rescue nil
ActiveRecord::Base.logger = Logger.new(STDERR)
Expand DownExpand Up@@ -220,27 +213,28 @@ def test_use_default_when_saved_if_not_touched
 assert_equal "initial.com", domain.domain
 end

 def test_dup_and_clone_touched_state_when_duped_or_cloned_before_save_new_record_true
DUP_METHODS.each do |dup|
 def test_copy_touched_state_when_copied_before_save_new_record_true
COPY_METHODS.each do |copy|
 u = TestUser.new :first_name => 'John', :last_name => 'Doe'
 u.last_name = 'overridden'
 u2 = u.send(dup)
 u2 = u.send(copy, :new_record => true)
 assert_equal 'overridden', u2.read_attribute(:last_name)
 assert_equal 'overridden', u2.last_name
 end
 end

 def test_dup_and_clone_touched_state_when_duped_or_cloned_after_save_new_record_false
 DUP_METHODS.each do |dup|
 # This test is referring to the record itself returning false from #new_record? after being "cloned" i.e copy(new_record: true)
 def test_copy_touched_state_when_copied_after_save_new_record_false
 COPY_METHODS.each do |copy|
 u = TestUser.new(:first_name => 'John', :last_name => 'Doe')
 u.last_name = 'overridden'
 u2 = u.send(dup)
 u2 = u.send(copy, :new_record => true)
 u2.save!
 u.save!
 assert u.send(dup).instance_variable_get(:@_attr_defaults_set_from_dup)
 assert_equal 'overridden', u.send(dup).last_name
 assert u.send(copy, :new_record => true).instance_variable_get(:@_attr_defaults_set_from_dup)
@jroeschjroeschJul 21, 2014

Copy link


Copy Markdown

Author
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Vocab change from dup to copy!
 assert_equal 'overridden', u.send(copy, :new_record => true).last_name
 ufind = TestUser.find(u.id)
 u3 = ufind.send(dup)
 u3 = ufind.send(copy, :new_record => true)
 assert_equal 'overridden', u3.read_attribute(:last_name), u3.attributes.inspect
 assert_equal 'overridden', u3.last_name
 u3.save!
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add copy by jroesch · Pull Request #3 · Invoca/attr_default · GitHub
Skip to content
Add copy#3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

jroesch
wants to merge
9
commits into

base:master
Choose a base branch

from

 Open


Add copy
#3
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
a13f18a

Initial refactor of attr_default to support copy


jroesch Jul 15, 2014
e3db97d

Fix versioning based on Rails not Ruby


jroesch Jul 15, 2014
d011a8e

had flipped the conditional by accident


jroesch Jul 15, 2014
7650431

properly pass arguments to the super invocation


jroesch Jul 16, 2014
53c4b68

fix misconception about how attr_default clone had worked before


jroesch Jul 16, 2014
4366cc0

fix issue with super dispatch


jroesch Jul 16, 2014
4bbb87d

modify attr_default to perform the behavior that was actually expecte…


jroesch Jul 18, 2014
1483858

clean up method aliasing


jroesch Jul 18, 2014
958abe8

Fix issue in reasoning about situtation pre Ruby 2


jroesch Jul 21, 2014

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


54 changes: 33 additions & 21 deletions
lib/attr_default.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,32 +88,44 @@ def write_attribute_with_fixups(attr_name, args)
 def needs_time_zone_fixup?(attr_name)
 self.class.send(:create_time_zone_conversion_attribute?, attr_name, self.class.columns_hash[attr_name])
 end

 def copy(opts = {})
 if opts.key? :new_record
 if opts[:new_record]
 result = if defined?(super)
 super(opts)
 else
 copy_new_record_true
 end

 result.created_at = nil unless !result.class.columns_hash.has_key?('created_at')
 result.updated_at = nil unless !result.class.columns_hash.has_key?('updated_at')
 if self.new_record?
 result.instance_variable_set(:@_attr_default_set, self._attr_default_set.dup)
 else
 result.instance_variable_set(:@_attr_defaults_set_from_dup, true)
 end

 if Gem.loaded_specs['activesupport'].version >= Gem::Version.new('3.1')
 def dup
 result = super
 result.created_at = nil unless !result.class.columns_hash.has_key?('created_at')
 result.updated_at = nil unless !result.class.columns_hash.has_key?('updated_at')
 if self.new_record?
 result.instance_variable_set(:@_attr_default_set, self._attr_default_set.dup)
 result
 else
 result.instance_variable_set(:@_attr_defaults_set_from_dup, true)
 if defined?(super)
 super(opts)
 else
 copy_new_record_false # self.dup # what kind of default logic do we wire in
 end
 end
 result
 else
 # eventually phase this out with required keywords in ruby 2.0
 raise ArgumentError, "Ambiguous call to copy please provide :new_record => (true|false)"
 end
 alias_method(:clone, :dup)
 end

 if Gem.loaded_specs['activesupport'].version >= Gem::Version.new('3.1')
 alias :copy_new_record_true :dup
 alias :copy_new_record_false :clone
 else
 def clone
 result = super
 result.created_at = nil unless !result.class.columns_hash.has_key?('created_at')
 result.updated_at = nil unless !result.class.columns_hash.has_key?('updated_at')
 if self.new_record?
 result.instance_variable_set(:@_attr_default_set, self._attr_default_set.dup)
 else
 result.instance_variable_set(:@_attr_defaults_set_from_dup, true)
 end
 result
 end
 alias :copy_new_record_true :clone
 alias :copy_new_record_false :dup
 end
 end
end
Expand Down

28 changes: 11 additions & 17 deletions
test/attr_default_test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,14 +24,7 @@
 false
 end

DUP_METHODS =
 if Gem.loaded_specs['activesupport'].version >= Gem::Version.new('4.0')
 [:dup]
 elsif Gem.loaded_specs['activesupport'].version >= Gem::Version.new('3.1')
 [:dup, :clone]
 else
 [:clone]
 end
COPY_METHODS = [:copy]

File.unlink('test.sqlite3') rescue nil
ActiveRecord::Base.logger = Logger.new(STDERR)
Expand DownExpand Up@@ -220,27 +213,28 @@ def test_use_default_when_saved_if_not_touched
 assert_equal "initial.com", domain.domain
 end

 def test_dup_and_clone_touched_state_when_duped_or_cloned_before_save_new_record_true
DUP_METHODS.each do |dup|
 def test_copy_touched_state_when_copied_before_save_new_record_true
COPY_METHODS.each do |copy|
 u = TestUser.new :first_name => 'John', :last_name => 'Doe'
 u.last_name = 'overridden'
 u2 = u.send(dup)
 u2 = u.send(copy, :new_record => true)
 assert_equal 'overridden', u2.read_attribute(:last_name)
 assert_equal 'overridden', u2.last_name
 end
 end

 def test_dup_and_clone_touched_state_when_duped_or_cloned_after_save_new_record_false
 DUP_METHODS.each do |dup|
 # This test is referring to the record itself returning false from #new_record? after being "cloned" i.e copy(new_record: true)
 def test_copy_touched_state_when_copied_after_save_new_record_false
 COPY_METHODS.each do |copy|
 u = TestUser.new(:first_name => 'John', :last_name => 'Doe')
 u.last_name = 'overridden'
 u2 = u.send(dup)
 u2 = u.send(copy, :new_record => true)
 u2.save!
 u.save!
 assert u.send(dup).instance_variable_get(:@_attr_defaults_set_from_dup)
 assert_equal 'overridden', u.send(dup).last_name
 assert u.send(copy, :new_record => true).instance_variable_get(:@_attr_defaults_set_from_dup)
@jroeschjroeschJul 21, 2014

Copy link


Copy Markdown

Author
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Vocab change from dup to copy!
 assert_equal 'overridden', u.send(copy, :new_record => true).last_name
 ufind = TestUser.find(u.id)
 u3 = ufind.send(dup)
 u3 = ufind.send(copy, :new_record => true)
 assert_equal 'overridden', u3.read_attribute(:last_name), u3.attributes.inspect
 assert_equal 'overridden', u3.last_name
 u3.save!
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
Add copy by jroesch · Pull Request #3 · Invoca/attr_default · GitHub
Skip to content
Add copy#3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

jroesch
wants to merge
9
commits into

base:master
Choose a base branch

from

 Open


Add copy
#3
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
a13f18a

Initial refactor of attr_default to support copy


jroesch Jul 15, 2014
e3db97d

Fix versioning based on Rails not Ruby


jroesch Jul 15, 2014
d011a8e

had flipped the conditional by accident


jroesch Jul 15, 2014
7650431

properly pass arguments to the super invocation


jroesch Jul 16, 2014
53c4b68

fix misconception about how attr_default clone had worked before


jroesch Jul 16, 2014
4366cc0

fix issue with super dispatch


jroesch Jul 16, 2014
4bbb87d

modify attr_default to perform the behavior that was actually expecte…


jroesch Jul 18, 2014
1483858

clean up method aliasing


jroesch Jul 18, 2014
958abe8

Fix issue in reasoning about situtation pre Ruby 2


jroesch Jul 21, 2014

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


54 changes: 33 additions & 21 deletions
lib/attr_default.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -88,32 +88,44 @@ def write_attribute_with_fixups(attr_name, args)
 def needs_time_zone_fixup?(attr_name)
 self.class.send(:create_time_zone_conversion_attribute?, attr_name, self.class.columns_hash[attr_name])
 end

 def copy(opts = {})
 if opts.key? :new_record
 if opts[:new_record]
 result = if defined?(super)
 super(opts)
 else
 copy_new_record_true
 end

 result.created_at = nil unless !result.class.columns_hash.has_key?('created_at')
 result.updated_at = nil unless !result.class.columns_hash.has_key?('updated_at')
 if self.new_record?
 result.instance_variable_set(:@_attr_default_set, self._attr_default_set.dup)
 else
 result.instance_variable_set(:@_attr_defaults_set_from_dup, true)
 end

 if Gem.loaded_specs['activesupport'].version >= Gem::Version.new('3.1')
 def dup
 result = super
 result.created_at = nil unless !result.class.columns_hash.has_key?('created_at')
 result.updated_at = nil unless !result.class.columns_hash.has_key?('updated_at')
 if self.new_record?
 result.instance_variable_set(:@_attr_default_set, self._attr_default_set.dup)
 result
 else
 result.instance_variable_set(:@_attr_defaults_set_from_dup, true)
 if defined?(super)
 super(opts)
 else
 copy_new_record_false # self.dup # what kind of default logic do we wire in
 end
 end
 result
 else
 # eventually phase this out with required keywords in ruby 2.0
 raise ArgumentError, "Ambiguous call to copy please provide :new_record => (true|false)"
 end
 alias_method(:clone, :dup)
 end

 if Gem.loaded_specs['activesupport'].version >= Gem::Version.new('3.1')
 alias :copy_new_record_true :dup
 alias :copy_new_record_false :clone
 else
 def clone
 result = super
 result.created_at = nil unless !result.class.columns_hash.has_key?('created_at')
 result.updated_at = nil unless !result.class.columns_hash.has_key?('updated_at')
 if self.new_record?
 result.instance_variable_set(:@_attr_default_set, self._attr_default_set.dup)
 else
 result.instance_variable_set(:@_attr_defaults_set_from_dup, true)
 end
 result
 end
 alias :copy_new_record_true :clone
 alias :copy_new_record_false :dup
 end
 end
end
Expand Down

28 changes: 11 additions & 17 deletions
test/attr_default_test.rb

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,14 +24,7 @@
 false
 end

DUP_METHODS =
 if Gem.loaded_specs['activesupport'].version >= Gem::Version.new('4.0')
 [:dup]
 elsif Gem.loaded_specs['activesupport'].version >= Gem::Version.new('3.1')
 [:dup, :clone]
 else
 [:clone]
 end
COPY_METHODS = [:copy]

File.unlink('test.sqlite3') rescue nil
ActiveRecord::Base.logger = Logger.new(STDERR)
Expand DownExpand Up@@ -220,27 +213,28 @@ def test_use_default_when_saved_if_not_touched
 assert_equal "initial.com", domain.domain
 end

 def test_dup_and_clone_touched_state_when_duped_or_cloned_before_save_new_record_true
DUP_METHODS.each do |dup|
 def test_copy_touched_state_when_copied_before_save_new_record_true
COPY_METHODS.each do |copy|
 u = TestUser.new :first_name => 'John', :last_name => 'Doe'
 u.last_name = 'overridden'
 u2 = u.send(dup)
 u2 = u.send(copy, :new_record => true)
 assert_equal 'overridden', u2.read_attribute(:last_name)
 assert_equal 'overridden', u2.last_name
 end
 end

 def test_dup_and_clone_touched_state_when_duped_or_cloned_after_save_new_record_false
 DUP_METHODS.each do |dup|
 # This test is referring to the record itself returning false from #new_record? after being "cloned" i.e copy(new_record: true)
 def test_copy_touched_state_when_copied_after_save_new_record_false
 COPY_METHODS.each do |copy|
 u = TestUser.new(:first_name => 'John', :last_name => 'Doe')
 u.last_name = 'overridden'
 u2 = u.send(dup)
 u2 = u.send(copy, :new_record => true)
 u2.save!
 u.save!
 assert u.send(dup).instance_variable_get(:@_attr_defaults_set_from_dup)
 assert_equal 'overridden', u.send(dup).last_name
 assert u.send(copy, :new_record => true).instance_variable_get(:@_attr_defaults_set_from_dup)
@jroeschjroeschJul 21, 2014

Copy link


Copy Markdown

Author
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Vocab change from dup to copy!
 assert_equal 'overridden', u.send(copy, :new_record => true).last_name
 ufind = TestUser.find(u.id)
 u3 = ufind.send(dup)
 u3 = ufind.send(copy, :new_record => true)
 assert_equal 'overridden', u3.read_attribute(:last_name), u3.attributes.inspect
 assert_equal 'overridden', u3.last_name
 u3.save!
Expand Down