jchris-couchrest 0.9.12 → 0.12.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jchris-couchrest
 version: !ruby/object:Gem::Version 
-  version: 0.9.12
+  version: 0.12.2
 platform: ruby
 authors: 
 - J. Chris Anderson
@@ -9,8 +9,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-14 00:00:00 -07:00
-default_executable: 
+date: 2008-11-22 00:00:00 -08:00
+default_executable: couchdir
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -30,6 +30,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0.5"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: mime-types
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.15"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: extlib
   version_requirement: 
@@ -40,25 +49,21 @@ dependencies:
         version: 0.9.6
     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
+email: jchris@apache.org
 executables: 
-- couchview
 - couchdir
-- couchapp
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
+- README.md
 - LICENSE
-- THANKS
+- THANKS.md
 files: 
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
-- THANKS
-- bin/couchapp
+- THANKS.md
 - bin/couchdir
-- bin/couchview
 - examples/model
 - examples/model/example.rb
 - examples/word_count
@@ -81,45 +86,31 @@ files:
 - lib/couchrest/commands/push.rb
 - lib/couchrest/core
 - lib/couchrest/core/database.rb
+- lib/couchrest/core/design.rb
+- lib/couchrest/core/document.rb
 - lib/couchrest/core/model.rb
 - lib/couchrest/core/server.rb
+- lib/couchrest/core/view.rb
 - lib/couchrest/helper
-- lib/couchrest/helper/file_manager.rb
 - lib/couchrest/helper/pager.rb
 - lib/couchrest/helper/streamer.rb
-- lib/couchrest/helper/templates
-- lib/couchrest/helper/templates/example-map.js
-- lib/couchrest/helper/templates/example-reduce.js
-- lib/couchrest/helper/templates/index.html
 - lib/couchrest/monkeypatches.rb
 - lib/couchrest.rb
-- spec/couchapp_spec.rb
 - spec/couchrest
 - spec/couchrest/core
 - spec/couchrest/core/couchrest_spec.rb
 - spec/couchrest/core/database_spec.rb
+- spec/couchrest/core/design_spec.rb
+- spec/couchrest/core/document_spec.rb
 - spec/couchrest/core/model_spec.rb
 - spec/couchrest/helpers
-- spec/couchrest/helpers/file_manager_spec.rb
 - spec/couchrest/helpers/pager_spec.rb
 - spec/couchrest/helpers/streamer_spec.rb
 - spec/fixtures
 - spec/fixtures/attachments
 - spec/fixtures/attachments/couchdb.png
+- spec/fixtures/attachments/README
 - spec/fixtures/attachments/test.html
-- spec/fixtures/couchapp
-- spec/fixtures/couchapp/attachments
-- spec/fixtures/couchapp/attachments/index.html
-- spec/fixtures/couchapp/views
-- spec/fixtures/couchapp/views/example-map.js
-- spec/fixtures/couchapp/views/example-reduce.js
-- spec/fixtures/couchapp-test
-- spec/fixtures/couchapp-test/my-app
-- spec/fixtures/couchapp-test/my-app/attachments
-- spec/fixtures/couchapp-test/my-app/attachments/index.html
-- spec/fixtures/couchapp-test/my-app/views
-- spec/fixtures/couchapp-test/my-app/views/example-map.js
-- spec/fixtures/couchapp-test/my-app/views/example-reduce.js
 - spec/fixtures/views
 - spec/fixtures/views/lib.js
 - spec/fixtures/views/test_view
@@ -131,7 +122,7 @@ files:
 - spec/spec_helper.rb
 - utils/remap.rb
 - utils/subset.rb
-has_rdoc: "true"
+has_rdoc: true
 homepage: http://github.com/jchris/couchrest
 post_install_message: 
 rdoc_options: []

data/THANKS

