Skip to content

Instantly share code, notes, and snippets.

--- mrbgem_dir_glob.rb 2015-06-17 12:55:13.000000000 -0400
+++ rbx_dir_glob.rb 2015-06-17 12:55:28.000000000 -0400
@@ -47,7 +47,7 @@
def call(env, parent)
path = path_join(parent, @name)
- if File.exists? path
+ if File.exist? path
env.matches << path
end
GIT
remote: git://github.com/sinatra/sinatra.git
revision: 298466de07baa85a4aa01eb91145fa26c4342d55
specs:
sinatra (1.4.6)
rack (~> 1.4)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
PATH
# Bundle install from last successful sinatra-contrib build:
# https://travis-ci.org/sinatra/sinatra-contrib/jobs/25039081
#
Installing rake 10.3.1
Installing backports 3.6.0
Installing diff-lcs 1.2.5
Installing erubis 2.7.0
Installing tilt 1.4.1
Installing haml 4.0.5
Installing multi_json 1.10.0
require 'action_controller'
require 'action_dispatch'
require 'action_dispatch/middleware/static'
use ActionDispatch::Static, 'public'
run lambda { |env|
[
200,
{
Gem::Ext::BuildError: ERROR: Failed to build gem native extension.
/Users/zscott/.rubies/ruby-trunk/bin/ruby extconf.rb
checking for sqlite3.h... yes
checking for sqlite3_libversion_number() in -lsqlite3... yes
checking for rb_proc_arity()... yes
checking for sqlite3_initialize()... yes
checking for sqlite3_backup_init()... yes
checking for sqlite3_column_database_name()... no
checking for sqlite3_enable_load_extension()... no
Index: vm_eval.c
===================================================================
--- vm_eval.c (revision 45094)
+++ vm_eval.c (working copy)
@@ -1767,39 +1767,56 @@
/*
* call-seq:
- * catch([arg]) {|tag| block } -> obj
+ * catch([tag]) {|tag| block } -> obj
Index: ext/openssl/ossl_rand.c
===================================================================
--- ext/openssl/ossl_rand.c (revision 46973)
+++ ext/openssl/ossl_rand.c (working copy)
@@ -171,10 +171,6 @@
return RAND_status() ? Qtrue : Qfalse;
}
-#define DEFMETH(class, name, func, argc) \
- rb_define_method((class), (name), (func), (argc)); \
diff --git a/lib/active_record/mass_assignment_security/associations.rb b/lib/active_record/mass_assignment_security/associations.rb
index ade4d3a..e6b23a9 100644
--- a/lib/active_record/mass_assignment_security/associations.rb
+++ b/lib/active_record/mass_assignment_security/associations.rb
@@ -84,6 +84,18 @@ module ActiveRecord
end
private :build_record
+
+ def build_through_record(record)
ActiveModel::MassAssignmentSecurity::Error: Can't mass-assign protected attributes for Membership: member_type
/Users/zscott/projects/protected_attributes/lib/active_model/mass_assignment_security/sanitizer.rb:60:in `process_removed_attributes'
/Users/zscott/projects/protected_attributes/lib/active_model/mass_assignment_security/sanitizer.rb:10:in `sanitize'
/Users/zscott/projects/protected_attributes/lib/active_model/mass_assignment_security.rb:346:in `sanitize_for_mass_assignment'
/Users/zscott/projects/protected_attributes/lib/active_record/mass_assignment_security/attribute_assignment.rb:58:in `assign_attributes'
/Users/zscott/projects/protected_attributes/lib/active_record/mass_assignment_security/core.rb:8:in `init_attributes'
/Users/zscott/projects/rails/activerecord/lib/active_record/core.rb:268:in `initialize'
/Users/zscott/projects/rails/activerecord/lib/active_record/inheritance.rb:30:in `new'
/Users/zscott/projects/rails/activerecord/lib/active_record/inheritance.rb
diff --git a/lib/active_record/mass_assignment_security/associations.rb b/lib/active_record/mass_assignment_security/associations.rb
index ade4d3a..c9cb0b8 100644
--- a/lib/active_record/mass_assignment_security/associations.rb
+++ b/lib/active_record/mass_assignment_security/associations.rb
@@ -16,7 +16,7 @@ module ActiveRecord
if attributes.is_a?(Array)
attributes.collect { |attr| build(attr, options, &block) }
else
- add_to_target(build_record(attributes, options)) do |record|
+ add_to_target(build_record(attributes, options.merge(without_protection: true))) do |record|