relaxo 0.4.2 → 0.4.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZmJjYzZmZTEwYTAwNzczMjhlNmI5YzdmZWIxNTViOTMwZmZkZmY4Ng==
-  data.tar.gz: !binary |-
-    MzA2ZDlmY2U0MzI0NGFkMGExYmRmNjkyY2ZkZjAzMjQzNzliMGJiYQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ODBmMzE1YzAwNjM3MmUzZjJiNDRlZjNkMTM0NjNjZjM1YTYxZjUxMmQwMGY0
-    Njk2NTllYWZlM2RjZmU0YmU2ZWYxNWNjNGZmNjE0YjU1ZWQwZjM2NWMzMjdl
-    NDJhZWE5MzVkZmJkMjMxZjI5YzNhYTk3ZjI5YmZlOGNkYzVkMmY=
-  data.tar.gz: !binary |-
-    ZDU3MmI3MTc3NTY3Nzk2NmQ4Njk2Y2IyNTBmNWExY2ZjYTljN2U2NGE1NjNm
-    ZTM2YTI0MWM5N2MwNTFmMTYzYzQ3Y2IyYWYxZTM4YWVhZTA4ZDA5MDFhMzNk
-    MmNkYzA2Yzk1ZGJlZWRhNTkwY2ZhNWM3ZDI4ZTc2ZDY3ODNiZWU=
+SHA1:
+  metadata.gz: a9717e7374491be200281a28c52e54779a227015
+  data.tar.gz: b35bd9c406790b3660bb74865d481a5c4eefa42e
+SHA512:
+  metadata.gz: 20fd23a6cb298e4fcfe8fff4d85e7fa1723f58c6ccad262086d61b55c574dfa94ae70c989257378a0ec2f7332861e0bc1c7fde56e28265c4a70adb20718f9dd2
+  data.tar.gz: cffb68a2e4db2c1b3a7345f2016b9910a2e61264bbd211385af2beeb37f6390c3a68321ee1d7269f62e8926c657b9bbd91ca4402ad9fc09e1d8bb15d2247761a

data/lib/relaxo/attachments.rb

@@ -42,7 +42,7 @@ module Relaxo
 	class Database
 		def attach(document, name, data, options = {})
 			parameters = {
-				:rev => document[REV]
+				:rev => Parameter::Raw(document[REV])
 			}.merge(options[:parameters] || {})
 			
 			headers = {}

data/lib/relaxo/client.rb

@@ -26,6 +26,38 @@ module Relaxo
 	# Typically returned from CouchDB when the request was successful:
 	SUCCESS = {'ok' => true}
 	
+	module Parameter
+		# Raw string parameter.
+		class Raw
+			def initialize(value)
+				@value = value
+			end
+			
+			def to_query_string
+				@value
+			end
+		end
+		
+		def self.Raw(value)
+			Raw.new(value)
+		end
+		
+		# Force JSON serialisation.
+		class JSON
+			def initialize(value)
+				@value = value
+			end
+			
+			def to_query_string
+				@value.to_json
+			end
+		end
+		
+		def self.JSON(value)
+			JSON.new(value)
+		end
+	end
+	
 	module Client
 		DEFAULT_GET_HEADERS = {:accept => :json}
 		DEFAULT_PUT_HEADERS = {:accept => :json, :content_type => :json}
@@ -109,7 +141,9 @@ module Relaxo
 			parameters.each do |key, value|
 				key_string = key.to_s
 				
-				if Symbol === value || key_string.end_with?("docid")
+				if value.respond_to? :to_query_string
+					query << escape(key_string) + '=' + escape(value.to_query_string)
+				elsif Symbol === value || key_string.end_with?("docid")
 					query << escape(key_string) + '=' + escape(value.to_s)
 				else
 					query << escape(key_string) + '=' + escape(value.to_json)

data/lib/relaxo/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Relaxo
-	VERSION = "0.4.2"
+	VERSION = "0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaxo
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,14 +28,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -56,19 +56,19 @@ dependencies:
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! "\t\tRelaxo provides a set of tools and interfaces for interacting
-  with CouchDB.\n\t\tIt aims to be as simple and efficient as possible while still
-  improving the\n\t\tusability of various CouchDB features.\n"
+description: "\t\tRelaxo provides a set of tools and interfaces for interacting with
+  CouchDB.\n\t\tIt aims to be as simple and efficient as possible while still improving
+  the\n\t\tusability of various CouchDB features.\n"
 email:
 - samuel.williams@oriontransfer.co.nz
 executables:
@@ -83,14 +83,6 @@ files:
 - README.md
 - bin/relaxo
 - bin/relaxo-admin
