ork 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 751f05a6aa58853ff594139a6f305dbbffd7ada2
-  data.tar.gz: 6350a3beb54c4dfebbe2494f9591cc1356881074
+  metadata.gz: 2c07bdc3fa0fd2f3ed00a327a9ca745315e33243
+  data.tar.gz: 9059ca0b44c7d24afdec3db8ce3ad8a2de5b05be
 SHA512:
-  metadata.gz: 843c02219e04d26548a4e329e79b0e9e032a81760f19945269e10809808a99c4254a8e9c0aa9c64ba94d349ac95008dd078542ef060310ab1764068115de5f0b
-  data.tar.gz: 339e08edc7416c6b8040d827ce4a588c2bc46fa1be1a4459877e6309a7afcd2c903c80836538a309ef5b76f170c3d28233e630eee10ace712a8b83d0e9cd5cb0
+  metadata.gz: 8da194455a375e7e84f75bbec0776ef9e5b5bcfa068b36eb7a27528b9bea1263a220a2ac3826921e94f22eea7e163469b87fb8e4b9cb705d050569d3fb72bcd8
+  data.tar.gz: d5e4c535d1f791a17994af104700173dcc5cd58ebc5968088931628e98fa15dbf826234987ba9294cc7d89e46754cb957a4710aaac83c41a40f9a2895341a22d

data/lib/ork/errors.rb

@@ -3,11 +3,13 @@ module Ork
   class IndexNotFound < RuntimeError; end
   class UniqueIndexViolation < RuntimeError; end
 
+  class NotOrkObject < StandardError; end
+
   # Document
   class InvalidClass < RuntimeError; end
 
   # Embedded
-  class NotAnEmbeddableObject < RuntimeError; end
+  class NotEmbeddable < StandardError; end
   class ParentMissing < RuntimeError; end
 
 

data/lib/ork/model.rb

@@ -68,5 +68,16 @@ module Ork
 
       model.new attributes
     end
+
+    def assert_valid_class(object, model)
+      raise Ork::NotOrkObject.new(object) unless object.class.include? Ork::Document
+      raise Ork::InvalidClass.new(object) if object.class.name != model.to_s
+    end
+
+    def assert_embeddable(object)
+      unless object.respond_to?(:embeddable?) && object.embeddable?
+        raise Ork::NotEmbeddable.new(object)
+      end
+    end
   end
 end

data/lib/ork/model/associations.rb

@@ -47,7 +47,8 @@ module Ork::Model
       end
 
       define_method(:"#{name}=") do |object|
-        raise Ork::InvalidClass.new(object) if object.class.name != model.to_s
+        assert_valid_class object, model
+
         send(writer, object ? object.id : nil)
         @_memo[name] = object
       end
@@ -145,12 +146,18 @@ module Ork::Model
       end
 
       define_method(:"#{name}_add") do |object|
-        raise Ork::InvalidClass.new(object) if object.class.name != model.to_s
+        assert_valid_class object, model
 
         @attributes[reader] = Array(@attributes[reader]) << object.id
-        @_memo[name] << object unless @_memo[name].nil?
+        @_memo[name] << object if @_memo[name]
       end
 
+      define_method(:"#{name}_remove") do |object|
+        assert_valid_class object, model
+
+        @_memo[name].delete(object) if @_memo[name]
+        @attributes[reader].delete(object.id) and object if @attributes[reader]
+      end
     end
 
     # A macro for defining an attribute, and the accessors
@@ -191,9 +198,7 @@ module Ork::Model
       end
 
       define_method(:"#{name}=") do |object|
-        unless object.respond_to?(:embeddable?) && object.embeddable?
-          raise Ork::NotAnEmbeddableObject.new(object)
-        end
+        assert_embeddable object
 
         @embedding[name] = object.attributes
         object.__parent = self
@@ -242,12 +247,20 @@ module Ork::Model
       end
 
       define_method(:"#{name}_add") do |object|
-        raise Ork::NotAnEmbeddableObject.new(object) unless object.embeddable?
+        assert_embeddable object
 
         object.__parent = self
-        @_memo[name] << object unless @_memo[name].nil?
+        @_memo[name] << object if @_memo[name]
         @embedding[name] = Array(@embedding[name]) << object.attributes
       end
+
+      define_method(:"#{name}_remove") do |object|
+        assert_embeddable object
+
+        object.__parent = nil
+        @_memo[name].delete(object) if @_memo[name]
+        @embedding[name].delete(object.attributes) and object if @embedding[name]
+      end
     end
 
     private

data/ork.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'ork'
-  s.version     = '0.1.3'
+  s.version     = '0.1.4'
   s.date        = Time.now.strftime('%Y-%m-%d')
   s.summary     = 'Ruby modeling layer for Riak.'
   s.description = 'Ork is a small Ruby modeling layer for Riak, inspired by Ohm.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ork
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Emiliano Mancuso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-14 00:00:00.000000000 Z
+date: 2014-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riak-client