ethos 0.2.0.beta4 → 0.2.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be315115b1c5686fe19970b30ad0ab222745981d
-  data.tar.gz: 7aebb378346adbb1a0aa2c46fa1f9c275a520cd7
+  metadata.gz: c27f8f8f52e943a5a3e0f4001bd2dbd0e51dfde2
+  data.tar.gz: d9934aa42583ef5992e77ca9aa2ff70b1eff97f2
 SHA512:
-  metadata.gz: a87b14e54f833fa83bdd67e1d06545db7a76feaea8f8e0528a6030bc86144b96f629ea3784bae3a37af3c5ad51658746f31555b19b72bf72d32ac6b08334e5ce
-  data.tar.gz: 6cd180a3fb63901b7c01d7590ed6c067ea5fa3f554982d96d663cd26a87f6fc8e9fcf081b59b164b20cb47f0c0ad95579c058fb89f60379a467dfbe54eba9806
+  metadata.gz: 409a53cba266a6c85d9f063f2ac3b5f001fa9ccab7141a351af1df5f91cbae5522d39cb130fe027a3e4fcdeb6bf04dac96194a9f514befe6dc5d168e87cbdd47
+  data.tar.gz: 8e30891588e5433b6454c4986985d3eb4d8da22009f85c69d5c5a79777f34e2225f32fdd57e0e3b75495df8be4fd8365def92f6f35da3eb0ceaaa0ab82f23432

data/lib/ethos/attributes.rb

@@ -18,23 +18,27 @@ module Ethos
       @_schema = schema
 
       schema.defaults.each do |key, value|
-        initial[key] = value
-        current[key] = value
+        initial[key] = current[key] = value
       end
 
-      values.each do |key, value|
-        key = key.to_sym
-
-        next unless schema.defined? key
-
-        initial[key] = value
-        current[key] = value
+      schema.attributes.keys.each do |key|
+        if values.key? key
+          initial[key] = current[key] = values[key]
+        elsif values.key? String key
+          initial[key] = current[key] = values[String key]
+        end
       end
     end
 
     def [](key)
       memoize key do
-        current[key] and Ethos::Type.cast current[key], schema.attributes[key][:type]
+        value = Ethos::Type.cast current[key], schema.attributes[key][:type]
+
+        schema.attributes[key][:extensions].each do |extension|
+          value.instance_eval &extension
+        end
+
+        value
       end
     end
 
@@ -44,6 +48,14 @@ module Ethos
       current[key] = value
     end
 
+    def ==(other)
+      return false unless other.is_a? self.class
+
+      not schema.attributes.keys.any? do |key|
+        self[key] != other[key]
+      end
+    end
+
     private
 
     def memoized

data/lib/ethos/entity.rb

@@ -8,8 +8,8 @@ module Ethos
         @_schema ||= Ethos::Schema.new
       end
 
-      def attribute(key, type, default: nil)
-        schema.define key, type, default: default
+      def attribute(key, type, default: nil, &extension)
+        schema.define key, type, default: default, extensions: [extension].compact
 
         reader = :"#{key}"
         writer = :"#{key}="
@@ -37,5 +37,11 @@ module Ethos
     def attributes
       @_attributes
     end
+
+    def ==(other)
+      return false unless other.is_a? self.class
+
+      self.attributes == other.attributes
+    end
   end
 end

data/lib/ethos/schema.rb

@@ -8,10 +8,11 @@ module Ethos
       @_defaults ||= {}
     end
 
-    def define(key, type, default: nil)
+    def define(key, type, default: nil, extensions: [])
       attributes[key] = {
         type: type,
-        default: default
+        default: default,
+        extensions: extensions
       }
 
       defaults[key] = default if default

data/lib/ethos/version.rb

@@ -1,3 +1,3 @@
 module Ethos
-  VERSION = '0.2.0.beta4'
+  VERSION = '0.2.0.beta5'
 end

data/spec/ethos/attributes.rb

@@ -46,3 +46,19 @@ scope do
     asserts(attributes[:value]) == 1
   end
 end
+
+scope do
+  spec do
+    this = Ethos::Attributes.new schema, values: {value: 1}
+    that = Ethos::Attributes.new schema, values: {value: 1}
+
+    asserts(this) == that
+  end
+
+  spec do
+    this = Ethos::Attributes.new schema, values: {value: 1}
+    that = Ethos::Attributes.new schema, values: {value: 2}
+
+    refutes(this) == that
+  end
+end

data/spec/ethos/entity.rb

@@ -66,6 +66,40 @@ scope do
   end
 end
 
+scope do
+  setup do
+    class Entity
+      prepend Ethos::Entity
+
+      attribute :value, String do
+        def extended?
+          true
+        end
+      end
+    end
+  end
+
+  spec do
+    entity = Entity.new
+
+    asserts(entity.value).extended?
+  end
+
+  spec do
+    entity = Entity.new value: '1'
+
+    asserts(entity.value).extended?
+  end
+
+  spec do
+    entity = Entity.new
+
+    entity.value = '1'
+
+    asserts(entity.value).extended?
+  end
+end
+
 scope do
   setup do
     class Entity
@@ -96,3 +130,27 @@ scope do
     end
   end
 end
+
+scope do
+  setup do
+    class Entity
+      prepend Ethos::Entity
+
+      attribute :value, Integer
+    end
+  end
+
+  spec do
+    this = Entity.new value: 1
+    that = Entity.new value: 1
+
+    asserts(this) == that
+  end
+
+  spec do
+    this = Entity.new value: 1
+    that = Entity.new value: 2
+
+    refutes(this) == that
+  end
+end

data/spec/ethos/schema.rb

@@ -8,7 +8,7 @@ scope do
   end
 
   spec do
-    asserts(schema.attributes[:value]) == {type: Integer, default: nil}
+    asserts(schema.attributes[:value]) == {type: Integer, default: nil, extensions: []}
   end
 
   spec do
@@ -22,7 +22,7 @@ scope do
   end
 
   spec do
-    asserts(schema.attributes[:value]) == {type: Integer, default: 1}
+    asserts(schema.attributes[:value]) == {type: Integer, default: 1, extensions: []}
   end
 
   spec do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ethos
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta4
+  version: 0.2.0.beta5
 platform: ruby
 authors:
 - Erol Fornoles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler