dolly 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad0bbb9be5691d6b00639f4af6d401657f7892a9
-  data.tar.gz: 00f1dbd0c0fb0c29b3ffedbde617875fe2c737e9
+  metadata.gz: b43649cf960832da484ca9d972ad118313156e01
+  data.tar.gz: ae8cbcfa0414e80e2a7ba881737f810e3582c232
 SHA512:
-  metadata.gz: 2e9514240a3f8e2a2e9c62d6142aa45cb534ba2d935d3c11789cbf039e0a43e500066de6b9c9db20a04bc68e76833bbd57a38d4049f86d90d3ef9448e31f33cc
-  data.tar.gz: 4fbb5496d005ad2110ce3268f42249a3e62116ddbf41ac9c92b8b8bc30470a6ad561b82cc764a485c796d1ccf150fdbc9c0ba6f48ba0794c50fa305ee6d578cf
+  metadata.gz: 94107541b5742c644dcb657d35ef95a68ae79beeaf17a41ead87eb54d5371e52fa1d6ec9db65d6d6384103a2d9ed0f748df82a2d52cf4689010f45304976b354
+  data.tar.gz: fcc8db3b3e45d28d670e98dc851c79d7ab06f977f932795f00b443e06d750539eb6a20a5c752e6eefe666b57528a4bd5aaef1c3c7eda61b3a482a0a8d3c836f9

data/lib/dolly/connection.rb

@@ -1,28 +1,29 @@
 require "dolly/request"
 require "dolly/name_space"
+require "dolly/db_config"
 
 module Dolly
   module Connection
     include Dolly::NameSpace
+    include Dolly::DbConfig
+
+    @@design_doc = nil
 
     def database
-      @database ||= Request.new(database_name: @@database_name)
+      @database ||= Request.new(env)
     end
 
     def database_name value
-       @@database_name ||= value
+      @@database_name ||= value
     end
 
     def default_doc
-      "#{design_doc}/_view/#{name_paramitized}"
+      "#{design_doc}/_view/find"
     end
 
     def design_doc
-      "_design/#{@@design_doc || DESIGN_DOC}"
+      "_design/#{env["design"]}"
     end
 
-    def set_design_doc value
-      @@design_doc = value
-    end
   end
 end

data/lib/dolly/db_config.rb

@@ -0,0 +1,18 @@
+module Dolly
+  module DbConfig
+    attr_accessor :config_file
+
+    def parse_config
+      YAML::load( ERB.new( File.read(config_file) ).result)
+    end
+
+    def env
+      parse_config[Rails.env]
+    end
+
+    def config_file
+      root = Rails.root || File.expand_path("../../../test/dummy/",  __FILE__)
+      File.join(root, 'config', 'couchdb.yml')
+    end
+  end
+end

data/lib/dolly/name_space.rb

@@ -4,6 +4,11 @@ module Dolly
       model_name.param_key
     end
 
+    def base_id id
+      return id unless id =~ /^#{name_paramitized}\//
+      id.match("[^/]+[/](.+)")[1]
+    end
+
     def namespace id
       return id if id =~ /^#{name_paramitized}/
       "#{name_paramitized}/#{id}"

data/lib/dolly/query.rb

@@ -17,7 +17,7 @@ module Dolly
       DESIGN_DOC = "dolly"
 
       def find *ids
-        response = default_view(keys: ids.map{|id| namespace(id)}).parsed_response
+        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)
       rescue NoMethodError => err
         if err.message == "undefined method `[]' for nil:NilClass"
@@ -28,7 +28,8 @@ module Dolly
       end
 
       def all
-        Collection.new default_view.parsed_response, name.constantize
+        q = {startkey: [name_paramitized,nil], endkey: [name_paramitized,{}]}
+        Collection.new default_view(q).parsed_response, name.constantize
       end
 
       def default_view options = {}

data/lib/dolly/railtie.rb

@@ -0,0 +1,12 @@
+require 'rails'
+
+module Dolly
+  class Railtie < Rails::Railtie
+    railtie_name :dolly
+
+    rake_tasks do
+      load File.join File.dirname(__FILE__), '../tasks/db.rake'
+    end
+  end
+end
+

data/lib/dolly/request.rb

@@ -10,15 +10,19 @@ module Dolly
     attr_accessor :database_name, :host, :port
 
     def initialize options = {}
-      @host = options[:host] || DEFAULT_HOST
-      @port = options[:port] || DEFAULT_PORT
-      @database_name = options[:database_name]
+      @host = options["host"] || DEFAULT_HOST
+      @port = options["port"] || DEFAULT_PORT
 
-      self.class.base_uri "#{protocol}://#{host}:#{port}"
+      @database_name = options["name"]
+      @username      = options["username"]
+      @password      = options["password"]
+
+      self.class.base_uri "#{protocol}://#{auth_info}#{host}:#{port}"
     end
 
-    def get resource, data
-      request :get, resource, {query: values_to_json(data)}
+    def get resource, data = nil
+      q = {query: values_to_json(data)} if data
+      request :get, resource, q
     end
 
     def put resource, data
