manveru-makura 2009.03.28 → 2009.04.22

data/CHANGELOG

@@ -0,0 +1,324 @@
+[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/MANIFEST

@@ -0,0 +1,35 @@
+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/bacon.rake
+tasks/changelog.rake
+tasks/gem.rake
+tasks/gem_installer.rake
+tasks/grancher.rake
+tasks/install_dependencies.rake
+tasks/manifest.rake
+tasks/rcov.rake
+tasks/release.rake
+tasks/reversion.rake

data/lib/makura.rb

@@ -57,6 +57,10 @@ module Makura
     end
     i.to_s(16)
   end
+
+  def constant(name, root = Module)
+    name.split('::').inject(root){|s,v| s.const_get(v) }
+  end
 end
 
 Sofa = Makura # be backwards compatible

data/lib/makura/database.rb

@@ -144,7 +144,7 @@ module Makura
     end
 
     def view(layout, params = {})
-      get("_design/#{layout}", params)
+      get("_view/#{layout}", params)
     end
 
     def save(doc)

data/lib/makura/layout.rb

@@ -34,20 +34,22 @@ module Makura
       common_load(:reduce, file_or_function)
     end
 
-    def common_load(root, file_or_function)
+    def common_load(type, file_or_function)
       return unless file_or_function
 
       if file_or_function =~ /function\(.*\)/
         function = file_or_function
       else
-        filename = "#{root}/#{file_or_function}.js"
+        parts = file_or_function.split('::')
+        file = parts.pop
+        filename = File.join(parts, type.to_s, "#{file}.js")
 
         if pathname = PATH.find{|pa| File.file?(File.join(pa, filename)) }
           function = File.read(File.join(pathname, filename))
         end
       end
 
-      instance_variable_set("@#{root}", function) if function
+      instance_variable_set("@#{type}", function) if function
     end
 
     def save

data/lib/makura/model.rb

@@ -246,9 +246,12 @@ 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]/, '_\&')
+        end
 
-        map_name    = opts[:map]    || "#{self.name}_#{name}".downcase
-        reduce_name = opts[:reduce] || "#{self.name}_#{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)
@@ -340,7 +343,7 @@ module Makura
 
       def view(name, opts = {})
         flat = opts.delete(:flat)
-        hash = database.view("#{self}/_view/#{name}", opts)
+        hash = database.view("#{Makura.escape(self)}/#{name}", opts)
 
         convert_raw(hash['rows'], flat)
       end
@@ -350,8 +353,8 @@ module Makura
           value = row['doc'] || row['value']
 
           if value.respond_to?(:to_hash)
-            if type = value['type'] and not flat
-              const_get(type).new(value)
+            if not flat and type = value['type']
+              Makura.constant(type).new(value)
             else
               row
             end

data/lib/makura/version.rb

@@ -1,3 +1,3 @@
 module Makura
-  VERSION = "2009.03.28"
+  VERSION = "2009.04.22"
 end

data/makura.gemspec

@@ -2,25 +2,25 @@
 
 Gem::Specification.new do |s|
   s.name = %q{makura}
-  s.version = "2009.03.28"
+  s.version = "2009.04.22"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael 'manveru' Fellinger"]
-  s.date = %q{2009-03-28}
+  s.date = %q{2009-04-22}
   s.default_executable = %q{makura}
   s.description = %q{Ruby wrapper around the CouchDB REST API.}
   s.email = %q{m.fellinger@gmail.com}
   s.executables = ["makura"]
-  s.files = ["COPYING", "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/bacon.rake", "tasks/changelog.rake", "tasks/gem.rake", "tasks/gem_installer.rake", "tasks/grancher.rake", "tasks/install_dependencies.rake", "tasks/manifest.rake", "tasks/rcov.rake", "tasks/release.rake", "tasks/reversion.rake"]
+  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/bacon.rake", "tasks/changelog.rake", "tasks/gem.rake", "tasks/gem_installer.rake", "tasks/grancher.rake", "tasks/install_dependencies.rake", "tasks/manifest.rake", "tasks/rcov.rake", "tasks/release.rake", "tasks/reversion.rake"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/manveru/makura}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.2}
   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 = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rest-client>, [">= 0.8.1"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: manveru-makura
 version: !ruby/object:Gem::Version 
-  version: 2009.03.28
+  version: 2009.04.22
 platform: ruby
 authors: 
 - Michael 'manveru' Fellinger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-28 00:00:00 -07:00
+date: 2009-04-22 00:00:00 -07:00
 default_executable: makura
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,7 +31,9 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- CHANGELOG
 - COPYING
+- MANIFEST
 - README.md
 - Rakefile
 - bin/makura
@@ -88,7 +90,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Ruby wrapper around the CouchDB REST API.
 test_files: []