reorm 0.1.4 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b41dda011f62f508e399da5e164dc26df0dbf50f
-  data.tar.gz: 36237b21f166740f1b39ee93ea1d5fe46fe0ce9f
+  metadata.gz: 0926ae773897fa1ab0198afe1c4577ccfdeea99c
+  data.tar.gz: 2f6d59a5ff0e3bbc41daa49262d62a20007f0956
 SHA512:
-  metadata.gz: c2d218a94642edcb778b26eb449a728e3117809d4433770efb311c811f1f039f28c23e715e737846c66f5779320e0d6babf7d7f96405ee486f0de4662f33653b
-  data.tar.gz: ba982ccbe3f4f15c709cd0adeb6f2679063c7aba8c9d85f6ea42f8cced3fa2bd04d451856b7047de2089a77246441b4565a54e7a9fa50f42433d4c504a8e7978
+  metadata.gz: 048f6fd28385581a438c97804d93fc4e2e384af5e2e6f5efcaf35f26a810a6fa74c4f03cf32c62c0836eae0f78201d86216e0244a91d6c4ed9bc17d69212dffb
+  data.tar.gz: 4c1198b1673b3b7867c49caaeef97ed0a7dfd3c2b1e266223305e159973d887ec90cb05d6cc7db6810aecd9d5cd2d23e184664c3abe8706629e9011a20b53b47

data/lib/reorm/cursor.rb

@@ -22,8 +22,12 @@ module Reorm
     end
     alias :reset :close
 
-    def filter(predicate)
-      Cursor.new(model_class, @query.filter(predicate), @order_by)
+    def filter(predicate=nil, &block)
+      if predicate.nil?
+        Cursor.new(model_class, @query.filter(&block), @order_by)
+      else
+        Cursor.new(model_class, @query.filter(predicate), @order_by)
+      end
     end
 
     def count
@@ -113,6 +117,12 @@ module Reorm
       Cursor.new(model_class, @query, arguments)
     end
 
+    def delete
+      Reorm.connection do |connection|
+        @query.delete.run(connection)
+      end
+    end
+
   private
 
     def open

data/lib/reorm/field_path.rb

@@ -41,13 +41,21 @@ module Reorm
           break
         else
           if index == @path.length - 1
-            result = [value[field], true]
+            result = [value_from_object(field, value), true]
           else
-            value = value[field]
+            value = value_from_object(field, value)
           end
         end
       end
       result
     end
+
+    def value_from_object(value, object)
+      if object.respond_to?(value)
+        object.send(value)
+      else
+        object[value]
+      end
+    end
   end
 end

data/lib/reorm/model.rb

@@ -13,14 +13,8 @@ module Reorm
 
     def initialize(properties={})
       @properties = {}
-      properties.each do |key, value|
-        if self.respond_to?(setter_name(key))
-          self.send(setter_name(key), value)
-        else
-          @properties[key.to_sym] = value
-        end
-      end
       @errors     = PropertyErrors.new
+      properties.each {|key, value| set_property(key, value)}
     end
     attr_reader :errors
 
@@ -36,6 +30,10 @@ module Reorm
       self
     end
 
+    def include?(field)
+      @properties.include?(property_name(field))
+    end
+
     def save(validated=true)
       if validated && !valid?
         raise Error, "Validation error encountered saving an instance of the #{self.class.name} class."
@@ -69,6 +67,31 @@ module Reorm
       else
         fire_events(events: [:after_save, :after_update])
       end
+      self
+    end
+
+    def update(properties={})
+      properties.each do |property, value|
+        set_property(property, value)
+      end
+      self.save if !properties.empty?
+      self
+    end
+
+    def delete
+      key = get_property(primary_key)
+      if key
+        Reorm.connection do |connection|
+          fire_events(events: [:before_delete])
+          result = r.table(table_name).get(key).delete.run(connection)
+          if result["deleted"] != 1
+            raise Error, "Deletion of record for a #{self.class.name} class instance with a primary key of #{key} failed."
+          end
+          fire_events(events: [:after_delete])
+          set_property(primary_key, nil)
+        end
+      end
+      self
     end
 
     def [](property_name)
