ethos 0.2.0.beta11 → 0.2.0.beta12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99cd1b8a90c428cda94c068cd4d4a5d870e7a99e
-  data.tar.gz: cb33a0ce5ba5e44949ee83be7a474447e2de73fc
+  metadata.gz: 9b44c823d7d00eff4d50e010996d19f46457eae3
+  data.tar.gz: 3e9bd146f6e5546871207e83a2222bf9abefca5d
 SHA512:
-  metadata.gz: 3d118062efe920c99f05d5dcc89d0fc66d5e1ef68594d1af2a642314b851a545674b8bbb23d032aa852f9d4cd845593a612cafe916fbe5b360e56dc1dd0e5ba0
-  data.tar.gz: 014147ee67124c927f940cfd594f00e608699576c55b8172071af0cadadb966e6a2ccb49346c958a0abdb6fde7148c2c54142c34d17886f29a84311b40ce8885
+  metadata.gz: 94e17b1c198ae737124d0c79435a02771978925836c8baa37ac8c03e356f3ab59b911cf2e10830ba2070cb31e0d9810e444d5a36f1fa1b21111a54b6c14b019f
+  data.tar.gz: 4fd8341549a9ecdbb66e110ad5fa958180da49b3814510c381e5f7a6994b1b15e95882dab63eb7d79b2969099e9b31189c534fa9b2211de6209cf920068ac486

data/lib/ethos/attributes.rb

@@ -6,10 +6,6 @@ module Ethos
       @_schema
     end
 
-    def initial
-      @_initial ||= {}
-    end
-
     def current
       @_current ||= {}
     end
@@ -18,14 +14,14 @@ module Ethos
       @_schema = schema
 
       schema.defaults.each do |key, value|
-        initial[key] = current[key] = value
+        current[key] = value
       end
 
       schema.attributes.keys.each do |key|
         if values.key? key
-          initial[key] = current[key] = values[key]
+          current[key] = values[key]
         elsif values.key? String key
-          initial[key] = current[key] = values[String key]
+          current[key] = values[String key]
         end
       end
     end

data/lib/ethos/entity.rb

@@ -25,12 +25,16 @@ module Ethos
       end
 
       def collection(key, type)
-        attribute key, Ethos::Collection, nothing: []
-
-        schema.attributes[key][:extensions].push Proc.new { self.type = type }
+        attribute key, Ethos::Collection, nothing: [] do
+          self.type = type
+        end
       end
     end
 
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
     def self.prepended(base)
       base.extend ClassMethods
     end

data/lib/ethos/schema.rb

@@ -4,6 +4,10 @@ module Ethos
       @_attributes ||= {}
     end
 
+    def keys
+      attributes.keys
+    end
+
     def defaults
       @_defaults ||= {}
     end

data/lib/ethos/version.rb

@@ -1,3 +1,3 @@
 module Ethos
-  VERSION = '0.2.0.beta11'
+  VERSION = '0.2.0.beta12'
 end

data/spec/ethos/schema.rb

@@ -29,3 +29,15 @@ scope do
     asserts(schema.defaults).key? :value
   end
 end
+
+scope do
+  setup do
+    schema.define :a, Integer
+    schema.define :b, Integer
+    schema.define :c, Integer
+  end
+
+  spec do
+    asserts(schema.keys) == %i[a b c]
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ethos
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta11
+  version: 0.2.0.beta12
 platform: ruby
 authors:
 - Erol Fornoles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler