dolly 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56886a385508910eeaa3205270cca2b4d1576930
-  data.tar.gz: 2f0e1bb676c10ac81943456ddf81a4355d487698
+  metadata.gz: f1180bb4a834ab23599e09b0c3cbf2b5d748fe6e
+  data.tar.gz: 374645939a64f8bbb6720963052db1c1e4aa7a21
 SHA512:
-  metadata.gz: 87161563ce0d86a810f216b73834071f1836d0ae3394066318ee80f01517353fb3390c8a0f31beeb047ed64c15dde9551ecd327d3179628b91d2e72629328f62
-  data.tar.gz: 7bde8a8ec5b1bf9eb59ddb25ac12c90151dbfdfba287f7f70bab1e43697b68dd3b6426c9ddeeac02ec8db0ae44fb3737085fbc596c04d6e45c25b127ec03c9dd
+  metadata.gz: c4eeabef4f2cb353ae1f0c36f344662894122a5fb22aa45f2590805154a473e1b03b322abc04cb7c702ea8c1d9437b260a263fb6e8cf22729863f7aadc28c510
+  data.tar.gz: 7358d9fe47ef56297fbfeb07bd904fb1ed76941422876a6bd93a35914c22ab44deec9c8517a0fdb9f3019172112607eca88e4fbdabc4322bbf41cb667b6ce891

data/lib/dolly/document.rb

@@ -1,10 +1,12 @@
 require "dolly/query"
 require "dolly/property"
+require 'dolly/timestamps'
 
 module Dolly
   class Document
     extend Dolly::Connection
     include Dolly::Query
+    extend Dolly::Timestamps
 
     attr_accessor :rows, :doc, :key
     class_attribute :properties
@@ -14,6 +16,18 @@ module Dolly
       init_properties options
     end
 
+    def update_properties options = {}
+      raise InvalidProperty unless valid_properties?(options)
+      options.each do |property, value|
+        send(:"#{property}=", value)
+      end
+    end
+
+    def update_properties! options = {}
+      update_properties(options)
+      save
+    end
+
     def id
       doc['_id'] ||= self.class.next_id
     end
@@ -34,6 +48,8 @@ module Dolly
     def save
       self.doc['_id'] = self.id if self.id.present?
       self.doc['_id'] = self.class.next_id if self.doc['_id'].blank?
+      set_created_at if respond_to? :set_created_at
+      set_updated_at if respond_to? :set_updated_at
       response = database.put(id_as_resource, self.doc.to_json)
       obj = JSON::parse response.parsed_response
       doc['_rev'] = obj['rev'] if obj['rev']
@@ -132,5 +148,12 @@ module Dolly
       self.doc['_id'] = self.class.namespace( normalized_id ) if normalized_id
     end
 
+    def valid_properties?(options)
+      options.keys.any?{ |option| properties_include?(option.to_s) }
+    end
+
+    def properties_include? property
+      _properties.map(&:name).include? property
+    end
   end
 end

data/lib/dolly/property.rb

@@ -2,6 +2,7 @@ module Dolly
   class Property
     attr_writer :value
     attr_accessor :name
+    attr_reader :class_name
 
     def initialize opts = {}
       @class_name = opts.delete(:class_name) if opts.present?

data/lib/dolly/query.rb

@@ -65,14 +65,6 @@ module Dolly
         JSON.parse database.get "_design/#{doc}/_view/#{view}", opts
       end
 
-      def timestamps!
-        %i/created_at updated_at/.each do |method|
-          define_method(method){ @doc[method.to_s] ||= DateTime.now }
-          define_method(:"[]"){|m| self.send(m.to_sym) }
-          define_method(:"[]="){|m, v| self.send(:"#{m}=", v) }
-          define_method(:"#{method}="){|val| @doc[method.to_s] = val }
-        end
-      end
     end
 
     def self.included(base)

data/lib/dolly/timestamps.rb

@@ -0,0 +1,19 @@
+module Dolly
+  module Timestamps
+
+    def timestamps!
+      Dolly::Document.class_eval do
+
+        property :created_at, :updated_at, class_name: DateTime
+
+        def set_created_at
+          self.created_at ||= DateTime.now
+        end
+
+        def set_updated_at
+          self.updated_at = DateTime.now
+        end
+      end
+    end
+  end
+end

