rrod 1.0.0.alpha.6 → 1.0.0.alpha.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c796e27be01b2f1ae14658a4566e5a1628dad0e
-  data.tar.gz: 98d98dae17e3b05f9f56f00b3acee8aee1820501
+  metadata.gz: f7c4fed6f4b07652c23c34383bad82edc55ef84f
+  data.tar.gz: ded28382a99937aecdf3d0f02718abc0f2dfb65f
 SHA512:
-  metadata.gz: 1753e525a127b61eee4791ef384d0c26a948d688ed06ff59c6c9b1172dde99ae773143c354acd11c3569dad7f23a7eb498291c6aaf33b63af21a5ad2aa792c3a
-  data.tar.gz: cf1565f5cd0515bad8c890501749b6be59ea78446e1e0a048a3baee316ae08a78e485374f1d3581ef47f7c187e8b59543c9bb5666f3d991b227c8958925bccfa
+  metadata.gz: 70db13dd62184794148611c3fa4a1258ae1f560d52cb0cad10b6c677b1f4320bf6886cfb63d1a28c204d40c5549c4d01128633821a12ce2fb55672030d5e7369
+  data.tar.gz: eef5ddd4e356cdaf0e07d9e785d62c5bcf27260d3256146e4f7be73b2dfb976e0fdbe9f2ea8f01b0073de175209dac32ad4d521bf0d079e157dd7eaa96323bf6

data/lib/rrod/model/attribute.rb

@@ -30,6 +30,7 @@ module Rrod
       end
 
       def define
+        define_attribute
         define_reader
         define_writer
         define_presence
@@ -64,6 +65,12 @@ module Rrod
         -> { Rrod::Model::Collection.new(self, model_class) }
       end
 
+      def define_attribute
+        _self = self # i am a shadow of self
+        model.define_singleton_method(
+          "#{Rrod::Model::Schema::RROD_ATTRIBUTE_PREFIX}#{name}") { _self }
+      end
+
       def define_reader
         model.send :define_method, name, self.class.reader_definition(name)
       end

data/lib/rrod/model/schema.rb

@@ -2,25 +2,37 @@ module Rrod
   module Model
     module Schema
 
+      RROD_ATTRIBUTE_PREFIX = "rrod_attribute_".freeze
+
       def attributes
-        @attributes ||= {}
+        @attributes ||= public_methods.map(&:to_s).reduce({}) { |acc, method|
+          next acc unless method.starts_with?(RROD_ATTRIBUTE_PREFIX)
+          key = method[RROD_ATTRIBUTE_PREFIX.length..-1]
+          acc.tap { |hash| hash[key] = send(method) }
+        }.with_indifferent_access
       end
      
       def attribute(name, type, options={})
-        attributes[name.to_sym] = Attribute.new(self, name, type, options).define
+        using_schema!
+        Attribute.new(self, name, type, options).define
       end
 
       def cast_attribute(key, value, instance)
-        attribute = attributes[key.to_sym]
+        attribute = attributes[key]
         attribute ? attribute.cast(value, instance) : value
       end
 
       def nested_in(parent)
-        define_method(parent) { @_parent }
+        define_method(parent) { _parent }
+      end
+
+      def using_schema!
+        return if schema?
+        instance_eval 'def schema?; true; end'
       end
 
       def schema?
-        attributes.any?
+        false
       end
 
       def rrod_cast(value, parent=nil)

data/lib/rrod/version.rb

@@ -1,2 +1,2 @@
 Rrod = Module.new unless defined? Rrod
-Rrod::VERSION = '1.0.0.alpha.6'
+Rrod::VERSION = '1.0.0.alpha.7'

data/spec/rrod/model/attribute_spec.rb

@@ -55,6 +55,16 @@ describe Rrod::Model::Attribute do
         expect(instance).to respond_to("#{name}_default")
       end
     end
+
+    describe "attribute definitions" do
+      it "adds the attribute definition to to model class" do
+        expect(model).to respond_to("rrod_attribute_#{name}")
+      end
+
+      it "allows access to the attribute from the class" do
+        expect(model.send("rrod_attribute_#{name}")).to eq attribute
+      end
+    end
   end
 
   describe "casting" do

data/spec/rrod/model/schema_spec.rb

@@ -32,6 +32,16 @@ describe Rrod::Model::Schema do
     it "provides defaults to readers" do
       expect(instance.likes_pets).to be true
     end
+
+    it "has a schema if its parent does" do
+      expect(model.schema?).to be true
+    end
+
+    it "nests inside its parent properly" do
+      pet = Pet.new(name: 'Molle')
+      instance.pets = [pet]
+      expect(instance.pets.first.owner).to be_a(Person)
+    end
   end
 
   it "will properly typecast when writing an attribute" do
@@ -40,7 +50,7 @@ describe Rrod::Model::Schema do
   end
 
   it "is using a schema if an attribute is declared" do
-    expect(Person.schema?).to be_truthy
+    expect(Person.schema?).to be true
   end
 
   describe "associations", integration: true do

data/spec/support/models/person.rb

@@ -1,5 +1,6 @@
 class Address
   include Rrod::Model
+  nested_in :resident
 
   attribute :street,     String
   attribute :city,       String

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rrod
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.6
+  version: 1.0.0.alpha.7
 platform: ruby
 authors:
 - Adam Hunter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riak-client