@@ -1,15 +0,0 @@
-CouchRest THANKS
-=====================
-
-CouchRest was originally developed by J. Chris Anderson <jchris@grabb.it>
-and a number of other contributors. Many people further contributed to 
-CouchRest by reporting problems, suggesting various improvements or submitting
-changes. A list of these people is included below.
-
- * Greg Borenstein <http://ideasfordozens.com>
- * Geoffrey Grosenbach <http://nubyonrails.com/>
- * Simon Rozet <simon /at/ rozet /dot/ name>
-
-Patches are welcome. The primary source for this software project is:
-
-http://github.com/jchris/couchrest/tree/master

data/bin/couchapp

@@ -1,55 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'optparse'
-require File.expand_path(File.dirname(__FILE__)) + '/../lib/couchrest'
-
-options = {
-  :loud => true,
-}
-
-opts = OptionParser.new do |opts|
-  opts.banner = "Usage: #$0 [options] (push|pull|generate)"
-  opts.on('-q', '--quiet', "Omit extra debug info") do
-    options[:loud] = false
-  end
-  opts.on_tail('-h', '--help', "Display detailed help and exit") do
-    puts opts
-    exit
-  end
-end
-
-opts.parse!(ARGV)
-
-case ARGV.shift
-when /generate/
-  appname = ARGV.shift
-  current = Dir.getwd 
-  appdir = File.join(current, appname)
-  puts "generating couchapp in #{appdir}"
-  CouchRest::FileManager.generate_app(appdir)
-  
-when /push/
-  dirname = ARGV.shift
-  current = Dir.getwd 
-  dir = File.expand_path(File.join(current, dirname))
-  dirapp = File.split(dir).last
-  if ARGV.length == 2
-    appname = ARGV.shift
-    dbstring = ARGV.shift
-  elsif ARGV.length == 1
-    appname = dirapp
-    dbstring = ARGV.shift    
-  else
-    puts opts
-    puts "push dirname [appname] database"
-    exit(0)
-  end
-  dbspec = CouchRest.parse(dbstring)
-  fm = CouchRest::FileManager.new(dbspec[:database], dbspec[:host])
-  fm.push_app(dir, appname)
-when /pull/
-
-else
-  puts opts
-  puts "please specify a command"
-end

data/bin/couchview

@@ -1,48 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'optparse'
-require 'couchrest'
-
-%w(generate push).each do |file|
-  require File.dirname(__FILE__) + "/../lib/couchrest/commands/#{file}"
-end
-
-# Set defaults
-options = {
-  :loud => true,
-}
-
-opts = OptionParser.new do |opts|
-  opts.banner = "Usage: #$0 [options] (push|generate) directory database"
-  opts.on('-q', '--quiet', "Omit extra debug info") do
-    options[:loud] = false
-  end
-  opts.on_tail('-h', '--help [push|generate]', "Display detailed help and exit") do |help_command|
-    puts opts
-    case help_command
-    when "push"
-      puts CouchRest::Commands::Push.help
-    when "generate"
-      puts CouchRest::Commands::Generate.help
-    end
-    exit
-  end
-end
-opts.parse!(ARGV)
-
-options[:command]       = ARGV.shift
-options[:directory]     = ARGV.shift
-options[:trailing_args] = ARGV
-
-# There must be a better way to check for extra required args
-unless (["push", "generate"].include?(options[:command]) && options[:directory] && options[:trailing_args])
-  puts(opts)
-  exit
-end
-
-case options[:command]
-when "push"
-  CouchRest::Commands::Push.run(options)
-when "generate"
-  CouchRest::Commands::Generate.run(options)
-end

data/lib/couchrest/helper/file_manager.rb

