rrod 1.0.0.alpha.1 → 1.0.0.alpha.2

data/lib/rrod/model/validations.rb

@@ -0,0 +1,15 @@
+module Rrod
+  module Model
+    module Validations
+      extend ActiveSupport::Concern
+      
+      included do
+        include ActiveModel::Validations
+      end
+
+      def save(options={})
+        options.fetch(:validate, true) ? (valid? and super()) : super()
+      end
+    end
+  end
+end

data/lib/rrod/model/validations/associated_validator.rb

@@ -0,0 +1,29 @@
+module Rrod
+  module Model
+    module Validations
+      
+      class AssociatedValidator < ActiveModel::EachValidator
+        def validate_each(record, attribute, value)
+          return if Array(value).collect{ |r| r.nil? || r.valid? }.all?
+          record.errors.add(attribute, error_message_for(attribute, value))
+        end
+
+        private
+   
+        def error_message_for(attribute, associated_records) 
+          Array(associated_records).map(&:errors).reject(&:blank?).map(&:full_messages).map(&:to_sentence).flatten.join('; ')
+        end
+
+      end
+     
+      module ClassMethods 
+
+        def validates_associated(*attrs)
+          validates_with AssociatedValidator, _merge_attributes(attrs)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/rrod/query.rb

@@ -27,4 +27,4 @@ module Rrod
     end
 
   end
-end
+end

data/lib/rrod/test_server/rspec.rb

@@ -18,7 +18,7 @@ module Rrod
               fail "Test server not working: #{Rrod::TestServer.fatal}" 
             end
 
-            if example.metadata[:test_server] == false
+            if ::RSpec.current_example.metadata[:test_server] == false
               Rrod::TestServer.stop
             else
               Rrod::TestServer.create unless Rrod::TestServer.exist?
@@ -32,9 +32,10 @@ module Rrod
 
           config.after(:each, :integration => true) do
             # i really don't understand this...
+            # well the 'example' needs to be accessed another way, Rspec.current_example.
             if !Rrod::TestServer.fatal && 
               Rrod::TestServer.started? && 
-              example.metadata[:test_server] != false
+              ::RSpec.current_example.metadata[:test_server] != false
               Rrod::TestServer.drop
             end
           end

data/lib/rrod/version.rb

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

data/spec/rrod/model/attribute_methods_spec.rb

@@ -10,7 +10,7 @@ describe Rrod::Model do
   describe "instantiation" do
     it "can create an object with an arbitrary hash" do
       expect(instance.wheels).to eq 4
-      expect(instance.color).to eq :black
+      # @TODO expect(instance.color).to eq :black
       expect(instance.make).to eq 'Jeep'
     end
 
@@ -20,7 +20,7 @@ describe Rrod::Model do
     end
 
     it "manages attribute keys as strings" do
-      expect(instance.attributes).to eq hash.stringify_keys
+      expect(instance.attributes.keys).to eq hash.stringify_keys.keys
     end
 
     it "ignores modifications to the attribute hash" do
@@ -57,8 +57,19 @@ describe Rrod::Model do
       end
     end
 
-    describe "query generation" do
-      it "lets you use strings with apostrophes in them" 
+  end
+
+  describe "defaults" do
+    let(:model)    { Class.new(Car) { attribute :wheels, Integer, default: 4 } }
+    let(:instance) { model.new }
+
+    it "will return the default when reading a nil value" do
+      expect(instance.wheels).to eq 4
+    end
+
+    it "will set the default to the read value" do
+      instance.wheels
+      expect(instance.instance_variable_get(:@attributes)['wheels']).to eq 4
     end
   end
 end

data/spec/rrod/model/attribute_spec.rb

@@ -30,10 +30,13 @@ describe Rrod::Model::Attribute do
   end
 
   describe "defaults" do
+    let(:default) { attribute.default(instance) }
+  
     context "when a value" do
       let(:options) { {default: 'SOO fluffy!'} }
+
       it "can provide a default value" do
-        expect(attribute.default).to eq 'SOO fluffy!'
+        expect(default).to eq 'SOO fluffy!'
       end
     end
 
