use builder 2.1.2 from a gem

Gemfile.sh

@@ -5,3 +5,5 @@ gem install sqlite3 -v=1.3.7
 gem install rack    -v=1.4.5
 gem install erubis  -v=2.7.0
 gem install json    -v=1.8.0
+
+gem install vendor/builder-2.1.3.ruby21.7054942.gem

RAILS_VERSION

@@ -1 +1 @@
-2.3.14.github35
+2.3.14.github33

actionpack/lib/action_controller/caching/fragments.rb

@@ -39,9 +39,9 @@ module ActionController #:nodoc:
           if cache = read_fragment(name, options)
             buffer.safe_concat(cache.html_safe)
           else
-            pos = buffer.bytesize
+            pos = buffer.length
             block.call
-            write_fragment(name, buffer.byteslice(pos..-1), options)
+            write_fragment(name, buffer[pos..-1], options)
           end
         else
           block.call

actionpack/lib/action_view/helpers/form_helper.rb

@@ -768,11 +768,7 @@ module ActionView
         options = options.stringify_keys
         tag_value = options.delete("value")
         name_and_id = options.dup
-        if name_and_id.has_key?("for")
-          name_and_id["id"] = name_and_id["for"]
-        else
-          name_and_id.delete("id")
-        end
+        name_and_id["id"] = name_and_id["for"]
         add_default_name_and_id_for_value(tag_value, name_and_id)
         options.delete("index")
         options["for"] ||= name_and_id["id"]
@@ -932,15 +928,15 @@ module ActionView
 
         def add_default_name_and_id(options)
           if options.has_key?("index")
-            options["name"] = tag_name_with_index(options["index"]) unless options.has_key?("name")
-            options["id"]   = tag_id_with_index(options["index"])   unless options.has_key?("id")
+            options["name"] ||= tag_name_with_index(options["index"])
+            options["id"]   ||= tag_id_with_index(options["index"])
             options.delete("index")
           elsif defined?(@auto_index)
-            options["name"] = tag_name_with_index(@auto_index) unless options.has_key?("name")
-            options["id"]   = tag_id_with_index(@auto_index)   unless options.has_key?("id")
+            options["name"] ||= tag_name_with_index(@auto_index)
+            options["id"]   ||= tag_id_with_index(@auto_index)
           else
-            options["name"] = tag_name + (options.has_key?('multiple') ? '[]' : '') unless options.has_key?("name")
-            options["id"]   = tag_id unless options.has_key?("id")
+            options["name"] ||= tag_name + (options.has_key?('multiple') ? '[]' : '')
+            options["id"]   ||= tag_id
           end
         end
 

actionpack/lib/action_view/template_handlers/erb.rb

@@ -17,7 +17,7 @@ module ActionView
           src << "@output_buffer.safe_append='"
           src << "\n" * @newline_pending if @newline_pending > 0
           src << escape_text(text)
-          src << "'.freeze;"
+          src << "';"
 
           @newline_pending = 0
         end
@@ -63,7 +63,7 @@ module ActionView
 
       def flush_newline_if_pending(src)
         if @newline_pending > 0
-          src << "@output_buffer.safe_append='#{"\n" * @newline_pending}'.freeze;"
+          src << "@output_buffer.safe_append='#{"\n" * @newline_pending}';"
           @newline_pending = 0
         end
       end

actionpack/test/controller/caching_test.rb

@@ -622,19 +622,6 @@ class FragmentCachingTest < ActionController::TestCase
     assert_equal 'generated till now -> fragment content', buffer
   end
 
-  def test_fragment_for_bytesize
-    buffer = "\xC4\x8D"
-    buffer.force_encoding('ASCII-8BIT')
-
-    @controller.fragment_for(buffer, 'bytesize') do
-      buffer.force_encoding('UTF-8')
-      buffer << "abc"
-    end
-
-    assert_equal Encoding::UTF_8, buffer.encoding
-    assert_equal "abc", @store.read('views/bytesize')
-  end
-
   def test_html_safety
     assert_nil @store.read('views/name')
     content = 'value'.html_safe

actionpack/test/template/form_helper_test.rb

@@ -175,10 +175,6 @@ class FormHelperTest < ActionView::TestCase
     I18n.locale = old_locale
   end
 
-  def test_label_with_for_attribute_as_nil
-    assert_dom_equal('<label>Title</label>', label(:post, :title, nil, :for => nil))
-  end
-
   def test_label_with_for_attribute_as_symbol
     assert_dom_equal('<label for="my_for">Title</label>', label(:post, :title, nil, :for => "my_for"))
   end
@@ -278,11 +274,6 @@ class FormHelperTest < ActionView::TestCase
       hidden_field("post", "title", :value => "Something Else")
   end
 
-  def test_text_field_with_id_as_nil
-    assert_dom_equal '<input name="post[title]" type="hidden" value="Hello World" />',
-      hidden_field("post", "title", :id => nil)
-  end
-
   def test_check_box
     assert_dom_equal(
       '<input name="post[secret]" type="hidden" value="0" /><input checked="checked" id="post_secret" name="post[secret]" type="checkbox" value="1" />',

activesupport/lib/active_support/vendor.rb

@@ -1,11 +1,6 @@
 # Prefer gems to the bundled libs.
 require 'rubygems'
 
-begin
-  gem 'builder', '~> 2.1.2'
-rescue Gem::LoadError
-  $:.unshift "#{File.dirname(__FILE__)}/vendor/builder-2.1.2"
-end
 require 'builder'
 
 begin

railties/lib/rails_generator/commands.rb

@@ -299,11 +299,7 @@ HELP
             # Evaluate any assignments in a temporary, throwaway binding.
             vars = template_options[:assigns] || {}
             b = template_options[:binding] || binding
-            if b.respond_to?(:local_variable_set)
-              vars.each { |k,v| b.local_variable_set(k, v) }
-            else
-              vars.each { |k,v| eval "#{k} = vars[:#{k}] || vars['#{k}']", b }
-            end
+            vars.each { |k,v| eval "#{k} = vars[:#{k}] || vars['#{k}']", b }
 
             # Render the source file with the temporary binding.
             ERB.new(file.read, nil, '-').result(b)

script/cibuild

@@ -4,4 +4,4 @@ set -x
 set -e
 
 script/cibuild-on 1.9.3-p231-tcs-github
-script/cibuild-on 2.1.0-github
+script/cibuild-on 2.0.0-github