makura 2009.05.27 → 2010.08

data/AUTHORS

@@ -0,0 +1,6 @@
+Following persons have contributed to makura.
+(Sorted by number of submitted patches, then alphabetically)
+
+    71 Michael Fellinger <m.fellinger@gmail.com>
+     7 Tadahiko Uehara <kikofx@gmail.com>
+     2 Preston Marshall <preston@synergy-solutions.biz>

data/MANIFEST

@@ -1,9 +1,12 @@
+AUTHORS
 CHANGELOG
 COPYING
 MANIFEST
 README.md
 Rakefile
 bin/makura
+doc/AUTHORS
+doc/CHANGELOG
 example/blog.rb
 example/couch/map/author_all.js
 example/couch/map/author_posts.js
@@ -29,6 +32,7 @@ tasks/changelog.rake
 tasks/copyright.rake
 tasks/gem.rake
 tasks/gem_installer.rake
+tasks/gem_setup.rake
 tasks/git.rake
 tasks/grancher.rake
 tasks/manifest.rake
@@ -36,6 +40,7 @@ tasks/metric_changes.rake
 tasks/rcov.rake
 tasks/release.rake
 tasks/reversion.rake
+tasks/setup.rake
 tasks/todo.rake
 tasks/traits.rake
 tasks/yard.rake

data/Rakefile

@@ -6,7 +6,7 @@ require 'date'
 
 PROJECT_SPECS = Dir['spec/**/*.rb']
 PROJECT_MODULE = 'Makura'
