granite-form 0.2.0 → 0.3.0

data/spec/granite/form/model/associations/reflections/embeds_many_spec.rb

@@ -3,7 +3,8 @@ require 'spec_helper'
 describe Granite::Form::Model::Associations::Reflections::EmbedsMany do
   before do
     stub_model(:project) do
-      include Granite::Form::Model::Lifecycle
+      include Granite::Form::Model::Persistence
+      include Granite::Form::Model::Associations
       attribute :title, String
     end
     stub_model(:user) do
@@ -24,24 +25,28 @@ describe Granite::Form::Model::Associations::Reflections::EmbedsMany do
         attribute :name
         embeds_many :projects,
           read: lambda { |reflection, object|
-            value = object.read_attribute(reflection.name)
+            value = object.instance_variable_get("@_value_#{reflection.name}")
             JSON.parse(value) if value.present?
           },
           write: lambda { |reflection, object, value|
-            object.write_attribute(reflection.name, value.to_json)
+            value = value.to_json if value
+            object.instance_variable_set("@_value_#{reflection.name}", value)
           }
       end
     end
 
-    let(:user) { User.instantiate name: 'Rick', projects: [{title: 'Genesis'}].to_json }
+    let(:user) { User.new }
     let(:new_project1) { Project.new(title: 'Project 1') }
     let(:new_project2) { Project.new(title: 'Project 2') }
 
     specify do
-      expect { user.projects.concat([new_project1, new_project2]) }
-        .to change { user.read_attribute(:projects) }
-        .from([{title: 'Genesis'}].to_json)
-        .to([{title: 'Genesis'}, {title: 'Project 1'}, {title: 'Project 2'}].to_json)
+      expect do
+        user.projects = [new_project1, new_project2]
+        user.association(:projects).sync
+      end
+        .to change { user.projects(true) }
+        .from([])
+        .to([have_attributes(title: 'Project 1'), have_attributes(title: 'Project 2')])
     end
   end
 
@@ -54,23 +59,10 @@ describe Granite::Form::Model::Associations::Reflections::EmbedsMany do
       specify { expect { user.projects.build(title: 'Project') }.to change { user.projects }.from([]).to([project]) }
     end
 
-    describe '#create' do
-      let(:project) { Project.new title: 'Project' }
-      specify { expect(user.projects.create(title: 'Project')).to eq(project) }
-      specify { expect { user.projects.create(title: 'Project') }.to change { user.projects }.from([]).to([project]) }
-    end
-
-    describe '#create!' do
-      let(:project) { Project.new title: 'Project' }
-      specify { expect(user.projects.create!(title: 'Project')).to eq(project) }
-      specify { expect { user.projects.create!(title: 'Project') }.to change { user.projects }.from([]).to([project]) }
-    end
-
     describe '#reload' do
       let(:project) { Project.new title: 'Project' }
       before do
-        user.update(projects: [project])
-        user.apply_association_changes!
+        user.write_attribute(:projects, [{title: 'Project'}])
       end
       before { user.projects.build }
 
@@ -120,8 +112,8 @@ describe Granite::Form::Model::Associations::Reflections::EmbedsMany do
 
       specify { expect(User.reflect_on_association(:projects).klass).to eq(User::Project) }
       specify { expect(User.new.projects).to eq([]) }
-      specify { expect(User.new.tap { |u| u.projects.create(title: 'Project') }.projects).to be_a(Granite::Form::Model::Associations::Collection::Embedded) }
-      specify { expect(User.new.tap { |u| u.projects.create(title: 'Project') }.read_attribute(:projects)).to eq([{'title' => 'Project'}]) }
+      specify { expect(User.new.tap { |u| u.projects.build(title: 'Project') }.projects).to be_a(Granite::Form::Model::Associations::Collection::Embedded) }
+      specify { expect(User.new.tap { |u| u.projects.build(title: 'Project') }.projects).to match([have_attributes(title: 'Project')]) }
     end
 
     context do
@@ -138,8 +130,8 @@ describe Granite::Form::Model::Associations::Reflections::EmbedsMany do
 
       specify { expect(User.reflect_on_association(:projects).klass).to eq(User::Project) }
       specify { expect(User.new.projects).to eq([]) }
