consyncful 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d8751b841c3cd74e65f5b9a11edb509972fd934b1e6d6a499851923b3d4ef18
-  data.tar.gz: 4d3c28b779113963c977264bfc2b6e1137743c7aacc20a593bcb7b10a78d55f7
+  metadata.gz: 258e4fe9fbea3099f0d78615c79b1e49658841c7b706f296a1d5402115c5ed7d
+  data.tar.gz: 8d47ad368c228b87a1f04fc5d1c4c236c16d6d3106bae1dda6a49de0a74a9c9d
 SHA512:
-  metadata.gz: 969f519cb526dac0f0d6c9e9f6fdc6254a1d29af6e3ba33d6e4317e2553ac8abdfd6b17f2fd3fd8115d889d20e0f126a6d93503acc9278efe2f32e21f58bc141
-  data.tar.gz: 6f6b6b06950ee4ffd443553b0ef77c09873d104affeb409230746ffe32a4cf204c0015368e0e2b64bf3c241c36f389ec9ac5fedb81eb150d844ff8fd8e774539
+  metadata.gz: 18b498a8a55c814edf02fabec13c54d93a6653aae0e1e87143ea9e2d637d3eb61e6beaf045201660ad065bb745f4df97b411fa6f451bbd02858d45b1e041aa24
+  data.tar.gz: 841216be1a7c0149aea9e6136369cdd2bd3a1e5d9edb9854b677f98d2ef1596b7df3273370054713915fd798016578263398f24d8e23460360caa2bb5751871d

data/.rubocop.yml

@@ -0,0 +1,9 @@
+
+
+
+Metrics/LineLength:
+  Max: 120
+
+Metrics/BlockLength:
+  Exclude:
+    - spec/**/*

data/.ruby-version

@@ -0,0 +1 @@
+2.5.5

data/Gemfile

@@ -1,6 +1,8 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+source 'https://rubygems.org'
+
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in consyncful.gemspec
 gemspec

data/Gemfile.lock

@@ -78,5 +78,3 @@ DEPENDENCIES
   rake (~> 10.0)
   rspec (~> 3.0)
 
-BUNDLED WITH
-   1.16.1

data/README.md

@@ -90,7 +90,7 @@ To run a syncronization process run:
 
 The first time you run this it will download all the contentful content, it will then check every 15 seconds for changes to the content and update/delete records in the database when changes are made in contentful.
 
-If you want to delete everything and start syncronising from scratch run:
+If you want to syncronise from scratch run:
 
     $ rake consyncful:refresh
 

data/Rakefile

@@ -1,6 +1,8 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "consyncful"
+require 'bundler/setup'
+require 'consyncful'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +11,5 @@ require "consyncful"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/consyncful.gemspec

@@ -1,17 +1,18 @@
+# frozen_string_literal: true
 
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "consyncful/version"
+require 'consyncful/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "consyncful"
+  spec.name          = 'consyncful'
   spec.version       = Consyncful::VERSION
-  spec.authors       = ["Andy Anastasiadis-Gray", "Montgomery Anderson"]
-  spec.email         = ["andy@boost.co.nz", "montgomery@boost.co.nz"]
+  spec.authors       = ['Andy Anastasiadis-Gray', 'Montgomery Anderson']
+  spec.email         = ['andy@boost.co.nz', 'montgomery@boost.co.nz']
 
-  spec.summary       = %q{Contentful to local database synchronisation for Rails}
-  # spec.homepage      = "TODO: Put your gem's website or public repo URL here."
-  spec.license       = "MIT"
+  spec.summary       = 'Contentful to local database synchronisation for Rails'
+  spec.homepage      = 'https://github.com/boost/consyncful'
+  spec.license       = 'MIT'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
@@ -25,15 +26,15 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
 
-  spec.add_dependency "mongoid", [">=7.0.2", "<8.0.0"]
-  spec.add_dependency "contentful", [">=2.11.1", "<3.0.0"]
+  spec.add_dependency 'contentful', ['>=2.11.1', '<3.0.0']
+  spec.add_dependency 'mongoid', ['>=7.0.2', '<8.0.0']
   spec.add_dependency 'term-ansicolor'
 end

data/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   mongo:
-    image: mongo
+    image: mongo:3.6
     volumes:
       - ./dev_data/mongo:/data/db
     ports:

data/lib/consyncful.rb

@@ -1,12 +1,14 @@
-require "consyncful/version"
+# frozen_string_literal: true
+
+require 'consyncful/version'
 
 require 'mongoid'
 require 'contentful'
 
-require "consyncful/base"
-require "consyncful/sync"
+require 'consyncful/base'
+require 'consyncful/sync'
 
-require "consyncful/railtie" if defined?(Rails)
+require 'consyncful/railtie' if defined?(Rails)
 
 module Consyncful
   class << self
@@ -32,7 +34,7 @@ module Consyncful
   DEFAULT_CLIENT_OPTIONS = {
     reuse_entries: true,
     api_url: 'cdn.contentful.com'
-  }
+  }.freeze
 
   def self.client
     @client ||= begin

data/lib/consyncful/sync.rb

@@ -21,14 +21,15 @@ module Consyncful
       last || new
     end
 
-    def self.reset
+    def self.fresh
       destroy_all
-      Base.destroy_all
+      latest
     end
 
-    def self.fresh
-      reset
-      latest
+    def drop_stale
+      stale = Base.where(:sync_id.ne => id, :sync_id.exists => true)
+      puts "Dropping #{stale.count} records that haven't been touched in this sync".red
+      stale.destroy
     end
 
     def run
@@ -39,6 +40,8 @@ module Consyncful
 
       sync_items(sync, stats)
 
+      drop_stale
+
       self.next_url = sync.next_sync_url
       self.last_run_at = Time.current
       save
@@ -49,6 +52,7 @@ module Consyncful
 
     def load_all_models
       return unless defined? Rails
+
       Rails.application.eager_load!
     end
 
@@ -99,6 +103,8 @@ module Consyncful
         instance[field] = value
       end
 
+      instance[:sync_id] = id
+
       instance.save
     end
 

data/lib/consyncful/tasks/consyncful.rake

@@ -9,7 +9,7 @@ namespace :consyncful do
     Consyncful::Sync.fresh.run
   end
 
-  task :sync, [:seconds] => [:environment, :update_model_names] do |task, args|
+  task :sync, [:seconds] => %i[environment update_model_names] do |_task, args|
     seconds = args[:seconds].to_i
     seconds = 15 if seconds.zero?
     loop do

data/lib/consyncful/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Consyncful
-  VERSION = "0.2.0"
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: consyncful
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Andy Anastasiadis-Gray
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-19 00:00:00.000000000 Z
+date: 2019-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,45 +54,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: mongoid
+  name: contentful
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.2
+        version: 2.11.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.2
+        version: 2.11.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: contentful
+  name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.11.1
+        version: 7.0.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.11.1
+        version: 7.0.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
@@ -117,6 +117,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -136,7 +138,7 @@ files:
 - lib/consyncful/sync.rb
 - lib/consyncful/tasks/consyncful.rake
 - lib/consyncful/version.rb
-homepage: 
+homepage: https://github.com/boost/consyncful
 licenses:
 - MIT
 metadata: {}
@@ -156,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Contentful to local database synchronisation for Rails