refactor

CHANGELOG.md

@@ -1,8 +1,10 @@
 0.0.17 / 2015-07-07
 ========
-  * Refactor ListDifferenceBuilder
+  * Refactor ListDifferenceBuilder/OrderedListDifferenceBuilder to ListBuilder/OrderedListBuilder
+  * Name change from ListDifferenceBuilder to ListBuilder
   * Breaking change, LDB now takes 2 arguments instead of 3 and the output of the #build method is an array of AR objects rather than a hash.
-  * Add CHANGELOG.md
+  * Remove deprecation on ListDifferenceBuilder
+  * Add to CHANGELOG.md
 
 0.0.16 / 2015-06-29
 ========

lib/deprecated_classes.rb

@@ -8,8 +8,7 @@ module Xing
     :ResourcesSerializer       => Xing::Serializers::RootResources,
     :JsonTreeLister            => Xing::Services::JsonTreeLister,
     :ActiveModelErrorConverter => Xing::Services::ErrorConverter,
-    :RemoteSnapshotFetcher     => Xing::Services::SnapshotFetcher,
-    :ListDifferenceBuilder     => Xing::Builders::OrderedListDifferenceBuilder
+    :RemoteSnapshotFetcher     => Xing::Services::SnapshotFetcher
   }
 end
 

lib/xing/builders.rb

@@ -3,5 +3,5 @@ module Builders
   end
 end
 
-require 'xing/builders/list_difference_builder'
-require 'xing/builders/ordered_list_difference_builder'
+require 'xing/builders/list_builder'
+require 'xing/builders/ordered_list_builder'

lib/xing/builders/list_difference_builder.rb → lib/xing/builders/list_builder.rb

@@ -2,7 +2,7 @@
 
 module Xing
   module Builders
-    class ListDifferenceBuilder
+    class ListBuilder
       include Services::Locator
 
       # list_data is is an array of JSON objects passed in by the mapper (the new list of records)
@@ -15,39 +15,27 @@ def initialize(list_data, mapper_class)
 
       attr_reader :errors
 
-      def build
-        sort_json_items
-        map_items
-
-        @new_list
-      end
-
-      def sort_json_items
-        @list_data = @list_data.map do |data|
-          { :locator => set_locator(data), :incoming => data}
-        end
-      end
-
-      def set_locator(data)
-        locator_for(data) unless (data[:links] || {})[:self].blank?
-      end
-
       def locator_for(data)
-        route_to(data[:links][:self])[:id].to_i
+        route_to(data[:links][:self])[:id].to_i unless (data[:links] || {})[:self].blank?
       end
 
-      def map_items
+      def build
         @new_list = []
-        @list_data.each_with_index do |item, index|
+        @list_data.each_with_index do |data, index|
 
-          mapper = @mapper_class.new(item[:incoming], item[:locator])
+          mapper = @mapper_class.new(data, locator_for(data))
 
-          # Sets association, attributes
           mapper.perform_mapping
+          set_position(mapper.record, index)
 
           @new_list << mapper.record
           @errors[index] = mapper.errors[:data] unless mapper.errors[:data].blank?
         end
+        @new_list
+      end
+
+      def set_position(record, index)
+        # position is not set in list builder
       end
     end
   end

lib/xing/builders/ordered_list_builder.rb

@@ -0,0 +1,9 @@
+module Xing
+  module Builders
+    class OrderedListBuilder < ListBuilder
+      def set_position(record, index)
+        record.position = index if record.has_attribute?(:position)
+      end
+    end
+  end
+end

spec/xing/builders/list_builder_spec.rb

@@ -0,0 +1,84 @@
+require 'spec_helper'
+
+describe Xing::Builders::ListBuilder do
+
+  let :builder do
+    Xing::Builders::ListBuilder.new(list_data, mapper_class)
+  end
+
+  let :mapper_class do
+    double("ItemMapper")
+  end
+
+  let :mapper_instance do
+    double("mapper")
+  end
+
+  let :new_ar_object do
+    double("New Relation AR Object")
+  end
+
+  let :updated_ar_object do
+    double("Updated AR Object")
+  end
+
+  let :list_data do
+    [
+      {
+        links: {
+          self: "/somethings/1"
+        },
+        data: {
+          stuff: "some updated stuff"
+        }
+      },
+      {
+        links: {
+          self: ""
+        },
+        data: {
+          stuff: "some new stuff"
+        }
+      }
+    ]
+  end
+
+  it "initialize" do
+    expect(builder.instance_variable_get('@list_data')).to eq(list_data)
+    expect(builder.instance_variable_get('@mapper_class')).to eq(mapper_class)
+    expect(builder.instance_variable_get('@errors')).to eq({})
+  end
+
+  describe "#build" do
+    before :each do
+      allow(builder).to receive(:locator_for).and_return(1)
+      allow(mapper_class).to receive(:new).with(list_data[0], 1).and_return(mapper_instance)
+      allow(mapper_class).to receive(:new).with(list_data[1], 1).and_return(mapper_instance)
+      allow(mapper_instance).to receive(:record).and_return(new_ar_object, new_ar_object, updated_ar_object, updated_ar_object)
+      allow(mapper_instance).to receive(:perform_mapping)
+      allow(new_ar_object).to receive(:has_attribute?).with(:position).and_return(false)
+      allow(updated_ar_object).to receive(:has_attribute?).with(:position).and_return(false)
+    end
+
+    context "successful" do
+      before :each do
+        allow(mapper_instance).to receive(:errors).and_return({})
+      end
+
+      it "should return array of AR records" do
+        expect(builder.build).to match_array([new_ar_object, updated_ar_object])
+      end
+    end
+
+    context "with errors" do
+      before :each do
+        allow(mapper_instance).to receive(:errors).and_return({data: {type: "I would do anything for love", message: "but I won't do that"}}, {data: {type: "I would do anything for love", message: "but I won't do that"}}, {})
+        builder.build
+      end
+
+      it "should return errors" do
+        expect(builder.errors).to eq({0=>{:type=>"I would do anything for love", :message=>"but I won't do that"}})
+      end
+    end
+  end
+end