ardm 0.1.0 → 0.2.0

data/lib/ardm/version.rb

@@ -1,3 +1,3 @@
 module Ardm
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/spec/fixtures/article.rb

@@ -16,7 +16,7 @@ module Ardm
 
       timestamps :at
 
-      before_validation do
+      before(:valid?) do
         self.slug = self.title
       end
     end # Article

data/spec/fixtures/resource_blog.rb

@@ -0,0 +1,53 @@
+module ::ResourceBlog
+  class User < Ardm::Record
+    self.table_name = "users"
+
+    property :name,        String, key: true
+    property :age,         Integer
+    property :summary,     Text
+    property :description, Text
+    property :admin,       Boolean, :accessor => :private
+
+    belongs_to :parent, self, :required => false
+    has n, :children, self, :inverse => :parent
+
+    belongs_to :referrer, self, :required => false
+    has n, :comments
+
+    # FIXME: figure out a different approach than stubbing things out
+    def comment=(*)
+      # do nothing with comment
+    end
+  end
+
+  class Author < User; end
+
+  class Comment < Ardm::Record
+    self.table_name = "comments"
+
+    property :id,   Serial
+    property :body, Text
+
+    belongs_to :user
+  end
+
+  class Article < Ardm::Record
+    self.table_name = "articles"
+
+    property :id,   Serial
+    property :body, Text
+
+    has n, :paragraphs
+  end
+
+  class Paragraph < Ardm::Record
+    self.table_name = "paragraphs"
+
+    property :id,   Serial
+    property :text, String
+
+    belongs_to :article
+  end
+end
+
+Ardm::Record.finalize

data/spec/integration/comma_separated_list_spec.rb

@@ -16,7 +16,7 @@ try_spec do
 
       describe 'when dumped and loaded again' do
         before do
-          expect(@resource.save).to be true
+          expect(@resource.save).to be_truthy
           @resource.reload
         end
 
@@ -33,7 +33,7 @@ try_spec do
 
       describe 'when dumped and loaded again' do
         before do
-          expect(@resource.save).to be true
+          expect(@resource.save).to be_truthy
           @resource.reload
         end
 
@@ -60,7 +60,7 @@ try_spec do
 
       describe 'when dumped and loaded again' do
         before do
-          expect(@resource.save).to be true
+          expect(@resource.save).to be_truthy
           @resource.reload
         end
 
@@ -77,7 +77,7 @@ try_spec do
         end
 
         it 'has blank entries removed' do
-          expect(@resource.interests.any? { |i| Ardm::Ext.blank?(i) }).to be false
+          expect(@resource.interests.any? { |i| Ardm::Ext.blank?(i) }).to be_falsey
         end
       end
     end

data/spec/integration/dirty_minder_spec.rb

@@ -54,7 +54,7 @@ try_spec do
         end
 
         it "should remember the new attribute" do
-          expect(@resource.positions['pays_buttloads_of_money']).to be true
+          expect(@resource.positions['pays_buttloads_of_money']).to be_truthy
         end
       end
 

data/spec/integration/enum_spec.rb

@@ -14,7 +14,7 @@ try_spec do
           :status => 'confirmed'
         )
 
-        expect(@resource.save).to be true
+        expect(@resource.save).to be_truthy
         @resource.reload
       end
 
@@ -41,7 +41,7 @@ try_spec do
           :body   => "Note that at the very least, there should be a check to see whether or not the user is created before chown'ing a file to the user.",
           :status => 'confirmed'
         )
-        expect(@resource.save).to be true
+        expect(@resource.save).to be_truthy
       end
 
       it 'supports queries with equality operator on enumeration property' do

data/spec/integration/epoch_time_spec.rb

@@ -22,7 +22,7 @@ try_spec do
 
       describe 'when dumped and loaded again' do
         before do
-          expect(@resource.save).to be true
+          expect(@resource.save).to be_truthy
           @resource.reload
         end
 
@@ -45,7 +45,7 @@ try_spec do
 
       describe 'when dumped and loaded again' do
         before do