@@ -80,6 +103,26 @@ module Reorm
       value
     end
 
+    def has_property?(property)
+      @properties.include?(property_name(property))
+    end
+
+    def get_property(property)
+      has_property?(property) ? self.__send__(property_name(property)) : nil
+    end
+
+    def set_property(property, value)
+      self.__send__(setter_name(property), value)
+      self
+    end
+
+    def set_properties(settings={})
+      settings.each do |property, value|
+        set_property(property, value)
+      end
+      self
+    end
+
     def respond_to?(method_name, include_private=false)
       method_name.to_s[-1, 1] == "=" || @properties.include?(property_name(method_name)) || super
     end

data/lib/reorm/modules/event_modules.rb

@@ -15,6 +15,10 @@ module Reorm
       store_event_handlers(:after_create, *methods)
     end
 
+    def after_delete(*methods)
+      store_event_handlers(:after_delete, *methods)
+    end
+
     def after_save(*methods)
       store_event_handlers(:after_save, *methods)
     end
@@ -31,6 +35,10 @@ module Reorm
       store_event_handlers(:before_create, *methods)
     end
 
+    def before_delete(*methods)
+      store_event_handlers(:before_delete, *methods)
+    end
+
     def before_save(*methods)
       store_event_handlers(:before_save, *methods)
     end
@@ -72,7 +80,7 @@ module Reorm
           events.each do |event|
             if handlers.include?(event)
               handlers[event].each do |handler|
-                if !object.respond_to?(handler)
+                if !object.respond_to?(handler, true)
                   raise Error, "Unable to locate a method called '#{handler}' for an instance of the #{object.class.name} class."
                 end
                 object.__send__(handler)

data/lib/reorm/version.rb

@@ -1,6 +1,6 @@
 module Reorm
   MAJOR_VERSION              = 0
   MINOR_VERSION              = 1
-  BUILD_VERSION              = 4
+  BUILD_VERSION              = 8
   VERSION                    = "#{MAJOR_VERSION}.#{MINOR_VERSION}.#{BUILD_VERSION}"
 end

data/spec/reorm/cursor_spec.rb

@@ -211,4 +211,14 @@ describe Reorm::Cursor do
       expect(indices).to eq([5, 4, 3, 2, 1])
     end
   end
+
+  describe "#delete()" do
+    it "deletes all records" do
+      query = CursorTestModel.filter do |record|
+        (record["index"].eq(1) | record["index"].eq(3) | record["index"].eq(5))
+      end
+      query.delete
+      expect(CursorTestModel.all.count).to eq(2)
+    end    
+  end
 end

data/spec/reorm/field_path_spec.rb

@@ -3,63 +3,63 @@ require "spec_helper"
 describe Reorm::FieldPath do
   describe "#name()" do
     subject {
-      Reorm::FieldPath.new(:first, :second, :third)
+      Reorm::FieldPath.new(:one, :two, :three)
     }
 
     it "returns the last element of the field path as the name" do
-      expect(subject.name).to eq(:third)
+      expect(subject.name).to eq(:three)
     end
   end
 
   describe "#value()" do
     it "fetches the value from the input" do
-      field = Reorm::FieldPath.new(:first)
-      expect(field.value({first: 1})).to eq(1)
+      field = Reorm::FieldPath.new(:one)
+      expect(field.value({one: 1})).to eq(1)
     end
 
     it "traverses a hierarchy if one has been specified" do
-    field = Reorm::FieldPath.new(:first, :second, :third)
-    expect(field.value({first: {second: {third: 3}}})).to eq(3)
+    field = Reorm::FieldPath.new(:one, :two, :three)
+    expect(field.value({one: {two: {three: 3}}})).to eq(3)
     end
 
     it "returns nil of the field does not exist" do