@@ -1,285 +0,0 @@
-require 'digest/md5'
-
-module 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
-
-      doc["signatures"] ||= {}
-      doc["_attachments"] ||= {}
-      # 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" => MIMES[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
-    
-    def pull_views(view_dir)
-      prefix = "_design"
-      ds = db.documents(:startkey => '#{prefix}/', :endkey => '#{prefix}/ZZZZZZZZZ')
-      ds['rows'].collect{|r|r['id']}.each do |id|
-        puts directory = id.split('/').last
-        FileUtils.mkdir_p(File.join(view_dir,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(view_dir, 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(view_dir, directory, "#{g}-reduce.js") # todo support non-js views
-            File.open(reducefile,'w') do |f|
-              f.write reducefunc
-            end
-          end
-        end
-      end  
-      
-    end
-    
-    def push_app(appdir, appname)
-      libs = []
-      viewdir = File.join(appdir,"views")
-      attachdir = File.join(appdir,"attachments")
-      views, lang = read_design_views(viewdir)
-      # attachments = read_attachments(attachdir)
-      docid = "_design/#{appname}"
-      design = @db.get(docid) rescue {}
-      design['_id'] = docid
-      design['views'] = views
-      design['language'] = lang
-      @db.save(design)
-      push_directory(attachdir, docid)
-      # puts views.inspect
-    end
-    
-    # Generate an application in the given directory.
-    # This is a class method because it doesn't depend on 
-    # specifying a database.
-    def self.generate_app(app_dir)
-      FileUtils.mkdir_p(app_dir)
-      FileUtils.mkdir_p(File.join(app_dir,"attachments"))      
-      FileUtils.mkdir_p(File.join(app_dir,"views"))
-      
-      index_template = File.join(File.expand_path(File.dirname(__FILE__)), 'templates','index.html')
-      index_dest = File.join(app_dir,"attachments","index.html")
-      FileUtils.cp(index_template, index_dest)
-      
-      map_template = File.join(File.expand_path(File.dirname(__FILE__)), 'templates','example-map.js')
-      map_dest = File.join(app_dir,"views","example-map.js")
-      FileUtils.cp(map_template, map_dest)
-      
-      rereduce_template = File.join(File.expand_path(File.dirname(__FILE__)), 'templates','example-reduce.js')
-      rereduce_dest = File.join(app_dir,"views","example-reduce.js")
-      FileUtils.cp(rereduce_template, rereduce_dest)
-    end
-    
-    private
-    
-    def read_design_views(viewdir)
-      libs = []
-      language = nil
-      views = {}
-      Dir["#{viewdir}/*.*"].each do |viewfile|
-        view_parts = viewfile.split('/')
-        viewfile_name = view_parts.last
-        # example-map.js
-        viewfile_name_parts = viewfile_name.split('.')
-        viewfile_ext = viewfile_name_parts.last
-        view_name_parts = viewfile_name_parts.first.split('-')
-        func_type = view_name_parts.pop
-        view_name = view_name_parts.join('-')
-        contents = File.open(viewfile).read
-        if /^lib\..*$/.match viewfile_name
-          libs.push(contents)
-        else
-          views[view_name] ||= {}
-          language = LANGS[viewfile_ext]
-          views[view_name][func_type] = contents.sub(/(\/\/|#)include-lib/,libs.join("\n"))
-        end
-      end
-      [views, language]
-    end
-    
-    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 = existing.merge(fields)
-        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

data/lib/couchrest/helper/templates/example-map.js

@@ -1,8 +0,0 @@
-// an example map function, emits the doc id 
-// and the list of keys it contains
-
-function(doc) {
-  var k, keys = []
-  for (k in doc) keys.push(k);
-  emit(doc._id, keys);
-};

data/lib/couchrest/helper/templates/example-reduce.js

@@ -1,10 +0,0 @@
-// example reduce function to count the
-// number of rows in a given key range.
-
-function(keys, values, rereduce) {
-  if (rereduce) {
-    return sum(values);
-  } else {
-    return values.length;
-  }
-};

data/lib/couchrest/helper/templates/index.html

@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Generated CouchApp</title>
-    <link rel="stylesheet" href="screen.css" type="text/css">
-  </head>
-  <body>
-    <h1>Generated CouchApp</h1>
-    <ul id="view"></ul>
-  </body>
-  <script src="/_utils/script/json2.js"></script>
-  <script src="/_utils/script/jquery.js?1.2.6"></script>
-  <script src="/_utils/script/jquery.couch.js?0.8.0"></script>
-  <script type="text/javascript" charset="utf-8">
-    $(function() {
-      var dbname = document.location.href.split('/')[3];
-      var design = unescape(document.location.href.split('/')[4]).split('/')[1];
-      var DB = $.couch.db(dbname);
-      DB.view(design+"/example",{success: function(json) {
-        $("#view").html(json.rows.map(function(row) {
-          return '<li>'+row.key+'</li>';
-        }).join(''));
-      }});
-    });
-  </script>
-</html>

data/spec/couchapp_spec.rb

@@ -1,82 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe "couchapp" do
-  before(:all) do
-    @fixdir = FIXTURE_PATH + '/couchapp-test'
-    @couchapp = File.expand_path(File.dirname(__FILE__)) + '/../bin/couchapp'
-    `rm -rf #{@fixdir}`
-    `mkdir -p #{@fixdir}`
-    @run = "cd #{@fixdir} && #{@couchapp}"
-    
-  end
-
-  describe "--help" do
-    it "should output the opts" do
-      `#{@run} --help`.should match(/Usage/)
-    end
-  end
-
-  describe "generate my-app" do
-    it "should create an app directory" do
-      `#{@run} generate my-app`.should match(/generating/i)
-      Dir["#{@fixdir}/*"].select{|x|x =~ /my-app/}.length.should == 1
-    end
-    it "should create a views directory" do
-      `#{@run} generate my-app`.should match(/generating/i)
-      Dir["#{@fixdir}/my-app/*"].select{|x|x =~ /views/}.length.should == 1
-    end
-  end
-  
-  describe "push my-app #{TESTDB}" do
-    before(:all) do
-      @cr = CouchRest.new(COUCHHOST)
-      @db = @cr.database(TESTDB)
-      @db.delete! rescue nil
-      @db = @cr.create_db(TESTDB) rescue nil
-      `#{@run} generate my-app`
-    end
-    it "should create the design document with the app name" do
-      `#{@run} push my-app #{TESTDB}`
-      lambda{@db.get("_design/my-app")}.should_not raise_error
-    end
-    it "should create the views" do
-      `#{@run} push my-app #{TESTDB}`
-      doc = @db.get("_design/my-app")
-      doc['views']['example']['map'].should match(/function/)
-    end
-    it "should create the index" do
-      `#{@run} push my-app #{TESTDB}`
-      doc = @db.get("_design/my-app")
-      doc['_attachments']['index.html']["content_type"].should == 'text/html'
-    end
-  end
-
-  describe "push . #{TESTDB}" do
-    before(:all) do
-      @cr = CouchRest.new(COUCHHOST)
-      @db = @cr.database(TESTDB)
-      @db.delete! rescue nil
-      @db = @cr.create_db(TESTDB) rescue nil
-      `#{@run} generate my-app`
-    end
-    it "should create the design document" do
-      `cd #{@fixdir}/my-app && #{@couchapp} push . #{TESTDB}`
-      lambda{@db.get("_design/my-app")}.should_not raise_error
-    end
-  end
-  
-  describe "push my-app my-design #{TESTDB}" do
-    before(:all) do
-      @cr = CouchRest.new(COUCHHOST)
-      @db = @cr.database(TESTDB)
-      @db.delete! rescue nil
-      @db = @cr.create_db(TESTDB) rescue nil
-      `#{@run} generate my-app`
-    end
-    it "should create the design document" do
-      `#{@run} push my-app my-design #{TESTDB}`
-      lambda{@db.get("_design/my-design")}.should_not raise_error
-    end
-  end
-end
-