-          expect(@resource.save).to be true
+          expect(@resource.save).to be_truthy
           @resource.reload
         end
 

data/spec/integration/file_path_spec.rb

@@ -53,7 +53,7 @@ try_spec do
 
       describe 'when saved and reloaded' do
         before do
-          expect(@resource.save).to be true
+          expect(@resource.save).to be_truthy
           @resource.reload
         end
 
@@ -95,7 +95,7 @@ try_spec do
 
       describe 'when saved and reloaded' do
         before do
-          expect(@resource.save).to be true
+          expect(@resource.save).to be_truthy
           @resource.reload
         end
 
@@ -113,7 +113,7 @@ try_spec do
 
       describe 'when saved and reloaded' do
         before do
-          expect(@resource.save).to be true
+          expect(@resource.save).to be_truthy
           @resource.reload
         end
 
@@ -131,7 +131,7 @@ try_spec do
 
       describe 'when saved and reloaded' do
         before do
-          expect(@resource.save).to be true
+          expect(@resource.save).to be_truthy
           @resource.reload
         end
 

data/spec/integration/flag_spec.rb

@@ -16,7 +16,9 @@ try_spec do
 
     describe 'with the default value' do
       it 'returns it as an array', skip: true do
-        expect(@resource.size).to eq([Ardm::Fixtures::TShirt.properties[:size].default])
+        skip "FIXME: This probably should pass" do
+          expect(@resource.size).to eq([Ardm::Fixtures::TShirt.properties[:size].default])
+        end
       end
     end
 
@@ -24,7 +26,7 @@ try_spec do
       describe 'dumped and loaded' do
         before do
           @resource.size = [ :xs, :medium ]
-          expect(@resource.save).to be true
+          expect(@resource.save).to be_truthy
           @resource.reload
         end
 
@@ -41,7 +43,7 @@ try_spec do
 
       describe 'dumped and loaded' do
         before do
-          expect(@resource.save).to be true
+          expect(@resource.save).to be_truthy
           @resource.reload
         end
 

data/spec/integration/json_spec.rb

@@ -16,7 +16,7 @@ try_spec do
 
       describe 'when dumped and loaded again' do
         before do
-          expect(@resource.save).to be true
+          expect(@resource.save).to be_truthy
           @resource.reload
         end
 
@@ -36,7 +36,7 @@ try_spec do
 
       describe 'when dumped and loaded again' do
         before do
-          expect(@resource.save).to be true
+          expect(@resource.save).to be_truthy
           @resource.reload
         end
 
@@ -56,7 +56,7 @@ try_spec do
 
       describe 'when dumped and loaded again' do
         before do
-          expect(@resource.save).to be true
+          expect(@resource.save).to be_truthy
           @resource.reload
         end
 

data/spec/public/model_spec.rb

@@ -3,6 +3,12 @@ require 'spec_helper'
 module ::ModelBlog
   # FIXME: load order in tests is being problematic
   class ArticlePublication < Ardm::Record
+    self.table_name = "article_publications"
+
+    property :id, Serial
+
+    belongs_to :article,     model: 'ModelBlog::Article'
+    belongs_to :publication, model: 'ModelBlog::Publication'
   end
 
   class Article < Ardm::Record
@@ -16,7 +22,7 @@ module ::ModelBlog
     belongs_to :original, self, :required => false
     has n, :revisions, self, :child_key => [ :original_id ]
     has 1, :previous,  self, :child_key => [ :original_id ], :order => [ :id.desc ]
-    has n, :article_publications, model: ::ModelBlog::ArticlePublication
+    has n, :article_publications, model: 'ArticlePublication'
     has n, :publications, :through => :article_publications
   end
 
@@ -26,18 +32,20 @@ module ::ModelBlog
     property :id,   Serial
     property :name, String
 
