dolly 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52fcc7a3f0888239aaff1a6398a81112d031722db14d3070d83d574179414197
-  data.tar.gz: 20d5efb134448842c4c547d85f0f395993fdd8817898e7b174e3e5f5714a7022
+  metadata.gz: 2bd1cf887f25cacb3b25be56354cf74c1771cd021514cb8bf733e31aa7198feb
+  data.tar.gz: cd464f54583a1f417fb58e27f504ccce8ddd33f39f1f48eea0f3b66487313445
 SHA512:
-  metadata.gz: f684874eaa87448a0ae67fddf5df98f3e86c5c6a53f8fb7b75e1331d16d63f07e6ef8eb2db17e461609433ccaf770a1c3a3c27b1551b5cf7c823f2d010005075
-  data.tar.gz: f44fa8ea168a1d6ca31042c4eed5b8cf0fdb1fd11dfcc5fb76e177598cce96512e6cca8a842e6c646fa4f65f8e4e0ea9759379ad73954c42fb1694c9803d42c3
+  metadata.gz: 5c2bddaf348f5028c10ea464ea3265a9653d741508a103d3bd4d3e83757261ead6de60d630db9a8fa512ba22e13cd36043debc8e8d7be457aa63079018a3d580
+  data.tar.gz: f1c2ede8149132f5d6941fbbe0b4eb1ada18ed060eb76ccd8b4eeffec556590b2b8c8044331d6726de10a0758120a6595b07f6da5afdd86da95be655344ceb8b

data/lib/dolly/connection.rb

@@ -1,3 +1,4 @@
+require 'curb'
 require 'oj'
 require 'cgi'
 require 'net/http'
@@ -11,19 +12,20 @@ module Dolly
     include Dolly::Configuration
     attr_reader :db, :app_env
 
-    DEFAULT_HEADER = { 'Content-Type' => 'application/json' }
+    DEFAULT_HEADER = { 'Content-Type' => 'application/json', 'Accept' => 'application/json' }
     SECURE_PROTOCOL = 'https'
+    DEFAULT_DATABASE = :default
 
     using StringRefinements
 
-    def initialize db = :default, app_env = :development
+    def initialize db = DEFAULT_DATABASE, app_env = :development
       @db      = db
       @app_env = app_env
     end
 
     def get(resource, data = {})
       query = { query: values_to_json(data) } if data
-      request :get, resource.cgi_escape, query
+      request :get, resource, query
     end
 
     def post resource, data
@@ -35,9 +37,9 @@ module Dolly
     end
 
     def delete resource, rev = nil, escape: true
-      query = { query: { rev: rev } } if rev
-      resource = resource.cgi_escape if escape
-      request :delete, resource, query
+      query = "?rev=#{rev}" if rev
+      resource = "#{escape ? resource.cgi_escape : resource}#{query}"
+      request :delete, resource
     end
 
     def view resource, opts
@@ -61,53 +63,36 @@ module Dolly
     end
 
     def request(method, resource, data = {})
-      headers  = Dolly::HeaderRequest.new data&.delete(:headers)
-      uri      = build_uri(resource, data&.delete(:query))
-      klass    = request_method(method)
-      req      = klass.new(uri, headers)
-      req.body = format_data(data, headers.json?)
-      response = start_request(req)
-
-      response_format(response, method)
+      headers  = Dolly::HeaderRequest.new(data&.delete(:headers))
+      data&.merge!(data&.delete(:query) || {})
+      db_resource = (resource =~ %r{^/}) ? resource : "/#{db_name}/#{resource}"
+      uri = URI("#{base_uri}#{db_resource}")
+      conn = curl_method_call(method, uri, data) do |curl|
+        if env['username'].present?
+          curl.http_auth_types = :basic
+          curl.username = env['username']
+          curl.password = env['password'].to_s
+        end
+
+        headers.each { |k, v| curl.headers[k] = v } if headers.present?
+      end
+      response_format(conn, method)
     end
 
     private
 
