justiz_sync 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b5a6baf253fa7526a90c2a9f79c3ac3fc860039
-  data.tar.gz: ddaf477b1753c677df99cacd42b8cb45dcc1d3e3
+  metadata.gz: 91ddc84cf4f63d03b44b185ccb85ef0867c0cdff
+  data.tar.gz: 6f6c67c180778487e22e1f7fc9c27c3f73952d3e
 SHA512:
-  metadata.gz: 799d9dd3b349b433c3dc44f3590a974a9b84012466c8cab1acf8f51d512261d4a02b76f5110c27ec277ef01e0ea41e00a078c9c8fce3cc76e21dc32d3594a52f
-  data.tar.gz: 8bc9eccd7c823322886f3f77c9254607e1ab593f81509fca477c9be89982daa5b58838d6817ab6ff3a020b0e03dc51c069bf52175c59e8cadf9e01b889e894bb
+  metadata.gz: fde1adc301c76978f2d286ad06e360ab9267fb7bbfe0008b2c61f122dbb45b98ed2477f29a7df4aad65f635309b67091398a07a7f5611c6db8121c17b0498933
+  data.tar.gz: 9d7a3be8790ea5c3ed00d31032ce5f819e7709181c549a900b32137c24630da41450346525bbef3818c866820c08d3779218d776b1cc4ff0fbe2bd5d89ca438e

data/justiz_sync.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "justiz", "~> 0.1.3"
+  spec.add_dependency "justiz", "~> 0.2.1"
   spec.add_dependency "opencrx", "~> 0.2.0"
   spec.add_dependency "thor"
 

data/lib/justiz_sync/cli.rb

@@ -11,16 +11,12 @@ module JustizSync
     desc 'sync', 'sync all records from justiz to opencrx'
     def sync
       transfer = Transfer.new(options)
-      if (state = options['state'])
-        transfer.sync_state(state)
-      else
-        transfer.sync
-      end
+      transfer.sync
     end
   end
 
   class Transfer
-    attr_reader :options
+    attr_reader :options, :stream
     def initialize(options)
       @options = options
       STDOUT.sync = true
@@ -28,24 +24,33 @@ module JustizSync
     end
 
     def sync
+      @stream = Stream.new
+      delete_unused = false
+      if (state = options['state'])
+        sync_state(state)
+      else
+        sync_all
+        delete_unused = true
+      end
+      stream.close(delete_unused)
+    end
+
+    def sync_all
       states = scraper.states
-      total = 0
       states.keys.each do |state|
-        total += sync_state(state)
+        sync_state(state)
       end
-      puts "Total #{total} synchronized"
     end
 
     def sync_state(state)
       courts = scraper.contacts_for(state)
       puts "Syncing #{state} #{courts.length} courts"
       sync_courts(courts)
-      courts.length
     end
 
     def sync_courts(courts)
       courts.each_with_index do |court, index|
-        OpencrxCourt.sync(court)
+        stream.sync(court)
         puts if verbose && index && (index % 20 == 0)
         putc('.') if verbose
       end

data/lib/justiz_sync/opencrx_court.rb

@@ -1,14 +1,12 @@
 require 'opencrx'
 
 module JustizSync
-
   class OpencrxCourt
     TAG = 'justiz'
 
     attr_reader :court
 
     class << self
-
       def sync(justiz_court)
         OpencrxCourt.new(justiz_court).sync
       end
@@ -19,7 +17,27 @@ module JustizSync
       end
 
       def find_tagged
-        Opencrx::Model::LegalEntity.query(query: "thereExistsUserString2().equalTo(\"#{TAG}\")")
+        tagged = []
+        position = 0
+        size = 500
+        begin
+          result_set = Opencrx::Model::LegalEntity.query(size: size, position: position,
+                                                         query: "thereExistsUserString2().equalTo(\"#{TAG}\")")
+          position += result_set.length
+          tagged += result_set
+        end while result_set && result_set.more?
+        tagged
+      end
+
+      def all_ids
+        find_tagged.map { |crx| crx.userString1 }
+      end
+
+      def destroy(ids)
+        ids.each do |id|
+          crx = find(id)
+          crx.destroy if crx
+        end
       end
 
       # court.id is stored in openCRX userString1