data/lib/dolly/version.rb

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

data/lib/exceptions/dolly.rb

@@ -24,4 +24,9 @@ module Dolly
       "Invalid config file at #{filename}"
     end
   end
+  class InvalidProperty < RuntimeError
+    def to_s
+      "Trying to set an undefined property."
+    end
+  end
 end

data/test/document_test.rb

@@ -44,21 +44,6 @@ class DocumentTest < ActiveSupport::TestCase
     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
-    later = DateTime.new 1963, 1, 1
-    now = DateTime.now
-    DateTime.stubs(:now).returns(now)
-    foo = FooBar.find "1"
-    assert_equal now, foo.created_at
-    assert_equal now, foo['created_at']
-    assert_equal now, foo.updated_at
-    assert foo.updated_at = later
-    assert_equal later, foo.updated_at
-    assert foo['created_at'] = later
-    assert_equal later, foo['created_at']
-    assert_equal foo['created_at'], foo.created_at
-  end
-
   test 'new in memory document' do
     #TODO: clean up all the fake request creation
     resp = {ok: true, id: "foo_bar/1", rev: "FF0000"}
@@ -270,6 +255,41 @@ class DocumentTest < ActiveSupport::TestCase
     assert foo.id.match(uuid)
   end
 
+  test 'update document properties' do
+    foo = FooBar.new 'id' => 'a', foo: 'ab', bar: 'ba'
+    assert_equal 'ab', foo.foo
+    foo.update_properties foo: 'c'
+    assert_equal 'c', foo.foo
+  end
+
+  test 'update document propertys with bang' do
+    foo = FooBar.new 'id' => 'a', foo: 'ab', bar: 'ba'
+    foo.expects(:save).once
+    foo.update_properties! foo: 'c'
+  end
+
+  test 'trying to update invalid property' do
+    foo = FooBar.new 'id' => 'a', foo: 'ab', bar: 'ba'
+    assert_raise Dolly::InvalidProperty do
+       foo.update_properties key_to_success: false
+    end
+  end
+
+  test 'set updated at' do
+    foo = FooBar.new 'id' => 'a', foo: 'ab'
+    foo.update_properties! foo: 'c'
+    assert_equal DateTime.now.to_s, foo.updated_at.to_s
+  end
+
+  test 'created at is set' do
+    resp = {ok: true, id: "foo_bar/1", rev: "FF0000"}
+    FakeWeb.register_uri :put, /http:\/\/localhost:5984\/test\/foo_bar%2F.+/, body: resp.to_json
+    properties = {foo: 1, bar: 2, boolean: false}
+    foo = FooBar.new properties
+    foo.save
+    assert_equal DateTime.now.to_s, foo.created_at.to_s
+  end
+
   test 'reader :bar is not calling the writer :bar=' do
     foo = FooBar.new
     foo.bar = 'bar'

data/test/dummy/log/test.log

@@ -67957,3 +67957,249 @@ DocumentTest: test_with_default_will_return_default_value_on_nil
 -----------------------------------
 DocumentTest: test_with_timestamps!
 -----------------------------------
