coopy 0.6.4.1 → 1.0.0

data/spec/spec_helper.rb

@@ -0,0 +1,29 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper"` to ensure that it is only
+# loaded once.
+
+require 'simplecov'
+require 'simplecov-rcov'
+SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
+SimpleCov.start
+
+require 'pry'
+require 'coopy'
+
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end
+
+def load_fixture(file_name)
+  File.read(File.join('spec', 'fixtures', file_name))
+end

metadata

@@ -1,75 +1,182 @@
 --- !ruby/object:Gem::Specification
 name: coopy
 version: !ruby/object:Gem::Version
-  version: 0.6.4.1
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
-- Paul Fitzpatrick
+- James Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-10 00:00:00.000000000 Z
-dependencies: []
-description: Data diffs/patches
-email: paul@robotrebuilt.com
-executables:
-- sqlite_diff
-- sqlite_patch
-- sqlite_rediff
+date: 2013-11-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !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'
+- !ruby/object:Gem::Dependency
+  name: simplecov-rcov
+  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: pry
+  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: Ruby port of coopyhx, for calculating tabular diffs
+email:
+- james@floppy.org.uk
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
+- .rspec
+- CHANGELOG.md
+- Gemfile
+- LICENSE.md
+- README.md
 - Rakefile
+- coopy.gemspec
 - lib/coopy.rb
-- lib/coopy/diff_render_html.rb
-- lib/coopy/diff_render_log.rb
-- lib/coopy/sql_compare.rb
-- lib/coopy/sequel_sql_wrapper.rb
-- lib/coopy/diff_apply_sql.rb
-- lib/coopy/diff_parser.rb
-- lib/coopy/sqlite_sql_wrapper.rb
-- lib/coopy/scraperwiki_utils.rb
-- lib/coopy/diff_output_stats.rb
-- lib/coopy/diff_output_tdiff.rb
-- lib/coopy/dbi_sql_wrapper.rb
-- lib/coopy/diff_render_csv.rb
-- lib/coopy/diff_output_group.rb
-- lib/coopy/diff_output_table.rb
-- lib/coopy/row_change.rb
-- lib/coopy/diff_output_raw.rb
-- lib/coopy/diff_output.rb
-- lib/coopy/scraperwiki_sql_wrapper.rb
-- lib/coopy/diff_columns.rb
-- lib/coopy/sql_wrapper.rb
-- lib/coopy/diff_output_action.rb
-- bin/sqlite_diff
-- bin/sqlite_rediff
-- bin/sqlite_patch
-- test/test_coopy.rb
-homepage: http://share.find.coop/
-licenses: []
+- lib/coopy/alignment.rb
+- lib/coopy/bag.rb
+- lib/coopy/cell_info.rb
+- lib/coopy/change_type.rb
+- lib/coopy/compare_flags.rb
+- lib/coopy/compare_table.rb
+- lib/coopy/coopy.rb
+- lib/coopy/cross_match.rb
+- lib/coopy/csv_table.rb
+- lib/coopy/diff_render.rb
+- lib/coopy/index.rb
+- lib/coopy/index_item.rb
+- lib/coopy/index_pair.rb
+- lib/coopy/mover.rb
+- lib/coopy/ordering.rb
+- lib/coopy/row.rb
+- lib/coopy/simple_cell.rb
+- lib/coopy/simple_table.rb
+- lib/coopy/simple_view.rb
+- lib/coopy/table.rb
+- lib/coopy/table_comparison_state.rb
+- lib/coopy/table_diff.rb
+- lib/coopy/table_text.rb
+- lib/coopy/table_view.rb
+- lib/coopy/unit.rb
+- lib/coopy/version.rb
+- lib/coopy/view.rb
+- spec/fixtures/bridges.html
+- spec/fixtures/bridges_diff.csv
+- spec/fixtures/bridges_new.csv
+- spec/fixtures/bridges_old.csv
+- spec/fixtures/planetary_bodies.html
+- spec/fixtures/planetary_bodies_diff.csv
+- spec/fixtures/planetary_bodies_new.csv
+- spec/fixtures/planetary_bodies_old.csv
+- spec/fixtures/quote_me.csv
+- spec/fixtures/quote_me2.csv
+- spec/integration/table_diff_spec.rb
+- spec/libs/compare_flags_spec.rb
+- spec/libs/coopy_spec.rb
+- spec/libs/ordering_spec.rb
+- spec/libs/unit_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
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
-summary: Coopy!
+specification_version: 4
+summary: Ruby port of coopyhx, for calculating tabular diffs
 test_files:
-- test/test_coopy.rb
+- spec/fixtures/bridges.html
+- spec/fixtures/bridges_diff.csv
+- spec/fixtures/bridges_new.csv
+- spec/fixtures/bridges_old.csv
+- spec/fixtures/planetary_bodies.html
+- spec/fixtures/planetary_bodies_diff.csv
+- spec/fixtures/planetary_bodies_new.csv
+- spec/fixtures/planetary_bodies_old.csv
+- spec/fixtures/quote_me.csv
+- spec/fixtures/quote_me2.csv
+- spec/integration/table_diff_spec.rb
+- spec/libs/compare_flags_spec.rb
+- spec/libs/coopy_spec.rb
+- spec/libs/ordering_spec.rb
+- spec/libs/unit_spec.rb
+- spec/spec_helper.rb

data/bin/sqlite_diff

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'coopy'
-Coopy.diff(ARGV)

data/bin/sqlite_patch

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'coopy'
-Coopy.patch(ARGV)