-    def start_request(req)
-      req.basic_auth env['username'], env['password'] if env['username']&.present?
-
-      http = Net::HTTP.new(req.uri.host, req.uri.port)
-      http.use_ssl = secure?
-
-      http.request(req)
-    end
-
-    def secure?
-      env['protocol'] == SECURE_PROTOCOL
+    def curl_method_call(method, uri, data, &block)
+      return Curl::Easy.http_head(uri.to_s, &block) if method.to_sym == :head
+      return Curl.delete(uri.to_s, &block) if method.to_sym == :delete
+      return Curl.send(method, uri, data, &block) if method.to_sym == :get
+      Curl.send(method, uri.to_s, data.to_json, &block)
     end
 
     def response_format(res, method)
-      raise Dolly::ResourceNotFound if res.code.to_i == 404
-      raise Dolly::ServerError.new(res.body) if (400..600).include? res.code.to_i
-      return res if method == :head
-      Oj.load(res.body, symbol_keys: true)
-    end
-
-    def format_data(data = nil, is_json)
-      return unless data
-      body = data.delete(:_body) || data
-      is_json ? body.to_json : body
-    end
-
-    def build_uri(resource, query = nil)
-      query_str = "?#{to_query(query)}" if query
-      uri       = (resource =~ %r{^/}) ? resource : "/#{db_name}/#{resource}"
-
-      URI("#{base_uri}#{uri}#{query_str}")
-    end
-
-    def request_method(method_name)
-      Object.const_get("Net::HTTP::#{method_name.capitalize}")
+      raise Dolly::ResourceNotFound if res.status.to_i == 404
+      raise Dolly::ServerError.new(res.status.to_i) if (400..600).include? res.status.to_i
+      return res.header_str if method == :head
+      Oj.load(res.body_str, symbol_keys: true)
     end
 
     def values_to_json hash

data/lib/dolly/mango.rb

@@ -47,9 +47,10 @@ module Dolly
     end
 
     def find_doc_by(query, opts = {})
-      raise Dolly::IndexNotFoundError unless index_exists?(query)
       opts.merge!(limit: 1)
-      perform_query(build_query(query, opts))[:docs].first
+      response = perform_query(build_query(query, opts))
+      print_index_warning(query) if response.fetch(:warning, nil)
+      response[:docs].first
     end
 
     def where(query, opts = {})
@@ -59,21 +60,55 @@ module Dolly
     end
 
     def docs_where(query, opts = {})
-      raise Dolly::IndexNotFoundError unless index_exists?(query)
-      perform_query(build_query(query, opts))[:docs]
+      response = perform_query(build_query(query, opts))
+      print_index_warning(query) if response.fetch(:warning, nil)
+      response[:docs]
     end
 
-    private
+    def find_bare(id, fields, options = {})
+      q = { _id: id }
+      opts = { fields: fields }.merge(options)
+      query = build_query(q, opts)
+      response = perform_query(query)
+      response[:docs]
+    end
 
-    def build_model_from_doc(doc)
-      return nil if doc.nil?
-      new(doc.slice(*all_property_keys))
+    def where_bare(selector, fields, options = {})
+      opts = { fields: fields }.merge(options)
+      query = build_query(selector, opts)
+      response = perform_query(query)
+      response[:docs]
+    end
+
+    def find_with_metadata(query, options = {})
+      opts = options.merge!(limit: 1)
+      perform_query(build_query(query, opts))
+    end
+
+    def where_with_metadata(query, options = {})
+      perform_query(build_query(query, options))
     end
 
     def perform_query(structured_query)
       connection.post(DESIGN, structured_query)
     end
 
+    private
+
+    def print_index_warning(query)
+      message = "Index not found for #{query.inspect}"
+      if (defined?(Rails.logger) && Rails&.env&.development?)
+        Rails.logger.info(message)
+      else
+        puts message
+      end
+    end
+
+    def build_model_from_doc(doc)
+      return nil if doc.nil?
+      new(doc.slice(*all_property_keys)).tap { |d| d.rev = doc[:_rev] }
+    end
+
     def build_query(query, opts)
       { 'selector' => build_selectors(query) }.merge(opts)
     end
