granite-form 0.2.0 → 0.3.0

data/lib/granite/form/model/associations/reflections/references_one.rb

@@ -7,8 +7,6 @@ module Granite
       module Associations
         module Reflections
           class ReferencesOne < ReferencesAny
-            include Singular
-
             def self.build(target, generated_methods, name, *args, &block)
               reflection = super
 

data/lib/granite/form/model/associations/reflections/singular.rb

@@ -14,14 +14,6 @@ module Granite
                 def build_#{name} attributes = {}
                   association(:#{name}).build(attributes)
                 end
-
-                def create_#{name} attributes = {}
-                  association(:#{name}).create(attributes)
-                end
-
-                def create_#{name}! attributes = {}
-                  association(:#{name}).create!(attributes)
-                end
                 RUBY
               end
             end

data/lib/granite/form/model/associations.rb

@@ -100,12 +100,6 @@ module Granite
           (@_associations ||= {})[reflection.name] ||= reflection.build_association(self)
         end
 
-        def apply_association_changes!
-          association_names.all? do |name|
-            association(name).apply_changes!
-          end
-        end
-
       private
 
         def attributes_for_inspect

data/lib/granite/form/model/attributes/base.rb

@@ -104,7 +104,7 @@ module Granite
             if block.arity >= 0 && block.arity <= args.length
               owner.instance_exec(*args.first(block.arity), &block)
             else
-              args = block.arity < 0 ? args : args.first(block.arity)
+              args = block.arity.negative? ? args : args.first(block.arity)
               yield(*args, owner)
             end
           end

data/lib/granite/form/model/attributes/reflections/attribute.rb

@@ -4,12 +4,6 @@ module Granite
       module Attributes
         module Reflections
           class Attribute < Base
-            def self.build(target, generated_methods, name, *args, &block)
-              attribute = super(target, generated_methods, name, *args, &block)
-              generate_methods name, generated_methods
-              attribute
-            end
-
             def self.generate_methods(name, target)
               target.class_eval <<-RUBY, __FILE__, __LINE__ + 1
               def #{name}

data/lib/granite/form/model/attributes/reflections/base.rb

@@ -7,11 +7,9 @@ module Granite
             attr_reader :name, :options
 
             class << self
-              def build(_target, _generated_methods, name, *args, &block)
-                options = args.extract_options!
-                options[:type] = args.first if args.first
-                options[:default] = block if block
-                new(name, options)
+              def build(_target, generated_methods, name, *args, &block)
+                generate_methods name, generated_methods
+                new(name, *args, &block)
               end
 
               def generate_methods(name, target) end
@@ -21,9 +19,12 @@ module Granite
               end
             end
 
-            def initialize(name, options = {})
+            def initialize(name, *args, &block)
               @name = name.to_s
-              @options = options
+
+              @options = args.extract_options!
+              @options[:type] = args.first if args.first
+              @options[:default] = block if block
             end
 
             def build_attribute(owner, raw_value = Granite::Form::UNDEFINED)

data/lib/granite/form/model/attributes/reflections/reference_one.rb

@@ -4,12 +4,6 @@ module Granite
       module Attributes
         module Reflections
           class ReferenceOne < Base
-            def self.build(_target, generated_methods, name, *args)
-              options = args.extract_options!
-              generate_methods name, generated_methods
-              new(name, options)
-            end
-
             def self.generate_methods(name, target)
               target.class_eval <<-RUBY, __FILE__, __LINE__ + 1
               def #{name}

data/lib/granite/form/model/persistence.rb

@@ -26,32 +26,14 @@ module Granite
           !!@persisted
         end
 
-        def destroyed?
-          !!@destroyed
-        end
-
         def marked_for_destruction?
-          @marked_for_destruction
-        end
-
-        def mark_for_destruction
-          @marked_for_destruction = true
-        end
-
-        def _destroy
-          marked_for_destruction?
+          false
         end
 
       private
 
         def mark_persisted!
           @persisted = true
-          @destroyed = false
-        end
-
-        def mark_destroyed!
-          @persisted = false
-          @destroyed = true
         end
       end
     end

data/lib/granite/form/model.rb

@@ -3,9 +3,7 @@ require 'granite/form/model/attributes'
 require 'granite/form/model/validations'
 require 'granite/form/model/scopes'
 require 'granite/form/model/primary'
-require 'granite/form/model/lifecycle'
 require 'granite/form/model/persistence'
-require 'granite/form/model/callbacks'
 require 'granite/form/model/associations'
 require 'granite/form/model/localization'
 require 'granite/form/model/representation'

data/lib/granite/form/version.rb

@@ -1,5 +1,5 @@
 module Granite
   module Form
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.3.0'.freeze
   end
 end

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Granite::Form::ActiveRecord::Associations 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
@@ -18,7 +18,8 @@ describe Granite::Form::ActiveRecord::Associations do
     end
 
     stub_model(:profile) do
-      include Granite::Form::Model::Lifecycle
+      include Granite::Form::Model::Persistence
+      include Granite::Form::Model::Associations
 
       attribute :first_name, String
       attribute :last_name, String
@@ -89,7 +90,10 @@ describe Granite::Form::ActiveRecord::Associations do
       end
 
       context 'with profile already set' do
-        before { user.create_profile(admin: true) }
+        before do
+          user.build_profile(admin: true)
+          user.save!
+        end
 
         specify do
           user.profile.admin = false
@@ -104,13 +108,9 @@ describe Granite::Form::ActiveRecord::Associations do
     let(:user) { User.create }
 
     describe '#projects' do
-      specify do
-        expect { user.projects << Project.new }
-          .not_to change { user.read_attribute(:projects) }
-      end
       specify do
         expect { user.projects << Project.new(title: 'First') }
-          .to change { user.projects.reload.count }.from(0).to(1)
+          .not_to change { user.read_attribute(:projects) }
       end
       specify do
         user.projects << Project.new(title: 'First')
@@ -124,15 +124,14 @@ describe Granite::Form::ActiveRecord::Associations do
 
         specify do
           expect { user.projects << project }
-            .to change { user.read_attribute(:projects) }.from(nil)
-            .to([{'title' => 'First', 'author' => {'name' => 'Author'}}])
+            .not_to change { user.read_attribute(:projects) }
         end
         specify do
           expect do
             user.projects << project
             user.save
           end
-            .to change { user.reload.read_attribute(:projects) }.from(nil)
+            .to change { user.reload.read_attribute(:projects) }.from([])
             .to([{'title' => 'First', 'author' => {'name' => 'Author'}}])
         end
       end
@@ -150,8 +149,7 @@ describe Granite::Form::ActiveRecord::Associations do
       end
       specify do
         expect { user.profile = Profile.new(first_name: 'google.com') }
-          .to change { user.read_attribute(:profile) }.from(nil)
-          .to({first_name: 'google.com', last_name: nil, admin: nil}.to_json)
+          .not_to change { user.read_attribute(:profile) }
       end
       specify do
         expect do
@@ -196,16 +194,16 @@ describe Granite::Form::ActiveRecord::Associations 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'}].to_json) }
+    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')]) }
 
     specify { expect(User.reflect_on_association(:profile).klass).to eq(User::Profile) }
     specify { expect(User.reflect_on_association(:profile).klass).to be < Profile }
     specify { expect(User.new.profile).to be_nil }
-    specify { expect(User.new.tap { |u| u.create_profile(first_name: 'Profile') }.profile).to be_a(User::Profile) }
+    specify { expect(User.new.tap { |u| u.build_profile(first_name: 'Profile') }.profile).to be_a(User::Profile) }
     specify do
-      expect(User.new.tap { |u| u.create_profile(first_name: 'Profile') }.read_attribute(:profile))
-        .to eq({first_name: 'Profile', last_name: nil, admin: nil, age: nil}.to_json)
+      expect(User.new.tap { |u| u.build_profile(first_name: 'Profile') }.profile)
+        .to have_attributes(first_name: 'Profile', last_name: nil, admin: nil, age: nil)
     end
   end
 end