-    has n, :article_publications, model: ::ModelBlog::ArticlePublication
-    has n, :acticles, :through => :article_publications
+    has n, :article_publications, model: ArticlePublication
+    has n, :articles, :through => :article_publications
   end
 
   class ArticlePublication < Ardm::Record
     self.table_name = "article_publications"
 
-    belongs_to :acticle,     model: '::ModelBlog::Article'
+    belongs_to :article,     model: '::ModelBlog::Article'
     belongs_to :publication, model: '::ModelBlog::Publication'
   end
 end
 
+Ardm::Record.finalize
+
 describe 'Ardm::Record' do
   before do
     @article_model     = ModelBlog::Article
@@ -51,6 +59,7 @@ describe 'Ardm::Record' do
 
     @original = @articles.create(:title => 'Original Article')
     @article  = @articles.create(:title => 'Sample Article', :body => 'Sample', :original => @original)
+    expect(@article.reload.original).to eq(@original)
     @other    = @articles.create(:title => 'Other Article',  :body => 'Other')
   end
 
@@ -138,8 +147,10 @@ describe 'Ardm::Record' do
 
   [ :destroy, :destroy! ].each do |method|
     describe "##{method}" do
-      it 'should remove all resources', pending: true do
-        expect { @article_model.send(method) }.to change { @article_model.any? }.from(true).to(false)
+      let(:model) { @article_model }
+
+      it 'should remove all resources' do
+        expect { model.send(method) }.to change { model.any? }.from(true).to(false)
       end
     end
   end
@@ -187,7 +198,66 @@ describe 'Ardm::Record' do
     end
   end
 
-  # FIXME: these are very broken right now
-  #it_should_behave_like 'Finder Interface'
+  describe "finders" do
+    before(:each) do
+      ModelBlog::Article.destroy
+      @articles = ModelBlog::Article.all
+      @original = @articles.create(:title => 'Original Article')
+      @article  = @articles.create(:title => 'Sample Article', :body => 'Sample', :original => @original)
+    end
+
+    include_examples 'Finder Interface'
+  end
 
+  it 'Ardm::Record should respond to raise_on_save_failure' do
+    Ardm::Record.should respond_to(:raise_on_save_failure)
+  end
+
+  describe '.raise_on_save_failure' do
+    subject { Ardm::Record.raise_on_save_failure }
+
+    it { should be(false) }
+  end
+
+  it 'Ardm::Record should respond to raise_on_save_failure=' do
+    Ardm::Record.should respond_to(:raise_on_save_failure=)
+  end
+
+  it 'A model should respond to raise_on_save_failure' do
+    @article_model.should respond_to(:raise_on_save_failure)
+  end
+
+  describe '#raise_on_save_failure' do
+    after do
+      # reset to the default value
+      reset_raise_on_save_failure(Ardm::Record)
+      reset_raise_on_save_failure(@article_model)
+    end
+
+    subject { @article_model.raise_on_save_failure }
+
+    describe 'when Ardm::Record.raise_on_save_failure has not been set' do
+      it { should be(false) }
+    end
+
+    describe 'when Ardm::Record.raise_on_save_failure has been set to true' do
+      before do
+        Ardm::Record.raise_on_save_failure = true
+      end
+
+      it { should be(true) }
+    end
+
+    describe 'when model.raise_on_save_failure has been set to true' do
+      before do
+        @article_model.raise_on_save_failure = true
+      end
+
+      it { should be(true) }
+    end
+  end
+
+  it 'A model should respond to raise_on_save_failure=' do
+    @article_model.should respond_to(:raise_on_save_failure=)
+  end
 end

data/spec/public/property_spec.rb

@@ -72,10 +72,12 @@ describe Ardm::Property do
       @image.instance_variable_set(:@description, 'Is set by magic')
     end
 
-    it 'gets instance variable value from the resource directly', pending: true do
-      # if you know a better way to test direct instance variable access,
-      # go ahead and make changes to this example
-      expect(Image.properties[:description].get!(@image)).to eq('Is set by magic')
+    it 'gets instance variable value from the resource directly' do
+      skip "support for this in ActiveRecord is questionable" do
+        # if you know a better way to test direct instance variable access,
+        # go ahead and make changes to this example
+        expect(Image.properties[:description].get!(@image)).to eq('Is set by magic')
+      end
     end
   end
 