data/bin/sqlite_rediff

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'coopy'
-Coopy.rediff(ARGV)

data/lib/coopy/dbi_sql_wrapper.rb

@@ -1,89 +0,0 @@
-require 'sql_wrapper'
-require 'dbi'
-
-class Coopy::DbiSqlWrapper < SqlWrapper
-  def initialize(db)
-    @db = db
-    @t = nil
-    @qt = nil
-  end
-
-  def complete_table(tbl)
-    return tbl unless tbl.nil?
-    return @t unless @t.nil?
-    @t = @db.tables[0]
-    @t
-  end
-
-  def quote_table(tbl)
-    return @db.quote(tbl) unless tbl.nil?
-    return @qt unless @qt.nil?
-    @t = @db.tables[0]
-    @qt = @db.quote(@t)
-    @qt
-  end
-
-  def insert(tbl,cols,vals)
-    tbl = quote_table(tbl)
-    template = cols.map{|x| '?'}.join(",")
-    template = "INSERT INTO #{tbl} VALUES(#{template})"
-    stmt = @db.prepare(template)
-    stmt.execute(*vals)
-    stmt.finish
-  end
-
-  def delete(tbl,cols,vals)
-    tbl = quote_table(tbl)
-    template = cols.map{|c| @db.quote(c) + ' = ?'}.join(" AND ")
-    template = "DELETE FROM #{tbl} WHERE #{template}"
-    stmt = @db.prepare(template)
-    stmt.execute(*vals)
-    stmt.finish
-  end
-  
-  def update(tbl,set_cols,set_vals,cond_cols,cond_vals)
-    tbl = quote_table(tbl)
-    conds = cond_cols.map{|c| @db.quote(c) + ' = ?'}.join(" AND ")
-    sets = set_cols.map{|c| @db.quote(c) + ' = ?'}.join(", ")
-    template = "UPDATE #{@qt} SET #{sets} WHERE #{conds}"
-    v = set_vals + cond_vals
-    stmt = @db.prepare(template)
-    stmt.execute(*v)
-    stmt.finish
-  end
-
-  def transaction(&block)
-    @db["AutoCommit"]=false
-    begin
-      block.call
-      @db.commit
-    rescue Exception => e
-      @db.rollback
-      raise e
-    end
-  end
-
-  def columns(tbl)
-    tbl = complete_table(tbl)
-    @db.columns(tbl)
-  end
-
-  def column_names(tbl)
-    columns(tbl).map{|c| c[:name]}
-  end
-
-  def enhash(cols,vals)
-    Hash[*cols.map{|c| c.to_sym}.zip(vals).flatten]
-  end
-
-  def fetch(sql,names)
-    @db.select_all(sql) do |row|
-      yield row
-    end
-  end
-
-  def primary_key(tbl)
-    # don't seem to have this information? oy.
-    [column_names(tbl)[0]]
-  end
-end

data/lib/coopy/diff_apply_sql.rb

@@ -1,35 +0,0 @@
-require 'coopy/diff_output_action'
-require 'coopy/sql_wrapper'
-
-# for now, assume no schema changes, and a single table
-class Coopy::DiffApplySql < DiffOutputAction
-  def initialize(db, name = nil)
-    @name = name
-    @db = db
-  end
-
-  def row_insert(rc)
-    cols = rc.active_columns
-    @db.insert(@name,
-               cols.map{|c| c[:title]},
-               cols.map{|c| rc.value_at(c)})
-  end
-
-  def row_delete(rc)
-    cols = rc.active_columns
-    @db.delete(@name,
-               cols.map{|c| c[:title]},
-               cols.map{|c| rc.value_at(c)})
-  end
-
-  def row_update(rc)
-    cols = rc.active_columns
-    touched_cols = cols.select{|c| !rc.new_value_at(c).nil?}
-    @db.update(@name,
-               touched_cols.map{|c| c[:title]},
-               touched_cols.map{|c| rc.new_value_at(c)},
-               cols.map{|c| c[:title]},
-               cols.map{|c| rc.value_at(c)})
-  end
-end
-

data/lib/coopy/diff_columns.rb

@@ -1,33 +0,0 @@
-class DiffColumns
-  attr_accessor :change_row
-  attr_accessor :title_row
-
-  # general
-  attr_accessor :column_name   # *after* any column changes
-  attr_accessor :column_offset # *after* any column changes
-  attr_accessor :column_by_name
-  attr_accessor :column_by_offset
-
-  def update(prefix=1)
-    return if @title_row.nil?
-    @column_name = {}
-    @column_offset = {}
-    @column_by_name = {}
-    @column_by_offset = []
-    offset = -prefix
-    @title_row.each_with_index do |title,idx|
-      @column_name[idx] = title
-      if offset>=0
-        # assuming no column changes for the moment
-        @column_offset[idx] = offset
-        @column_by_name[title] = {
-          :title => title,
-          :in_offset => offset,
-          :diff_offset => idx
-        }
-        @column_by_offset << @column_by_name[title]
-      end
-      offset = offset+1
-    end
-  end
-end

data/lib/coopy/diff_output.rb

@@ -1,21 +0,0 @@
-require 'coopy/diff_columns'
-require 'coopy/row_change'
-
-class DiffOutput
-  def begin_diff
-  end
-
-  def end_diff
-  end
-
-  def apply_row(rc)
-  end
-
-  def to_string
-    ""
-  end
-
-  def want_context
-    true
-  end
-end