-PROJECT_VERSION = ENV['VERSION'] || Date.today.strftime("%Y.%m.%d")
+PROJECT_VERSION = ENV['VERSION'].dup || Date.today.strftime("%Y.%m.%d")
 
 GEMSPEC = Gem::Specification.new{|s|
   s.name         = 'makura'

data/doc/AUTHORS

@@ -0,0 +1,6 @@
+Following persons have contributed to makura.
+(Sorted by number of submitted patches, then alphabetically)
+
+    79 Michael Fellinger <m.fellinger@gmail.com>
+     8 Tadahiko Uehara <kikofx@gmail.com>
+     2 Preston Marshall <preston@synergy-solutions.biz>

data/doc/CHANGELOG

@@ -0,0 +1,378 @@
+[1f2647f | Tue Aug 03 05:32:53 UTC 2010] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2010.08
+
+[2f92913 | Tue Aug 03 05:32:36 UTC 2010] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove last jquery reference
+
+[3e9ccc2 | Tue Aug 03 05:26:53 UTC 2010] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Update tasks
+
+[8a3f06f | Fri Jul 16 04:55:40 UTC 2010] Tadahiko Uehara <kikofx@gmail.com>
+
+  * Remove reduce parameter to prevent 'Invalid URL parameter' error.
+
+    See https://issues.apache.org/jira/browse/COUCHDB-383#action_12722350
+
+[a5c7b82 | Wed May 27 06:25:54 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix url for Model#multi_fetch
+
+[9c9f8b3 | Wed May 27 06:25:40 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * The model namespace now directly translates into the couch/ structure, Foo::Bar#duh becomes couch/map/foo/bar/duh.js
+
+[3dc3e54 | Wed May 27 06:24:38 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix issue with layout on 1.9
+
+[14cf088 | Wed May 27 02:29:08 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * forgot AUTHORS
+
+[752081e | Wed May 27 02:28:46 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2009.05.27
+
+[d4565ac | Wed May 27 02:23:09 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix rakefile
+
+[33f27af | Wed May 27 02:21:44 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Update tasks
+
+[4fd7977 | Mon May 11 03:52:51 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Revert changes to get going on 0.9.0
+
+[255e65c | Tue Apr 21 17:14:06 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2009.04.22
+
+[307642a | Tue Apr 21 17:12:55 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add Makura::constant and use it in convert_raw
+
+[e6370eb | Tue Apr 21 17:10:12 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Make Makura run on 1.8 again
+
+[4f8cc31 | Tue Apr 21 17:09:59 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix references to _view
+
+[513495b | Tue Apr 21 06:15:47 UTC 2009] Tadahiko Uehara <kikofx@gmail.com>
+
+  * Make convert_raw work with namespaced model.
+
+[e2eee79 | Sun Apr 19 04:58:12 UTC 2009] Tadahiko Uehara <kikofx@gmail.com>
+
+  * Support for namespaced models by using namespace as layout's dir name.
+
+            MyApp::Admin::Foo #=> .couch/my_app/admin/map/foo_xxx.js
+
+[8c9aa24 | Sat Mar 28 08:01:56 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2009.03.28
+
+[da5cebc | Sat Mar 28 08:00:13 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Put version in another file for easier management
+
+[534a2bc | Sat Mar 28 07:59:15 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add Rakefile and some tasks
+
+[643fa64 | Sun Mar 01 13:23:15 UTC 2009] Tadahiko Uehara <kikofx@gmail.com>
+
+  * Use Array() instead of to_a for Ruby 1.9 compatibility.
+
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[3d77ce6 | Sat Mar 21 05:07:04 UTC 2009] Preston Marshall <preston@synergy-solutions.biz>
+
+  * new gem
+
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[9eb26bb | Sat Mar 21 05:00:38 UTC 2009] Preston Marshall <preston@synergy-solutions.biz>
+
+  * Updated view path for latest svn (not sure when it was added, but it works with this) temp views may be affected too, but have not tried them yet
+
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[6b23e9c | Sat Mar 21 17:00:04 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * remove Model#saved?, that makes Model#save work as expected
+
+[c83c392 | Sat Mar 21 16:55:57 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove last traces of NotNaughty from example
+
+[19a63b5 | Mon Mar 02 01:08:08 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix inspect for Database
+
+[5ae5345 | Sun Mar 01 14:23:15 UTC 2009] Tadahiko Uehara <kikofx@gmail.com>
+
+  * Use Array() instead of to_a for Ruby 1.9 compatibility.
+
+[1ff34ab | Sat Feb 28 14:24:53 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Shame on me, forgot to add that change... will push new version tomorrow
+
+    Signed-off-by: Tadahiko Uehara <kikofX@gmail.com>
+
+[dfc353a | Sat Feb 28 14:23:39 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2009.03.01, removed json gem dependency as ruby 1.9.1 has it in stdlib
+
+    Signed-off-by: Tadahiko Uehara <kikofX@gmail.com>
+
+[29fe7ec | Sat Feb 28 15:24:53 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Shame on me, forgot to add that change... will push new version tomorrow
+
+[349be0a | Sat Feb 28 15:23:39 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2009.03.01, removed json gem dependency as ruby 1.9.1 has it in stdlib
+
+[ad1a97d | Mon Feb 23 00:51:19 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Proper fallback to default_language
+
+    Signed-off-by: Tadahiko Uehara <kikofX@gmail.com>
+
+[4b89942 | Mon Feb 16 07:32:02 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Some docs for localize plugin
+
+    Signed-off-by: Tadahiko Uehara <kikofX@gmail.com>
+
+[b79a538 | Mon Feb 16 07:31:55 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Support for default language in localize plugin
+
+    Signed-off-by: Tadahiko Uehara <kikofX@gmail.com>
+
+[de84c8b | Wed Feb 18 01:45:30 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Update version
+
+    Signed-off-by: Tadahiko Uehara <kikofX@gmail.com>
+
+[4d4a4c1 | Mon Feb 16 07:24:51 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add plugin/localize
+
+    Signed-off-by: Tadahiko Uehara <kikofX@gmail.com>
+
+[83e9177 | Mon Feb 23 01:51:19 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Proper fallback to default_language
+
+[a72c2c6 | Wed Feb 18 02:45:30 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Update version
+
+[1feac5a | Mon Feb 16 08:32:02 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Some docs for localize plugin
+
+[4ab5df7 | Mon Feb 16 08:31:55 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Support for default language in localize plugin
+
+[cd045a1 | Mon Feb 16 08:24:51 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add plugin/localize
+
+[fddd7aa | Fri Feb 13 05:41:25 UTC 2009] Tadahiko Uehara <kikofx@gmail.com>
+
+  * fix typo.
+
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[5469f31 | Fri Feb 13 06:41:25 UTC 2009] Tadahiko Uehara <kikofx@gmail.com>
+
+  * fix typo.
+
+[025964f | Thu Jan 15 02:35:37 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Sofa is now called Makura
+
+[e8bfaf9 | Mon Dec 29 17:09:46 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Don't rely on NotNaughty!
+
+[fb10169 | Wed Dec 24 04:56:55 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Release 2008.12.24
+
+[e4b2a88 | Wed Dec 24 04:56:29 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Layout::PATH
+
+[2156ed1 | Wed Dec 24 04:55:37 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove Rack as dependency
+
+[b9a9724 | Sun Dec 21 08:51:18 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Support for map/reduce templating
+
+[411786e | Fri Dec 19 12:08:11 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Better error message if resource not found
+
+[6579ae3 | Tue Dec 16 02:57:40 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix usage of pretty_from_md5
+
+[514c7d6 | Mon Dec 15 07:03:43 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Update gemspec
+
+[05640a9 | Mon Dec 15 07:03:02 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove dependency on not_naughty
+
+[c72821d | Mon Dec 15 07:02:44 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Convert MD5 from CouchDB uuid generator into base 62
+
+[405d360 | Sun Dec 14 06:40:52 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Implement Model#hash and Model#eql?
+
+[87c709e | Sat Dec 13 04:18:14 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Model::multi_fetch and Model::multi_fetch_with_docs
+
+[7e369ed | Fri Dec 12 06:27:34 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Ignore nil value parameters for the uri
+
+[5decf5c | Fri Dec 12 06:03:28 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Rescue correct error on Model::[]
+
+[bc28450 | Thu Dec 11 10:11:57 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Disable caching automatically if memcached isn't available
+
+[aea3dd7 | Wed Dec 10 14:45:16 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add Model#detach to get rid of attachments
+
+[1705ad2 | Mon Dec 08 05:31:11 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * CACHE_TTL is now 5 by default
+
+[e6aa3f9 | Thu Dec 04 08:31:07 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Make only one request per relation
+
+[c47cea0 | Thu Dec 04 08:30:39 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add Model#to_json
+
+[aceb7e7 | Thu Dec 04 08:30:18 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add support for caching GET requests in memcached
+
+[c055759 | Thu Dec 04 05:36:15 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * a little bit better error handling
+
+[204f003 | Wed Dec 03 02:49:13 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2008.12.03
+
+[2eec148 | Mon Dec 01 15:58:20 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Avoid storing empty maps, bad bad mojo
+
+[617b9f6 | Sat Nov 29 06:53:53 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2008.11.29
+
+[cbe43fa | Sat Nov 29 06:53:14 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove debugging output
+
+[67f811e | Fri Nov 28 07:52:46 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Compensate for a bug in couch_httpd_view.erl
+
+[ba95c06 | Fri Nov 28 07:51:56 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Automatic conversion of Time, new :type parameter for property
+
+[2b2cffd | Fri Nov 28 07:51:19 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Allow Database#[]= to save docs
+
+[9b2ab26 | Thu Nov 27 13:57:39 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Update gemspec, correct files
+
+[3c0541b | Thu Nov 27 13:11:22 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Plugin functionality and pager plugin
+
+[22840cb | Thu Nov 27 13:10:57 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Allow layout :map => source, :reduce => source
+
+[ae9aeb5 | Thu Nov 27 13:10:08 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Model::view_with_docs to take advantage of include_docs
+
+[8a5e7ca | Thu Nov 27 10:30:48 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2008.11.27
+
+[753cfa7 | Thu Nov 27 10:26:28 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * add bin/sofa for quick debugging sessions
+
+[d2a0886 | Thu Nov 27 10:26:07 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Small refactor
+
+[b1bdaf0 | Tue Nov 25 10:44:05 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Enable cloning
+
+[09dea66 | Tue Nov 25 09:57:15 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * add encode_attachments
+
+[3277f11 | Tue Nov 25 09:31:04 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Adding MIT license
+
+[f6dd8ef | Tue Nov 25 09:30:35 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Document some of Sofa::Server
+
+[3f0bc71 | Tue Nov 25 09:30:22 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Make relations sane
+
+[041dfd1 | Tue Nov 25 09:29:57 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Expand and document Sofa::Database
+
+[032b958 | Tue Nov 25 09:29:01 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Better errors
+
+[0bd7246 | Fri Nov 21 12:07:47 UTC 2008] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Inaugral commit
+

data/lib/makura/layout.rb

@@ -40,7 +40,7 @@ module Makura
       if file_or_function =~ /function\(.*\)/
         function = file_or_function
       else
-        parts = file_or_function.split('::')
+        parts = file_or_function.to_s.split('::')
         file = parts.pop
         filename = File.join(parts, type.to_s, "#{file}.js")
 

data/lib/makura/model.rb

@@ -246,12 +246,13 @@ module Makura
 
       def layout(name, opts = {})
         design[name] = layout = Layout.new(name, design)
-        unless opts[:map] or opts[:reduce]
-          prefix = self.name.gsub(/\B[A-Z][^A-Z]/, '_\&')
+
+        unless opts[:map] || opts[:reduce]
+          prefix = self.name.gsub('::', '/')
         end
 
-        map_name    = opts[:map]    || "#{prefix}_#{name}".downcase
-        reduce_name = opts[:reduce] || "#{prefix}_#{name}".downcase
+        map_name    = opts[:map]    || "#{prefix}/#{name}".downcase
+        reduce_name = opts[:reduce] || "#{prefix}/#{name}".downcase
 
         layout.load_map(map_name)
         layout.load_reduce(reduce_name)
@@ -320,12 +321,12 @@ module Makura
       def multi_fetch(name, opts = {})
         keys = opts.delete(:keys) || opts.delete('keys')
         opts.merge!(:payload => {'keys' => Array(keys)})
-        hash = database.post("_view/#{self}/#{name}", opts)
+        hash = database.post("#{Makura.escape(self)}/_view/#{name}", opts)
         convert_raw(hash['rows'])
       end
 
       def multi_fetch_with_docs(name, opts = {})
-        opts.merge!(:include_docs => true, :reduce => false)
+        opts.merge!(:include_docs => true)
         multi_fetch(name, opts)
       end
       alias multi_document_fetch multi_fetch_with_docs
@@ -335,7 +336,7 @@ module Makura
       # To make using this approach more convenient use this method.
 
       def view_with_docs(name, opts = {})
-        opts.merge!(:include_docs => true, :reduce => false)
+        opts.merge!(:include_docs => true)
         view(name, opts)
       end
 

data/lib/makura/version.rb

@@ -1,3 +1,3 @@
 module Makura
-  VERSION = "2009.05.27"
+  VERSION = "2010.08"
 end

data/makura.gemspec

@@ -2,25 +2,25 @@
 
 Gem::Specification.new do |s|
   s.name = %q{makura}
-  s.version = "2009.05.27"
+  s.version = "2010.08"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael 'manveru' Fellinger"]
-  s.date = %q{2009-05-27}
+  s.date = %q{2010-08-03}
   s.default_executable = %q{makura}
   s.email = %q{m.fellinger@gmail.com}
   s.executables = ["makura"]
-  s.files = ["CHANGELOG", "COPYING", "MANIFEST", "README.md", "Rakefile", "bin/makura", "example/blog.rb", "example/couch/map/author_all.js", "example/couch/map/author_posts.js", "example/couch/map/post_all.js", "example/couch/map/post_comments.js", "example/couch/reduce/sum_length.js", "lib/makura.rb", "lib/makura/database.rb", "lib/makura/design.rb", "lib/makura/error.rb", "lib/makura/http_methods.rb", "lib/makura/layout.rb", "lib/makura/model.rb", "lib/makura/plugin/localize.rb", "lib/makura/plugin/pager.rb", "lib/makura/server.rb", "lib/makura/uuid_cache.rb", "lib/makura/version.rb", "makura.gemspec", "tasks/authors.rake", "tasks/bacon.rake", "tasks/changelog.rake", "tasks/copyright.rake", "tasks/gem.rake", "tasks/gem_installer.rake", "tasks/git.rake", "tasks/grancher.rake", "tasks/manifest.rake", "tasks/metric_changes.rake", "tasks/rcov.rake", "tasks/release.rake", "tasks/reversion.rake", "tasks/todo.rake", "tasks/traits.rake", "tasks/yard.rake", "tasks/ycov.rake"]
+  s.files = ["AUTHORS", "CHANGELOG", "COPYING", "MANIFEST", "README.md", "Rakefile", "bin/makura", "doc/AUTHORS", "doc/CHANGELOG", "example/blog.rb", "example/couch/map/author_all.js", "example/couch/map/author_posts.js", "example/couch/map/post_all.js", "example/couch/map/post_comments.js", "example/couch/reduce/sum_length.js", "lib/makura.rb", "lib/makura/database.rb", "lib/makura/design.rb", "lib/makura/error.rb", "lib/makura/http_methods.rb", "lib/makura/layout.rb", "lib/makura/model.rb", "lib/makura/plugin/localize.rb", "lib/makura/plugin/pager.rb", "lib/makura/server.rb", "lib/makura/uuid_cache.rb", "lib/makura/version.rb", "makura.gemspec", "tasks/authors.rake", "tasks/bacon.rake", "tasks/changelog.rake", "tasks/copyright.rake", "tasks/gem.rake", "tasks/gem_installer.rake", "tasks/gem_setup.rake", "tasks/git.rake", "tasks/grancher.rake", "tasks/manifest.rake", "tasks/metric_changes.rake", "tasks/rcov.rake", "tasks/release.rake", "tasks/reversion.rake", "tasks/setup.rake", "tasks/todo.rake", "tasks/traits.rake", "tasks/yard.rake", "tasks/ycov.rake"]
   s.homepage = %q{http://github.com/manveru/makura}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.3}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Ruby wrapper around the CouchDB REST API.}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rest-client>, [">= 0.8.1"])
     else
       s.add_dependency(%q<rest-client>, [">= 0.8.1"])

data/tasks/authors.rake

@@ -1,25 +1,12 @@
-# Once git has a fix for the glibc in handling .mailmap and another fix for
-# allowing empty mail address to be mapped in .mailmap we won't have to handle
-# them manually.
-
-desc 'Update AUTHORS'
+desc 'Update doc/AUTHORS'
 task :authors do
   authors = Hash.new(0)
 
   `git shortlog -nse`.scan(/(\d+)\s(.+)\s<(.*)>$/) do |count, name, email|
-    case name
-    when "ahoward"
-      name, email = "Ara T. Howard", "ara.t.howard@gmail.com"
-    when "Martin Hilbig blueonyx@dev-area.net"
-      name, email = "Martin Hilbig", "blueonyx@dev-area.net"
-    when "Michael Fellinger m.fellinger@gmail.com"
-      name, email = "Michael Fellinger", "m.fellinger@gmail.com"
-    end
-
     authors[[name, email]] += count.to_i
   end
 
-  File.open('AUTHORS', 'w+') do |io|
+  File.open('doc/AUTHORS', 'w+') do |io|
     io.puts "Following persons have contributed to #{GEMSPEC.name}."
     io.puts '(Sorted by number of submitted patches, then alphabetically)'
     io.puts ''

data/tasks/bacon.rake

@@ -1,5 +1,5 @@
 desc 'Run all bacon specs with pretty output'
-task :bacon => :install_dependencies do
+task :bacon => :setup do
   require 'open3'
   require 'scanf'
   require 'matrix'
@@ -16,16 +16,22 @@ task :bacon => :install_dependencies do
   left_format = "%4d/%d: %-#{len + 11}s"
   spec_format = "%d specifications (%d requirements), %d failures, %d errors"
 
+  load_path = File.expand_path('../../lib', __FILE__)
+
   specs.each_with_index do |spec, idx|
     print(left_format % [idx + 1, specs_size, spec])
 
-    Open3.popen3(RUBY, spec) do |sin, sout, serr|
+    Open3.popen3(RUBY, '-I', load_path, spec) do |sin, sout, serr|
       out = sout.read.strip
       err = serr.read.strip
 
-      # this is conventional, see spec/innate/state/fiber.rb for usage
+      # this is conventional
       if out =~ /^Bacon::Error: (needed .*)/
         puts(yellow % ("%6s %s" % ['', $1]))
+      elsif out =~ /^Spec (precondition: "[^"]*" failed)/
+        puts(yellow % ("%6s %s" % ['', $1]))
+      elsif out =~ /^Spec require: "require" failed: "(no such file to load -- [^"]*)"/
+        puts(yellow % ("%6s %s" % ['', $1]))
       else
         total = nil
 

data/tasks/changelog.rake

@@ -1,13 +1,15 @@
 desc 'update changelog'
 task :changelog do
-  File.open('CHANGELOG', 'w+') do |changelog|
+  File.open('doc/CHANGELOG', 'w+') do |changelog|
     `git log -z --abbrev-commit`.split("\0").each do |commit|
       next if commit =~ /^Merge: \d*/
       ref, author, time, _, title, _, message = commit.split("\n", 7)
       ref    = ref[/commit ([0-9a-f]+)/, 1]
       author = author[/Author: (.*)/, 1].strip
       time   = Time.parse(time[/Date: (.*)/, 1]).utc
-      title.strip!
+      time   = time.strftime('%a %b %d %H:%M:%S %Z %Y')
+
+      title = title.to_s.strip
 
       changelog.puts "[#{ref} | #{time}] #{author}"
       changelog.puts '', "  * #{title}"

data/tasks/gem_setup.rake

@@ -0,0 +1,112 @@
+task :gem_setup do
+  class GemSetup
+    def initialize(options = {}, &block)
+      @gems = []
+      @options = options.dup
+      @verbose = @options.delete(:verbose)
+
+      run(&block)
+    end
+
+    def run(&block)
+      return unless block_given?
+      instance_eval(&block)
+      setup
+    end
+
+    def gem(name, version = nil, options = {})
+      if version.respond_to?(:merge!)
+        options = version
+      else
+        options[:version] = version
+      end
+
+      @gems << [name, options]
+    end
+
+    # all gems defined, let's try to load/install them
+    def setup
+      require 'rubygems'
+      require 'rubygems/dependency_installer'
+
+      @gems.each do |name, options|
+        setup_gem(name, options)
+      end
+    end
+
+    def setup_gemspec(gemspec)
+      gemspec.dependencies.each do |dependency|
+        dependency.version_requirements.as_list.each do |version|
+          gem(dependency.name, version)
+        end
+      end
+
+      setup
+    end
+
+    # First try to activate.
+    # If activation fails, try to install and activate again.
+    # If the second activation also fails, try to require as it may just as
+    # well be in $LOAD_PATH.
+    def setup_gem(name, options)
+      version = [options[:version]].compact
+      lib_name = options[:lib] || name
+
+      log "activating #{name}"
+
+      Gem.activate(name, *version)
+    rescue Gem::LoadError
+      log "activating #{name} failed, try to install"
+
+      install_gem(name, version, options)
+    end
+
+    # tell rubygems to install a gem
+    def install_gem(name, version, options)
+      installer = Gem::DependencyInstaller.new(options)
+
+      temp_argv(options[:extconf]) do
+        log "installing #{name}"
+        installer.install(name, *version)
+      end
+
+      Gem.activate(name, *version)
+
+      log "install and final activation successful"
+    rescue Gem::GemNotFoundException => ex
+      log "installation failed: #{ex}, use normal require"
+
+      require(options[:lib] || name)
+
+      log "require successful, cannot verify version though"
+    end
+
+    # prepare ARGV for rubygems installer
+    def temp_argv(extconf)
+      if extconf ||= @options[:extconf]
+        old_argv = ARGV.clone
+        ARGV.replace(extconf.split(' '))
+      end
+
+      yield
+
+    ensure
+      ARGV.replace(old_argv) if extconf
+    end
+
+    private
+
+    def log(msg)
+      return unless @verbose
+
+      if defined?(Log)
+        Log.info(msg)
+      else
+        puts(msg)
+      end
+    end
+
+    def rubyforge; 'http://gems.rubyforge.org/' end
+    def github; 'http://gems.github.com/' end
+  end
+end

data/tasks/metric_changes.rake

@@ -7,26 +7,18 @@ namespace :metric do
 
     print 'counting changes '
 
-    Dir.glob 'lib/**/*.rb' do |rb|
-      count = `git log --pretty=oneline '#{rb}'`.count("\n")
+    Dir['lib/**/*.rb'].each do |rb|
+      changes = `git-log --pretty=oneline '#{rb}'`.count("\n")
       print '.'
       # out[changes, rb]
-      changes[rb] = count
+      changes[rb] = changes
     end
     puts ' done.'
 
     sorted = changes.sort_by{|r,c| c }.reverse
-
-    top = sorted.first(20)
-    unless top.empty?
-      puts "Top 20:"
-      top.each{|(r,c)| out[c,r] }
-    end
-
-    bottom = sorted.last(20) - top
-    unless bottom.empty?
-      puts "Bottom 20:"
-      bottom.each{|(r,c)| out[c,r] }
-    end
+    puts "Top 20:"
+    sorted.first(20).each{|(r,c)| out[c,r] }
+    puts "Bottom 20:"
+    sorted.last(20).each{|(r,c)| out[c,r] }
   end
 end

data/tasks/release.rake

@@ -1,69 +1,65 @@
 namespace :release do
-  task :all => [:release_github, :release_rubyforge]
+  task :prepare => %w[reversion authors gemspec]
+  task :all => %w[release:github release:rubyforge release:gemcutter]
 
-  desc 'Display instructions to release on github'
-  task :github => [:reversion, :gemspec] do
+  desc 'Release on github'
+  task :github => :prepare do
     name, version = GEMSPEC.name, GEMSPEC.version
 
-    puts <<INSTRUCTIONS
-First add the relevant files:
+    sh('git', 'add',
+       'MANIFEST', 'doc/CHANGELOG', 'doc/AUTHORS',
+       "#{name}.gemspec",
+       "lib/#{name}/version.rb")
 
-git add MANIFEST CHANGELOG #{name}.gemspec lib/#{name}/version.rb
+    puts <<-INSTRUCTIONS
+================================================================================
 
-Then commit them, tag the commit, and push:
+I added the relevant files, you can commit them, tag the commit, and push:
 
 git commit -m 'Version #{version}'
 git tag -a -m '#{version}' '#{version}'
 git push
 
-INSTRUCTIONS
-
+================================================================================
+    INSTRUCTIONS
   end
 
-  # TODO: Not tested
-  desc 'Display instructions to release on rubyforge'
-  task :rubyforge => [:reversion, :gemspec, :package] do
+  desc 'Release on rubyforge'
+  task :rubyforge => ['release:prepare', :package] do
     name, version = GEMSPEC.name, GEMSPEC.version
 
-    puts <<INSTRUCTIONS
+    pkgs = Dir["pkg/#{name}-#{version}.{tgz,zip}"].map{|file|
+      "rubyforge add_file #{name} #{name} '#{version}' '#{file}'"
+    }
+
+    puts <<-INSTRUCTIONS
+================================================================================
+
 To publish to rubyforge do following:
 
 rubyforge login
-rubyforge add_release #{name} #{name} #{version} pkg/#{name}-#{version}.gem
+rubyforge add_release #{name} #{name} '#{version}' pkg/#{name}-#{version}.gem
 
-After you have done these steps, see:
+To publish the archives for distro packagers:
 
-rake release:rubyforge_archives
+#{pkgs.join "\n"}
 
-INSTRUCTIONS
+================================================================================
+    INSTRUCTIONS
   end
 
-  desc 'Display instructions to add archives after release:rubyforge'
-  task :rubyforge_archives do
-    release_id = latest_release_id
-
-    puts "Adding archives for distro packagers is:", ""
-
-    Dir["pkg/#{name}-#{version}.{gz,zip}"].each do |file|
-      puts "rubyforge add_file #{name} #{name} #{release_id} '#{file}'"
-    end
+  desc 'Release on gemcutter'
+  task :gemcutter => ['release:prepare', :package] do
+    name, version = GEMSPEC.name, GEMSPEC.version
 
-    puts
-  end
-end
+    puts <<-INSTRUCTIONS
+================================================================================
 
-# Use URI and proper XPATH, something along these lines:
-#
-# a = doc.at('a[@href=~"release_id"]')[:href]
-# release_id = URI(a).query[/release_id=(\w+)/, 1]
-def latest_release_id
-  require 'open-uri'
-  require 'hpricot'
+To publish to gemcutter do following:
 
-  url = "http://rubyforge.org/frs/?group_id=#{PROJECT_RUBYFORGE_GROUP_ID}"
-  doc = Hpricot(open(url))
-  a = (doc/:a).find{|a| a[:href] =~ /release_id/}
+gem push pkg/#{name}-#{version}.gem
 
-  version = a.inner_html
-  release_id = Hash[*a[:href].split('?').last.split('=').flatten]['release_id']
+================================================================================
+    INSTRUCTIONS
+  end
 end

data/tasks/setup.rake

@@ -0,0 +1,12 @@
+desc 'install all possible dependencies'
+task :setup => [:gem_setup] do
+  GemSetup.new :verbose => false do
+    DEPENDENCIES.each do |name, options|
+      gem(name, options)
+    end
+
+    DEVELOPMENT_DEPENDENCIES.each do |name, options|
+      gem(name, options)
+    end
+  end
+end

data/tasks/todo.rake

@@ -1,6 +1,6 @@
 desc "show a todolist from all the TODO tags in the source"
 task :todo do
-  Dir.glob '{lib,spec}/**/*.rb' do |file|
+  Dir.glob('{lib,spec}/**/*.rb') do |file|
     lastline = todo = comment = long_comment = false
 
     File.readlines(file).each_with_index do |line, lineno|
@@ -8,7 +8,7 @@ task :todo do
       comment = line =~ /^\s*?#.*?$/
       long_comment = line =~ /^=begin/
       long_comment = line =~ /^=end/
-      todo = true if line =~ /TODO/ and (long_comment or comment)
+      todo = true if line =~ /TODO|FIXME|THINK/ and (long_comment or comment)
       todo = false if line.gsub('#', '').strip.empty?
       todo = false unless comment or long_comment
       if todo

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: makura
 version: !ruby/object:Gem::Version 
-  version: 2009.05.27
+  hash: 8051
+  prerelease: false
+  segments: 
+  - 2010
+  - 8
+  version: "2010.08"
 platform: ruby
 authors: 
 - Michael 'manveru' Fellinger
@@ -9,19 +14,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-27 00:00:00 +09:00
+date: 2010-08-03 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 61
+        segments: 
+        - 0
+        - 8
+        - 1
         version: 0.8.1
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: 
 email: m.fellinger@gmail.com
 executables: 
@@ -31,12 +42,15 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- AUTHORS
 - CHANGELOG
 - COPYING
 - MANIFEST
 - README.md
 - Rakefile
 - bin/makura
+- doc/AUTHORS
+- doc/CHANGELOG
 - example/blog.rb
 - example/couch/map/author_all.js
 - example/couch/map/author_posts.js
@@ -62,6 +76,7 @@ files:
 - tasks/copyright.rake
 - tasks/gem.rake
 - tasks/gem_installer.rake
+- tasks/gem_setup.rake
 - tasks/git.rake
 - tasks/grancher.rake
 - tasks/manifest.rake
@@ -69,6 +84,7 @@ files:
 - tasks/rcov.rake
 - tasks/release.rake
 - tasks/reversion.rake
+- tasks/setup.rake
 - tasks/todo.rake
 - tasks/traits.rake
 - tasks/yard.rake
@@ -83,21 +99,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.3
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper around the CouchDB REST API.