-      specify { expect(User.new.tap { |u| u.projects.create(title: 'Project') }.projects).to be_a(Granite::Form::Model::Associations::Collection::Embedded) }
-      specify { expect(User.new.tap { |u| u.projects.create(title: 'Project') }.read_attribute(:projects)).to eq([{'title' => 'Project', 'value' => nil}]) }
+      specify { expect(User.new.tap { |u| u.projects.build(title: 'Project') }.projects).to be_a(Granite::Form::Model::Associations::Collection::Embedded) }
+      specify { expect(User.new.tap { |u| u.projects.build(title: 'Project') }.projects).to match([have_attributes(title: 'Project', value: nil)]) }
     end
   end
 end

data/spec/granite/form/model/associations/reflections/embeds_one_spec.rb

@@ -3,7 +3,8 @@ require 'spec_helper'
 describe Granite::Form::Model::Associations::Reflections::EmbedsOne do
   before do
     stub_model(:author) do
-      include Granite::Form::Model::Lifecycle
+      include Granite::Form::Model::Persistence
+      include Granite::Form::Model::Associations
       attribute :name, String
     end
 
@@ -27,22 +28,26 @@ describe Granite::Form::Model::Associations::Reflections::EmbedsOne do
         attribute :title
         embeds_one :author,
           read: lambda { |reflection, object|
-            value = object.read_attribute(reflection.name)
+            value = object.instance_variable_get("@_value_#{reflection.name}")
             JSON.parse(value) if value.present?
           },
           write: lambda { |reflection, object, value|
-            object.write_attribute(reflection.name, value ? value.to_json : nil)
+            value = value.to_json if value
+            object.instance_variable_set("@_value_#{reflection.name}", value)
           }
       end
     end
 
-    let(:book) { Book.instantiate author: {name: 'Duke'}.to_json }
+    let(:book) { Book.new }
     let(:author) { Author.new(name: 'Rick') }
 
     specify do
-      expect { book.author = author }
-        .to change { book.read_attribute(:author) }
-        .from({name: 'Duke'}.to_json).to({name: 'Rick'}.to_json)
+      expect do
+        book.author = author
+        book.association(:author).sync
+      end
+        .to change { book.author(true) }
+        .from(nil).to(have_attributes(name: 'Rick'))
     end
   end
 
@@ -65,18 +70,6 @@ describe Granite::Form::Model::Associations::Reflections::EmbedsOne do
     specify { expect { book.build_author(name: 'Author') }.to change { book.author }.from(nil).to(author) }
   end
 
-  describe '#create_author' do
-    let(:author) { Author.new name: 'Author' }
-    specify { expect(book.create_author(name: 'Author')).to eq(author) }
-    specify { expect { book.create_author(name: 'Author') }.to change { book.author }.from(nil).to(author) }
-  end
-
-  describe '#create_author!' do
-    let(:author) { Author.new name: 'Author' }
-    specify { expect(book.create_author!(name: 'Author')).to eq(author) }
-    specify { expect { book.create_author!(name: 'Author') }.to change { book.author }.from(nil).to(author) }
-  end
-
   context 'on the fly' do
     context do
       before do
@@ -92,8 +85,8 @@ describe Granite::Form::Model::Associations::Reflections::EmbedsOne do
 
       specify { expect(Book.reflect_on_association(:author).klass).to eq(Book::Author) }
       specify { expect(Book.new.author).to be_nil }
-      specify { expect(Book.new.tap { |b| b.create_author(name: 'Author') }.author).to be_a(Book::Author) }
-      specify { expect(Book.new.tap { |b| b.create_author(name: 'Author') }.read_attribute(:author)).to eq('name' => 'Author') }
+      specify { expect(Book.new.tap { |b| b.build_author(name: 'Author') }.author).to be_a(Book::Author) }
+      specify { expect(Book.new.tap { |b| b.build_author(name: 'Author') }.author).to have_attributes(name: 'Author') }
     end
 
     context do
@@ -110,8 +103,8 @@ describe Granite::Form::Model::Associations::Reflections::EmbedsOne do
 
       specify { expect(Book.reflect_on_association(:author).klass).to eq(Book::Author) }
       specify { expect(Book.new.author).to be_nil }
-      specify { expect(Book.new.tap { |b| b.create_author(name: 'Author') }.author).to be_a(Book::Author) }
-      specify { expect(Book.new.tap { |b| b.create_author(name: 'Author') }.read_attribute(:author)).to eq('name' => 'Author', 'age' => nil) }
+      specify { expect(Book.new.tap { |b| b.build_author(name: 'Author') }.author).to be_a(Book::Author) }
+      specify { expect(Book.new.tap { |b| b.build_author(name: 'Author') }.author).to have_attributes(name: 'Author', age: nil) }
     end
   end
 end

