Fix bug 1039591: Don't use url basename as suggested app name

console/app/models/cartridge_type.rb

@@ -57,18 +57,26 @@ def suggest_name
     if name.present?
       name_prefix
     elsif url.present?
-      url_basename
+      url_suggested_name
     end
   end
 
   def to_param
     url || name
   end
 
-  def url_basename
+  def url_suggested_name
     uri = URI.parse(url)
     name = uri.fragment
     name = Rack::Utils.parse_nested_query(uri.query)['name'] if name.blank? && uri.query
+    name.presence
+  rescue
+    nil
+  end
+
+  def url_basename
+    uri = URI.parse(url)
+    name = url_suggested_name
     name = File.basename(uri.path) if name.blank? && uri.path.present? && uri.path != '/'
     name.presence || url
   rescue

console/test/functional/application_types_controller_test.rb

@@ -288,6 +288,42 @@ def readable_domain(name="readable")
     assert_nil assigns(:suggesting_name)
   end
 
+  test "should suggest name from custom cart url with hash" do
+    with_unique_user
+    get :show, :id => 'custom', :application_type => {:cartridges => 'http://foo.bar#custom_cart'}
+    assert_response :success
+    assert_select 'h3', 'From Scratch'
+    assert_select '.text-warning', /Downloaded cartridges do not receive updates automatically/
+    assert_select "input[type=hidden][name='application[cartridges][][url]'][value=http://foo.bar#custom_cart]"
+    assert_select ".indicator-gear-increase", "+1"
+    assert_equal 'customcart', assigns(:application).name
+    assert assigns(:suggesting_name)
+  end
+
+  test "should suggest name from custom cart url with name param" do
+    with_unique_user
+    get :show, :id => 'custom', :application_type => {:cartridges => 'http://foo.bar?name=custom_cart'}
+    assert_response :success
+    assert_select 'h3', 'From Scratch'
+    assert_select '.text-warning', /Downloaded cartridges do not receive updates automatically/
+    assert_select "input[type=hidden][name='application[cartridges][][url]'][value=http://foo.bar?name=custom_cart]"
+    assert_select ".indicator-gear-increase", "+1"
+    assert_equal 'customcart', assigns(:application).name
+    assert assigns(:suggesting_name)
+  end
+
+  test "should not suggest name from custom cart url" do
+    with_unique_user
+    get :show, :id => 'custom', :application_type => {:cartridges => 'http://foo.bar'}
+    assert_response :success
+    assert_select 'h3', 'From Scratch'
+    assert_select '.text-warning', /Downloaded cartridges do not receive updates automatically/
+    assert_select "input[type=hidden][name='application[cartridges][][url]'][value=http://foo.bar]"
+    assert_select ".indicator-gear-increase", "+1"
+    assert_nil assigns(:application).name
+    assert_nil assigns(:suggesting_name)
+  end
+
   test "should render custom cart type with a choice" do
     with_unique_user
     get :show, :id => 'custom', :cartridges => 'ruby'