assimilate 0.4.2 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 35f952558d63466990088b75567b8de91b113478
+  data.tar.gz: 2d28174a377bcde1acff585ddb66f0314b55dd68
+SHA512:
+  metadata.gz: 18359a13a1ce54a56151e34f7ffb4588d316541b2b5c9b8e63c34333617e28429853f9ef717015478aa0bb8f265c35968de2dfbb8f0ee00bcd296ceb566cdadf
+  data.tar.gz: 8649d17882e3baf0f9229544e832d9dcfcba4fef6c4d5473bc64f3999291a45a5f992c0b8e22972fcd206370544e020a804958e19a1a09437d4809ee9b8b2e92

data/assimilate.gemspec

@@ -16,14 +16,14 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Assimilate::VERSION
 
-  gem.required_ruby_version = '>= 1.9.2'
+  gem.required_ruby_version = '>= 2.3.1'
 
-  gem.add_dependency "mongo", "~> 1.6.0"
-  gem.add_dependency "bson_ext", "~> 1.6.0"
+  gem.add_dependency "mongo", "~> 2.3.0"
+  #gem.add_dependency "bson_ext", "~> 1.12.0"
   gem.add_dependency 'activesupport', "~> 3.2.0"
 
-  gem.add_development_dependency "rake", "~> 0.9.2"
-  gem.add_development_dependency "rspec", "~> 2.9.0"
-  gem.add_development_dependency "guard-rspec", "~> 0.7.0"
-  gem.add_development_dependency "ruby_gntp", "~> 0.3.4"
+  gem.add_development_dependency "rake", "~> 11.2"
+  gem.add_development_dependency "rspec", "~> 3.5.0"
+  #gem.add_development_dependency "guard-rspec", "~> 0.7.0"
+  #gem.add_development_dependency "ruby_gntp", "~> 0.3.4"
 end

data/lib/assimilate/batch.rb

@@ -120,7 +120,7 @@ class Assimilate::Batch
     raise(Assimilate::DuplicateImportError, "duplicate batch for datestamp #{datestamp}") if @catalog.batches.find(dkey => @domain, 'datestamp' => @datestamp).to_a.any?
     raise(Assimilate::DuplicateImportError, "duplicate batch for file #{@filename}") if @catalog.batches.find(dkey => @domain, 'filename' => @filename).to_a.any?
 
-    @catalog.batches.insert({
+    @catalog.batches.insert_one({
       dkey => @domain,
       'datestamp' => @datestamp,
       'filename' => @filename
@@ -130,7 +130,7 @@ class Assimilate::Batch
   def apply_deletes
     unless @suppress_deletes
       @deleted_keys.each do |key|
-        @catalog.catalog.update(
+        @catalog.catalog.update_one(
           {
             @domainkey => domain,
             idfield => key
@@ -148,14 +148,14 @@ class Assimilate::Batch
   def apply_inserts
     @adds.each_slice(INSERT_BATCH_SIZE) do |slice|
       # mongo insert can't handle CSV::Row objects, must be converted to regular hashes
-      @catalog.catalog.insert(decorate(slice))
+      @catalog.catalog.insert_many(decorate(slice))
     end
   end
 
   def apply_updates
     marker = @catalog.config[:update_marker]
     @changes.each do |key, diffs|
-      @catalog.catalog.update(
+      @catalog.catalog.update_one(
         {
           @domainkey => domain,
           idfield => key

data/lib/assimilate/catalog.rb

@@ -26,9 +26,9 @@ class Assimilate::Catalog
     @config = YAML.load(File.open(args[:config]))
     check_config
 
-    @db = Mongo::Connection.new.db(@config[:db])
-    @catalog = @db.collection(@config[:catalog])
-    @batches = @db.collection(@config[:batch])
+    @db = Mongo::Client.new("mongodb://127.0.0.1:27017/" + @config[:db])
+    @catalog = @db[@config[:catalog]]
+    @batches = @db[@config[:batch]]
   end
 
   def check_config

data/lib/assimilate/extender.rb

@@ -113,14 +113,14 @@ class Assimilate::Extender
     @adds.each do |key|
       data = @seen[key]
       if keyfield
-        @catalog.catalog.insert(
+        @catalog.catalog.insert_one(
           @domainkey => domain,
           idfield => key,
           keyfield => data
         )
       else
         # top-level extension
-        @catalog.catalog.insert(
+        @catalog.catalog.insert_one(
           data.merge(
             @domainkey => domain,
             idfield => key
@@ -135,7 +135,7 @@ class Assimilate::Extender
     @changes.each do |key|
       data = @seen[key]
       if keyfield
-        @catalog.catalog.update(
+        @catalog.catalog.update_one(
           {
             @domainkey => domain,
             idfield => key
@@ -147,7 +147,7 @@ class Assimilate::Extender
         )
       else
         # top-level extension
-        @catalog.catalog.update(
+        @catalog.catalog.update_one(
           {
             @domainkey => domain,
             idfield => key

data/lib/assimilate/version.rb

@@ -1,3 +1,3 @@
 module Assimilate
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

data/spec/lib/batch_spec.rb

@@ -9,8 +9,8 @@ describe "importing file" do
   end
 
   def reset_catalog
-    @catalog.catalog.remove
-    @catalog.batches.remove
+    @catalog.catalog.drop
+    @catalog.batches.drop
   end
 
   def import_data(datestamp, filename = "batch_input.csv")

data/spec/lib/extend_spec.rb

@@ -9,8 +9,8 @@ describe "loading extended data" do
   end
 
   def reset_catalog
-    @catalog.catalog.remove
-    @catalog.batches.remove
+    @catalog.catalog.drop
+    @catalog.batches.drop
   end
 
   def import_base_data(datestamp, filename = "batch_input.csv")

data/spec/spec_helper.rb

@@ -1,8 +1,9 @@
-require 'rspec/autorun'
+#require 'rspec/autorun'
 require "tempfile"
 require "csv"
 
 require File.expand_path('../../lib/assimilate', __FILE__)
 
 RSpec.configure do |config|
+  config.expect_with(:rspec) { |c| c.syntax = :should }
 end

metadata

@@ -1,128 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: assimilate
 version: !ruby/object:Gem::Version
-  version: 0.4.2
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - Jason May
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-03 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
-- !ruby/object:Gem::Dependency
-  name: bson_ext
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '11.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '11.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.9.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.9.0
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-- !ruby/object:Gem::Dependency
-  name: ruby_gntp
-  requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 3.5.0
 description: Ingest updates from CSV and apply to set of hashes
 email:
 - jmay@pobox.com
@@ -131,8 +74,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE
@@ -160,30 +103,26 @@ files:
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.3.1
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -258423526564247738
 requirements: []
 rubyforge_project: assimilate
-rubygems_version: 1.8.24
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Review & incorporate changes to a repository of persistent hashes in mongodb.
 test_files:
 - spec/data/batch_input.csv