yaks 0.8.0.beta1 → 0.8.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad5b36d2206adbc6ccc3a79eb484d70eb6a56f62
-  data.tar.gz: e902f2b6b88e269d4dc788e3e19969f881ec107c
+  metadata.gz: e70fb16fe2a8b8d06d5748409ac51ce7de353cba
+  data.tar.gz: ed91cadda25837e29c307bed1caa86b7e93bb5b4
 SHA512:
-  metadata.gz: 38efaa84bb8b2ae036fd7bc04aae45da7d9ecd8cb386f7dfbe95ee0470c52ffdf1bbf62c81893f599fa030a9859fe1496c764bc744a3d44ddaceecc36f1de619
-  data.tar.gz: 93e074f082306f8a8bbd6f36a0564a3d30c3b056c2b29061506155ffaec1725268170d427f751fda58959ece321fa625fc00f712877d5040a9727cb88bf01b0e
+  metadata.gz: 61c520e3fa43ee9de85d54b1bf478c3d0ef68933f98c31668a8f7330bf75b1306edb1f442824434843e50d0d03068ad7f0a0a05fa8212adbf895ebd24ce97e40
+  data.tar.gz: ad0ab6ae6c9d0d385baf8bdaeef55c6cbffdaf2a3b87fadf30e7d28f2cf0a17bfa71967396963771aeebe5decd75ef2e986ebfe634501145e4e56c18eeb5a416

data/Rakefile

@@ -82,10 +82,11 @@ task :mutant_chunked do
     # >> Yaks::Reader::Hal
     # Yaks::Resource,
     # Yaks::Resource::Form,
-    Yaks::Resource::Form::Field,
-    Yaks::Resource::Form::Field::Option,
-    Yaks::Resource::Form::Fieldset,
-    Yaks::Resource::Link,
+    # Yaks::Resource::Form::Field,
+    # Yaks::Resource::Form::Field::Option,
+    # Yaks::Resource::Form::Fieldset,
+    #Yaks::Resource::Link,
+    Yaks::Resource::HasFields,
     # >> Yaks::Runner
     # >> Yaks::RuntimeError
     # >> Yaks::Serializer

data/lib/yaks/mapper/link.rb

@@ -33,11 +33,12 @@ module Yaks
       end
 
       def add_to_resource(resource, mapper, _context)
+        return resource.with(links: resource.links.reject {|link| link.rel?(rel)}) if options[:remove]
+
         resource_link = map_to_resource_link(mapper)
         return resource unless resource_link
-        if options[:remove]
-          resource.with(links: resource.links.reject {|link| link.rel?(rel)})
-        elsif options[:replace]
+
+        if options[:replace]
           resource.with(links: resource.links.reject {|link| link.rel?(rel)} << resource_link)
         else
           resource.add_link(resource_link)

data/lib/yaks/resource/form/field.rb

@@ -6,12 +6,38 @@ module Yaks
 
         def value
           if type.equal? :select
-            selected = options.find { |option| option.selected }
+            selected = options.find(&:selected)
             selected.value if selected
           else
             @value
           end
         end
+
+        def with_value(value)
+          if type.equal? :select
+            with(options: select_options_for_value(value))
+          else
+            with(value: value)
+          end
+        end
+
+        private
+
+        def select_options_for_value(value)
+          unset = ->(option) { option.selected && !value().eql?(value) }
+          set   = ->(option) { !option.selected && option.value.eql?(value) }
+
+          options.each_with_object([]) do |option, new_opts|
+            new_opts << case option
+                        when unset
+                          option.update selected: false
+                        when set
+                          option.update selected: true
+                        else
+                          option
+                        end
+          end
+        end
       end
     end
   end

data/lib/yaks/resource/form/fieldset.rb

@@ -3,6 +3,7 @@ module Yaks
     class Form
       class Fieldset
         include Attributes.new(:fields)
+        include Yaks::Resource::HasFields
 
         def type
           :fieldset

data/lib/yaks/resource/form.rb

@@ -2,6 +2,7 @@ module Yaks
   class Resource
     class Form
       include Yaks::Mapper::Form::Config.attributes.remove(:dynamic_blocks)
+      include Yaks::Resource::HasFields
 
       def [](name)
         fields.find {|field| field.name.equal? name}.value

data/lib/yaks/resource/has_fields.rb

@@ -0,0 +1,17 @@
+module Yaks
+  class Resource
+    module HasFields
+      def map_fields(&block)
+        with(
+          fields: fields.map do |field|
+            if field.type.equal? :fieldset
+              field.map_fields(&block)
+            else
+              block.call(field)
+            end
+          end
+        )
+      end
+    end
+  end
+end

data/lib/yaks/version.rb

@@ -1,3 +1,3 @@
 module Yaks
-  VERSION = '0.8.0.beta1'
+  VERSION = '0.8.0.beta2'
 end

data/lib/yaks.rb

@@ -85,6 +85,7 @@ require 'yaks/mapper'
 require 'yaks/mapper/association_mapper'
 require 'yaks/collection_mapper'
 
+require 'yaks/resource/has_fields'
 require 'yaks/resource/form'
 require 'yaks/resource/form/field'
 require 'yaks/resource/form/field/option'

data/spec/unit/yaks/resource/form/field_spec.rb

@@ -0,0 +1,88 @@
+RSpec.describe Yaks::Resource::Form::Field do
+  subject do
+    described_class.new(type: 'text', name: 'foo', value: 123)
+  end
+
+  describe '#value' do
+    its(:value) { should eql 123 }
+
+    context 'with a select box - with selection' do
+      subject do
+        described_class.new(name: 'foo', type: :select, options: [
+          Yaks::Resource::Form::Field::Option.new(label: 'foo', selected: false, value: 1),
+          Yaks::Resource::Form::Field::Option.new(label: 'foo', selected: true, value: 2),
+          Yaks::Resource::Form::Field::Option.new(label: 'foo', selected: false, value: 3),
+        ])
+      end
+
+      it 'should return the selected value' do
+        expect( subject.value ).to eql 2
+      end
+    end
+
+    context 'with a select box - no selection' do
+      subject do
+        described_class.new(name: 'foo', type: :select, options: [
+          Yaks::Resource::Form::Field::Option.new(label: 'foo', selected: false, value: 1),
+          Yaks::Resource::Form::Field::Option.new(label: 'foo', selected: false, value: 2),
+          Yaks::Resource::Form::Field::Option.new(label: 'foo', selected: false, value: 3),
+        ])
+      end
+
+      it 'should return nothing' do
+        expect( subject.value ).to be nil
+      end
+    end
+  end
+
+  describe '#with_value' do
+    context 'with a regular field' do
+      it 'should update the given attributes' do
+        expect(subject.with_value(321).value).to eql 321
+      end
+    end
+
+    context 'with a select field' do
+      subject do
+        described_class.new(name: 'foo', type: :select, options: [
+          Yaks::Resource::Form::Field::Option.new(label: 'f', selected: true,  value: "1"),
+          Yaks::Resource::Form::Field::Option.new(label: 'f', selected: false, value: "2"),
+          Yaks::Resource::Form::Field::Option.new(label: 'f', selected: true,  value: "3"),
+          Yaks::Resource::Form::Field::Option.new(label: 'f', selected: false, value: "4"),
+        ])
+      end
+
+      let(:updated) { subject.with_value("2") }
+
+      it 'should keep existing attributes' do
+        expect([updated.name, updated.type]).to eq ['foo', :select]
+      end
+
+      context 'when changing from a previous value' do
+        it 'should update the affected option' do
+          expect(updated.value).to eq "2"
+        end
+
+        it 'should reuse existing Option instances' do
+          expect(updated.options.last).to equal subject.options.last
+        end
+
+        it 'should unset all selected options' do
+          expect(updated.options.map(&:selected)).to eq [false, true, false, false]
+        end
+      end
+
+      context 'when keeping the old value value' do
+        let(:updated) { subject.with_value("1") }
+
+        it 'should not change the value' do
+          expect(updated.value).to eq "1"
+        end
+
+        it 'should reuse existing Option instances' do
+          expect(updated.options.first).to equal subject.options.first
+        end
+      end
+    end
+  end
+end

data/spec/unit/yaks/resource/form_spec.rb

@@ -48,4 +48,5 @@ RSpec.describe Yaks::Resource::Form do
       ]
     end
   end
+
 end

data/spec/unit/yaks/resource/has_fields_spec.rb

@@ -0,0 +1,50 @@
+RSpec.describe Yaks::Resource::HasFields do
+  let(:class_with_fields) do
+    Class.new do
+      include Yaks::Resource::HasFields
+      include Yaks::Attributes.new(:fields)
+    end
+  end
+
+  let(:fields) do
+    [
+      Yaks::Resource::Form::Fieldset.new(fields: [
+        Yaks::Resource::Form::Field.new(name: :foo, value: '123', type: 'text'),
+        Yaks::Resource::Form::Field.new(name: :bar, value: '+32 477 123 123', type: 'tel')
+      ]),
+      Yaks::Resource::Form::Fieldset.new(fields: [
+        Yaks::Resource::Form::Fieldset.new(fields: [
+          Yaks::Resource::Form::Field.new(name: :quux, value: '999', type: 'tel')
+        ]),
+        Yaks::Resource::Form::Field.new(name: :qux, value: '777', type: 'text')
+      ])
+    ]
+  end
+
+  subject(:with_fields) { class_with_fields.new(fields: fields) }
+
+  describe '#map_fields' do
+
+    let(:update_fields) do
+      ->(field) do
+        field.with({ value: "updated" })
+      end
+    end
+
+    it 'will map over nested fieldsets' do
+      expect(subject.map_fields(&update_fields)).to eql class_with_fields.new(fields: [
+        Yaks::Resource::Form::Fieldset.new(fields: [
+          Yaks::Resource::Form::Field.new(name: :foo, value: 'updated', type: 'text'),
+          Yaks::Resource::Form::Field.new(name: :bar, value: 'updated', type: 'tel')
+        ]),
+        Yaks::Resource::Form::Fieldset.new(fields: [
+          Yaks::Resource::Form::Fieldset.new(fields: [
+            Yaks::Resource::Form::Field.new(name: :quux, value: 'updated', type: 'tel')
+          ]),
+          Yaks::Resource::Form::Field.new(name: :qux, value: 'updated', type: 'text')
+        ])
+      ])
+    end
+  end
+
+end