-      field = Reorm::FieldPath.new(:first, :second, :third)
-      expect(field.value({first: 1})).to be_nil
+      field = Reorm::FieldPath.new(:one, :two, :three)
+      expect(field.value({one: 1})).to be_nil
     end
   end
 
   describe "#value!()" do
     it "raises an exception if the value does not exist" do
-      field = Reorm::FieldPath.new(:first, :second, :third)
+      field = Reorm::FieldPath.new(:one, :two, :three)
       expect {
-        field.value!({first: 1})
+        field.value!({one: 1})
       }.to raise_exception(Reorm::Error, "Unable to locate the #{field.name} (full path: #{field}) field for an instance of the Hash class.")
     end
   end
 
   describe "#exists?()" do
     subject {
-      Reorm::FieldPath.new(:first, :second, :third)
+      Reorm::FieldPath.new(:one, :two, :three)
     }
 
     it "returns true if the field exists within the specified document" do
-      expect(subject.exists?({first: {second: {third: 3}}})).to eq(true)
+      expect(subject.exists?({one: {two: {three: 3}}})).to eq(true)
     end
 
     it "returns false if the field does not exist within the specified document" do
-      expect(subject.exists?({first: 1})).to eq(false)
+      expect(subject.exists?({one: 1})).to eq(false)
     end
   end
 
   describe "#to_s" do
     it "returns the correct value for a simple field path" do
-      field = Reorm::FieldPath.new(:first)
-      expect(field.to_s).to eq("first")
+      field = Reorm::FieldPath.new(:one)
+      expect(field.to_s).to eq("one")
     end
 
     it "returns the correct value for a more complicated field path" do
-      field = Reorm::FieldPath.new(:first, :second, :third)
-      expect(field.to_s).to eq("first -> second -> third")
+      field = Reorm::FieldPath.new(:one, :two, :three)
+      expect(field.to_s).to eq("one -> two -> three")
     end
   end
 end

data/spec/reorm/model_spec.rb

@@ -22,9 +22,11 @@ end
 
 class SaveTestModel < Reorm::Model
 	after_create :on_after_create
+  after_delete :on_after_delete
 	after_save :on_after_save
 	after_update :on_after_update
 	before_create :on_before_create
+  before_delete :on_before_delete
 	before_save :on_before_save
 	before_update :on_before_update
 
@@ -42,6 +44,10 @@ class SaveTestModel < Reorm::Model
 		@events << :after_create
 	end
 
+  def on_after_delete
+    @events << :after_delete
+  end
+
 	def on_after_save
 		@events << :after_save
 	end
@@ -54,6 +60,10 @@ class SaveTestModel < Reorm::Model
 		@events << :before_create
 	end
 
+  def on_before_delete
+    @events << :before_delete
+  end
+
 	def on_before_save
 		@events << :before_save
 	end
@@ -232,6 +242,55 @@ describe Reorm::Model do
 		end
 	end
 
