makura 2010.08.26 → 2011.01.21

data/doc/AUTHORS

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

data/doc/CHANGELOG

@@ -1,3 +1,27 @@
+[f605cce | Thu Jan 20 16:12:17 UTC 2011] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Move Makura::Server#paramify to Makura::paramify to allow reuse
+
+[c136984 | Tue Oct 12 11:20:18 UTC 2010] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix validation in Model#save, it checked for the wrong method name.
+
+[b236bcb | Mon Oct 04 13:18:39 UTC 2010] Michael Fellinger <m.fellinger@gmail.com>
+
+  * design is not an optional argument
+
+[ea03df7 | Thu Sep 30 01:02:39 UTC 2010] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Make escape compatible with unicode
+
+[37c2281 | Tue Sep 28 11:15:21 UTC 2010] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Allow for _sum _count and _stats as builtin functions
+
+[afd5ba8 | Tue Sep 28 11:15:08 UTC 2010] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add ServerBrokeConnection to exceptions
+
 [b7479a6 | Wed Aug 25 16:26:05 UTC 2010] Michael Fellinger <m.fellinger@gmail.com>
 
   * Version 2010.08.26

data/lib/makura.rb

@@ -30,16 +30,35 @@ require 'makura/layout'
 module Makura
   CHARS = (48..128).map{|c| c.chr}.grep(/[[:alnum:]]/)
   MOD = CHARS.size
+  JSON_PARAMS = %w[key startkey endkey]
 
   module_function
 
   # From Rack
   def escape(s)
-    s.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/n) {
-      '%'+$1.unpack('H2'*$1.size).join('%').upcase
+    s.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/u) {
+      '%'+$1.unpack('H2'*bytesize($1)).join('%').upcase
     }.tr(' ', '+')
   end
 
+  def paramify(hash)
+    hash.map{|k,v|
+      k = k.to_s
+      v = v.to_json if JSON_PARAMS.include?(k)
+      "#{escape(k)}=#{escape(v)}"
+    }.join('&')
+  end
+
+  if "".respond_to?(:bytesize)
+    def bytesize(string)
+      string.bytesize
+    end
+  else
+    def bytesize(string)
+      string.size
+    end
+  end
+
   def pretty_from_md5(md5)
     id = md5.to_i(16)
     o = []

data/lib/makura/error.rb

@@ -4,6 +4,7 @@ module Makura
     class ConnectionRefused < Error; end
     class RequestFailed < Error; end
     class ResourceNotFound < RequestFailed; end
+    class ServerBrokeConnection < RequestFailed; end
     class Conflict < RequestFailed; end
     class MissingRevision < RequestFailed; end
     class BadRequest < RequestFailed; end

data/lib/makura/layout.rb

@@ -7,7 +7,7 @@ module Makura
       File.join(Makura::ROOT, '../couch')
     ]
 
-    def initialize(name, design = nil)
+    def initialize(name, design)
       @name, @design = name, design
       @design[name] = self
       @map = @reduce = nil
@@ -37,7 +37,8 @@ module Makura
     def common_load(type, file_or_function)
       return unless file_or_function
 
-      if file_or_function =~ /function\(.*\)/
+      case file_or_function
+      when /function\(.*\)/, /^_(sum|count|stats)$/
         function = file_or_function
       else
         parts = file_or_function.to_s.split('::')

data/lib/makura/model.rb

@@ -85,7 +85,7 @@ module Makura
       end
 
       def save
-        return if not valid? if respond_to?(:valid)
+        return unless valid? if respond_to?(:valid?)
         save!
       end
 

data/lib/makura/server.rb

@@ -145,6 +145,8 @@ module Makura
       return raw
     rescue RestClient::RequestFailed => ex
       raise appropriate_error(ex)
+    rescue RestClient::ServerBrokeConnection => ex
+      raise Error::ServerBrokeConnection, request[:url], ex.backtrace
     rescue RestClient::ResourceNotFound => ex
       raise Error::ResourceNotFound, request[:url], ex.backtrace
     rescue Errno::ECONNREFUSED
@@ -183,20 +185,10 @@ module Makura
       end
     end
 
-    JSON_PARAMS = %w[key startkey endkey]
-
-    def paramify(hash)
-      hash.map{|k,v|
-        k = k.to_s
-        v = v.to_json if JSON_PARAMS.include?(k)
-        "#{Makura.escape(k)}=#{Makura.escape(v)}"
-      }.join('&')
-    end
-
     def uri(path = '/', params = {})
       uri = @uri.dup
       uri.path = (path[0,1] == '/' ? path : "/#{path}").squeeze('/')
-      uri.query = paramify(params) unless params.empty?
+      uri.query = Makura.paramify(params) unless params.empty?
       uri
     end
   end

data/lib/makura/version.rb

@@ -1,3 +1,3 @@
 module Makura
-  VERSION = "2010.08.26"
+  VERSION = "2011.01.21"
 end

data/makura.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{makura}
-  s.version = "2010.08.26"
+  s.version = "2011.01.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael 'manveru' Fellinger"]
-  s.date = %q{2010-08-26}
+  s.date = %q{2011-01-21}
   s.default_executable = %q{makura}
   s.email = %q{m.fellinger@gmail.com}
   s.executables = ["makura"]

metadata

@@ -3,10 +3,10 @@ name: makura
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 2010
-  - 8
-  - 26
-  version: 2010.08.26
+  - 2011
+  - 1
+  - 21
+  version: 2011.01.21
 platform: ruby
 authors: 
 - Michael 'manveru' Fellinger
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-26 00:00:00 +09:00
+date: 2011-01-21 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency