diffable_array 0.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6a49bfa81326b864fbe178d2dee4fe10ad355355
+  data.tar.gz: 68300ffb39d6119d5461ad33550caba7cf87918f
+SHA512:
+  metadata.gz: 1f229c36d18dedaf02868d2ad4317bc6224850928e8ace1c7f2f4ded5c7893b08dec054f041416136bb05e3c92aa708e4dece46d97ab602689b1eac1caacbdd5
+  data.tar.gz: 4f233f8ff27f18b891fa998b45a6a7632e471207ce5c22ead5880998eb690461b48879e15905306ac29116ac687bdbea6b7c0a0adb235af53f6d9be8da62392a

data/.gitignore

@@ -0,0 +1,22 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in diffable_array.gemspec
+gemspec

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2014 Dan Barber
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,29 @@
+# DiffableArray
+
+TODO: Write a gem description
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'diffable_array'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install diffable_array
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Contributing
+
+1. Fork it ( https://github.com/[my-github-username]/diffable_array/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request

data/Rakefile

@@ -0,0 +1,7 @@
+require "bundler/gem_tasks"
+
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task default: :spec

data/diffable_array.gemspec

@@ -0,0 +1,24 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'diffable_array/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "diffable_array"
+  spec.version       = DiffableArray::VERSION
+  spec.authors       = ["Dan Barber"]
+  spec.email         = ["hello@danbarber.me"]
+  spec.summary       = %q{Do a diff style merge of two arrays}
+  spec.description   = %q{Do a diff style merge of two arrays, respecting the order as much as possible.}
+  spec.homepage      = ""
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+end

data/lib/diffable_array.rb

@@ -0,0 +1,24 @@
+require "diffable_array/version"
+
+class DiffableArray < Array
+  def diff_merge(array)
+    me = self.dup
+    other = array.dup
+    new_array = DiffableArray.new
+
+    until me.length == 0 && other.length == 0
+      new_array |= me + other if me.empty? || other.empty?
+      break if other.empty? || me.empty?
+
+      element = if other[1..-1].include?(me.first) && !me[1..-1].include?(other.first)
+                  other.slice!(0)
+                else
+                  me.slice!(0)
+                end
+
+      new_array << element
+    end
+
+    new_array.uniq
+  end
+end

data/lib/diffable_array/version.rb

@@ -0,0 +1,3 @@
+class DiffableArray < Array
+  VERSION = "0.0.1"
+end

data/spec/diffable_array_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+describe DiffableArray do
+
+  it 'merges arrays with the same length and one differing element' do
+    array1 = DiffableArray.new(['grapefruit', 'banana', 'lemon'])
+    array2 = ['grapefruit', 'apple', 'lemon']
+
+    expected_result = ['grapefruit', 'banana', 'apple', 'lemon']
+
+    merged_array = array1.diff_merge(array2)
+
+    expect(merged_array).to eq(expected_result)
+  end
+
+  it 'merges arrays with different lengths and different numbers of differing elements' do
+    array1 = DiffableArray.new(['grapefruit', 'banana', 'lemon'])
+    array2 = ['grapefruit', 'apple', 'orange', 'lemon']
+
+    expected_result = ['grapefruit', 'banana', 'apple', 'orange', 'lemon']
+
+    merged_array = array1.diff_merge(array2)
+
+    expect(merged_array).to eq(expected_result)
+  end
+
+  it 'merges entirely different arrays' do
+    array1 = DiffableArray.new(['grapefruit', 'banana', 'lemon'])
+    array2 = ['orange', 'plum', 'kiwi']
+
+    expected_result = ['grapefruit', 'banana', 'lemon', 'orange', 'plum', 'kiwi']
+
+    merged_array = array1.diff_merge(array2)
+
+    expect(merged_array).to eq(expected_result)
+  end
+
+  it 'merges arrays with the same start and end element' do
+    array1 = DiffableArray.new(['grapefruit', 'banana', 'lemon'])
+    array2 = ['orange', 'plum', 'grapefruit']
+
+    expected_result = ['orange', 'plum', 'grapefruit', 'banana', 'lemon']
+
+    merged_array = array1.diff_merge(array2)
+
+    expect(merged_array).to eq(expected_result)
+  end
+
+  it 'merges arrays with the same elements in a different order' do
+    array1 = DiffableArray.new(['grapefruit', 'banana', 'lemon'])
+    array2 = DiffableArray.new(['lemon', 'grapefruit', 'banana'])
+
+    expected_result = ['grapefruit', 'banana', 'lemon']
+
+    merged_array = array1.diff_merge(array2)
+    expect(merged_array).to eq(expected_result)
+
+    expected_result = ['lemon', 'grapefruit', 'banana']
+
+    merged_array = array2.diff_merge(array1)
+    expect(merged_array).to eq(expected_result)
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1 @@
+require 'diffable_array'

metadata

@@ -0,0 +1,99 @@
+--- !ruby/object:Gem::Specification
+name: diffable_array
+version: !ruby/object:Gem::Version
+  version: 0.0.1
+platform: ruby
+authors:
+- Dan Barber
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2014-09-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Do a diff style merge of two arrays, respecting the order as much as
+  possible.
+email:
+- hello@danbarber.me
+executables: []
+extensions: []
+extra_rdoc_files: []
+files:
+- ".gitignore"
+- Gemfile
+- LICENSE.txt
+- README.md
+- Rakefile
+- diffable_array.gemspec
+- lib/diffable_array.rb
+- lib/diffable_array/version.rb
+- spec/diffable_array_spec.rb
+- spec/spec_helper.rb
+homepage: ''
+licenses:
+- MIT
+metadata: {}
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 2.2.2
+signing_key: 
+specification_version: 4
+summary: Do a diff style merge of two arrays
+test_files:
+- spec/diffable_array_spec.rb
+- spec/spec_helper.rb