@@ -283,8 +285,10 @@ describe Ardm::Property do
       expect(Track.properties[:musicbrainz_hash].unique?).to be(true)
     end
 
-    it 'is true for serial fields', pending: true do
-      expect(Track.properties[:title].unique?).to be(true)
+    it 'is true for serial fields' do
+      skip do
+        expect(Track.properties[:title].unique?).should be(true)
+      end
     end
 
     it 'is true for keys' do

data/spec/public/resource_spec.rb

@@ -1,66 +1,8 @@
 require 'spec_helper'
 
-module ::ResourceBlog
-  class User < Ardm::Record
-    self.table_name = "users"
-
-    property :name,        String, :key => true
-    property :age,         Integer
-    property :summary,     Text
-    property :description, Text
-    property :admin,       Boolean, :accessor => :private
-
-    belongs_to :parent, self, :required => false
-    has n, :children, self, :inverse => :parent
-
-    belongs_to :referrer, self, :required => false
-    has n, :comments
-
-    # FIXME: figure out a different approach than stubbing things out
-    def comment=(*)
-      # do nothing with comment
-    end
-  end
-
-  class Author < User; end
-
-  class Comment < Ardm::Record
-    self.table_name = "comments"
-
-    property :id,   Serial
-    property :body, Text
-
-    belongs_to :user
-  end
-
-  class Article < Ardm::Record
-    self.table_name = "articles"
-
-    property :id,   Serial
-    property :body, Text
-    timestamps :at
-
-    has n, :paragraphs
-  end
-
-  class Paragraph < Ardm::Record
-    self.table_name = "paragraphs"
-
-    property :id,   Serial
-    property :text, String
-
-    belongs_to :article
-  end
-end
-
-Ardm::Record.finalize
-
-# TODO: unused?
-#class ::ResourceDefault < Ardm::Record
-#  property :name, String, :key => true, :default => 'a default value'
-#end
-
 describe Ardm::Record do
+  require './spec/fixtures/resource_blog'
+
   before do
     @user_model      = ResourceBlog::User
     @author_model    = ResourceBlog::Author
@@ -91,7 +33,7 @@ describe Ardm::Record do
     subject { @user.raise_on_save_failure }
 
     describe 'when model.raise_on_save_failure has not been set' do
-      it { is_expected.to be false }
+      it { is_expected.to be_falsey }
     end
 
     describe 'when model.raise_on_save_failure has been set to true' do
@@ -165,11 +107,14 @@ describe Ardm::Record do
 
         describe 'and it is an invalid resource', pending: true do
           before do
+            Ardm::Record.any_instance.stub(:save).and_return(false)
             expect(@user).to receive(:save_self).and_return(false)
           end
 
           it 'should raise an exception' do
-            expect { subject }.to raise_error(Ardm::SaveFailureError, "Blog::User##{method} returned false, Blog::User was not saved")
+            expect { subject }.to raise_error(Ardm::SaveFailureError, "Blog::User##{method} returned false, Blog::User was not saved") { |error|
+              error.resource.should equal(@user)
+            }
           end
         end
       end
@@ -177,7 +122,7 @@ describe Ardm::Record do
   end
 
   [ :update, :update! ].each do |method|
-    describe 'with attributes where one is a foreign key' do
+    describe 'with attributes where one is a foreign key', :pending => "#relationships not needed" do
       before do
         @dkubb = @user_model.create(:name => 'dkubb', :age => 33)
         @user.referrer = @dkubb
@@ -247,7 +192,7 @@ describe Ardm::Record do
   describe '#attribute_set' do
     subject { object.attribute_set(name, value) }
 
-    let(:object) { @user }
+    let(:object) { @user.clone }
 
     context 'with a known property' do
       let(:name)  { :name   }