@@ -34,6 +38,11 @@ module Dolly
     end
 
     private
+    def auth_info
+      return "" unless @username.present?
+      "#{@username}:#{@password}@"
+    end
+
     def values_to_json hash
       hash.reduce({}){|h, v| h[v.first] = v.last.to_json; h}
     end
@@ -43,6 +52,7 @@ module Dolly
     end
 
     def request method, resource, data = nil
+      data ||= {}
       headers = { 'Content-Type' => 'application/json' }
       response = self.class.send method, full_path(resource), data.merge(headers: headers)
       if response.code == 404

data/lib/dolly/version.rb

@@ -1,3 +1,3 @@
 module Dolly
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/dolly.rb

@@ -1,4 +1,5 @@
 require "dolly/version"
 require "dolly/document"
+require 'dolly/railtie' if defined?(Rails)
 
 module Dolly; end

data/lib/exceptions/dolly.rb

@@ -9,4 +9,9 @@ module Dolly
       'There has been an error on the couchdb server. Please review your couch logs.'
     end
   end
+  class MissingDesignError < RuntimeError
+    def to_s
+      'Design document is missing. Add it into couchdb.yml as design:name.'
+    end
+  end
 end

data/lib/tasks/db.rake

@@ -0,0 +1,26 @@
+namespace :db do
+  desc "Will create if missing database and add default views"
+  task setup: :environment do
+    VIEW_DOC = {
+      language: "coffeescript",
+      views: {
+        find: {
+          map: "(d)->\n  if d._id\n    [str, t, id] = d._id.match /([^/]+)[/](.+)/\n    emit [t, id], 1 if t and id"
+        }
+      }
+    }.freeze
+
+    Dolly::Document.database.put "", nil
+
+    remote_doc = begin
+      JSON.parse Dolly::Document.database.get(Dolly::Document.design_doc).parsed_response
+    rescue Dolly::ResourceNotFound
+      {}
+    end
+
+    doc = VIEW_DOC.merge remote_doc
+
+    Dolly::Document.database.put Dolly::Document.design_doc, doc.to_json
+    puts "design document #{Dolly::Document.design_doc} was created/updated."
+  end
+end

data/test/document_test.rb

@@ -1,9 +1,6 @@
 require 'test_helper'
 
 class FooBar < Dolly::Document
-  database_name 'test'
-  set_design_doc 'test'
-
   property :foo, :bar
   property :with_default, default: 1
   property :boolean, class_name: TrueClass, default: true
@@ -12,19 +9,23 @@ class FooBar < Dolly::Document
 end
 
 class DocumentTest < ActiveSupport::TestCase
+  DB_BASE_PATH = "http://localhost:5984/test/_design/test/_view/".freeze
+  VIEW_DOC = "find".freeze
 
   def setup
     data     = {foo: 'Foo', bar: 'Bar', type: 'foo_bar'}
+
     all_docs = [ {foo: 'Foo B', bar: 'Bar B', type: 'foo_bar'},  {foo: 'Foo A', bar: 'Bar A', type: 'foo_bar'}]
 
     view_resp   = build_view_response [data]
     empty_resp  =  build_view_response []
     @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
-    build_request [], @multi_resp
+    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
   end
 
   test 'with timestamps!' do
@@ -44,14 +45,14 @@ class DocumentTest < ActiveSupport::TestCase
 
   test 'empty find should raise error' do
     assert_raise Dolly::ResourceNotFound do
-      FakeWeb.register_uri :get, "http://localhost:5984/test/_design/test/_view/foo_bar?keys=%5B%5D&include_docs=true", :status => ["404", "Not Found"]
+      FakeWeb.register_uri :get, "#{view_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, "http://localhost:5984/test/_design/test/_view/foo_bar?keys=%5B%5D&include_docs=true", :status => ["500", "Error"]
+      FakeWeb.register_uri :get, "#{view_base_path}?keys=%5B%5D&include_docs=true", :status => ["500", "Error"]
       foo = FooBar.find
     end
   end
@@ -139,9 +140,12 @@ class DocumentTest < ActiveSupport::TestCase
   end
 
   def build_request keys, body, view_name = 'foo_bar'
-    base_url = "http://localhost:5984/test/_design/test/_view/foo_bar"
     query = "keys=#{CGI::escape keys.to_s.gsub(' ','')}&" unless keys.blank?
-    FakeWeb.register_uri :get, "#{base_url}?#{query.to_s}include_docs=true", body: body.to_json
+    FakeWeb.register_uri :get, "#{view_base_path}?#{query.to_s}include_docs=true", body: body.to_json
+  end
+
+  def view_base_path
+    "#{DB_BASE_PATH}#{VIEW_DOC}"
   end
 
 end

data/test/dummy/config/couchdb.yml

@@ -2,7 +2,7 @@ defaults: &defaults
   host: localhost
   port: 5984
   protocol: http
-  design_doc: 'my_app'
+  design: 'test'
 
 development:
   <<: *defaults
@@ -11,5 +11,3 @@ development:
 test:
   <<: *defaults
   name: test
-
-