document attachments now supported
This commit is contained in:
Chris Anderson
parent
b2765a5309
commit
bf1acd8355
|
|
@ -7,7 +7,7 @@ require File.dirname(__FILE__) + '/database'
|
|||
|
||||
class CouchRest
|
||||
attr_accessor :uri
|
||||
def initialize server
|
||||
def initialize server = 'http://localhost:5984'
|
||||
@uri = server
|
||||
end
|
||||
|
||||
|
|
@ -38,7 +38,7 @@ class CouchRest
|
|||
end
|
||||
|
||||
def get uri
|
||||
JSON.parse(RestClient.get(uri))
|
||||
JSON.parse(RestClient.get(uri), :max_nesting => false)
|
||||
end
|
||||
|
||||
def post uri, doc = nil
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
require 'cgi'
|
||||
require "base64"
|
||||
|
||||
class CouchRest
|
||||
class Database
|
||||
|
|
@ -29,8 +30,17 @@ class CouchRest
|
|||
CouchRest.get "#{@root}/#{slug}"
|
||||
end
|
||||
|
||||
# PUT or POST depending on precense of _id attribute
|
||||
def fetch_attachment doc, name
|
||||
doc = CGI.escape(doc)
|
||||
name = CGI.escape(name)
|
||||
RestClient.get "#{@root}/#{doc}/#{name}"
|
||||
end
|
||||
|
||||
# PUT or POST depending on presence of _id attribute
|
||||
def save doc
|
||||
if doc['_attachments']
|
||||
doc['_attachments'] = encode_attachments(doc['_attachments'])
|
||||
end
|
||||
if doc['_id']
|
||||
slug = CGI.escape(doc['_id'])
|
||||
CouchRest.put "#{@root}/#{slug}", doc
|
||||
|
|
@ -51,5 +61,19 @@ class CouchRest
|
|||
def delete!
|
||||
CouchRest.delete @root
|
||||
end
|
||||
private
|
||||
def encode_attachments attachments
|
||||
result = {}
|
||||
attachments.each do |k,v|
|
||||
result[k] = {
|
||||
"type" => "base64",
|
||||
"data" => base64(v)
|
||||
}
|
||||
end
|
||||
result
|
||||
end
|
||||
def base64 data
|
||||
Base64.encode64(data).gsub(/\s/,'')
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -98,27 +98,31 @@ when "push" # files to views
|
|||
end
|
||||
designs = all.group_by{|f|f[0]}
|
||||
designs.each do |design,parts|
|
||||
puts "design #{design}"
|
||||
# puts "replace _design/#{design}? (enter to proceed, 'n' to skip)"
|
||||
# rep = $stdin.gets.chomp
|
||||
# next if rep == 'n'
|
||||
dviews = {}
|
||||
parts.group_by{|p|p[1]}.each do |view,fs|
|
||||
fs.each do |f|
|
||||
dviews["#{view}-reduce"] ||= {}
|
||||
dviews["#{view}-reduce"][f[2]] = readjs(f.last,libs)
|
||||
end
|
||||
dviews["#{view}-map"] = {:map => dviews["#{view}-reduce"]['map']}
|
||||
dviews["#{view}-map"] = {'map' => dviews["#{view}-reduce"]['map']}
|
||||
dviews.delete("#{view}-reduce") unless dviews["#{view}-reduce"]["reduce"]
|
||||
end
|
||||
# save them to the db
|
||||
begin
|
||||
view = db.get("_design/#{design}")
|
||||
db.delete(view)
|
||||
rescue
|
||||
end
|
||||
view = db.get("_design/#{design}") rescue nil
|
||||
if (view && view['views'] == dviews)
|
||||
puts "no change to _design/#{design}. skipping..."
|
||||
else
|
||||
puts "replacing _design/#{design}"
|
||||
db.delete(view) rescue nil
|
||||
db.save({
|
||||
"_id" => "_design/#{design}",
|
||||
:views => dviews
|
||||
})
|
||||
end
|
||||
end
|
||||
|
||||
when "pull" # views to files
|
||||
ds = db.documents(:startkey => '_design/', :endkey => '_design/ZZZZZZZZZ')
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ describe CouchRest do
|
|||
v = @cr.info["version"]
|
||||
vi = v.split(/a/).pop.to_i
|
||||
vi.should be >= 661484 # versions older than this will likely fail many specs
|
||||
vi.should be <= 661484 # versions newer than this haven't been tried
|
||||
vi.should be <= 663797 # versions newer than this haven't been tried
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -183,6 +183,49 @@ describe CouchRest::Database do
|
|||
end
|
||||
end
|
||||
|
||||
describe "PUT document with attachment" do
|
||||
before(:each) do
|
||||
@attach = "<html><head><title>My Doc</title></head><body><p>Has words.</p></body></html>"
|
||||
@doc = {
|
||||
"_id" => "mydocwithattachment",
|
||||
"field" => ["some value"],
|
||||
"_attachments" => {
|
||||
"test.html" => @attach
|
||||
}
|
||||
}
|
||||
@db.save(@doc)
|
||||
end
|
||||
it "should save and be indicated" do
|
||||
doc = @db.get("mydocwithattachment")
|
||||
doc['_attachments']['test.html']['length'].should == @attach.length
|
||||
end
|
||||
it "should be there" do
|
||||
attachment = @db.fetch_attachment("mydocwithattachment","test.html")
|
||||
attachment.should == @attach
|
||||
end
|
||||
end
|
||||
|
||||
describe "POST document with attachment (with funky name)" do
|
||||
before(:each) do
|
||||
@attach = "<html><head><title>My Funky Doc</title></head><body><p>Has words.</p></body></html>"
|
||||
@doc = {
|
||||
"field" => ["some other value"],
|
||||
"_attachments" => {
|
||||
"http://example.com/stuff.cgi?things=and%20stuff" => @attach
|
||||
}
|
||||
}
|
||||
@docid = @db.save(@doc)['id']
|
||||
end
|
||||
it "should save and be indicated" do
|
||||
doc = @db.get(@docid)
|
||||
doc['_attachments']['http://example.com/stuff.cgi?things=and%20stuff']['length'].should == @attach.length
|
||||
end
|
||||
it "should be there" do
|
||||
attachment = @db.fetch_attachment(@docid,"http://example.com/stuff.cgi?things=and%20stuff")
|
||||
attachment.should == @attach
|
||||
end
|
||||
end
|
||||
|
||||
describe "PUT (new document with url id)" do
|
||||
it "should create the document" do
|
||||
@docid = "http://example.com/stuff.cgi?things=and%20stuff"
|
||||
|
|
|
|||
Loading…
Reference in a new issue