data/spec/granite/form/model/associations/reflections/references_many_spec.rb

@@ -4,7 +4,7 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesMany do
   before do
     stub_class(:author, ActiveRecord::Base) do
       scope :name_starts_with_a, -> { name_starts_with('a') }
-      scope :name_starts_with, ->(letter) { where("name LIKE '#{letter}%'") }
+      scope :name_starts_with, ->(letter) { where("name ILIKE '#{letter}%'") }
     end
 
     stub_model(:book) do

data/spec/granite/form/model/associations/reflections/references_one_spec.rb

@@ -4,7 +4,7 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesOne do
   before do
     stub_class(:author, ActiveRecord::Base) do
       scope :name_starts_with_a, -> { name_starts_with('a') }
-      scope :name_starts_with, ->(letter) { where("name LIKE '#{letter}%'") }
+      scope :name_starts_with, ->(letter) { where("name ILIKE '#{letter}%'") }
     end
 
     stub_model(:book) do
@@ -263,25 +263,4 @@ describe Granite::Form::Model::Associations::Reflections::ReferencesOne do
       specify { expect { book.author_id = nil }.to change { book.author }.from(other).to(nil) }
     end
   end
-
-  describe '#build_author' do
-    specify { expect(book.build_author(name: 'Author')).to be_a(Author) }
-    specify { expect(book.build_author(name: 'Author')).not_to be_persisted }
-    specify { expect { book.build_author(name: 'Author') }.to change { book.author }.from(nil).to(an_instance_of(Author)) }
-    specify { expect { book.build_author(name: 'Author') }.not_to change { book.author_id }.from(nil) }
-  end
-
-  describe '#create_author' do
-    specify { expect(book.create_author(name: 'Author')).to be_a(Author) }
-    specify { expect(book.create_author(name: 'Author')).to be_persisted }
-    specify { expect { book.create_author(name: 'Author') }.to change { book.author }.from(nil).to(an_instance_of(Author)) }
-    specify { expect { book.create_author(name: 'Author') }.to change { book.author_id }.from(nil).to(be_a(Integer)) }
-  end
-
-  describe '#create_author!' do
-    specify { expect(book.create_author!(name: 'Author')).to be_a(Author) }
-    specify { expect(book.create_author!(name: 'Author')).to be_persisted }
-    specify { expect { book.create_author!(name: 'Author') }.to change { book.author }.from(nil).to(an_instance_of(Author)) }
-    specify { expect { book.create_author!(name: 'Author') }.to change { book.author_id }.from(nil).to(be_a(Integer)) }
-  end
 end

data/spec/granite/form/model/associations/validations_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 describe Granite::Form::Model::Associations::Validations do
   before do
     stub_model(:project) do
-      include Granite::Form::Model::Lifecycle
       include Granite::Form::Model::Associations
       include Granite::Form::Model::Associations::Validations
 
@@ -17,8 +16,6 @@ describe Granite::Form::Model::Associations::Validations do
     end
 
     stub_model(:profile) do
-      include Granite::Form::Model::Lifecycle
-
       attribute :first_name, String
       attribute :last_name, String
       validates :first_name, presence: true

data/spec/granite/form/model/associations_spec.rb

@@ -7,7 +7,7 @@ describe Granite::Form::Model::Associations do
         include Granite::Form::Model::Associations
       end
       stub_model(:project) do
-        include Granite::Form::Model::Lifecycle
+        include Granite::Form::Model::Persistence
       end
       stub_model(:user, Nobody) do
         include Granite::Form::Model::Associations
@@ -65,7 +65,7 @@ describe Granite::Form::Model::Associations do
   context do
     before do
       stub_model(:project) do
-        include Granite::Form::Model::Lifecycle
+        include Granite::Form::Model::Persistence
         include Granite::Form::Model::Associations
 
         attribute :title, String
@@ -80,7 +80,7 @@ describe Granite::Form::Model::Associations do
       end
 
       stub_model(:profile) do
-        include Granite::Form::Model::Lifecycle
+        include Granite::Form::Model::Persistence
 
         attribute :first_name, String
         attribute :last_name, String
@@ -160,27 +160,6 @@ describe Granite::Form::Model::Associations do
       specify { expect(user.association_names).to eq(%i[profile projects]) }
     end
 