+--------------------------------------------------
+BulkDocumentTest: test_adding_document_to_bulk_doc
+--------------------------------------------------
+-----------------------------------------------------------------
+BulkDocumentTest: test_bulk_document_intialize_with_empty_payload
+-----------------------------------------------------------------
+------------------------------------------------------------------
+BulkDocumentTest: test_save_document_will_remove_docs_from_payload
+------------------------------------------------------------------
+--------------------------------------------------------------
+DocumentTest: test_Dolly::Document_have_bulk_document_instance
+--------------------------------------------------------------
+-------------------------------------------
+DocumentTest: test_all_first_returns_FooBar
+-------------------------------------------
+------------------------------------------
+DocumentTest: test_all_last_returns_FooBar
+------------------------------------------
+--------------------------------------
+DocumentTest: test_all_will_get_2_docs
+--------------------------------------
+------------------------------------------------
+DocumentTest: test_all_will_get_FooBar_documents
+------------------------------------------------
+------------------------------------------
+DocumentTest: test_can_find_with_fixnum_id
+------------------------------------------
+----------------------------------------------
+DocumentTest: test_default_will_be_avoerwriten
+----------------------------------------------
+--------------------------------------------
+DocumentTest: test_delete_method_on_document
+--------------------------------------------
+------------------------------------------------
+DocumentTest: test_empty_find_should_raise_error
+------------------------------------------------
+------------------------------------------------------------
+DocumentTest: test_error_on_server_raises_Dolly::ServerError
+------------------------------------------------------------
+--------------------------------------------------
+DocumentTest: test_find_will_get_a_FooBar_document
+--------------------------------------------------
+----------------------------------------------------------------
+DocumentTest: test_find_with_multiple_ids_will_return_Collection
+----------------------------------------------------------------
+--------------------------------------------------------
+DocumentTest: test_first_class_method_returns_collection
+--------------------------------------------------------
+---------------------------------------------------------
+DocumentTest: test_first_class_method_returns_single_item
+---------------------------------------------------------
+---------------------------------------------
+DocumentTest: test_getting_not_found_document
+---------------------------------------------
+-------------------------------------------------------
+DocumentTest: test_last_class_method_returns_collection
+-------------------------------------------------------
+--------------------------------------------------------
+DocumentTest: test_last_class_method_returns_single_item
+--------------------------------------------------------
+-------------------------------------------------
+DocumentTest: test_multi_response_with_right_data
+-------------------------------------------------
+---------------------------------------
+DocumentTest: test_new_document_have_id
+---------------------------------------
+-------------------------------------------------------------------
+DocumentTest: test_new_document_will_have_id_from__id_or_id_strings
+-------------------------------------------------------------------
+-------------------------------------------------------------------
+DocumentTest: test_new_document_will_have_id_from__id_or_id_symbols
+-------------------------------------------------------------------
+------------------------------------------
+DocumentTest: test_new_document_with_no_id
+------------------------------------------
+-----------------------------------------
+DocumentTest: test_new_in_memory_document
+-----------------------------------------
+------------------------------------
+DocumentTest: test_query_custom_view
+------------------------------------
+----------------------------------------------
+DocumentTest: test_query_custom_view_collation
+----------------------------------------------
+--------------------------------------------------------------
+DocumentTest: test_reader_:bar_is_not_calling_the_writer_:bar=
+--------------------------------------------------------------
+------------------------------------------
+DocumentTest: test_soft_delete_on_document
+------------------------------------------
+----------------------------------------------------
+DocumentTest: test_trying_to_update_invalid_property
+----------------------------------------------------
+---------------------------------------------
+DocumentTest: test_update_document_properties
+---------------------------------------------
+------------------------------------------------------
+DocumentTest: test_update_document_propertys_with_bang
+------------------------------------------------------
+-------------------------------------------
+DocumentTest: test_will_have_key_properties
+-------------------------------------------
+--------------------------------------------------------
+DocumentTest: test_will_have_object_with_DateTime_method
+--------------------------------------------------------
+----------------------------------------------------
+DocumentTest: test_will_have_object_with_Date_method
+----------------------------------------------------
+----------------------------------------------------
+DocumentTest: test_will_have_object_with_Time_method
+----------------------------------------------------
+--------------------------------------------------------
+DocumentTest: test_will_have_object_with_boolean?_method
+--------------------------------------------------------
+------------------------------------------------
+DocumentTest: test_will_have_only_set_properties
+------------------------------------------------
+----------------------------------------------------------------
+DocumentTest: test_with_default_will_return_default_value_on_nil
+----------------------------------------------------------------
+-----------------------------------
+DocumentTest: test_with_timestamps!
+-----------------------------------
+--------------------------------------------------
+BulkDocumentTest: test_adding_document_to_bulk_doc
+--------------------------------------------------
+-----------------------------------------------------------------
+BulkDocumentTest: test_bulk_document_intialize_with_empty_payload
+-----------------------------------------------------------------
+------------------------------------------------------------------
+BulkDocumentTest: test_save_document_will_remove_docs_from_payload
+------------------------------------------------------------------
+--------------------------------------------------------------
+DocumentTest: test_Dolly::Document_have_bulk_document_instance
+--------------------------------------------------------------
+-------------------------------------------
+DocumentTest: test_all_first_returns_FooBar
+-------------------------------------------
+------------------------------------------
+DocumentTest: test_all_last_returns_FooBar
+------------------------------------------
+--------------------------------------
+DocumentTest: test_all_will_get_2_docs
+--------------------------------------
+------------------------------------------------
+DocumentTest: test_all_will_get_FooBar_documents
+------------------------------------------------
+------------------------------------------
+DocumentTest: test_can_find_with_fixnum_id
+------------------------------------------
+----------------------------------------------
+DocumentTest: test_default_will_be_avoerwriten
+----------------------------------------------
+--------------------------------------------
+DocumentTest: test_delete_method_on_document
+--------------------------------------------
+------------------------------------------------
+DocumentTest: test_empty_find_should_raise_error
+------------------------------------------------
+------------------------------------------------------------
+DocumentTest: test_error_on_server_raises_Dolly::ServerError
+------------------------------------------------------------
+--------------------------------------------------
+DocumentTest: test_find_will_get_a_FooBar_document
+--------------------------------------------------
+----------------------------------------------------------------
+DocumentTest: test_find_with_multiple_ids_will_return_Collection
+----------------------------------------------------------------
+--------------------------------------------------------
+DocumentTest: test_first_class_method_returns_collection
+--------------------------------------------------------
+---------------------------------------------------------
+DocumentTest: test_first_class_method_returns_single_item
+---------------------------------------------------------
+---------------------------------------------
+DocumentTest: test_getting_not_found_document
+---------------------------------------------
+-------------------------------------------------------
+DocumentTest: test_last_class_method_returns_collection
+-------------------------------------------------------
+--------------------------------------------------------
+DocumentTest: test_last_class_method_returns_single_item
+--------------------------------------------------------
+-------------------------------------------------
+DocumentTest: test_multi_response_with_right_data
+-------------------------------------------------
+---------------------------------------
+DocumentTest: test_new_document_have_id
+---------------------------------------
+-------------------------------------------------------------------
+DocumentTest: test_new_document_will_have_id_from__id_or_id_strings
+-------------------------------------------------------------------
+-------------------------------------------------------------------
+DocumentTest: test_new_document_will_have_id_from__id_or_id_symbols
+-------------------------------------------------------------------
+------------------------------------------
+DocumentTest: test_new_document_with_no_id
+------------------------------------------
+-----------------------------------------
+DocumentTest: test_new_in_memory_document
+-----------------------------------------
+------------------------------------
+DocumentTest: test_query_custom_view
+------------------------------------
+----------------------------------------------
+DocumentTest: test_query_custom_view_collation
+----------------------------------------------
+--------------------------------------------------------------
+DocumentTest: test_reader_:bar_is_not_calling_the_writer_:bar=
+--------------------------------------------------------------
+------------------------------------------
+DocumentTest: test_soft_delete_on_document
+------------------------------------------
+----------------------------------------------------
+DocumentTest: test_trying_to_update_invalid_property
+----------------------------------------------------
+---------------------------------------------
+DocumentTest: test_update_document_properties
+---------------------------------------------
+------------------------------------------------------
+DocumentTest: test_update_document_propertys_with_bang
+------------------------------------------------------
+-------------------------------------------
+DocumentTest: test_will_have_key_properties
+-------------------------------------------
+--------------------------------------------------------
+DocumentTest: test_will_have_object_with_DateTime_method
+--------------------------------------------------------
+----------------------------------------------------
+DocumentTest: test_will_have_object_with_Date_method
+----------------------------------------------------
+----------------------------------------------------
+DocumentTest: test_will_have_object_with_Time_method
+----------------------------------------------------
+--------------------------------------------------------
+DocumentTest: test_will_have_object_with_boolean?_method
+--------------------------------------------------------
+------------------------------------------------
+DocumentTest: test_will_have_only_set_properties
+------------------------------------------------
+----------------------------------------------------------------
+DocumentTest: test_with_default_will_return_default_value_on_nil
+----------------------------------------------------------------
+-----------------------------------
+DocumentTest: test_with_timestamps!
+-----------------------------------

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dolly
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - javierg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -141,6 +141,7 @@ files:
 - lib/dolly/query.rb
 - lib/dolly/railtie.rb
 - lib/dolly/request.rb
+- lib/dolly/timestamps.rb
 - lib/dolly/version.rb
 - lib/dolly.rb
 - lib/exceptions/dolly.rb