dolly 0.5.7 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a6f4cc93cbfb6e3efc584188c23775282d6bd95
-  data.tar.gz: 2bf8db9298eee2e91925d1edc9e1536e1ce435db
+  metadata.gz: f310bb10ff18ec990f101c2f6ad8470ba4ecfe24
+  data.tar.gz: 25ac2e2e160160ddb1fbab3ec95d0554772fe4c1
 SHA512:
-  metadata.gz: 90b551dbf530f8e36fa6f35e1ab307478096514db83bd78d603e4bdf62e93aedcb7c5d6b4a0c4822d5ff171f5521c306f60c477620a76b5df72c583d4e447f2b
-  data.tar.gz: 2a3e019741cb1e7d6b193537bcce6bb8ade95b9a4231a40b27e094b4254bd47ac054f95fbe6d985d3232843ea75cc771a5bda35fc03755dbc77c7514805cecfa
+  metadata.gz: 190ec76bedcb882c2ca6e66e4f791861ad66773308f3994d664b9e3af301751924cb551c89bee17ac123984a45ebcd4e1aac3f88a8f2ff24b216efe10d590092
+  data.tar.gz: 54397eca72bcd6f50ab064e94cde974f48f6d5b5348a8e8eebe22b22aa92b8c225908444203ff041c13453306394b8c562584b15c67f2c513f222d40a7571c85

data/lib/dolly/document.rb

@@ -93,7 +93,8 @@ module Dolly
         property = Property.new(options)
 
         define_method(name) do
-          property.value = @doc[name.to_s] || default_value
+          key = name.to_s
+          property.value = @doc.has_key?(key) ? @doc[key] : default_value
           property.value
         end
 
@@ -115,6 +116,7 @@ module Dolly
     end
 
     def init_properties options = {}
+      raise Dolly::ResourceNotFound if options['error'] == 'not_found'
       #TODO: right now not listed properties will be ignored
       options.each do |k, v|
         next unless respond_to? :"#{k}="

data/lib/dolly/name_space.rb

@@ -1,5 +1,6 @@
 require "active_model/naming"
 
+#TODO: remove this module to be part of Dolly::Document
 module Dolly
   module NameSpace
     include ActiveModel::Naming
@@ -9,12 +10,12 @@ module Dolly
     end
 
     def base_id id
-      return id unless id =~ /^#{name_paramitized}\//
-      id.match("[^/]+[/](.+)")[1]
+      id = URI.unescape id
+      id.sub %r~^#{name_paramitized}/~, ''
     end
 
     def namespace id
-      return id if id =~ /^#{name_paramitized}/
+      return id if id =~ %r~^#{name_paramitized}/~
       "#{name_paramitized}/#{id}"
     end
   end

data/lib/dolly/query.rb

@@ -12,9 +12,14 @@ module Dolly
 
       DESIGN_DOC = "dolly"
 
-      def find *ids
-        response = default_view(keys: ids.map{ |id| [name_paramitized, base_id(id)] }).parsed_response
-        ids.count > 1 ? Collection.new(response, name.constantize) : self.new.from_json(response)
+      def find *keys
+        query_hash = { keys: keys.map{|key| namespace key} }
+
+        if keys.count > 1
+          build_collection( query_hash )
+        else
+          self.new.from_json( database.all_docs(query_hash).parsed_response )
+        end
       rescue NoMethodError => err
         if err.message == "undefined method `[]' for nil:NilClass"
           raise Dolly::ResourceNotFound
@@ -23,22 +28,26 @@ module Dolly
         end
       end
 
+      def default_query_args
+        {startkey: "#{name_paramitized}/", endkey: "#{name_paramitized}/{}"}
+      end
+
       def all
-        build_collection startkey: [name_paramitized,nil], endkey: [name_paramitized,{}]
+        build_collection default_query_args
       end
 
       def first limit = 1
-        res = build_collection startkey: [name_paramitized,nil], endkey: [name_paramitized,{}], limit: limit
+        res = build_collection default_query_args.merge( limit: 1)
         limit == 1 ? res.first : res
       end
 
       def last limit = 1
-        res = build_collection startkey: [name_paramitized,{}], endkey: [name_paramitized,nil], limit: limit, descending: true
+        res = build_collection({startkey: default_query_args[:endkey], endkey: default_query_args[:startkey], limit: limit, descending: true})
         limit == 1 ? res.first : res
       end
 
       def build_collection q