@@ -41,7 +44,17 @@ describe Rrod::Model::Attribute do
       let(:options) { {default: -> { 'alligator' }} }
 
       it "can provide a default value if a proc" do
-        expect(attribute.default).to eq 'alligator'
+        expect(default).to eq 'alligator'
+      end
+
+      context "given an instance" do
+        let(:model)   { Class.new { include Rrod::Model; attr_accessor :foo } }
+        let(:options) { {default: -> { foo.upcase }} }
+
+        it "evaluates in the context of the given instance" do
+          instance.foo = 'whoah'
+          expect(default).to eq('WHOAH')
+        end
       end
     end
   end

data/spec/rrod/model/callbacks_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+require 'support/models/person'
+
+describe Rrod::Model::Callbacks do
+  let(:instance) { Person.new }
+
+  describe "assignment" do
+    it "provides callbacks" do
+      expect(instance).to receive(:poke)
+      instance.attributes = {name: 'Pooka'}
+    end
+  end
+
+  describe "validation" do
+    it "provides callbacks" do
+      expect(instance).to receive(:stuffs)
+      instance.valid?
+    end
+  end
+
+  describe "saving" do
+    it "provides callbacks" do
+      expect(instance).to receive(:other_stuffs)
+      instance.save
+    end
+
+    describe "create" do
+      it "runs when new" do
+        expect(instance).to receive(:created!)
+        expect(instance).not_to receive(:updated!)
+        instance.save
+      end
+
+      it "does not run when persisted" do
+        instance.instance_variable_set :@persisted, true
+        expect(instance).not_to receive(:created!)
+        instance.save
+      end
+    end
+
+    describe "update" do
+      before :each do
+        instance.instance_variable_set :@persisted, true
+      end
+
+      it "runs when persisted" do
+        expect(instance).to receive(:updated!)
+        expect(instance).not_to receive(:created!)
+        instance.save
+      end
+
+      it "does not run when new" do
+        instance.instance_variable_set :@persisted, false
+        expect(instance).not_to receive(:updated!)
+        instance.save
+      end
+    end
+  end
+
+end

data/spec/rrod/model/collection_spec.rb

@@ -3,7 +3,7 @@ require 'support/models/person'
 
 describe Rrod::Model::Collection do
   let(:array)      { [Pet.new] }
-  let(:collection) { described_class.new(array) }
+  let(:collection) { described_class.new(Pet, array) }
 
   describe "initialization" do
     it "takes a collection" do
@@ -11,9 +11,18 @@ describe Rrod::Model::Collection do
     end
 
     it "defaults to an empty collection" do
-      expect(described_class.new.collection).to be_an Array
+      expect(described_class.new(Pet).collection).to be_an Array
     end
 
+    describe "#build" do 
+      it "adds to the collection" do
+        collection.build(name: 'Lion')
+        expect(collection.collection.length).to eq 2
+        expect(collection.collection.last.name).to eq('Lion')
+      end
+    end
+
+
     describe "errors" do
       describe "non enumerable" do
         let(:array) { Object.new }
@@ -22,14 +31,14 @@ describe Rrod::Model::Collection do
         end
       end
 
-      describe "not all Rrod::Model" do
-        let(:array) { [Pet.new, Object.new] }
+      describe "not all same Rrod::Model" do
+        let(:array) { [Pet.new, Address.new] }
         it "raises if not all `Rrod::Model`s" do
           expect { collection }.to raise_error(Rrod::Model::Collection::InvalidMemberTypeError)
         end
 
         it "clears the collection" do
-          collection = described_class.new
+          collection = described_class.new(Pet)
           begin; collection.collection = array; rescue; end
           expect(collection.collection).to be_empty
         end

data/spec/rrod/model/finders_spec.rb

@@ -31,29 +31,29 @@ describe Rrod::Model::Finders, integration: true do
   end
 
   describe "finding by attributes in the hash" do
-    describe "find_first_by" do
+    describe "find_by" do
       it "can find one" do