-    describe '#apply_association_changes!' do
-      let(:profile) { Profile.new first_name: 'Name' }
-      let(:project) { Project.new title: 'Project' }
-      let(:user) { User.new(profile: profile, projects: [project]) }
-      before { project.build_author(name: 'Author') }
-
-      specify do
-        expect { user.apply_association_changes! }.to change { user.attributes['profile'] }
-          .from(nil).to('first_name' => 'Name', 'last_name' => nil)
-      end
-      specify do
-        expect { user.apply_association_changes! }.to change { user.attributes['projects'] }
-          .from(nil).to([{'title' => 'Project', 'author' => {'name' => 'Author'}}])
-      end
-
-      context do
-        let(:project) { Project.new }
-        specify { expect { user.apply_association_changes! }.to raise_error Granite::Form::AssociationChangesNotApplied }
-      end
-    end
-
     describe '#instantiate' do
       before { User.send(:include, Granite::Form::Model::Persistence) }
       let(:profile) { Profile.new first_name: 'Name' }

data/spec/granite/form/model/dirty_spec.rb

@@ -30,7 +30,7 @@ describe Granite::Form::Model::Dirty do
   let(:other_author) { Author.create!(name: 'Other') }
 
   specify { expect(Model.new.changes).to eq({}) }
-  specify { expect(Model.new.tap { |m| m.create_something(value: 'Value') }.changes).to eq({}) }
+  specify { expect(Model.new.tap { |m| m.build_something(value: 'Value') }.changes).to eq({}) }
 
   specify { expect(Model.new(author: author).changes).to eq('author_id' => [nil, author.id]) }
   specify { expect(Model.new(author_id: author.id).changes).to eq('author_id' => [nil, author.id]) }

data/spec/granite/form/model/persistence_spec.rb

@@ -11,12 +11,10 @@ describe Granite::Form::Model::Persistence do
   end
 
   specify { expect(model.new).not_to be_persisted }
-  specify { expect(model.new).not_to be_destroyed }
 
   describe '#instantiate' do
     specify { expect(model.instantiate({})).to be_an_instance_of model }
     specify { expect(model.instantiate({})).to be_persisted }
-    specify { expect(model.instantiate({})).not_to be_destroyed }
 
     context do
       subject(:instance) { model.instantiate(name: 'Hello', foo: 'Bar') }

data/spec/granite/form/model/validations/associated_spec.rb

@@ -3,8 +3,7 @@ require 'spec_helper'
 describe Granite::Form::Model::Validations::AssociatedValidator do
   before do
     stub_model(:validated_assoc) do
-      include Granite::Form::Model
-      include Granite::Form::Model::Lifecycle
+      include Granite::Form::Model::Persistence
 
       attribute :name, String
 
@@ -12,8 +11,7 @@ describe Granite::Form::Model::Validations::AssociatedValidator do
     end
 
     stub_model(:unvalidated_assoc) do
-      include Granite::Form::Model
-      include Granite::Form::Model::Lifecycle
+      include Granite::Form::Model::Persistence
 
       attribute :name, String
     end

data/spec/granite/form/model/validations/nested_spec.rb

@@ -3,8 +3,7 @@ require 'spec_helper'
 describe Granite::Form::Model::Validations::NestedValidator do
   before do
     stub_model(:validated_assoc) do
-      include Granite::Form::Model
-      include Granite::Form::Model::Lifecycle
+      include Granite::Form::Model::Persistence
       include Granite::Form::Model::Primary
 
       primary :id, Integer
@@ -14,8 +13,7 @@ describe Granite::Form::Model::Validations::NestedValidator do
     end
 
     stub_model(:unvalidated_assoc) do
-      include Granite::Form::Model
-      include Granite::Form::Model::Lifecycle
+      include Granite::Form::Model::Persistence
 
       attribute :name, String
     end

data/spec/spec_helper.rb

@@ -10,21 +10,6 @@ require 'database_cleaner'
 
 Dir[File.join(__dir__, 'support', '**', '*.rb')].sort.each { |f| require f }
 
-ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
-ActiveRecord::Base.logger = Logger.new('/dev/null')
-
-ActiveRecord::Schema.define do
-  create_table :users do |t|
-    t.column :email, :string
-    t.column :projects, :text
-    t.column :profile, :text
-  end
-
-  create_table :authors do |t|
-    t.column :name, :string
-  end
-end
-
 RSpec.configure do |config|
   config.mock_with :rspec
   config.order = :random