data/spec/unit/yaks/resource/link_spec.rb

@@ -16,4 +16,16 @@ RSpec.describe Yaks::Resource::Link do
     let(:options) { super().merge(templated: true) }
     its(:templated?) { should be true }
   end
+
+  describe '#rel?' do
+    let(:rel) { "/rels/foo" }
+
+    it 'should be true if the rel matches' do
+      expect(link.rel?("/rels/foo")).to be true
+    end
+
+    it 'should be false if the rel does not match' do
+      expect(link.rel?(:foo)).to be false
+    end
+  end
 end

data/spec/unit/yaks/resource_spec.rb

@@ -162,4 +162,3 @@ RSpec.describe Yaks::Resource do
   end
 
 end
-# ~> -:1:in `<main>': uninitialized constant RSpec (NameError)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaks
 version: !ruby/object:Gem::Version
-  version: 0.8.0.beta1
+  version: 0.8.0.beta2
 platform: ruby
 authors:
 - Arne Brasseur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-09 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inflection
@@ -287,6 +287,7 @@ files:
 - lib/yaks/resource/form/field.rb
 - lib/yaks/resource/form/field/option.rb
 - lib/yaks/resource/form/fieldset.rb
+- lib/yaks/resource/has_fields.rb
 - lib/yaks/resource/link.rb
 - lib/yaks/runner.rb
 - lib/yaks/serializer.rb
@@ -347,8 +348,9 @@ files:
 - spec/unit/yaks/null_resource_spec.rb
 - spec/unit/yaks/pipeline_spec.rb
 - spec/unit/yaks/primitivize_spec.rb
-- spec/unit/yaks/resource/form/field_sepc.rb
+- spec/unit/yaks/resource/form/field_spec.rb
 - spec/unit/yaks/resource/form_spec.rb
+- spec/unit/yaks/resource/has_fields_spec.rb
 - spec/unit/yaks/resource/link_spec.rb
 - spec/unit/yaks/resource_spec.rb
 - spec/unit/yaks/runner_spec.rb
@@ -436,8 +438,9 @@ test_files:
 - spec/unit/yaks/null_resource_spec.rb
 - spec/unit/yaks/pipeline_spec.rb
 - spec/unit/yaks/primitivize_spec.rb
-- spec/unit/yaks/resource/form/field_sepc.rb
+- spec/unit/yaks/resource/form/field_spec.rb
 - spec/unit/yaks/resource/form_spec.rb
+- spec/unit/yaks/resource/has_fields_spec.rb
 - spec/unit/yaks/resource/link_spec.rb
 - spec/unit/yaks/resource_spec.rb
 - spec/unit/yaks/runner_spec.rb

data/spec/unit/yaks/resource/form/field_sepc.rb

@@ -1,37 +0,0 @@
-RSpec.describe Yaks::Resource::Form::Field do
-  subject do
-    described_class.new(value: 123)
-  end
-
-  describe '#value' do
-    its(:value) { should eql 123 }
-
-    context 'with a select box - with selection' do
-      subject do
-        described.class.new(type: :select, options: [
-                              Yaks::Resource::Form::Field::Option.new(selected: false, value: 1),
-                              Yaks::Resource::Form::Field::Option.new(selected: true, value: 2),
-                              Yaks::Resource::Form::Field::Option.new(selected: false, value: 3),
-                            ])
-      end
-
-      it 'should return the selected value' do
-        expect( subject.value ).to eql 2
-      end
-    end
-
-    context 'with a select box - no selection' do
-      subject do
-        described.class.new(type: :select, options: [
-                              Yaks::Resource::Form::Field::Option.new(selected: false, value: 1),
-                              Yaks::Resource::Form::Field::Option.new(selected: false, value: 2),
-                              Yaks::Resource::Form::Field::Option.new(selected: false, value: 3),
-                            ])
-      end
-
-      it 'should return nothing' do
-        expect( subject.value ).to be nil
-      end
-    end
-  end
-end