-        found = model.find_first_by(make: 'Jeep')
+        found = model.find_by(make: 'Jeep')
         expect(found).to be_a model 
         expect(found.make).to eq "Jeep"
       end
 
       it "will work properly when finding by id" do
-        found = model.find_first_by(id: instance.id)
+        found = model.find_by(id: instance.id)
         expect(found).to be_a model
       end
 
       it "will return nil if one can't be found" do
-        found = model.find_first_by(id: "id that is not there")
+        found = model.find_by(id: "id that is not there")
         expect(found).to be nil
       end
 
       it "will raise an exception if one can't be found with a !" do
-        expect { model.find_first_by! zombies: true }.to raise_error(Rrod::Model::NotFound)
+        expect { model.find_by! zombies: true }.to raise_error(ArgumentError)
       end
     end
 
-    describe "find_all_by" do
+    describe "search" do
       it "can find all" do
         founds = model.find_all_by(make: 'Jeep', wheels: 4)
         found = founds.first
@@ -62,17 +62,18 @@ describe Rrod::Model::Finders, integration: true do
         expect(found.make).to eq "Jeep"
       end
 
-      it "will raise an exception if finding all by id" do
+      it "will raise an exception if searching by id" do
         expect {model.find_all_by(id: instance.id)}.to raise_error(ArgumentError)
       end
 
-      it "will return [] if none can be found" do
-        expect(model.find_all_by zombies: 'yes plz').to eq []
+      it "will return an exeception if none can be found" do
+        expect { model.find_all_by zombies: 'yes plz'}.to raise_error(ArgumentError)
       end
 
       it "will raise an exception if none can be found with a !" do
-        expect { model.find_all_by! brains: :none }.to raise_error(Rrod::Model::NotFound)
+        expect { model.find_all_by! brains: :none }.to raise_error(ArgumentError)
       end
     end
   end
+
 end

data/spec/rrod/model/schema_spec.rb

@@ -20,7 +20,7 @@ describe Rrod::Model::Schema do
   end
 
   it "is using a schema if an attribute is declared" do
-    expect(Person.schema?).to be_true
+    expect(Person.schema?).to be_truthy
   end
 
   describe "associations", integration: true do
@@ -54,6 +54,24 @@ describe Rrod::Model::Schema do
       expect(hash['address']).to eq 'street' => '123 Fancy Pants Lane'
     end
 
+    it "will set the parent on a nested model when assigned" do
+      instance.address = Address.new
+      expect(instance.address._parent).to eq(instance)
+    end
+
+    it "will alias the parent with method given to nested_in" do
+      instance.pets = [Pet.new]
+      expect(instance.pets.first.owner).to eq(instance)
+    end
+
+  end
+
+  it "raises an UncastableObjectError if object is not castable" do
+    expect { Pet.rrod_cast(Object.new) }.to raise_error(Rrod::Model::UncastableObjectError)
+  end
+
+  it "will not add ids to models instantiated via `rrod_cast`" do
+    expect(Pet.rrod_cast(name: 'Molle').attributes).to_not have_key('id')
   end
 
 end

data/spec/rrod/model/timestamps_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe Rrod::Model::Timestamps do
+  let(:klass)     { Class.new {include Rrod::Model; timestamps!} }
+  let(:instance)  { klass.new }
+  let(:attribute) { Rrod::Model::Attribute }
+  let(:now)       { Time.now }
+
+  it "provides a created_at attribute" do
+    expect(klass.attributes[:created_at]).to be_an attribute
+  end
+
+  it "provides a updated_at attribute" do
+    expect(klass.attributes[:updated_at]).to be_an attribute
+  end
+
+  describe "Time.now" do
+    before(:each) { Time.stub(:now).and_return(now) }
+
+    it "sets created_at upon instantiation" do
+      expect(instance.created_at).to eq now
+    end
+
+    it "sets updated_at when the object is updated" do
+      instance.stub(:persist).and_return(true)
+      expect(instance).to receive(:updated_at=).with(now)
+      instance.save
+    end
+  end
+end