-- build/master.rb
-- build/rakefile.rb
-- build/relaxo-0.1.0.gemspec
-- build/relaxo-0.1.1.gemspec
-- build/relaxo-0.2.0.gemspec
-- build/relaxo-0.3.0.gemspec
-- build/relaxo-0.3.1.gemspec
-- build/relaxo-0.4.0.gemspec
 - lib/relaxo.rb
 - lib/relaxo/attachments.rb
 - lib/relaxo/base64-1.8.rb
@@ -118,17 +110,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Relaxo is a helper for loading and working with CouchDB.

data/build/master.rb

@@ -1,22 +0,0 @@
-
-Dir.chdir("../") do
-	require './lib/relaxo/version'
-
-	Gem::Specification.new do |s|
-		s.name = "relaxo"
-		s.version = Relaxo::VERSION::STRING
-		s.author = "Samuel Williams"
-		s.email = "samuel@oriontransfer.org"
-		s.homepage = "http://www.codeotaku.com/projects/relaxo"
-		s.platform = Gem::Platform::RUBY
-		s.summary = "Relaxo is a helper for loading and working with CouchDB."
-		s.files = FileList["{bin,lib,test}/**/*"] + ["rakefile.rb", "Gemfile", "README.md"]
-
-		s.executables << 'relaxo'
-
-		s.add_dependency("json", "~> 1.7.3")
-		s.add_dependency("rest-client", "~> 1.6.7")
-
-		s.has_rdoc = "yard"
-	end
-end

data/build/rakefile.rb

@@ -1,39 +0,0 @@
-
-# Automatic Gem Build Script v3.0
-
-require 'fileutils'
-require 'rubygems'
-
-MasterGemspec = "master.rb"
-
-GEM = ENV['GEM'] || "gem"
-
-desc 'Build a gemspec file'
-task :build_gemspec do
-  $spec = Gem::Specification.load(MasterGemspec)
-  
-  $versioned_gem = "#{$spec.name}-#{$spec.version}.gem"
-  $versioned_gemspec = "#{$spec.name}-#{$spec.version}.gemspec"
-  $base_gemspec = "#{$spec.name}.gemspec"
-  
-  puts "Building #{$versioned_gemspec}..."
-  
-  File.open($versioned_gemspec, "w") do |f|
-    f.write($spec.to_ruby)
-  end
-  
-  puts "Copying file to ../#{$base_gemspec}"
-  FileUtils.cp($versioned_gemspec, "../#{$base_gemspec}")
-end
-
-task :build_gem => [:build_gemspec] do
-  Dir.chdir("../") do
-    system("#{GEM} build #{$base_gemspec}")
-  end
-end
-
-task :install_gem => [:build_gem] do
-  Dir.chdir("../") do
-    system("#{GEM} install --local #{$versioned_gem}")
-  end
-end

data/build/relaxo-0.1.0.gemspec

@@ -1,29 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "relaxo"
-  s.version = "0.1.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Samuel Williams"]
-  s.date = "2012-07-09"
-  s.email = "samuel.williams@oriontransfer.co.nz"
-  s.executables = ["relaxo"]
-  s.files = ["bin/relaxo", "lib/relaxo", "lib/relaxo/version.rb", "lib/relaxo.rb", "README.md"]
-  s.homepage = "http://www.oriontransfer.co.nz/gems/relaxo"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
-  s.summary = "Relaxo is a helper for loading and working with CouchDB."
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<couchrest>, [">= 0"])
-    else
-      s.add_dependency(%q<couchrest>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<couchrest>, [">= 0"])
-  end
-end

data/build/relaxo-0.1.1.gemspec

@@ -1,32 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "relaxo"
-  s.version = "0.1.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Samuel Williams"]
-  s.date = "2012-07-10"
-  s.email = "samuel.williams@oriontransfer.co.nz"
-  s.executables = ["relaxo"]
-  s.files = ["bin/relaxo", "lib/relaxo", "lib/relaxo/client.rb", "lib/relaxo/database.rb", "lib/relaxo/model.rb", "lib/relaxo/properties.rb", "lib/relaxo/recordset.rb", "lib/relaxo/server.rb", "lib/relaxo/version.rb", "lib/relaxo.rb", "README.md"]
-  s.homepage = "http://www.oriontransfer.co.nz/gems/relaxo"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
-  s.summary = "Relaxo is a helper for loading and working with CouchDB."
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<couchrest>, [">= 0"])
-      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
-    else
-      s.add_dependency(%q<couchrest>, [">= 0"])
-      s.add_dependency(%q<rest-client>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<couchrest>, [">= 0"])
-    s.add_dependency(%q<rest-client>, [">= 0"])
-  end
-end

data/build/relaxo-0.2.0.gemspec