data/spec/support/active_record.rb

@@ -0,0 +1,20 @@
+ActiveRecord::Base.establish_connection(
+  adapter: 'postgresql',
+  database: 'granite',
+  username: 'granite',
+  password: 'granite',
+  host: 'localhost'
+)
+ActiveRecord::Base.logger = Logger.new('/dev/null')
+
+ActiveRecord::Schema.define do
+  create_table :users, force: :cascade do |t|
+    t.column :email, :string
+    t.column :projects, :text
+    t.column :profile, :text
+  end
+
+  create_table :authors, force: :cascade do |t|
+    t.column :name, :string
+  end
+end

data/spec/support/shared/nested_attribute_examples.rb

@@ -4,7 +4,7 @@ shared_examples 'nested attributes' do
   before do
     stub_model :project do
       include Granite::Form::Model::Primary
-      include Granite::Form::Model::Lifecycle
+      include Granite::Form::Model::Associations
 
       primary :slug, String
       attribute :title, String
@@ -12,7 +12,7 @@ shared_examples 'nested attributes' do
 
     stub_model :profile do
       include Granite::Form::Model::Primary
-      include Granite::Form::Model::Lifecycle
+      include Granite::Form::Model::Associations
 
       primary :identifier
       attribute :first_name, String
@@ -49,14 +49,12 @@ shared_examples 'nested attributes' do
       specify do
         expect do
           user.profile_attributes = {first_name: 'User 1', _destroy: '1'}
-          user.save { true }
         end.not_to change { user.profile.first_name }
       end
       specify { expect { user.profile_attributes = {identifier: profile.identifier.to_s, first_name: 'User 1', _destroy: '1'} }.to change { user.profile.first_name }.to('User 1') }
       specify do
         expect do
           user.profile_attributes = {identifier: profile.identifier.to_s, first_name: 'User 1', _destroy: '1'}
-          user.save { true }
         end.to change { user.profile.first_name }.to('User 1')
       end
 
@@ -67,14 +65,12 @@ shared_examples 'nested attributes' do
         specify do
           expect do
             user.profile_attributes = {first_name: 'User 1', _destroy: '1'}
-            user.save { true }
           end.not_to change { user.profile.first_name }
         end
-        specify { expect { user.profile_attributes = {identifier: profile.identifier.to_s, first_name: 'User 1', _destroy: '1'} }.to change { user.profile.first_name }.to('User 1') }
+        specify { expect { user.profile_attributes = {identifier: profile.identifier.to_s, first_name: 'User 1', _destroy: '1'} }.to change { user.profile }.to(nil) }
         specify do
           expect do
             user.profile_attributes = {identifier: profile.identifier.to_s, first_name: 'User 1', _destroy: '1'}
-            user.save { true }
           end.to change { user.profile }.to(nil)
         end
       end
@@ -92,8 +88,6 @@ shared_examples 'nested attributes' do
     context 'not primary' do
       before do
         stub_model :profile do
-          include Granite::Form::Model::Lifecycle
-
           attribute :identifier, Integer
           attribute :first_name, String
         end
@@ -245,7 +239,6 @@ shared_examples 'nested attributes' do
             {slug: projects.first.slug.to_i, title: 'Project 3', _destroy: '1'},
             {title: 'Project 4', _destroy: '1'}
           ]
-          user.save { true }
         end
           .to change { user.projects.map(&:title) }.to(['Project 3', 'Project 2'])
       end
@@ -259,16 +252,6 @@ shared_examples 'nested attributes' do
               {slug: projects.first.slug.to_i, title: 'Project 3', _destroy: '1'},
               {title: 'Project 4', _destroy: '1'}
             ]
-          end
-            .to change { user.projects.map(&:title) }.to(['Project 3', 'Project 2'])
-        end
-        specify do
-          expect do
-            user.projects_attributes = [
-              {slug: projects.first.slug.to_i, title: 'Project 3', _destroy: '1'},
-              {title: 'Project 4', _destroy: '1'}
-            ]
-            user.save { true }
           end
             .to change { user.projects.map(&:title) }.to(['Project 2'])
         end
@@ -303,7 +286,6 @@ shared_examples 'nested attributes' do
       before do
         stub_model :project do
           include Granite::Form::Model::Primary
-          include Granite::Form::Model::Lifecycle
 
           attribute :slug, String
           attribute :title, String