data/spec/rrod/model/validations/associated_validator_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+require 'support/models/player'
+require 'support/models/team'
+
+describe Rrod::Model::Validations::AssociatedValidator do
+  context 'for a many association' do
+    # this is the same as a one association..
+    let(:team)     { Team.new }
+    let(:ichiro)   { Player.new(name: 'Ichiro', position: 'RF') }
+    let(:arod)     { Player.new(position: '3B') }
+    let(:joeschmo) { Player.new }
+    
+    before(:each) do
+      team.players = [ichiro, arod, joeschmo]
+    end
+
+    it 'is invalid when the associated records are invalid' do
+      expect(arod.valid?).to be false
+      expect(joeschmo.valid?).to be false
+      expect(team.valid?).to be false
+    end
+ 
+    it 'includes the associated records validation error messages in the error message' do 
+      team.valid?
+      expect(team.errors[:players].size).to be 1
+      # maybe change this to better error messages
+      error_message = team.errors[:players].first
+      expect(error_message).to eq "Name can't be blank; Name can't be blank and Position can't be blank"
+    end  
+
+ 
+    it 'is valid when the associated records are valid' do
+      expect(ichiro.valid?).to be true
+      
+      arod.name = 'Alex Rodriguez'
+      expect(arod.valid?).to be true
+      
+      joeschmo.name = 'Joe Schmo' 
+      joeschmo.position = 'C'
+      expect(joeschmo.valid?).to be true
+  
+      expect(team.valid?).to be true
+    end
+
+  end
+end

data/spec/rrod/model/validations_spec.rb

@@ -1,50 +1,48 @@
 require 'spec_helper'
 require 'support/models/person'
 
-describe Rrod::Model do
-  describe "validations" do
-    let(:klass)      { Person }
-    let(:validators) { klass.validators }
-    let(:instance)   { klass.new }
-
-    it "adds validations as class methods" do
-      expect(validators.any? { |v| ActiveModel::Validations::LengthValidator === v }).to be_true
-    end
-
-    it "allows describing validations in the attribute" do
-      expect(validators.any? { |v| ActiveModel::Validations::PresenceValidator === v }).to be_true
-    end
-
-    it "raises a no method error if no validation exists" do
-      expect {
-        Class.new {
-          include Rrod::Model
-          attribute :kittens, Integer, bunnies: true
-        }
-      }.to raise_error(ArgumentError, /BunniesValidator/)
-    end
-
-
-    it "can determine an instances validity" do
-      expect(instance).not_to be_valid
-    end
-
-    it "will not save if invalid" do
-      expect(instance).not_to receive(:persist)
-      instance.save
-    end
-
-    it "will return false from saving if invalid" do
-      expect(instance.save).to be_false
-    end
-
-    it "sets up errors properlies" do
-      instance.valid?
-      expect(instance.errors).to be_present
-    end
-
-    it "will allow saving when not validating" do
-      expect(instance.save(validate: false)).to be_true
-    end
+describe Rrod::Model::Validations do
+  let(:klass)      { Person }
+  let(:validators) { klass.validators }
+  let(:instance)   { klass.new }
+
+  it "adds validations as class methods" do
+    expect(validators.any? { |v| ActiveModel::Validations::LengthValidator === v }).to be_truthy
+  end
+
+  it "allows describing validations in the attribute" do
+    expect(validators.any? { |v| ActiveModel::Validations::PresenceValidator === v }).to be_truthy
+  end
+
+  it "raises a no method error if no validation exists" do
+    expect {
+      Class.new {
+        include Rrod::Model
+        attribute :kittens, Integer, bunnies: true
+      }
+    }.to raise_error(ArgumentError, /BunniesValidator/)
+  end
+
+
+  it "can determine an instances validity" do
+    expect(instance).not_to be_valid
+  end
+
+  it "will not save if invalid" do
+    expect(instance).not_to receive(:persist)
+    instance.save
+  end
+
+  it "will return false from saving if invalid" do
+    expect(instance.save).to be_falsey
+  end
+
+  it "sets up errors properlies" do
+    instance.valid?
+    expect(instance.errors).to be_present
+  end
+
+  it "will allow saving when not validating" do
+    expect(instance.save(validate: false)).to be_truthy
   end
 end