jchris-couchrest 0.8.3 → 0.9.0

data/bin/couchdir

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+unless ARGV.length >= 2
+  puts "usage: couchdir path/to/directory db-name [docid]"
+  exit
+end
+
+require 'rubygems'
+require 'couchrest'
+
+dirname = ARGV[0]
+dbname = ARGV[1]
+docid = ARGV[2]
+
+puts "Create attachments for the files in #{dirname} in database #{dbname}."
+
+fm = CouchRest::FileManager.new(dbname)
+fm.loud = true
+puts "Pushing views from directory #{dirname} to database #{fm.db}"
+fm.push_directory(dirname, docid)

data/bin/couchview

@@ -0,0 +1,111 @@
+#!/usr/bin/env ruby
+
+commands = %w{push generate}
+
+command = ARGV[0]
+
+if !commands.include?(command)
+  puts <<-USAGE
+Couchview has two modes: push and generate. Run couchview push or couchview generate for usage documentation.  
+USAGE
+  exit
+end
+
+if ARGV.length == 1
+  case command
+  when "generate"
+    puts <<-GEN
+Usage: couchview generate directory design1 design2 design3 ...
+
+Couchview will create directories and example views for the design documents you specify.  
+  
+GEN
+  when "push"
+    puts <<-PUSH
+== Pushing views with Couchview ==
+
+Usage: couchview push directory dbname
+
+Couchview expects a specific filesystem layout for your CouchDB views (see
+example below). It also supports advanced features like inlining of library
+code (so you can keep DRY) as well as avoiding unnecessary document
+modification.
+
+Couchview also solves a problem with CouchDB's view API, which only provides
+access to the final reduce side of any views which have both a map and a
+reduce function defined. The intermediate map results are often useful for
+development and production. CouchDB is smart enough to reuse map indexes for
+functions duplicated across views within the same design document.
+
+For views with a reduce function defined, Couchview creates both a reduce view
+and a map-only view, so that you can browse and query the map side as well as
+the reduction, with no performance penalty.
+
+== Example ==
+
+couchview push foo-project/bar-views baz-database
+
+This will push the views defined in foo-project/bar-views into a database
+called baz-database. Couchview expects the views to be defined in files with
+names like:
+
+foo-project/bar-views/my-design/viewname-map.js
+foo-project/bar-views/my-design/viewname-reduce.js
+foo-project/bar-views/my-design/noreduce-map.js
+
+Pushed to => http://localhost:5984/baz-database/_design/my-design
+
+And the design document:  
+    {
+      "views" : {
+        "viewname-map" : {
+          "map" : "### contents of view-name-map.js ###"
+        },
+        "viewname-reduce" : {
+          "map" : "### contents of view-name-map.js ###",
+          "reduce" : "### contents of view-name-reduce.js ###"
+        },
+        "noreduce-map" : {
+          "map" : "### contents of noreduce-map.js ###"
+        }
+      }
+    }
+
+Couchview will create a design document for each subdirectory of the views
+directory specified on the command line.
+
+== Library Inlining == 
+
+Couchview can optionally inline library code into your views so you only have
+to maintain it in one place. It looks for any files named lib.* in your
+design-doc directory (for doc specific libs) and in the parent views directory
+(for project global libs). These libraries are only inserted into views which
+include the text
+
+//include-lib
+
+or
+
+#include-lib
+
+Couchview is a result of scratching my own itch. I'd be happy to make it more
+general, so please contact me at jchris@grabb.it if you'd like to see anything
+added or changed.
+PUSH
+  end
+  exit
+end
+
+require 'rubygems'
+require 'couchrest'
+
+if command == 'push'
+  dirname = ARGV[1]
+  dbname = ARGV[2]
+  fm = CouchRest::FileManager.new(dbname)
+  fm.loud = true
+  puts "Pushing views from directory #{dirname} to database #{fm.db}"
+  fm.push_views(dirname)
+elsif command == 'generate'
+  puts "Under construction ;)"
+end

data/lib/couch_rest.rb