@@ -88,15 +123,12 @@ module Dolly
     end
 
     def build_key(key)
+      return key if key.to_s.starts_with?(SELECTOR_SYMBOL)
       "#{SELECTOR_SYMBOL}#{key}"
     end
 
     def is_operator?(key)
-      ALL_OPERATORS.include?(key)
-    end
-
-    def index_exists?(query)
-      Dolly::MangoIndex.find_by_fields(fetch_fields(query))
+      ALL_OPERATORS.include?(key) || key.to_s.starts_with?(SELECTOR_SYMBOL)
     end
 
     def fetch_fields(query)

data/lib/dolly/mango_index.rb

@@ -23,9 +23,13 @@ module Dolly
         post(DESIGN, build_index_structure(name, fields, type))
       end
 
+      def create_in_database(database, name, fields, type = 'json')
+        connection_for_database(database).post(DESIGN, build_index_structure(name, fields, type))
+      end
+
       def find_by_fields(fields)
         rows = get(ALL_DOCS, key: key_from_fields(fields))[ROWS_KEY]
-        rows && rows.any?
+        (rows && rows.any?)
       end
 
       def delete_all
@@ -42,6 +46,10 @@ module Dolly
 
       private
 
+      def connection_for_database(database)
+        Dolly::Connection.new(database.to_sym, Rails.env || :development)
+      end
+
       def connection
         @connection ||= Dolly::Document.connection
       end

data/lib/dolly/property_manager.rb

@@ -2,6 +2,7 @@ module Dolly
   module PropertyManager
     def build_property(attributes)
       assign_identity_properties(attributes)
+      assign_rev_properties(attributes)
 
       lambda do |property|
         name = property.key.to_sym
@@ -17,14 +18,14 @@ module Dolly
       end
     end
 
-    def write_attribute key, value
+    def write_attribute(key, value)
       value = set_property_value(key, value)
       instance_variable_set(:"@#{key}", value)
-      update_doc(key, value) unless value.nil?
+      update_doc(key, value)
     end
 
     def valid_property?(name)
-      properties.include? name
+      properties.include?(name)
     end
 
     def update_doc(key, value)
@@ -43,5 +44,10 @@ module Dolly
       id_presence = opts[:id] || opts[:_id] || opts['id'] || opts['_id']
       self.id = id_presence if id_presence
     end
+
+    def assign_rev_properties(opts = {})
+      rev_presence = opts[:rev] || opts [:_rev] || opts['rev'] || opts['_rev']
+      self.rev = rev_presence if rev_presence
+    end
   end
 end

data/lib/dolly/query.rb

@@ -11,12 +11,30 @@ module Dolly
     using StringRefinements
 
     def find *keys
-      query_hash = { keys: namespace_keys(keys).map { |k| k.cgi_escape } }
+      query_hash = { keys: namespace_keys(keys) }
 
       build_collection(query_hash).first_or_all&.itself ||
         raise(Dolly::ResourceNotFound)
     end
 
+    def bulk_find(*keys_to_find)
+      data = {
+        query: { include_docs: true },
+        keys: keys_to_find.map { |key| namespace_key(key) }
+      }
+
+      res = connection.post('_all_docs', data)
+      Collection.new(rows: res, options: { doc_type: self.class_name })
+    end
+
+    def find_all(*keys)
+      query_hash = { keys: namespace_keys(keys) }
+      return [] if query_hash[:keys].none?
+
+      keys_to_find_counter = query_hash[:keys].length
+      build_collection(query_hash).first_or_all(true)&.itself
+    end
+
     def safe_find *keys
       find *keys
     rescue Dolly::ResourceNotFound
@@ -38,7 +56,7 @@ module Dolly
     end
 
     def find_with doc, view_name, opts = {}
-      opts          = opts.each_with_object({}) { |(k, v), h| h[k] = escape_value(v) }
+      opts          = opts.each_with_object({}) { |(k, v), h| h[k] = v }
       query_results = raw_view(doc, view_name, opts)
 
       Collection.new({ rows: query_results, options: {} }).first_or_all