+	describe "#update()" do
+		subject {
+			SaveTestModel.new(one: 1, two: 2, three: 3)
+		}
+
+		it "updates the properties for the model object and calls save()" do
+			expect(subject).to receive(:save)
+		  subject.update(one: "One", four: 4)
+		  expect(subject.one).to eq("One")
+		  expect(subject.two).to eq(2)
+		  expect(subject.three).to eq(3)
+		  expect(subject.four).to eq(4)
+		end
+
+		it "does not calls save if the no properties are specified" do
+			expect(subject).not_to receive(:save)
+		  subject.update()
+		end
+	end
+
+  describe "#delete()" do
+    subject {
+      SaveTestModel.create(one: 1, two: 2, three: 3)
+    }
+
+    it "removes the record for the model instance deleted" do
+      id = subject.id
+      subject.delete
+      expect(subject.id).to be_nil
+      expect(SaveTestModel.filter(id: id).count).to eq(0)
+    end
+
+    it "does nothing if the model instance has not been saved" do
+      instance = SaveTestModel.new(one: 1, two: 2, three: 3)
+      expect {
+        instance.delete
+      }.not_to raise_exception
+      subject
+      expect(SaveTestModel.all.count).to eq(1)
+    end
+
+    it "fires the before and after delete events" do
+      instance = SaveTestModel.create(one: 1, two: 2)
+      instance.delete
+      expect(instance.events).to include(:before_delete)
+      expect(instance.events).to include(:after_delete)
+    end
+  end
+
 	describe "#[]()" do
 		subject {
 			SaveTestModel.new(one: 1, two: "Two")
@@ -263,6 +322,73 @@ describe Reorm::Model do
 		end
 	end
 
+	describe "#has_property?()" do
+		subject {
+			SaveTestModel.new(one: 1, two: "Two")
+		}
+
+    it "returns true when a model possesses the named property" do
+    	expect(subject.has_property?(:two)).to eq(true)
+    end
+
+    it "returns false when a model does not possess the named property" do
+    	expect(subject.has_property?(:three)).to eq(false)
+    end
+	end
+
+	describe "#get_property()" do
+		subject {
+			SaveTestModel.new(one: 1, two: "Two")
+		}
+
+    it "returns the value of the specified property" do
+    	expect(subject.get_property(:one)).to eq(1)
+    	expect(subject.get_property(:two)).to eq("Two")
+    end
+
+    it "returns nil of a property does not exist" do
+    	expect(subject.get_property(:three)).to be_nil
+    end
+	end
+
+	describe "#set_property()" do
+		subject {
+			SaveTestModel.new(one: 1, two: "Two")
+		}
+
+    it "updates the value of an existing property" do
+    	subject.set_property(:two, 2)
+    	expect(subject.two).to eq(2)
+    end
+
+    it "assigns a value to a property that did not previously exist" do
+    	subject.set_property(:three, 3)
+    	expect(subject.three).to eq(3)
+    end
+	end
+
+  describe "#set_proerties()" do
+    subject {
+      SaveTestModel.new(one: 1, two: "Two", three: 3)
+    }
+
+    it "updates existing properties" do
+      subject.set_properties(one: "One", two: 2, three: "Three")
+      expect(subject.one).to eq("One")
+      expect(subject.two).to eq(2)
+      expect(subject.three).to eq("Three")
+    end
+
+    it "assigns properties that had not been previously set" do
+      subject.set_properties(four: 4, five: "Five")
+      expect(subject.one).to eq(1)
+      expect(subject.two).to eq("Two")
+      expect(subject.three).to eq(3)
+      expect(subject.four).to eq(4)
+      expect(subject.five).to eq("Five")
+    end
+  end
+
 	describe "#create()" do
 		let(:standin) {
 			SaveTestModel.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reorm
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.8
 platform: ruby
 authors:
 - Peter Wood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-08 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -157,7 +157,6 @@ files:
 - lib/reorm/validators/validator.rb
 - lib/reorm/version.rb
 - reorm.gemspec
-- spec/catwalk/modules/timestamped_spec.rb
 - spec/reorm/cursor_spec.rb
 - spec/reorm/field_path_spec.rb
 - spec/reorm/model_spec.rb
@@ -198,7 +197,6 @@ signing_key:
 specification_version: 4
 summary: A library for use with the RethinkDB application.
 test_files:
-- spec/catwalk/modules/timestamped_spec.rb
 - spec/reorm/cursor_spec.rb
 - spec/reorm/field_path_spec.rb
 - spec/reorm/model_spec.rb

data/spec/catwalk/modules/timestamped_spec.rb

@@ -1,17 +0,0 @@
-require "spec_helper"
-
-class TimestampedTestClass < Reorm::Model
-	extend Reorm::Timestamped
-end
-
-describe Reorm::Timestamped do
-	subject {
-		TimestampedTestClass
-	}
-
-	it "set the timestamp fields when a record is created" do
-		record = subject.create(label: "First")
-		expect(record.created_at).not_to be_nil
-		expect(record.updated_at).to be_nil
-	end
-end