@@ -1,32 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "relaxo"
-  s.version = "0.2.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Samuel Williams"]
-  s.date = "2012-07-11"
-  s.email = "samuel.williams@oriontransfer.co.nz"
-  s.executables = ["relaxo"]
-  s.files = ["bin/relaxo", "lib/relaxo", "lib/relaxo/client.rb", "lib/relaxo/database.rb", "lib/relaxo/model.rb", "lib/relaxo/properties", "lib/relaxo/properties/money.rb", "lib/relaxo/properties.rb", "lib/relaxo/recordset.rb", "lib/relaxo/server.rb", "lib/relaxo/version.rb", "lib/relaxo.rb", "README.md"]
-  s.homepage = "http://www.oriontransfer.co.nz/gems/relaxo"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
-  s.summary = "Relaxo is a helper for loading and working with CouchDB."
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<couchrest>, [">= 0"])
-      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
-    else
-      s.add_dependency(%q<couchrest>, [">= 0"])
-      s.add_dependency(%q<rest-client>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<couchrest>, [">= 0"])
-    s.add_dependency(%q<rest-client>, [">= 0"])
-  end
-end

data/build/relaxo-0.3.0.gemspec

@@ -1,32 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "relaxo"
-  s.version = "0.3.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Samuel Williams"]
-  s.date = "2012-07-11"
-  s.email = "samuel.williams@oriontransfer.co.nz"
-  s.executables = ["relaxo"]
-  s.files = ["bin/relaxo", "lib/relaxo", "lib/relaxo/client.rb", "lib/relaxo/database.rb", "lib/relaxo/server.rb", "lib/relaxo/session.rb", "lib/relaxo/version.rb", "lib/relaxo.rb", "README.md"]
-  s.homepage = "http://www.oriontransfer.co.nz/gems/relaxo"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
-  s.summary = "Relaxo is a helper for loading and working with CouchDB."
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<json>, ["~> 1.7.3"])
-      s.add_runtime_dependency(%q<rest-client>, ["~> 1.6.7"])
-    else
-      s.add_dependency(%q<json>, ["~> 1.7.3"])
-      s.add_dependency(%q<rest-client>, ["~> 1.6.7"])
-    end
-  else
-    s.add_dependency(%q<json>, ["~> 1.7.3"])
-    s.add_dependency(%q<rest-client>, ["~> 1.6.7"])
-  end
-end

data/build/relaxo-0.3.1.gemspec

@@ -1,32 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "relaxo"
-  s.version = "0.3.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Samuel Williams"]
-  s.date = "2012-07-23"
-  s.email = "samuel.williams@oriontransfer.co.nz"
-  s.executables = ["relaxo"]
-  s.files = ["bin/relaxo", "lib/relaxo", "lib/relaxo/client.rb", "lib/relaxo/connection.rb", "lib/relaxo/database.rb", "lib/relaxo/session.rb", "lib/relaxo/version.rb", "lib/relaxo.rb", "test/database_test.rb", "README.md"]
-  s.homepage = "http://www.oriontransfer.co.nz/gems/relaxo"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
-  s.summary = "Relaxo is a helper for loading and working with CouchDB."
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<json>, ["~> 1.7.3"])
-      s.add_runtime_dependency(%q<rest-client>, ["~> 1.6.7"])
-    else
-      s.add_dependency(%q<json>, ["~> 1.7.3"])
-      s.add_dependency(%q<rest-client>, ["~> 1.6.7"])
-    end
-  else
-    s.add_dependency(%q<json>, ["~> 1.7.3"])
-    s.add_dependency(%q<rest-client>, ["~> 1.6.7"])
-  end
-end

data/build/relaxo-0.4.0.gemspec

@@ -1,32 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "relaxo"
-  s.version = "0.4.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Samuel Williams"]
-  s.date = "2012-10-14"
-  s.email = "samuel.williams@oriontransfer.co.nz"
-  s.executables = ["relaxo"]
-  s.files = ["bin/relaxo", "lib/relaxo", "lib/relaxo/attachments.rb", "lib/relaxo/base64-1.8.rb", "lib/relaxo/client.rb", "lib/relaxo/connection.rb", "lib/relaxo/database.rb", "lib/relaxo/json.rb", "lib/relaxo/transaction.rb", "lib/relaxo/version.rb", "lib/relaxo.rb", "test/README.md", "test/attachments_test.rb", "test/connection_test.rb", "test/database_test.rb", "test/helper.rb", "test/transaction_test.rb", "README.md"]
-  s.homepage = "http://www.oriontransfer.co.nz/gems/relaxo"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
-  s.summary = "Relaxo is a helper for loading and working with CouchDB."
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<json>, ["~> 1.7.3"])
-      s.add_runtime_dependency(%q<rest-client>, ["~> 1.6.7"])
-    else
-      s.add_dependency(%q<json>, ["~> 1.7.3"])
-      s.add_dependency(%q<rest-client>, ["~> 1.6.7"])
-    end
-  else
-    s.add_dependency(%q<json>, ["~> 1.7.3"])
-    s.add_dependency(%q<rest-client>, ["~> 1.6.7"])
-  end
-end