data/lib/justiz_sync/stream.rb

@@ -0,0 +1,26 @@
+module JustizSync
+  class Stream
+    def initialize
+      @ids= []
+      @total_items = 0
+      @new_items = 0
+    end
+
+    def sync(court)
+      @ids << court.id
+      @total_items += 1
+      @new_items += OpencrxCourt.new(court).sync
+    end
+
+    def close(delete_unused = false)
+      all_ids = OpencrxCourt.all_ids
+      unused = all_ids - @ids
+      puts "#{@total_items} processed"
+      puts "#{@new_items} new entrie(s)"
+      if delete_unused
+        OpencrxCourt.destroy(unused)
+        puts "#{unused.length} deleted entrie(s)"
+      end
+    end
+  end
+end

data/lib/justiz_sync/version.rb

@@ -1,3 +1,3 @@
 module JustizSync
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/justiz_sync.rb

@@ -1,5 +1,6 @@
 require 'justiz_sync/version'
 require 'justiz_sync/opencrx_court'
+require 'justiz_sync/stream'
 require 'justiz_sync/cli'
 
 module JustizSync

data/spec/cli_spec.rb

@@ -6,7 +6,7 @@ describe JustizSync::Cli do
     JustizSync::Cli.start(%w(sync --verbose  --state=BRD))
   end
 
-  it "syncs all records" do
+  xit "syncs all records" do
     JustizSync::Cli.start(%w(sync --verbose))
   end
 end

data/spec/opencrx_court_spec.rb

@@ -1,20 +1,21 @@
 require_relative "spec_helper"
 
 describe JustizSync::OpencrxCourt do
+  let(:court) { Justiz::Contact.new(court: 'TEST Staatsanwaltschaft Düsseldorf',
+                                    location: 'Fritz-Roeber-Straße 2, 40213 Düsseldorf',
+                                    post: 'P.O.Box 123, 40999 Düsseldorf - Post',
+                                    phone: '0211 6025 0',
+                                    fax: '0211 6025 2929',
+                                    justiz_id: 'R1100S',
+                                    url: 'http://www.sta-duesseldorf.nrw.de',
+                                    email: 'poststelle@sta-duesseldorf.nrw.de') }
+
+
   before do
     Opencrx::connect("http://localhost:8080", "guest", "guest")
   end
 
   context "sync" do
-    let(:court) { Justiz::Contact.new(court: 'TEST Staatsanwaltschaft Düsseldorf',
-                                      location: 'Fritz-Roeber-Straße 2, 40213 Düsseldorf',
-                                      post: 'P.O.Box 123, 40999 Düsseldorf - Post',
-                                      phone: '0211 6025 0',
-                                      fax: '0211 6025 2929',
-                                      justiz_id: 'R1100S',
-                                      url: 'http://www.sta-duesseldorf.nrw.de',
-                                      email: 'poststelle@sta-duesseldorf.nrw.de') }
-
     before do
       delete_courts(court.id)
     end
@@ -43,12 +44,6 @@ describe JustizSync::OpencrxCourt do
       expect(find_attribute(addresses, :emailAddress)).to eq([court.email])
     end
 
-    def delete_courts(id)
-      while (crx = JustizSync::OpencrxCourt.find(id))
-        crx.destroy
-      end
-    end
-
     it "should create and find court" do
       expect(JustizSync::OpencrxCourt.sync(court)).to eq(1)
       crx = JustizSync::OpencrxCourt.find(court.id)
@@ -56,18 +51,19 @@ describe JustizSync::OpencrxCourt do
       delete_courts(court.id)
     end
 