-        res = default_view(q)
+        res = database.all_docs(q)
         Collection.new res.parsed_response, name.constantize
       end
 
@@ -47,10 +56,6 @@ module Dolly
         Collection.new res.parsed_response, name.constantize
       end
 
-      def default_view options = {}
-        view default_doc, options
-      end
-
       def view doc, options = {}
         options.merge! include_docs: true
         database.get doc, options
@@ -69,5 +74,6 @@ module Dolly
     def self.included(base)
       base.extend ClassMethods
     end
+
   end
 end

data/lib/dolly/request.rb

@@ -47,6 +47,11 @@ module Dolly
       tools("_uuids", opts)["uuids"]
     end
 
+    def all_docs data = {}
+      data =  values_to_json data.merge( include_docs: true )
+      request :get, '_all_docs', {query: data}
+    end
+
     private
     def tools path, opts = nil
       data = {}

data/lib/dolly/version.rb

@@ -1,3 +1,3 @@
 module Dolly
-  VERSION = "0.5.7"
+  VERSION = "0.6.0"
 end

data/lib/tasks/db.rake

@@ -1,30 +1,8 @@
 namespace :db do
   desc "Will create if missing database and add default views"
   task setup: :environment do
-    FIND_VIEW = { "find" => { "map" => "(d)->\n  if d._id\n    [str, t, id] = d._id.match /([^/]+)[/](.+)/\n    emit [t, id], 1 if t and id"} }
-
-    default_doc = {
-      "language" => "coffeescript",
-      "views" => FIND_VIEW
-    }.freeze
-
     Dolly::Document.database.put "", nil
-
-    remote_doc = begin
-      JSON.parse Dolly::Document.database.get(Dolly::Document.design_doc).parsed_response
-    rescue Dolly::ResourceNotFound
-      nil
-    end
-
-    doc = if remote_doc
-      remote_doc["views"].merge! FIND_VIEW
-      remote_doc
-    else
-      default_doc
-    end
-
-    res = Dolly::Document.database.put Dolly::Document.design_doc, doc.to_json
-    puts "design document #{Dolly::Document.design_doc} was created/updated."
+    puts "Database created"
   end
 
   desc "Will update design document with what is on db/designs/*.coffee"

data/test/document_test.rb

@@ -9,8 +9,7 @@ class FooBar < Dolly::Document
 end
 
 class DocumentTest < ActiveSupport::TestCase
-  DB_BASE_PATH = "http://localhost:5984/test/_design/test/_view/".freeze
-  VIEW_DOC = "find".freeze
+  DB_BASE_PATH = "http://localhost:5984/test".freeze
 
   def setup
     data     = {foo: 'Foo', bar: 'Bar', type: 'foo_bar'}
@@ -19,17 +18,24 @@ class DocumentTest < ActiveSupport::TestCase
 
     view_resp   = build_view_response [data]
     empty_resp  =  build_view_response []
+    not_found_resp = generic_response [{ key: "foo_bar/2", error: "not_found" }]
     @multi_resp = build_view_response all_docs
 
     build_request [["foo_bar","1"]], view_resp
     build_request [["foo_bar","2"]], empty_resp
     build_request [["foo_bar","1"],["foo_bar","2"]], @multi_resp
 
