Skip to content

Commit

Permalink
remove dead code from solr_query
Browse files Browse the repository at this point in the history
  • Loading branch information
danielsdeleo committed Feb 3, 2011
1 parent 67adee4 commit c6e5e5b
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 90 deletions.
33 changes: 0 additions & 33 deletions chef/lib/chef/solr_query.rb
Original file line number Diff line number Diff line change
Expand Up @@ -197,43 +197,10 @@ def post_to_solr(doc)
FIELD_ATTR_END = '">'
CLOSE_FIELD = "</field>"

def solr_add(data)
Chef::Log.debug("adding to SOLR: #{data.inspect}")

xml = ""
xml << START_XML

data.each do |field, values|
values.each do |v|
xml << FIELD_ATTR
xml << field
xml << FIELD_ATTR_END
xml << xml_escape(v)
xml << CLOSE_FIELD
end
end
xml << END_XML
xml

post_to_solr(xml)
end

def solr_commit(opts={})
post_to_solr(generate_single_element("commit", opts))
end

def solr_optimize(opts={})
post_to_solr(generate_single_element("optimize", opts))
end

def solr_rollback
post_to_solr(generate_single_element("rollback"))
end

def solr_delete_by_id(ids)
post_to_solr(generate_delete_document("id", ids))
end

def solr_delete_by_query(queries)
post_to_solr(generate_delete_document("query", queries))
end
Expand Down
57 changes: 0 additions & 57 deletions chef/spec/unit/solr_query_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -142,25 +142,6 @@
end
end

describe "solr_add" do
before(:each) do
@solr.stub!(:post_to_solr).and_return(true)
@data = { "foo" => ["bar"] }
end

it "should send valid XML to solr" do
@solr.should_receive(:post_to_solr).with("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<add><doc><field name=\"foo\">bar</field></doc></add>\n")
@solr.solr_add(@data)
end

it "XML escapes content before sending to SOLR" do
@data["foo"] = ["<&>"]
@solr.should_receive(:post_to_solr).with("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<add><doc><field name=\"foo\">&lt;&amp;&gt;</field></doc></add>\n")

@solr.solr_add(@data)
end
end

describe "solr_commit" do
before(:each) do
@solr.stub!(:post_to_solr).and_return(true)
Expand All @@ -172,44 +153,6 @@
end
end

describe "solr_optimize" do
before(:each) do
@solr.stub!(:post_to_solr).and_return(true)
end

it "should send valid commit xml to solr" do
@solr.should_receive(:post_to_solr).with("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<optimize/>\n")
@solr.solr_optimize
end
end

describe "solr_rollback" do
before(:each) do
@solr.stub!(:post_to_solr).and_return(true)
end

it "should send valid commit xml to solr" do
@solr.should_receive(:post_to_solr).with("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<rollback/>\n")
@solr.solr_rollback
end
end

describe "solr_delete_by_id" do
before(:each) do
@solr.stub!(:post_to_solr).and_return(true)
end

it "should send valid delete id xml to solr" do
@solr.should_receive(:post_to_solr).with("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<delete><id>1</id></delete>\n")
@solr.solr_delete_by_id(1)
end

it "should accept multiple ids" do
@solr.should_receive(:post_to_solr).with("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<delete><id>1</id><id>2</id></delete>\n")
@solr.solr_delete_by_id([ 1, 2 ])
end
end

describe "solr_delete_by_query" do
before(:each) do
@solr.stub!(:post_to_solr).and_return(true)
Expand Down

0 comments on commit c6e5e5b

Please sign in to comment.