throne 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/throne.rb

@@ -1,4 +1,4 @@
-require 'yajl/json_gem'
+require 'yajl'
 require 'rest_client'
 require 'hashie'
 

data/lib/throne/database.rb

@@ -16,7 +16,7 @@ class Throne::Database
   # Creates this database, will not error if the database exists
   def create_database
     begin
-      c.put @url, {}
+      C.put @url, {}
     rescue RestClient::RequestFailed => e
       unless e.message =~ /412$/
         raise e
@@ -27,7 +27,7 @@ class Throne::Database
   # deletes this database.
   def delete_database
     begin
-      c.delete @url
+      C.delete @url
     rescue RestClient::ResourceNotFound
     end
   end
@@ -40,7 +40,7 @@ class Throne::Database
   def get(docid, rev=nil)
     begin
       revurl = rev ? "?rev=#{rev}" : ""
-      Hashie::Mash.new(JSON.parse(c.get(@url + '/' + docid + revurl)))
+      Hashie::Mash.new(JP.parse(C.get(@url + '/' + docid + revurl)))
     rescue RestClient::ResourceNotFound
       nil
     end
@@ -49,11 +49,11 @@ class Throne::Database
   # creates/updates a document from a hash/array structure
   def save(doc)
     if id = doc['_id']
-      res = c.put(@url + '/' + id, doc.to_json)
+      res = C.put(@url + '/' + id, JE.encode(doc))
     else
-      res = c.post(@url, doc.to_json)
+      res = C.post(@url, JE.encode(doc))
     end
-    res = JSON.parse(res) 
+    res = JP.parse(res) 
     return nil unless res['ok']
     Throne::StringWithRevision.new(res['id'], res['rev'])
   end
@@ -67,18 +67,26 @@ class Throne::Database
       doc = doc['_id']
     end
 
-    c.delete(@url + '/' + doc + '?rev=' + rev)
+    C.delete(@url + '/' + doc + '?rev=' + rev)
   end
 
-  # runs a function by path, with optional params passed in
-  def function(path, params = {}, &block)
+  # runs a function by path, returning an array of results.
+  def function(path, params = {})
+    items = []
+    function_iter(path, params) {|i| items << i}
+    items
+  end
+
+
+  # runs a function by path, invoking once for each item. 
+  def function_iter(path, params = {}, &block)
     url = @url + '/' + path
-    res = JSON.parse(c.get(paramify_url(url, params)))
+    res = JP.parse(C.get(paramify_url(url, params)))
     res = Throne::ArrayWithFunctionMeta.new(res['rows'], res['offset'])
     if block_given?
-      # TODO - stream properly
+      # TODO - stream properly, need to get objects.
       res.each do |i|
-        yield i
+        yield Hashie::Mash.new(i)
       end
       nil
     else
@@ -91,7 +99,7 @@ class Throne::Database
   def paramify_url url, params = {}
     if params && !params.empty?
       query = params.collect do |k,v|
-        v = v.to_json if %w{key startkey endkey}.include?(k.to_s) && 
+        v = JE.encode(v) if %w{key startkey endkey}.include?(k.to_s) && 
           (v.kind_of?(Array) || v.kind_of?(Hash))
         "#{k}=#{CGI.escape(v.to_s)}"
       end.join("&")
@@ -101,7 +109,10 @@ class Throne::Database
   end
   
 
-  def c; RestClient; end
+  C = RestClient
+  # This is so I can switch stuff later.
+  JP = Yajl::Parser
+  JE = Yajl::Encoder
 end
 
 # Extended string, to store the couch revision

data/lib/throne/tasks.rb

@@ -2,10 +2,11 @@ require 'yaml'
 
 # Defines tasks for managing databases and views.
 #
-# To reference a file in lib/ from your design doc, use a commend like this
-# // !code library.js
+# To reference a file in lib/ from your design doc, use a comment like this
+# 
+#     // !code library.js
 #