@@ -0,0 +1,62 @@
+class CouchRest
+  attr_accessor :uri
+  def initialize server = 'http://localhost:5984'
+    @uri = server
+  end
+  
+  # list all databases on the server
+  def databases
+    CouchRest.get "#{@uri}/_all_dbs"
+  end
+  
+  def database name
+    CouchRest::Database.new(@uri, name)
+  end
+  
+  # get the welcome message
+  def info
+    CouchRest.get "#{@uri}/"
+  end
+
+  # restart the couchdb instance
+  def restart!
+    CouchRest.post "#{@uri}/_restart"
+  end
+  
+  # create a database
+  def create_db name
+    CouchRest.put "#{@uri}/#{name}"
+    database name
+  end
+
+  class << self
+    def put uri, doc = nil
+      payload = doc.to_json if doc
+      JSON.parse(RestClient.put(uri, payload))
+    end
+  
+    def get uri
+      JSON.parse(RestClient.get(uri), :max_nesting => false)
+    end
+    
+    def post uri, doc = nil
+      payload = doc.to_json if doc
+      JSON.parse(RestClient.post(uri, payload))
+    end
+    
+    def delete uri
+      JSON.parse(RestClient.delete(uri))
+    end
+    
+    def paramify_url url, params = nil
+      if params
+        query = params.collect do |k,v|
+          v = v.to_json if %w{key startkey endkey}.include?(k.to_s)
+          "#{k}=#{CGI.escape(v.to_s)}"
+        end.join("&")
+        url = "#{url}?#{query}"
+      end
+      url
+    end
+  end  
+end

data/lib/couchrest.rb

@@ -2,68 +2,9 @@ require "rubygems"
 require 'json'
 require 'rest_client'
 
+require File.dirname(__FILE__) + '/couch_rest'
 require File.dirname(__FILE__) + '/database'
 require File.dirname(__FILE__) + '/pager'
+require File.dirname(__FILE__) + '/file_manager'
 
-class CouchRest
-  attr_accessor :uri
-  def initialize server = 'http://localhost:5984'
-    @uri = server
-  end
-  
-  # list all databases on the server
-  def databases
-    CouchRest.get "#{@uri}/_all_dbs"
-  end
-  
-  def database name
-    CouchRest::Database.new(@uri, name)
-  end
-  
-  # get the welcome message
-  def info
-    CouchRest.get "#{@uri}/"
-  end
 
-  # restart the couchdb instance
-  def restart!
-    CouchRest.post "#{@uri}/_restart"
-  end
-  
-  # create a database
-  def create_db name
-    CouchRest.put "#{@uri}/#{name}"
-    database name
-  end
-
-  class << self
-    def put uri, doc = nil
-      payload = doc.to_json if doc
-      JSON.parse(RestClient.put(uri, payload))
-    end
-  
-    def get uri
-      JSON.parse(RestClient.get(uri), :max_nesting => false)
-    end
-    
-    def post uri, doc = nil
-      payload = doc.to_json if doc
-      JSON.parse(RestClient.post(uri, payload))
-    end
-    
-    def delete uri
-      JSON.parse(RestClient.delete(uri))
-    end
-    
-    def paramify_url url, params = nil
-      if params
-        query = params.collect do |k,v|
-          v = v.to_json if %w{key startkey endkey}.include?(k.to_s)
-          "#{k}=#{CGI.escape(v.to_s)}"
-        end.join("&")
-        url = "#{url}?#{query}"
-      end
-      url
-    end
-  end  
-end

data/lib/database.rb

@@ -1,6 +1,5 @@
 require 'cgi'
 require "base64"
-require File.dirname(__FILE__) + '/couchrest'
 
 class CouchRest
   class Database
@@ -11,6 +10,10 @@ class CouchRest
       @root = "#{host}/#{name}"
     end
     
+    def to_s
+      @root
+    end
+    
     def documents params = nil
       url = CouchRest.paramify_url "#{@root}/_all_docs", params
       CouchRest.get url  

data/lib/file_manager.rb

