simple_form_object 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c5b1bb8877957e9dece06a0ea28f2eddb48c744
-  data.tar.gz: b1d5870ddc177dad61b1ec5f313f37a378cb2565
+  metadata.gz: 1fbf783ca89d65945dbdeac23091e2b8609e7d31
+  data.tar.gz: 7e4049380a3fd366d256921c8ba53211bfbcdcd4
 SHA512:
-  metadata.gz: 5cbbbde1b4d58ed0374267535412fb76375e172dd2ec02f16692357dab90844a2cc697a676b16d85235365fa0075c9c70ca80331dc115db70175b9ec326bb389
-  data.tar.gz: 97b625f72a2bdec29e3e97d2aabeb3364d6a33e47d0f1751fdd5e1015ed0d6f6d4a06dfc7f39ffab8c4a76847e62d28b7d4eb7eac8f04c9546ccd83eafa411cf
+  metadata.gz: ccceb3c72c942e845e37ca67800fd60c216361d281faa1c18ab8acc68c4111c1e39e2946b141095772d9eaac33ab61e49fa371e0fd5f33090bd8ce40fb16897a
+  data.tar.gz: 9575382b6d1f35cc090ca179b3911182ad31ee387012ae3193dd9ff82cc6be4a48ea4d9f746f19c0a27dcd0489b59600a341a916446e83016fb781b2b536ce00

data/lib/simple_form_object.rb

@@ -39,9 +39,9 @@ module SimpleFormObject
   end
 
   class Attribute
-    def initialize(name, type, options)
+    def initialize(name, type = nil, options)
       @name = name
-      @type = type
+      @type = type || :string
       @options = options
 
       extract_options
@@ -55,14 +55,16 @@ module SimpleFormObject
 
     def apply_default_to(form)
       if form.send(@name).nil?
-        form.send("#{@name}=", @default) if @default
+        form.send("#{@name}=", @default) if @apply_default
       end
     end
 
     private
 
     def extract_options
-      @default = options.fetch(:default, nil)
+      @apply_default = true
+      @default = options.fetch(:default) { @apply_default = false; nil }
+      @skip_validations = options.fetch(:skip_validations, false)
     end
   end
 

data/lib/simple_form_object/version.rb

@@ -1,3 +1,3 @@
 module SimpleFormObject
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/simple_form_objects.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["lengarvey@gmail.com"]
   spec.summary       = %q{Simple form objects for simple form and rails}
   spec.description   = %q{Very simple form objects for simple form and rails}
-  spec.homepage      = "http://github.com/lengarvey/simple_form_objects"
+  spec.homepage      = "http://github.com/reinteractive-open/simple_form_object"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

data/spec/attribute_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+describe SimpleFormObject::Attribute do
+  describe 'initialization' do
+    subject(:attribute) { SimpleFormObject::Attribute.new(name, type, options) }
+
+    let(:name) { :foo }
+    let(:type) { :boolean }
+    let(:options) { { default: 'hello' } }
+
+    it 'should be initialized with a name, type and options hash' do
+      expect(attribute.name).to eq name
+      expect(attribute.type).to eq type
+      expect(attribute.options).to eq options
+    end
+
+    describe 'type' do
+      let(:type) { nil }
+
+      it 'is :string when nil or not provided' do
+        expect(attribute.type).to eq :string
+      end
+    end
+  end
+
+  describe '#apply_default_to' do
+    let(:name) { :foo }
+    let(:type) { :boolean }
+    let(:options) { { default: default } }
+    let(:default) { true }
+    let(:attribute) { SimpleFormObject::Attribute.new(name, type, options) }
+    let(:form) { double(foo: nil) }
+
+    it 'should apply the default value to the attribute on the object' do
+      expect(form).to receive("#{name}=").with(default)
+      attribute.apply_default_to(form)
+    end
+
+    context 'with a falsey default' do
+      let(:default) { false }
+      it 'should apply the default value to the attribute on the object' do
+        expect(form).to receive("#{name}=").with(default)
+        attribute.apply_default_to(form)
+      end
+    end
+
+    context 'when the form object attribute has a value' do
+      let(:form) { double(foo: false) }
+
+      it 'should not apply the default' do
+        expect(form).to_not receive("#{name}=").with(default)
+        attribute.apply_default_to(form)
+        expect(form.foo).to eq false
+      end
+    end
+
+  end
+end

data/spec/model_spec.rb

@@ -1,15 +1,11 @@
 require 'spec_helper'
 
-describe 'including SimpleFormObject' do
-  context 'when included' do
-    let(:instance) do
-      class Klass
-        include SimpleFormObject
-      end
-
-      Klass.new
-    end
+describe 'SimpleFormObject' do
+  let(:base_klass) { Class.new.tap{|k| k.include SimpleFormObject } }
+  let(:klass) { base_klass }
+  let(:instance) { klass.new }
 
+  context 'when included' do
     it 'should have ActiveModel::Model' do
       expect(instance).to respond_to :valid?
     end
@@ -17,14 +13,9 @@ describe 'including SimpleFormObject' do
 
   describe '.attribute' do
     let(:attribute) { :foo }
-    let(:instance) do
-      class Klass
-        include SimpleFormObject
-
-        attribute :foo
-      end
 
-      Klass.new
+    before do
+      klass.attribute :foo
     end
 
     it 'should respond to "attribute"' do
@@ -39,15 +30,10 @@ describe 'including SimpleFormObject' do
       let(:types) { %i(boolean string email url tel password search text file hidden integer float decimal range datetime date time select radio_buttons check_boxes country time_zone) }
 
       let(:type) { :boolean }
-      let(:attr) { :foo }
-      let(:instance) do
-        class AnotherForm
-          include SimpleFormObject
-
-          attribute :foo, :boolean
-        end
+      let(:attr) { :la }
 
-        AnotherForm.new
+      before do
+        klass.attribute attr, type
       end
 
       it 'should return a fake column with the correct type' do
@@ -56,34 +42,23 @@ describe 'including SimpleFormObject' do
     end
 
     describe 'options' do
-      describe 'default' do
-        let(:instance) do
-          class AnotherForm
-            include SimpleFormObject
-
-            attribute :foo, :boolean, default: true
-          end
+      let(:type) { :boolean }
+      let(:attr) { :doh }
 
-          AnotherForm.new
-        end
+      before do
+        klass.attribute attr, type, default: true
+      end
 
+      describe 'default' do
         it 'should set the attribute to the default' do
-          expect(instance.foo).to eq true
+          expect(instance.doh).to eq true
         end
 
         context 'when a value is supplied in the initialization hash' do
-          let(:instance) do
-            class AnotherForm
-              include SimpleFormObject
-
-              attribute :foo, :boolean, default: true
-            end
-
-            AnotherForm.new(foo: false)
-          end
+          let(:instance) { klass.new(doh: false) }
 
           it 'should use the value in the hash' do
-            expect(instance.foo).to eq false
+            expect(instance.doh).to eq false
           end
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_form_object
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Leonard Garvey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -95,9 +95,10 @@ files:
 - lib/simple_form_object.rb
 - lib/simple_form_object/version.rb
 - simple_form_objects.gemspec
+- spec/attribute_spec.rb
 - spec/model_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/lengarvey/simple_form_objects
+homepage: http://github.com/reinteractive-open/simple_form_object
 licenses:
 - MIT
 metadata: {}
@@ -122,5 +123,6 @@ signing_key:
 specification_version: 4
 summary: Simple form objects for simple form and rails
 test_files:
+- spec/attribute_spec.rb
 - spec/model_spec.rb
 - spec/spec_helper.rb