-    FakeWeb.register_uri :get, "#{view_base_path}?startkey=%5B%22foo_bar%22%2Cnull%5D&endkey=%5B%22foo_bar%22%2C%7B%7D%5D&include_docs=true", body: @multi_resp.to_json
-    FakeWeb.register_uri :get, "#{view_base_path}?startkey=%5B%22foo_bar%22%2Cnull%5D&endkey=%5B%22foo_bar%22%2C%7B%7D%5D&limit=1&include_docs=true", body: view_resp.to_json
-    FakeWeb.register_uri :get, "#{view_base_path}?startkey=%5B%22foo_bar%22%2Cnull%5D&endkey=%5B%22foo_bar%22%2C%7B%7D%5D&limit=2&include_docs=true", body: @multi_resp.to_json
-    FakeWeb.register_uri :get, "#{view_base_path}?startkey=%5B%22foo_bar%22%2C%7B%7D%5D&endkey=%5B%22foo_bar%22%2Cnull%5D&limit=1&descending=true&include_docs=true", body: view_resp.to_json
-    FakeWeb.register_uri :get, "#{view_base_path}?startkey=%5B%22foo_bar%22%2C%7B%7D%5D&endkey=%5B%22foo_bar%22%2Cnull%5D&limit=2&descending=true&include_docs=true", body: @multi_resp.to_json
+    #TODO: Mock Dolly::Request to return helper with expected response. request builder can be tested by itself.
+    FakeWeb.register_uri :get, "#{query_base_path}?startkey=%22foo_bar%2F%22&endkey=%22foo_bar%2F%7B%7D%22&include_docs=true", body: @multi_resp.to_json
+    FakeWeb.register_uri :get, "#{query_base_path}?startkey=%22foo_bar%2F%22&endkey=%22foo_bar%2F%7B%7D%22&limit=1&include_docs=true", body: view_resp.to_json
+    FakeWeb.register_uri :get, "#{query_base_path}?endkey=%22foo_bar%2F%22&startkey=%22foo_bar%2F%7B%7D%22&limit=1&descending=true&include_docs=true", body: view_resp.to_json
+    FakeWeb.register_uri :get, "#{query_base_path}?startkey=%22foo_bar%2F%22&endkey=%22foo_bar%22%2C%7B%7D&limit=2&include_docs=true", body: @multi_resp.to_json
+    FakeWeb.register_uri :get, "#{query_base_path}?endkey=%22foo_bar%2F%22&startkey=%22foo_bar%2F%7B%7D%22&limit=2&descending=true&include_docs=true", body: @multi_resp.to_json
+    FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2F1%22%5D&include_docs=true", body: view_resp.to_json
+    FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%5D&include_docs=true", body: not_found_resp.to_json
+    FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2Ferror%22%5D&include_docs=true", body: 'error', status: ["500", "Error"]
+    FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2F1%22%2C%22foo_bar%2F2%22%5D&include_docs=true", body: @multi_resp.to_json
+    FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%22foo_bar%2F2%22%5D&include_docs=true", body: not_found_resp.to_json
   end
 
   test 'with timestamps!' do
@@ -62,15 +68,15 @@ class DocumentTest < ActiveSupport::TestCase
 
   test 'empty find should raise error' do
     assert_raise Dolly::ResourceNotFound do
-      FakeWeb.register_uri :get, "#{view_base_path}?keys=%5B%5D&include_docs=true", :status => ["404", "Not Found"]
+      FakeWeb.register_uri :get, "#{query_base_path}?keys=%5B%5D&include_docs=true", :status => ["404", "Not Found"]
       foo = FooBar.find
     end
   end
 
   test 'error on server raises Dolly::ServerError' do
     assert_raise Dolly::ServerError do
-      FakeWeb.register_uri :get, "#{view_base_path}?keys=%5B%5D&include_docs=true", :status => ["500", "Error"]
-      foo = FooBar.find
+      FakeWeb.register_uri :get, "#{query_base_path}?keys=", :status => ["500", "Error"]
+      foo = FooBar.find 'error'
     end
   end
 
@@ -100,6 +106,11 @@ class DocumentTest < ActiveSupport::TestCase
     assert_equal false, foo.respond_to?(:type)
   end
 
+  test 'can find with fixnum id' do
+    foo = FooBar.find 1
+    assert_equal 'Foo', foo.foo
+  end
+
   test 'with default will return default value on nil' do
     foo = FooBar.find "1"
     assert_equal 1, foo.with_default
@@ -201,6 +212,10 @@ class DocumentTest < ActiveSupport::TestCase
   end
 
   private
+  def generic_response rows, count = 1
+    {total_rows: count, offset:0, rows: rows}
+  end
+
   def build_view_response properties
     rows = properties.map.with_index do |v, i|
       {
@@ -210,16 +225,16 @@ class DocumentTest < ActiveSupport::TestCase
         doc: {_id: "foo_bar/#{i}", _rev: SecureRandom.hex}.merge!(v)
       }
     end
-    {total_rows: properties.count, offset:0, rows: rows}
+    generic_response rows, properties.count
   end
 
   def build_request keys, body, view_name = 'foo_bar'
     query = "keys=#{CGI::escape keys.to_s.gsub(' ','')}&" unless keys.blank?
-    FakeWeb.register_uri :get, "#{view_base_path}?#{query.to_s}include_docs=true", body: body.to_json
+    FakeWeb.register_uri :get, "#{query_base_path}?#{query.to_s}include_docs=true", body: body.to_json
   end
 
-  def view_base_path
-    "#{DB_BASE_PATH}#{VIEW_DOC}"
+  def query_base_path
+    "#{DB_BASE_PATH}/_all_docs"
   end
 
 end