@@ -0,0 +1,396 @@
+require 'digest/md5'
+
+class CouchRest
+  class FileManager
+    attr_reader :db
+    attr_accessor :loud
+    
+    LANGS = {"rb" => "ruby", "js" => "javascript"}
+    MIMES = {
+      "html"  => "text/html",
+      "htm"   => "text/html",
+      "png"   => "image/png",
+      "css"   => "text/css",
+      "js"    => "test/javascript"
+    }    
+    def initialize(dbname, host="http://localhost:5984")
+      @db = CouchRest.new(host).database(dbname)
+    end
+    
+    def push_directory(push_dir, docid=nil)
+      docid ||= push_dir.split('/').reverse.find{|part|!part.empty?}
+
+      pushfiles = Dir["#{push_dir}/**/*.*"].collect do |f|
+        {f.split("#{push_dir}/").last => open(f).read}
+      end
+
+      return if pushfiles.empty?
+
+      @attachments = {}
+      @signatures = {}
+      pushfiles.each do |file|
+        name = file.keys.first
+        value = file.values.first
+        @signatures[name] = md5(value)
+
+        @attachments[name] = {
+          "data" => value,
+          "content_type" => MIMES[name.split('.').last]
+        }
+      end
+
+      doc = @db.get(docid) rescue nil
+
+      unless doc
+        say "creating #{docid}"
+        @db.save({"_id" => docid, "_attachments" => @attachments, "signatures" => @signatures})
+        return
+      end
+
+      # remove deleted docs
+      to_be_removed = doc["signatures"].keys.select do |d| 
+        !pushfiles.collect{|p| p.keys.first}.include?(d) 
+      end
+
+      to_be_removed.each do |p|
+        say "deleting #{p}"
+        doc["signatures"].delete(p)
+        doc["_attachments"].delete(p)
+      end
+
+      # update existing docs:
+      doc["signatures"].each do |path, sig|
+        if (@signatures[path] == sig)
+          say "no change to #{path}. skipping..."
+        else
+          say "replacing #{path}"
+          doc["signatures"][path] = md5(@attachments[path]["data"])
+          doc["_attachments"][path].delete("stub")
+          doc["_attachments"][path].delete("length")    
+          doc["_attachments"][path]["data"] = @attachments[path]["data"]
+          doc["_attachments"][path].merge!({"data" => @attachments[path]["data"]} )
+
+        end
+      end
+
+      # add in new files
+      new_files = pushfiles.select{|d| !doc["signatures"].keys.include?( d.keys.first) } 
+
+      new_files.each do |f|
+        say "creating #{f}"
+        path = f.keys.first
+        content = f.values.first
+        doc["signatures"][path] = md5(content)
+
+        doc["_attachments"][path] = {
+          "data" => content,
+          "content_type" => @content_types[path.split('.').last]
+        }
+      end
+
+      begin
+        @db.save(doc)
+      rescue Exception => e
+        say e.message
+      end
+    end
+    
+    def push_views(view_dir)
+      designs = {}
+
+      Dir["#{view_dir}/**/*.*"].each do |design_doc|
+        design_doc_parts = design_doc.split('/')
+        next if /^lib\..*$/.match design_doc_parts.last
+        pre_normalized_view_name = design_doc_parts.last.split("-")
+        view_name = pre_normalized_view_name[0..pre_normalized_view_name.length-2].join("-")
+
+        folder = design_doc_parts[-2]
+
+        designs[folder] ||= {}
+        designs[folder]["views"] ||= {}
+        design_lang = design_doc_parts.last.split(".").last
+        designs[folder]["language"] ||= LANGS[design_lang]
+
+        libs = ""
+        Dir["#{view_dir}/lib.#{design_lang}"].collect do |global_lib|
+          libs << open(global_lib).read
+          libs << "\n"
+        end
+        Dir["#{view_dir}/#{folder}/lib.#{design_lang}"].collect do |global_lib|
+          libs << open(global_lib).read
+          libs << "\n"
+        end
+        if design_doc_parts.last =~ /-map/
+          designs[folder]["views"]["#{view_name}-map"] ||= {}
+
+          designs[folder]["views"]["#{view_name}-map"]["map"] = read(design_doc, libs)
+
+          designs[folder]["views"]["#{view_name}-reduce"] ||= {}
+          designs[folder]["views"]["#{view_name}-reduce"]["map"] = read(design_doc, libs)
+        end
+
+        if design_doc_parts.last =~ /-reduce/
+          designs[folder]["views"]["#{view_name}-reduce"] ||= {}
+
+          designs[folder]["views"]["#{view_name}-reduce"]["reduce"] = read(design_doc, libs)
+        end
+      end
+
+      # cleanup empty maps and reduces
+      designs.each do |name, props|
+        props["views"].each do |view, funcs|
+          next unless view.include?("reduce")
+          props["views"].delete(view) unless funcs.keys.include?("reduce")
+        end
+      end
+      
+      designs.each do |k,v|
+        create_or_update("_design/#{k}", v)
+      end
+      
+      designs
+    end
+    
+    
+    private
+    
+    def say words
+      puts words if @loud
+    end
+    
+    def md5 string
+      Digest::MD5.hexdigest(string)
+    end
+    
+    def read(file, libs=nil)
+      st = open(file).read
+      st.sub!(/(\/\/|#)include-lib/,libs) if libs
+      st
+    end
+    
+    def create_or_update(id, fields)
+      existing = @db.get(id) rescue nil
+
+      if existing
+        updated = fields.merge({"_id" => id, "_rev" => existing["_rev"]})
+        if existing != updated
+          say "replacing #{id}"
+          db.save(updated)
+        else
+          say "skipping #{id}"
+        end
+      else
+        say "creating #{id}"
+        db.save(fields.merge({"_id" => id}))
+      end
+
+    end
+  end
+end
+
+__END__
+
+
+
+
+# parse the file structure to load the public files, controllers, and views into a hash with the right shape for coucdb
+couch = {}
+
+couch["public"] = Dir["#{File.expand_path(File.dirname("."))}/public/**/*.*"].collect do |f|
+  {f.split("public/").last => open(f).read}
+end
+
+couch["controllers"] = {}
+Dir["#{File.expand_path(File.dirname("."))}/app/controllers/**/*.*"].collect do |c|
+  path_parts = c.split("/")
+  
+  controller_name = path_parts[path_parts.length - 2]
+  action_name = path_parts[path_parts.length - 1].split(".").first
+
+  couch["controllers"][controller_name] ||= {"actions" => {}}
+  couch["controllers"][controller_name]["actions"][action_name] = open(c).read
+  
+end
+
+couch["designs"] = {}
+Dir["#{File.expand_path(File.dirname("."))}/app/views/**/*.*"].collect do |design_doc|
+  design_doc_parts = design_doc.split('/')
+  pre_normalized_view_name = design_doc_parts.last.split("-")
+  view_name = pre_normalized_view_name[0..pre_normalized_view_name.length-2].join("-")
+
+  folder = design_doc.split("app/views").last.split("/")[1]
+
+  couch["designs"][folder] ||= {}
+  couch["designs"][folder]["views"] ||= {}
+  couch["designs"][folder]["language"] ||= LANGS[design_doc_parts.last.split(".").last]
+  
+  if design_doc_parts.last =~ /-map/
+    couch["designs"][folder]["views"]["#{view_name}-map"] ||= {}
+
+    couch["designs"][folder]["views"]["#{view_name}-map"]["map"] = open(design_doc).read
+
+    couch["designs"][folder]["views"]["#{view_name}-reduce"] ||= {}
+    couch["designs"][folder]["views"]["#{view_name}-reduce"]["map"] = open(design_doc).read
+  end
+  
+  if design_doc_parts.last =~ /-reduce/
+    couch["designs"][folder]["views"]["#{view_name}-reduce"] ||= {}
+
+    couch["designs"][folder]["views"]["#{view_name}-reduce"]["reduce"] = open(design_doc).read
+  end
+end
+
+# cleanup empty maps and reduces
+couch["designs"].each do |name, props|
+  props["views"].delete("#{name}-reduce") unless props["views"]["#{name}-reduce"].keys.include?("reduce")
+end
+
+# parsing done, begin posting
+
+# connect to couchdb
+cr = CouchRest.new("http://localhost:5984")
+@db = cr.database(DBNAME)
+
+def create_or_update(id, fields)
+  existing = get(id)
+  
+  if existing
+    updated = fields.merge({"_id" => id, "_rev" => existing["_rev"]})
+  else
+    puts "saving #{id}"
+    save(fields.merge({"_id" => id}))
+  end
+  
+  if existing == updated
+    puts "no change to #{id}. skipping..."
+  else
+    puts "replacing #{id}"
+    save(updated)
+  end
+
+end
+
+def get(id)
+  doc = handle_errors do
+    @db.get(id)
+  end
+end
+
+def save(doc)
+  handle_errors do
+    @db.save(doc)
+  end
+end
+
+def handle_errors(&block)
+  begin
+    yield
+  rescue Exception => e
+    # puts e.message
+    nil
+  end
+end
+
+
+if todo.include? "views"
+  puts "posting views into CouchDB"
+  couch["designs"].each do |k,v|
+    create_or_update("_design/#{k}", v)
+  end
+  puts
+end
+
+if todo.include? "controllers"
+  puts "posting controllers into CouchDB"
+  couch["controllers"].each do |k,v|
+    create_or_update("controller/#{k}", v)
+  end
+  puts
+end
+
+
+if todo.include? "public"
+  puts "posting public docs into CouchDB"
+
+  if couch["public"].empty?
+    puts "no docs in public"; exit 
+  end
+  
+  @content_types = {
+    "html"       => "text/html",
+    "htm"        => "text/html",
+    "png"        => "image/png",
+    "css"        => "text/css",
+    "js"         => "test/javascript"
+  }
+  
+  def md5 string
+    Digest::MD5.hexdigest(string)
+  end
+    
+  @attachments = {}
+  @signatures = {}
+  couch["public"].each do |doc|
+    @signatures[doc.keys.first] = md5(doc.values.first)
+    
+    @attachments[doc.keys.first] = {
+      "data" => doc.values.first,
+      "content_type" => @content_types[doc.keys.first.split('.').last]
+    }
+  end
+  
+  doc = get("public")
+  
+  unless doc
+    puts "creating public"
+    @db.save({"_id" => "public", "_attachments" => @attachments, "signatures" => @signatures})
+    exit
+  end
+  
+  # remove deleted docs
+  to_be_removed = doc["signatures"].keys.select{|d| !couch["public"].collect{|p| p.keys.first}.include?(d) }
+  
+  to_be_removed.each do |p|
+    puts "deleting #{p}"
+    doc["signatures"].delete(p)
+    doc["_attachments"].delete(p)
+  end
+  
+  # update existing docs:
+  doc["signatures"].each do |path, sig|
+    if (@signatures[path] == sig)
+      puts "no change to #{path}. skipping..."
+    else
+      puts "replacing #{path}"
+      doc["signatures"][path] = md5(@attachments[path]["data"])
+      doc["_attachments"][path].delete("stub")
+      doc["_attachments"][path].delete("length")    
+      doc["_attachments"][path]["data"] = @attachments[path]["data"]
+      doc["_attachments"][path].merge!({"data" => @attachments[path]["data"]} )
+      
+    end
+  end
+  
+  # add in new files
+  new_files = couch["public"].select{|d| !doc["signatures"].keys.include?( d.keys.first) } 
+  
+  new_files.each do |f|
+    puts "creating #{f}"
+    path = f.keys.first
+    content = f.values.first
+    doc["signatures"][path] = md5(content)
+    
+    doc["_attachments"][path] = {
+      "data" => content,
+      "content_type" => @content_types[path.split('.').last]
+    }
+  end
+  
+  begin
+    @db.save(doc)
+  rescue Exception => e
+    puts e.message
+  end
+  
+  puts
+end

data/lib/pager.rb

@@ -1,14 +1,3 @@
-# paginate though 'gcharts/mp3-trk-dom-map' view and save
-
-# get 1000 records
-# truncate so that the key of the last record is not included in the page
-#  that key will be the first of the next page
-# (if the last key equals the first key, up the page size)
-# group the results by key
-# yield the group
-
-require File.dirname(__FILE__) + '/couchrest'
-
 module Enumerable
   def group_by
     inject({}) do |grouped, element|

data/spec/couchrest_spec.rb

@@ -16,19 +16,6 @@ describe CouchRest do
     end
   end
 
-  describe "tested against the current CouchDB svn revision" do
-    it "should be up to date" do
-      v = @cr.info["version"]
-      if /incubating/.match(v)
-        v.should include('0.8.0')
-      else
-        vi = v.split(/a/).pop.to_i
-        vi.should be >= 661484 # versions older than this will likely fail many specs
-        vi.should be <= 663797 # versions newer than this haven't been tried
-      end
-    end
-  end
-
   describe "getting info" do
     it "should list databases" do
       @cr.databases.should be_an_instance_of(Array)

data/spec/file_manager_spec.rb

@@ -0,0 +1,116 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe CouchRest::FileManager do
+  before(:all) do
+    @cr = CouchRest.new(COUCHHOST)
+    @db = @cr.database(TESTDB)
+    @db.delete! rescue nil
+    @db = @cr.create_db(TESTDB) rescue nil
+  end
+  it "should initialize" do
+    @fm = CouchRest::FileManager.new(TESTDB)
+    @fm.should_not be_nil
+  end
+  it "should require a db name" do
+    lambda{CouchRest::FileManager.new}.should raise_error
+  end
+  it "should accept a db name" do
+    @fm = CouchRest::FileManager.new(TESTDB, 'http://localhost')
+    @fm.db.name.should == TESTDB
+  end
+  it "should default to localhost couchdb" do
+    @fm = CouchRest::FileManager.new(TESTDB)
+    @fm.db.host.should == 'http://localhost:5984'
+  end
+end
+
+describe CouchRest::FileManager, "pushing views" do
+  before(:all) do
+    @cr = CouchRest.new(COUCHHOST)
+    @db = @cr.database(TESTDB)
+    @db.delete! rescue nil
+    @db = @cr.create_db(TESTDB) rescue nil
+    
+    @fm = CouchRest::FileManager.new(TESTDB, COUCHHOST)
+    @view_dir = File.dirname(__FILE__) + '/fixtures/views'
+    ds = @fm.push_views(@view_dir)
+    @design = @db.get("_design/test_view")
+  end
+  it "should create a design document for each folder" do
+    @design["views"].should_not be_nil
+  end
+  it "should push a map and reduce view" do
+    @design["views"]["test-map"].should_not be_nil
+    @design["views"]["test-reduce"].should_not be_nil
+  end
+  it "should push a map only view" do
+    @design["views"]["only-map"].should_not be_nil
+    @design["views"]["only-reduce"].should be_nil
+  end
+  it "should include library files" do
+    @design["views"]["only-map"]["map"].should include("globalLib")
+    @design["views"]["only-map"]["map"].should include("justThisView")
+  end
+  it "should not create extra design docs" do
+    docs = @db.documents(:startkey => '_design', :endkey => '_design/ZZZZZZ')
+    docs['total_rows'].should == 1
+  end
+end
+
+describe CouchRest::FileManager, "pushing a directory with id" do
+  before(:all) do
+    @cr = CouchRest.new(COUCHHOST)
+    @db = @cr.database(TESTDB)
+    @db.delete! rescue nil
+    @db = @cr.create_db(TESTDB) rescue nil
+    
+    @fm = CouchRest::FileManager.new(TESTDB, COUCHHOST)
+    @push_dir = File.dirname(__FILE__) + '/fixtures/attachments'
+    ds = @fm.push_directory(@push_dir, 'attached')
+  end
+  it "should create a document for the folder" do
+    @db.get("attached")
+  end
+  it "should make attachments" do
+    doc = @db.get("attached")
+    doc["_attachments"]["test.html"].should_not be_nil
+  end
+  it "should set the content type" do
+    doc = @db.get("attached")
+    doc["_attachments"]["test.html"]["content_type"].should == "text/html"
+  end
+end
+
+describe CouchRest::FileManager, "pushing a directory without id" do
+  before(:all) do
+    @cr = CouchRest.new(COUCHHOST)
+    @db = @cr.database(TESTDB)
+    @db.delete! rescue nil
+    @db = @cr.create_db(TESTDB) rescue nil
+    
+    @fm = CouchRest::FileManager.new(TESTDB, COUCHHOST)
+    @push_dir = File.dirname(__FILE__) + '/fixtures/attachments'
+    ds = @fm.push_directory(@push_dir)
+  end
+  it "should use the dirname" do
+    doc = @db.get("attachments")
+    doc["_attachments"]["test.html"].should_not be_nil
+  end
+end
+
+describe CouchRest::FileManager, "pushing a directory/ without id" do
+  before(:all) do
+    @cr = CouchRest.new(COUCHHOST)
+    @db = @cr.database(TESTDB)
+    @db.delete! rescue nil
+    @db = @cr.create_db(TESTDB) rescue nil
+    
+    @fm = CouchRest::FileManager.new(TESTDB, COUCHHOST)
+    @push_dir = File.dirname(__FILE__) + '/fixtures/attachments/'
+    ds = @fm.push_directory(@push_dir)
+  end
+  it "should use the dirname" do
+    doc = @db.get("attachments")
+    doc["_attachments"]["test.html"].should_not be_nil
+  end
+end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: jchris-couchrest
 version: !ruby/object:Gem::Version 
-  version: 0.8.3
+  version: 0.9.0
 platform: ruby
 authors: 
 - J. Chris Anderson
+- Greg Borenstein
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-06-20 00:00:00 -07:00
+date: 2008-08-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,23 +33,27 @@ dependencies:
     version: 
 description: CouchRest provides a simple interface on top of CouchDB's RESTful HTTP API, as well as including some utility scripts for managing views and attachments.
 email: jchris@grabb.it
-executables: []
-
+executables: 
+- couchview
+- couchdir
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
 - lib/couchrest.rb
+- lib/couch_rest.rb
 - lib/database.rb
 - lib/pager.rb
+- lib/file_manager.rb
 - Rakefile
 - README
-- script/couchdir
-- script/couchview
+- bin/couchdir
+- bin/couchview
 - spec/couchrest_spec.rb
 - spec/database_spec.rb
 - spec/pager_spec.rb
+- spec/file_manager_spec.rb
 - spec/spec_helper.rb
 has_rdoc: false
 homepage: http://github.com/jchris/couchrest

data/script/couchdir

@@ -1,62 +0,0 @@
-#!/usr/bin/env ruby
-
-unless ARGV.length >= 2
-  puts "usage: couchdir path/to/directory db-name"
-  exit
-end
-
-dirname = ARGV[0].sub(/\/$/,'')
-dbname = ARGV[1]
-
-  
-
-puts "Shoving #{dirname} into #{dbname}."
-
-require File.expand_path(File.dirname(__FILE__)) + '/../couchrest'
-require 'fileutils'
-
-cr = CouchRest.new("http://localhost:5984")
-@db = cr.database(dbname)
-
-@content_types = {
-  "html"       => "text/html",
-  "htm"        => "text/html",
-  "png"        => "image/png",
-  "css"        => "text/css"
-}
-
-files = Dir.glob(File.join(dirname,"**","*"))
-attachments = {}
-files.each do |filename|
-  content = open(filename).read
-  aname = filename.split('/')
-  aname.shift
-  aname = aname.join('/')
-  attachments[aname] = {
-    "data" => content,
-    "content_type" => @content_types[aname.split('.').last]
-  }
-end
-
-puts attachments.keys.inspect
-
-begin
-  doc = @db.get(dirname) 
-rescue RestClient::Request::RequestFailed
-  doc = nil
-end
-
-# puts "get: #{doc.inspect}"
-
-if doc
-  doc["_attachments"] = attachments
-else
-  doc = {
-    "_id" => dirname,
-    "_attachments" => attachments
-  }
-end
-
-# puts "saving: #{doc.inspect}"
-@db.save(doc)
-puts "saved"

data/script/couchview

@@ -1,162 +0,0 @@
-#!/usr/bin/env ruby
-
-commands = %w{pull push}
-
-command = ARGV[0]
-
-if !commands.include?(command)
-  puts <<-USAGE
-Usage: couchview (pull|push) my-database-name
-For help on pull and push run script/views (pull|push) without a database name.
-USAGE
-  exit
-end
-
-if ARGV.length == 1
-  case command
-  when "pull"
-    puts <<-PULL
-couchview pull my-database-name
-
-I will automagically create a "views" directory in your current working directory if none exists.
-Then I copy the design documents and views into a directory structure like:
-
-./views/my-design-doc/view-name-map.js
-./views/my-design-doc/view-name-reduce.js
-
-If your view names don't end in "map" or "reduce" I'll add those suffixes as a pull. On push I'll put them in new locations corresponding to these new names (overwriting the old design documents). I'm opinionated, but if these conventions don't work for you, the source code is right here.
-    
-    PULL
-  when "push"
-    puts <<-PUSH
-couchview push my-database-name
-
-I'll push all the files in your views directory to the specified database. Because CouchDB caches the results of view calculation by function content, there's no performance penalty for duplicating the map function twice, which I'll do if you have a reduce function. This makes it possible to browse the results of just the map, which can be useful for both queries and debugging.
-
-./views/my-design-doc/view-name-map.js
-./views/my-design-doc/view-name-reduce.js
-
-  Pushed to =>
-
-  http://localhost:5984/my-database-name/_design/my-design-doc
-    {
-      "views" : {
-        "view-name-map" : {
-          "map" : "### contents of view-name-map.js ###"
-        },
-        "view-name-reduce" : {
-          "map" : "### contents of view-name-map.js ###",
-          "reduce" : "### contents of view-name-reduce.js ###"
-        },
-      }
-    }
-PUSH
-  end
-  exit
-end
-
-dbname = ARGV[1]
-dirname = ARGV[2] || "views"
-
-puts "Running #{command} on #{dbname} from directory #{dirname}."
-
-require File.expand_path(File.dirname(__FILE__)) + '/../couchrest'
-require 'fileutils'
-
-module Enumerable
-  def group_by
-    inject({}) do |groups, element|
-      (groups[yield(element)] ||= []) << element
-      groups
-    end
-  end if RUBY_VERSION < '1.9'
-end
-
-# connect to couchdb
-cr = CouchRest.new("http://localhost:5984")
-db = cr.database(dbname)
-
-def readjs(file, libs=nil)
-  st = open(file).read
-  st.sub!(/\/\/include-lib/,libs) if libs
-  st
-end
-
-case command
-when "push" # files to views
-  views = {}
-  viewfiles = Dir.glob(File.join(dirname,"**","*.js")) # todo support non-js views
-  libfiles = viewfiles.select{|f|/lib\.js/.match(f)}
-  libs = open(libfiles[0]).read if libfiles[0]
-  all = (viewfiles-libfiles).collect do |file|
-    fileparts = file.split('/')
-    filename = /(\w.*)-(\w.*)\.js/.match file.split('/').pop
-    design = fileparts[1]
-    view = filename[1]
-    func = filename[2]
-    path = file
-    [design,view,func,path]
-  end
-  designs = all.group_by{|f|f[0]}
-  designs.each do |design,parts|
-    # 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.delete("#{view}-reduce") unless dviews["#{view}-reduce"]["reduce"]
-    end
-    # save them to the db
-    begin
-      view = db.get("_design/#{design}") 
-    rescue RestClient::Request::RequestFailed
-      view = nil
-    end
-    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')
-  ds['rows'].collect{|r|r['id']}.each do |id|
-    puts directory = id.split('/').last
-    FileUtils.mkdir_p(File.join("views",directory))
-    views = db.get(id)['views']
-    
-    vgroups = views.keys.group_by{|k|k.sub(/\-(map|reduce)$/,'')}
-    vgroups.each do|g,vs|
-      mapname = vs.find {|v|views[v]["map"]}
-      if mapname
-        # save map
-        mapfunc = views[mapname]["map"]
-        mapfile = File.join(dirname,directory,"#{g}-map.js") # todo support non-js views
-        File.open(mapfile,'w') do |f|
-          f.write mapfunc
-        end
-      end
-      
-      reducename = vs.find {|v|views[v]["reduce"]}
-      if reducename
-        # save reduce
-        reducefunc = views[reducename]["reduce"]
-        reducefile = File.join(dirname,directory,"#{g}-reduce.js") # todo support non-js views
-        File.open(reducefile,'w') do |f|
-          f.write reducefunc
-        end
-      end
-    end
-  end  
-end