couchrest 1.0.0.beta → 1.0.0.beta2

data/Rakefile

@@ -25,9 +25,10 @@ begin
     gemspec.files = %w( LICENSE README.md Rakefile THANKS.md history.txt couchrest.gemspec) + Dir["{examples,lib,spec,utils}/**/*"] - Dir["spec/tmp"]
     gemspec.has_rdoc = true
     gemspec.add_dependency("rest-client", ">= 1.5.1")
+    gemspec.add_dependency("json", "<= 1.4.2")
 #    gemspec.add_dependency("couchrest_extended_document", ">= 1.0.0")
     gemspec.version = CouchRest::VERSION
-    gemspec.date = "2008-11-22"
+    gemspec.date = "2010-07-01"
     gemspec.require_path = "lib"
   end
 rescue LoadError
@@ -64,4 +65,4 @@ module Rake
 end
 
 Rake.remove_task("github:release")
-Rake.remove_task("release")
+Rake.remove_task("release")

data/couchrest.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{couchrest}
-  s.version = "1.0.0.beta"
+  s.version = "1.0.0.beta2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["J. Chris Anderson", "Matt Aimonetti", "Marcos Tapajos", "Will Leinweber"]
-  s.date = %q{2010-06-15}
+  s.date = %q{2010-07-01}
   s.description = %q{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.}
   s.email = %q{jchris@apache.org}
   s.extra_rdoc_files = [
@@ -73,7 +73,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/couchrest/couchrest}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Lean and RESTful interface to CouchDB.}
   s.test_files = [
     "spec/couchrest/couchrest_spec.rb",
@@ -93,13 +93,16 @@ Gem::Specification.new do |s|
     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>, [">= 1.5.1"])
+      s.add_runtime_dependency(%q<json>, ["<= 1.4.2"])
     else
       s.add_dependency(%q<rest-client>, [">= 1.5.1"])
+      s.add_dependency(%q<json>, ["<= 1.4.2"])
     end
   else
     s.add_dependency(%q<rest-client>, [">= 1.5.1"])
+    s.add_dependency(%q<json>, ["<= 1.4.2"])
   end
 end
 

data/lib/couchrest.rb

@@ -13,11 +13,9 @@
 #    limitations under the License.
 
 require 'rubygems'
-begin
-  require 'json'
-rescue LoadError
-  raise "No compatible json library found, install either json or json_pure gem" unless Kernel.const_defined?("JSON")
-end
+gem 'json', "<= 1.4.2"
+require 'json'
+gem 'rest-client', ">= 1.5.1"
 require 'rest_client'
 
 # Not sure why this is required, so removed until a reason is found!
@@ -30,7 +28,7 @@ require 'couchrest/rest_api'
 
 # = CouchDB, close to the metal
 module CouchRest
-  VERSION    = '1.0.0.beta'
+  VERSION    = '1.0.0.beta2'
   
   autoload :Server,       'couchrest/server'
   autoload :Database,     'couchrest/database'
@@ -136,6 +134,4 @@ class CouchRest::ExtendedDocument < CouchRest::Document
     raise "ExtendedDocument is no longer included in CouchRest base driver, see couchrest_extended_document gem"
   end
 
-end
-
-
+end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: couchrest
 version: !ruby/object:Gem::Version 
+  hash: -1848230054
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - beta
-  version: 1.0.0.beta
+  - beta2
+  version: 1.0.0.beta2
 platform: ruby
 authors: 
 - J. Chris Anderson
@@ -18,16 +19,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-15 00:00:00 -03:00
+date: 2010-07-01 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 1
         - 5
@@ -35,6 +38,22 @@ dependencies:
         version: 1.5.1
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - <=
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 4
+        - 2
+        version: 1.4.2
+  type: :runtime
+  version_requirements: *id002
 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@apache.org
 executables: []
@@ -107,16 +126,20 @@ 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"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
       - 1
       - 3
@@ -125,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Lean and RESTful interface to CouchDB.