data/lib/dolly/query_arguments.rb

@@ -3,7 +3,7 @@
 module Dolly
   module QueryArguments
     def last_item_in_range
-      URI.escape("\ufff0")
+      "\ufff0"
     end
 
     def default_query_args

data/lib/dolly/request_header.rb

@@ -7,7 +7,7 @@ module Dolly
     CONTENT_TYPE_KEY = 'Content-Type'
     JSON_CONTENT = 'application/json'
 
-    def_delegators :@collection, :[], :[]=, :keys, :each
+    def_delegators :@collection, :[], :[]=, :keys, :each, :present?, :merge!
 
     def initialize hash = nil
       @collection = hash || default_value

data/lib/dolly/version.rb

@@ -1,3 +1,3 @@
 module Dolly
-  VERSION = "3.0.1"
+  VERSION = "3.1.0"
 end

data/lib/dolly/view_query.rb

@@ -2,13 +2,20 @@ require 'dolly/class_methods_delegation'
 
 module Dolly
   module ViewQuery
-    def raw_view(doc, view_name, opts = {})
-      design = "_design/#{doc}/_view/#{view_name}"
+    def raw_view(design, view_name, opts = {})
+      design = "_design/#{design}/_view/#{view_name}"
       connection.view(design, opts)
     end
 
     def view_value(doc, view_name, opts = {})
       raw_view(doc, view_name, opts)[:rows].flat_map { |result| result[:value] }
     end
+
+    def collection_view(design, view_name, opts = {})
+      opts.delete(:include_docs)
+      design = "_design/#{design}/_view/#{view_name}"
+      response = connection.view(design, opts)
+      Dolly::Collection.new(rows: response, options: opts)
+    end
   end
 end

data/lib/tasks/db.rake

@@ -69,8 +69,15 @@ namespace :db do
 
       files.each do |file|
         index_data = JSON.parse(File.read(file))
-        puts "Creating index: #{index_data["name"]}"
-        puts Dolly::MangoIndex.create(index_data['name'], index_data['fields'])
+        database = index_data.fetch('db', 'default').to_sym
+        puts "*" * 100
+        puts "Creating index: #{index_data["name"]} for database: #{database}"
+
+        if database == Dolly::Connection::DEFAULT_DATABASE
+          puts Dolly::MangoIndex.create(index_data['name'], index_data['fields'])
+        else
+          puts Dolly::MangoIndex.create_in_database(database, index_data['name'], index_data['fields'])
+        end
       end
     end
   end

data/test/property_manager_test.rb

@@ -0,0 +1,18 @@
+require 'test_helper'
+
+class TestDoc < Dolly::Document
+  property :name, class_name: String
+  property :email, class_name: String
+  property :last_name, class_name: String
+end
+
+class PropertyManagerTest < Test::Unit::TestCase
+  test 'write_attribute with nil value' do
+    doc = TestDoc.new(name: 'name', last_name: nil, email: 'does not change')
+    assert_equal(doc.name, 'name')
+    doc.update_properties(name: nil)
+    assert_equal(doc.name, nil)
+    assert_equal(doc.last_name, nil)
+    assert_equal(doc.email, 'does not change')
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dolly
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - javierg
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-02 00:00:00.000000000 Z
+date: 2021-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: curb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: test-unit-full
   requirement: !ruby/object:Gem::Requirement
@@ -141,13 +155,14 @@ files:
 - test/inheritance_test.rb
 - test/mango_index_test.rb
 - test/mango_test.rb
+- test/property_manager_test.rb
 - test/support/test.txt
 - test/test_helper.rb
 - test/view_query_test.rb
 homepage: https://www.amco.me
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -162,8 +177,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: will write something
 test_files:
@@ -178,3 +193,4 @@ test_files:
 - test/support/test.txt
 - test/test_helper.rb
 - test/document_test.rb
+- test/property_manager_test.rb