-    it "should update court" do
-      JustizSync::OpencrxCourt.sync(court)
-
-      updated_court = court.dup
-      updated_court.url += ' Update'
-
-      expect(JustizSync::OpencrxCourt.sync(updated_court)).to eq(1)
-      crx = JustizSync::OpencrxCourt.find(court.id)
-      match_court(updated_court, crx)
-      crx.destroy
-      expect(JustizSync::OpencrxCourt.find(court.id)).to_not be
-    end
+    # id is now digest, so any changes creates a new id
+    #it "should update court" do
+    #  JustizSync::OpencrxCourt.sync(court)
+    #
+    #  updated_court = court.dup
+    #  updated_court.url += ' Update'
+    #
+    #  expect(JustizSync::OpencrxCourt.sync(updated_court)).to eq(1)
+    #  crx = JustizSync::OpencrxCourt.find(court.id)
+    #  match_court(updated_court, crx)
+    #  crx.destroy
+    #  expect(JustizSync::OpencrxCourt.find(court.id)).to_not be
+    #end
 
     it "should not update unchanged court" do
       JustizSync::OpencrxCourt.sync(court)
@@ -78,16 +74,4 @@ describe JustizSync::OpencrxCourt do
       crx.destroy
     end
   end
-
-  context "tagged" do
-    xit "deletes tagged entries" do
-      total = 0
-      begin
-        result_set = JustizSync::OpencrxCourt.find_tagged
-        result_set.each(&:destroy)
-        total += result_set.length
-      end while result_set && result_set.more?
-      puts "#{total} destroyed"
-    end
-  end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,9 @@
 require 'rspec'
 require 'justiz_sync'
 require 'awesome_print'
+
+def delete_courts(id)
+  while (crx = JustizSync::OpencrxCourt.find(id))
+    crx.destroy
+  end
+end

data/spec/stream_spec.rb

@@ -0,0 +1,34 @@
+require_relative "spec_helper"
+
+describe JustizSync::OpencrxCourt do
+  let(:court1) { Justiz::Contact.new(court: 'TEST 1') }
+  let(:court2) { Justiz::Contact.new(court: 'TEST 2') }
+
+  before do
+    Opencrx::connect("http://localhost:8080", "guest", "guest")
+  end
+
+  before do
+    ids = JustizSync::OpencrxCourt.all_ids
+    JustizSync::OpencrxCourt.destroy(ids)
+  end
+
+  it "streams" do
+    JustizSync::OpencrxCourt.sync(court1)
+    stream = JustizSync::Stream.new
+    stream.sync(court2)
+    stream.close(true)
+    crx = JustizSync::OpencrxCourt.find(court1.id)
+    expect(crx).to_not be
+    crx = JustizSync::OpencrxCourt.find(court2.id)
+    expect(crx.name).to eq(court2.court)
+    crx.destroy
+  end
+
+  it "deletes all entries" do
+    stream = JustizSync::Stream.new
+    stream.close
+    result_set = JustizSync::OpencrxCourt.find_tagged
+    expect(result_set.length).to eq(0)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: justiz_sync
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Mike Park
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: justiz
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: opencrx
   requirement: !ruby/object:Gem::Requirement
@@ -127,10 +127,12 @@ files:
 - lib/justiz_sync.rb
 - lib/justiz_sync/cli.rb
 - lib/justiz_sync/opencrx_court.rb
+- lib/justiz_sync/stream.rb
 - lib/justiz_sync/version.rb
 - spec/cli_spec.rb
 - spec/opencrx_court_spec.rb
 - spec/spec_helper.rb
+- spec/stream_spec.rb
 homepage: https://github.com/mike-park/justiz_sync
 licenses:
 - MIT
@@ -159,3 +161,4 @@ test_files:
 - spec/cli_spec.rb
 - spec/opencrx_court_spec.rb
 - spec/spec_helper.rb
+- spec/stream_spec.rb