coopy 0.6.4.1 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7493ee11a18d6521e605f88a26b937ce6b096f15
+  data.tar.gz: a0410f887465a882377849fe96e55c1c70588708
+SHA512:
+  metadata.gz: 37677ed77595308b7a205686c3048ba02051603ca8b6ce3c6ff1000f97e5c8522a243472cf01e5f8782273a9161fa81540d70f9fbe0f13b30179a6f35e7f16a1
+  data.tar.gz: 6806bd9e2ded7bedd32315c6764beac55338b7ae50b5c119609840504e87ebe52fbf45c4d956ba065749603148676204dba430d62f429f2eeb74ae76541c3c67

data/.gitignore

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

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+# Coopy for Ruby Changelog
+
+## 1.0.0
+
+ * First working version!
+ * Basic support for two-way diffs of Ruby CSV objects
+ * HTML output

data/Gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+ruby '2.0.0'
+#ruby-gemset=coopy
+
+# Specify your gem's dependencies in coopy.gemspec
+gemspec

data/LICENSE.md

@@ -0,0 +1,22 @@
+Copyright (c) 2013 The Open Data Institute
+
+# 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,59 @@
+# Coopy for Ruby
+
+[![Build Status](http://jenkins.theodi.org/job/coopy-ruby-master/badge/icon)](http://jenkins.theodi.org/job/coopy-ruby-master/)
+[![Dependency Status](https://gemnasium.com/theodi/coopy-ruby.png)](https://gemnasium.com/theodi/coopy-ruby)
+[![Code Climate](https://codeclimate.com/github/theodi/coopy-ruby.png)](https://codeclimate.com/github/theodi/coopy-ruby)
+
+A pure Ruby port of Paul Fitzpatrick's [coopyhx](http://paulfitz.github.io/coopyhx) library for tabular diffs.
+
+Not all the coopyhx code is ported or tested. There will be bugs. However, basic two-file CSV diff appears to be working. See 'Usage' section below for details.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'coopy'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install coopy
+
+## Usage
+
+You can diff Ruby's built-in CSV objects, like so:
+
+```
+old_table = Coopy::CsvTable.new(old_csv_object)
+new_table = Coopy::CsvTable.new(new_csv_object)
+
+alignment = Coopy.compare_tables(old_table,new_table).align
+flags = Coopy::CompareFlags.new
+highlighter = Coopy::TableDiff.new(alignment,flags)
+
+diff_table = Coopy::SimpleTable.new(0,0)
+highlighter.hilite diff_table
+```
+
+You can inspect `diff_table` to see the changes.
+
+You can also generate an HTML view of this diff like this:
+
+```
+diff2html = Coopy::DiffRender.new
+diff2html.render diff_table
+html = diff2html.html
+```
+
+There is plenty more in the original coopyhx, but this is all that's known working at the moment.
+
+## Contributing
+
+1. Fork it
+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 new Pull Request

data/Rakefile

@@ -1,8 +1,6 @@
-require 'rake/testtask'
+require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
 
-Rake::TestTask.new do |t|
-  t.libs << 'test'
-end
+RSpec::Core::RakeTask.new(:spec)
 
-desc "Run tests"
-task :default => :test
+task :default => :spec

data/coopy.gemspec

@@ -0,0 +1,26 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'coopy/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "coopy"
+  spec.version       = Coopy::VERSION
+  spec.authors       = ["James Smith"]
+  spec.email         = ["james@floppy.org.uk"]
+  spec.description   = %q{Ruby port of coopyhx, for calculating tabular diffs}
+  spec.summary       = %q{Ruby port of coopyhx, for calculating tabular diffs}
+  spec.homepage      = ""
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files`.split($/)
+  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.3"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "simplecov-rcov"
+  spec.add_development_dependency "pry"
+end

data/lib/coopy.rb

@@ -1,178 +1,35 @@
-require 'optparse'
+require "coopy/version"
 
-class Coopy
-
-  class Flavor
-    attr_accessor :key
-    attr_accessor :banner
-    attr_accessor :min_length
-
-    def sql_subject?
-      [:diff,:patch].include? key
-    end
-
-    def sql_object?
-      key == :diff
-    end
-
-    def can_choose_format?
-      key != :patch
-    end
-
-    def can_set_output?
-      key != :patch
-    end
-
-    def default_format
-      (key==:patch) ? :apply : :csv
-    end
-  end
-
-  class OpenStruct
-    attr_accessor :format
-    attr_accessor :output
-  end
-
-  def self.parse(flavor,args)
-    options = OpenStruct.new
-    options.format = flavor.default_format
-    options.output = nil
-    OptionParser.new do |opts|
-      begin
-        opts.banner = flavor.banner
-        opts.separator ""
-        opts.separator "Specific options"
-        if flavor.can_choose_format?
-          opts.on("-f","--format [FORMAT]", [:csv, :html, :tdiff, :apply, :stats],
-                  "select format (csv,html,tdiff,apply,stats)") do |fmt|
-            options.format = fmt
-          end
-        end
-        if flavor.can_set_output?
-          opts.on("-o", "--output [FILENAME]",
-                  "direct output to a file") do |fname|
-            options.output = fname
-          end
-        end
-        opts.on_tail("-h", "--help", "Show this message") do
-          puts opts
-          exit
-        end
-        opts.parse!(args)
-        return options
-      rescue
-        puts "#{$!} (--help for help)"
-        exit 1
-      end
-    end
-  end
-
-  def self.core(flavor,argv)
-    options = self.parse(flavor,argv)
-
-    if argv.length < flavor.min_length
-      self.parse(flavor,["--help"])
-      exit(1)
-    end
-
-    if flavor.sql_subject?
-      db = SQLite3::Database.new(argv[0])
-      sql = SqliteSqlWrapper.new(db)
-    end
-
-    if flavor.sql_object?
-      name1 = nil
-      name2 = nil
-      case argv.length
-      when 2
-        name0 = sql.get_table_names[0]
-        db.execute("ATTACH ? AS `__peer_ - _`",argv[1])
-        name1 = "main.#{name0}"
-        name2 = "__peer_ - _.#{name0}"
-      when 3
-        name1 = argv[1]
-        name2 = argv[2]
-      when 4
-        name1 = "main.#{argv[1]}"
-        db.execute("ATTACH ? AS __peer__",argv[2])
-        name2 = "__peer__.#{argv[3]}"
-      end
-      cmp = SqlCompare.new(sql,name1,name2)
-    else
-      cmp = DiffParser.new(argv[flavor.min_length-1])
-    end
-
-    patches = DiffOutputGroup.new
-    # patches << DiffOutputRaw.new
-    case options.format
-    when :html
-      patches << DiffRenderHtml.new
-    when :tdiff
-      patches << DiffOutputTdiff.new
-    when :csv
-      patches << DiffRenderCsv.new
-    when :apply
-      patches << DiffApplySql.new(sql,name1)
-    when :raw
-      patches << DiffOutputRaw.new
-    when :stats
-      patches << DiffOutputStats.new
-    else
-      patches << DiffRenderCsv.new
-    end
-
-    cmp.set_output(patches)
-    
-    cmp.apply
-    result = patches.to_string
-    if result != ""
-      if options.output.nil?
-        print result
-      else
-        File.open(options.output,"w") do |f|
-          f << result
-        end
-      end
-    end
-    0
-  end
-
-  def self.diff(argv)
-    flavor = Flavor.new
-    flavor.key = :diff
-    flavor.banner = "Usage: sqlite_diff [options] ver1.sqlite ver2.sqlite"
-    flavor.min_length = 2
-    self.core(flavor,argv)
-  end
-
-  def self.patch(argv)
-    flavor = Flavor.new
-    flavor.key = :patch
-    flavor.banner = "Usage: sqlite_patch [options] db.sqlite patch.csv"
-    flavor.min_length = 2
-    self.core(flavor,argv)
-  end
-
-  def self.rediff(argv)
-    flavor = Flavor.new
-    flavor.key = :rediff
-    flavor.banner = "Usage: sqlite_rediff [options] patch.csv"
-    flavor.min_length = 1
-    self.core(flavor,argv)
-  end
+module Coopy
+  # Your code goes here...
 end
 
-require 'coopy/diff_output_raw'
-require 'coopy/diff_output_tdiff'
-require 'coopy/diff_render_html'
-require 'coopy/diff_render_csv'
-require 'coopy/diff_output_action'
-require 'coopy/diff_output_group'
-require 'coopy/diff_output_stats'
-require 'coopy/diff_apply_sql'
-require 'coopy/diff_parser'
-
-require 'coopy/sqlite_sql_wrapper'
-require 'coopy/sql_compare'
-require 'sqlite3'
-
+# interfaces
+require 'coopy/bag'
+require 'coopy/row'
+require 'coopy/table'
+require 'coopy/view'
+
+# proper classes
+require 'coopy/compare_flags'
+require 'coopy/change_type'
+require 'coopy/cell_info'
+require 'coopy/unit'
+require 'coopy/ordering'
+require 'coopy/simple_cell'
+require 'coopy/index_item'
+require 'coopy/index'
+require 'coopy/cross_match'
+require 'coopy/index_pair'
+require 'coopy/alignment'
+require 'coopy/table_view'
+require 'coopy/table_comparison_state'
+require 'coopy/compare_table'
+require 'coopy/mover'
+require 'coopy/table_diff'
+require 'coopy/coopy'
+require 'coopy/simple_view'
+require 'coopy/csv_table'
+require 'coopy/simple_table'
+require 'coopy/table_text'
+require 'coopy/diff_render'

data/lib/coopy/alignment.rb

@@ -0,0 +1,260 @@
+module Coopy
+  class Alignment
+
+    attr_accessor :reference # Alignment
+    attr_accessor :meta # Alignment
+
+    def initialize
+      @map_a2b = {} # Map<Int,Int>
+      @map_b2a = {} # Map<Int,Int>
+      @ha = @hb = 0
+      @map_count = 0
+      @reference = nil
+      @meta = nil
+      @order_cache_has_reference = false
+      @ia = 0
+      @ib = 0
+    end
+
+    def range(ha, hb)
+      @ha = ha
+      @hb = hb
+    end
+
+    def tables(ta, tb)
+      @ta = ta
+      @tb = tb
+    end
+
+    def headers(ia, ib)
+      @ia = ia
+      @ib = ib
+    end
+
+    def set_rowlike(flag)
+    end
+
+    def hb
+      @hb
+    end
+
+    def link(a, b)
+      @map_a2b[a] = b
+      @map_b2a[b] = a
+      @map_count+=1
+    end
+
+    def add_index_columns(unit)
+      if @index_columns.nil?
+        @index_columns = []
+      end
+      @index_columns << unit
+    end
+
+    def get_index_columns
+      @index_columns
+    end
+
+    def a2b(a)
+      @map_a2b[a]
+    end
+
+    def b2a(b)
+      @map_b2a[b]
+    end
+
+    def count
+      @map_count
+    end
+
+    def to_s
+      map_a2b.to_s
+    end
+
+    def to_order
+      if @order_cache
+        if @reference
+          if !@order_cache_has_reference
+            @order_cache = nil
+          end
+        end
+      end
+      @order_cache = to_order_3 if @order_cache.nil?
+      @order_cache_has_reference = true if reference
+      @order_cache
+    end
+
+    def get_source
+      @ta
+    end
+
+    def get_target
+      @tb
+    end
+
+    def get_source_header
+      @ia
+    end
+
+    def get_target_header
+      @ib
+    end
+
+    def to_order_3
+      ref = @reference
+      if ref.nil?
+        ref = Coopy::Alignment.new
+        ref.range(@ha,@ha)
+        ref.tables(@ta,@ta)
+        (0...@ha).each do |i|
+          ref.link(i,i)
+        end
+      end
+      order = Coopy::Ordering.new
+      if @reference.nil?
+        order.ignore_parent
+      end
+      xp = 0
+      xl = 0
+      xr = 0
+      hp = @ha
+      hl = ref.hb
+      hr = @hb
+      vp = {}
+      vl = {}
+      vr = {}
+      (0...hp).each { |i| vp[i] = i }
+      (0...hl).each { |i| vl[i] = i }
+      (0...hr).each { |i| vr[i] = i }
+      ct_vp = hp
+      ct_vl = hl
+      ct_vr = hr
+      prev  = -1
+      ct    = 0
+      max_ct = (hp+hl+hr)*10
+      while (ct_vp>0 || 
+             ct_vl>0 || 
+             ct_vr>0) do
+        ct+=1
+        if ct>max_ct
+          puts("Ordering took too long, something went wrong")
+          break
+        end
+        xp = 0 if (xp>=hp)
+        xl = 0 if (xl>=hl)
+        xr = 0 if (xr>=hr)
+        if xp<hp && ct_vp>0
+          if a2b(xp).nil? && ref.a2b(xp).nil?
+            if vp.has_key?(xp)
+              order.add(-1,-1,xp)
+              prev = xp
+              vp.remove(xp)
+              ct_vp-=1
+            end
+            xp+=1
+            next
+          end
+        end
+        zl = nil
+        zr = nil
+        if xl<hl && ct_vl>0
+          zl = ref.b2a(xl)
+          if zl.nil?
+            if vl.has_key?(xl)
+              order.add(xl,-1,-1)
+              vl.remove(xl)
+              ct_vl-=1
+            end
+            xl+=1
+            next
+          end
+        end
+        if xr<hr && ct_vr>0
+          zr = b2a(xr)
+          if zr.nil?
+            if vr.has_key?(xr)
+              order.add(-1,xr,-1)
+              vr.delete(xr)
+               ct_vr-=1
+            end
+            xr+=1
+            next
+          end
+        end
+        if zl
+          if a2b(zl).nil?
+            # row deleted in remote
+            if vl.has_key?(xl)
+              order.add(xl,-1,zl)
+              prev = zl
+              vp.delete(zl)
+              ct_vp-=1
+              vl.delete(xl)
+              ct_vl-=1
+              xp = zl+1
+            end
+            xl+=1
+            next
+          end
+        end
+        if zr
+          if ref.a2b(zr).nil?
+            # row deleted in local
+            if vr.has_key?(xr)
+              order.add(-1,xr,zr)
+              prev = zr
+              vp.remove(zr)
+              ct_vp-=1
+              vr.remove(xr)
+              ct_vr-=1
+              xp = zr+1
+            end
+            xr+=1
+            next
+          end
+        end
+        if zl && zr && a2b(zl) && ref.a2b(zr)
+          # we have a choice of order
+          # local thinks zl should come next
+          # remote thinks zr should come next
+          if zl==prev+1 || zr!=prev+1
+            if vr.has_key?(xr)
+              order.add(ref.a2b(zr),xr,zr)
+              prev = zr
+              vp.delete(zr)
+              ct_vp-=1
+              vl.delete(ref.a2b(zr))
+              ct_vl-=1
+              vr.delete(xr)
+              ct_vr-=1
+              xp = zr+1
+              xl = ref.a2b(zr)+1
+            end
+            xr+=1
+            next
+          else
+            if vl.has_key?(xl)
+              order.add(xl,a2b(zl),zl)
+              prev = zl
+              vp.remove(zl)
+              ct_vp-=1
+              vl.remove(xl)
+              ct_vl-=1
+              vr.remove(a2b(zl))
+              ct_vr-=1
+              xp = zl+1
+              xr = a2b(zl)+1
+            end
+            xl+=1
+            next
+          end
+        end
+        xp+=1
+        xl+=1
+        xr+=1
+      end
+      return order
+    end
+
+  end
+end