dolly 0.7.3 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4aebf024e5e48154c3725af48715816d015b6444
-  data.tar.gz: e1a4d17548ecdd9e9d4cceb9c482ba77de1ba983
+  metadata.gz: 56886a385508910eeaa3205270cca2b4d1576930
+  data.tar.gz: 2f0e1bb676c10ac81943456ddf81a4355d487698
 SHA512:
-  metadata.gz: 2262642fce24061d8141d160be3aec870a8cf101931bb0bf6371b3e08d5e590ddb80121d0cac6246f1530ac5a175557d9c343e36066ad1bb7eca6cc086b425ea
-  data.tar.gz: 98160dca126b53ca2c3840719463747d29067985777445149744fb003720842428a1026f66e1ccab3dd80cc5c03b4687e1ba1c53524d70009f1caaf7a00af6aa
+  metadata.gz: 87161563ce0d86a810f216b73834071f1836d0ae3394066318ee80f01517353fb3390c8a0f31beeb047ed64c15dde9551ecd327d3179628b91d2e72629328f62
+  data.tar.gz: 7bde8a8ec5b1bf9eb59ddb25ac12c90151dbfdfba287f7f70bab1e43697b68dd3b6426c9ddeeac02ec8db0ae44fb3737085fbc596c04d6e45c25b127ec03c9dd

data/lib/dolly/collection.rb

@@ -48,7 +48,8 @@ module Dolly
         properties = r['doc']
         id = properties.delete '_id'
         rev = properties.delete '_rev' if properties['_rev']
-        document = docs_class.new properties
+        doc_class = doc_class id
+        document = doc_class.new properties
         document.doc = properties.merge({'_id' => id, '_rev' => rev})
         @set << document
       end
@@ -70,6 +71,15 @@ module Dolly
       @docs_class
     end
 
+    def doc_class id
+      # TODO: We need to improve and document the way we return
+      # multiple types when querying from a class, as it might
+      # be confusing. We *could* also get dolly to parse the result
+      # before sending it back to the client.
+      doc_class = id[/^[a-z_]+/].camelize.constantize
+      docs_class == doc_class ? docs_class : doc_class
+    end
+
     def json
       @json
     end

data/lib/dolly/property.rb

@@ -7,7 +7,7 @@ module Dolly
       @class_name = opts.delete(:class_name) if opts.present?
       @name = opts.delete(:name).to_s
       @default = opts.delete(:default)
-      warn 'There are some unprocesed options' if opts.present?
+      warn 'There are some unprocessed options!' if opts.present?
     end
 
     def value
@@ -41,6 +41,18 @@ module Dolly
       @value.to_f
     end
 
+    def date_value
+      @value.to_date
+    end
+
+    def time_value
+      @value.to_time
+    end
+
+    def date_time_value
+      @value.to_datetime
+    end
+
     def true_class_value
       truthy_value?
     end

data/lib/dolly/query.rb

@@ -29,7 +29,7 @@ module Dolly
       end
 
       def default_query_args
-        {startkey: "#{name_paramitized}/", endkey: "#{name_paramitized}/{}"}
+        {startkey: "#{name_paramitized}/", endkey: "#{name_paramitized}/\ufff0"}
       end
 
       def all

data/lib/dolly/version.rb

@@ -1,3 +1,3 @@
 module Dolly
-  VERSION = "0.7.3"
+  VERSION = "0.7.5"
 end

data/test/document_test.rb

@@ -4,10 +4,15 @@ class FooBar < Dolly::Document
   property :foo, :bar
   property :with_default, default: 1
   property :boolean, class_name: TrueClass, default: true
+  property :date, class_name: Date
+  property :time, class_name: Time
+  property :datetime, class_name: DateTime
 
   timestamps!
 end
 
+class Baz < Dolly::Document; end
+
 class DocumentTest < ActiveSupport::TestCase
   DB_BASE_PATH = "http://localhost:5984/test".freeze
 
@@ -20,17 +25,18 @@ class DocumentTest < ActiveSupport::TestCase
     empty_resp  =  build_view_response []
     not_found_resp = generic_response [{ key: "foo_bar/2", error: "not_found" }]
     @multi_resp = build_view_response all_docs
+    @multi_type_resp = build_view_collation_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
 
     #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%2F%EF%BF%B0%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%EF%BF%B0%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%EF%BF%B0%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}?endkey=%22foo_bar%2F%22&startkey=%22foo_bar%2F%EF%BF%B0%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"]
@@ -88,6 +94,24 @@ class DocumentTest < ActiveSupport::TestCase
     assert_equal false, foo.boolean?
   end
 
+  test 'will have object with Date method' do
+    foo = FooBar.find 1
+    foo.date = Date.today
+    assert_equal true, foo.date.is_a?(Date)
+  end
+
+  test 'will have object with Time method' do
+    foo = FooBar.find 1
+    foo.time = Time.now
+    assert_equal true, foo.time.is_a?(Time)
+  end
+
+  test 'will have object with DateTime method' do
+    foo = FooBar.find 1
+    foo.datetime = DateTime.now
+    assert_equal true, foo.datetime.is_a?(DateTime)
+  end
+
   test 'find will get a FooBar document' do
     foo = FooBar.find "1"
     assert_equal true, foo.kind_of?(FooBar)
@@ -202,6 +226,14 @@ class DocumentTest < ActiveSupport::TestCase
     f.each{ |d| assert d.kind_of?(FooBar) }
   end
 
+  test 'query custom view collation' do
+    FakeWeb.register_uri :get, "http://localhost:5984/test/_design/test/_view/custom_view?startkey=%5B1%5D&endkey=%5B1%2C%7B%7D%5D&include_docs=true", body: @multi_type_resp.to_json
+    f = FooBar.find_with "test", "custom_view", { startkey: [1], endkey: [1, {}]}
+    assert_equal 2, f.count
+    assert f.first.kind_of?(FooBar)
+    assert f.last.kind_of?(Baz)
+  end
+
   test 'new document have id' do
     foo = FooBar.new
     assert_equal 0, (foo.id =~ /^foo_bar\/[abcdef0-9]+/i)
@@ -238,6 +270,14 @@ class DocumentTest < ActiveSupport::TestCase
     assert foo.id.match(uuid)
   end
 
+  test 'reader :bar is not calling the writer :bar=' do
+    foo = FooBar.new
+    foo.bar = 'bar'
+    foo.save!
+    foo.expects(:bar=).times(0)
+    assert_equal 'bar', foo.bar
+  end
+
   private
   def generic_response rows, count = 1
     {total_rows: count, offset:0, rows: rows}
@@ -255,6 +295,20 @@ class DocumentTest < ActiveSupport::TestCase
     generic_response rows, properties.count
   end
 
+  def build_view_collation_response properties
+    rows = properties.map.with_index do |v, i|
+      id = i.zero? ? "foo_bar/#{i}" : "baz/#{i}"
+      {
+        id: id,
+        key: "foo_bar",
+        value: 1,
+        doc: {_id: id, _rev: SecureRandom.hex}.merge!(v)
+      }
+    end
+    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, "#{query_base_path}?#{query.to_s}include_docs=true", body: body.to_json

data/test/dummy/config/initializers/filter_parameter_logging.rb

@@ -0,0 +1,4 @@
+# Be sure to restart your server when you modify this file.
+
+# Configure sensitive parameters which will be filtered from the log file.
+Rails.application.config.filter_parameters += [:password]