-# This will include the contents at this locate.
+# This will include the contents at this location.
 #
 # These tasks require an environment variable of SERVER_URL to be set.
 #
@@ -13,38 +14,38 @@ require 'yaml'
 # root of base path will be included in all databases, items with a database will be
 # included into that database only.
 #
-# base_path/
-# |-- lib
-# |    `-- library.js
-# |-- data
-# |   `-- .json and .yml folders with seed data
-# |-- design
-# |   `-- <design doc name>
-# |       |-- lists
-# |       |   `-- listname.js
-# |       |-- shows
-# |       |   `-- showname.js
-# |       |-- validate_doc_update.sh
-# |       `-- views
-# |           `-- statuses
-# |               |-- map.js
-# |               `-- reduce.js 
-# |-- <db name>
+#     base_path/
 #     |-- lib
 #     |    `-- library.js
 #     |-- data
 #     |   `-- .json and .yml folders with seed data
-#     `-- design
-#          `-- <design doc name>
-#              |-- lists
-#              |   `-- listname.js
-#              |-- shows
-#              |   `-- showname.js
-#              |-- validate_doc_update.sh 
-#              `-- views
-#                  `-- statuses
-#                      |-- map.js
-#                      `-- reduce.js 
+#     |-- design
+#     |   `-- <design doc name>
+#     |       |-- lists
+#     |       |   `-- listname.js
+#     |       |-- shows
+#     |       |   `-- showname.js
+#     |       |-- validate_doc_update.js
+#     |       `-- views
+#     |           `-- statuses
+#     |               |-- map.js
+#     |               `-- reduce.js 
+#     |-- <db name>
+#         |-- lib
+#         |    `-- library.js
+#         |-- data
+#         |   `-- .json and .yml folders with seed data
+#         `-- design
+#              `-- <design doc name>
+#                  |-- lists
+#                  |   `-- listname.js
+#                  |-- shows
+#                  |   `-- showname.js
+#                  |-- validate_doc_update.js 
+#                  `-- views
+#                      `-- statuses
+#                          |-- map.js
+#                          `-- reduce.js 
 #
 class Throne::Tasks
   # This will inject Rake tasks for managing the database data. The base path should

data/throne.gemspec

@@ -0,0 +1,73 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{throne}
+  s.version = "0.0.4"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Lincoln Stoll"]
+  s.date = %q{2009-12-17}
+  s.description = %q{Simple library for working with CouchDB. Avoids magic, keeps it simple.}
+  s.email = %q{lstoll@lstoll.net}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc",
+     "TODO"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "TODO",
+     "VERSION",
+     "lib/throne.rb",
+     "lib/throne/database.rb",
+     "lib/throne/document.rb",
+     "lib/throne/tasks.rb",
+     "spec/database_spec.rb",
+     "spec/document_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb",
+     "spec/tasks_spec.rb",
+     "throne.gemspec"
+  ]
+  s.homepage = %q{http://github.com/lstoll/throne}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Simple CouchDB library}
+  s.test_files = [
+    "spec/database_spec.rb",
+     "spec/document_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/tasks_spec.rb"
+  ]
+
+  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
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
+      s.add_runtime_dependency(%q<hashie>, [">= 0"])
+      s.add_runtime_dependency(%q<yajl-ruby>, [">= 0"])
+    else
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<rest-client>, [">= 0"])
+      s.add_dependency(%q<hashie>, [">= 0"])
+      s.add_dependency(%q<yajl-ruby>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<rest-client>, [">= 0"])
+    s.add_dependency(%q<hashie>, [">= 0"])
+    s.add_dependency(%q<yajl-ruby>, [">= 0"])
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: throne
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Lincoln Stoll
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-16 00:00:00 +11:00
+date: 2009-12-17 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,6 +79,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/tasks_spec.rb
+- throne.gemspec
 has_rdoc: true
 homepage: http://github.com/lstoll/throne
 licenses: []