openc_bot 0.0.18 → 0.0.26

data/schemas/spec/validation_spec.rb

@@ -1,5 +1,5 @@
 require 'json-schema'
-require 'debugger'
+# require 'debugger'
 
 describe "open-schemas" do
   it "should validate valid json" do

data/spec/lib/exceptions_spec.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 require_relative '../spec_helper'
 require 'openc_bot'
+require 'json-schema'
 
 describe 'OpencBot exceptions' do
 
@@ -12,14 +13,36 @@ describe 'OpencBot exceptions' do
   end
 
   describe OpencBot::RecordInvalid do
+    before do
+      @schema = File.join(File.dirname(__FILE__),'..','..','schemas','schemas','company-schema.json')
+      @record = {
+        :name => 'Foo Inc'
+      }
+
+      @validation_errors = JSON::Validator.fully_validate(@schema, @record.to_json, {:errors_as_objects => true})
+
+      @error = OpencBot::RecordInvalid.new(@validation_errors)
+
+    end
 
     it 'should have OpencBotError as superclass' do
       OpencBot::RecordInvalid.superclass.should == OpencBot::OpencBotError
     end
 
     it "should have set validation_errors accessor on instantiation" do
-      error = OpencBot::RecordInvalid.new(:some_validation_error)
-      error.validation_errors.should == :some_validation_error
+      @error.validation_errors.should == @validation_errors
+    end
+
+    describe 'message' do
+      it 'should include validation_errors' do
+        @error.message.should match 'Validation failed'
+        @error.message.should match "did not contain a required property of 'company_number'"
+        @error.message.should match "did not contain a required property of 'jurisdiction_code'"
+      end
+
+      # context 'and given message when instantiated' do
+      #   @error = OpencBot::RecordInvalid.new(@validation_errors, "some custom message").should match "some custom message"
+      # end
     end
   end
 end

data/spec/lib/helpers/incremental_search_spec.rb

@@ -384,7 +384,7 @@ describe 'a module that includes IncrementalSearch' do
       end
     end
 
-    context 'and highest_uid in cache' do
+    context 'and highest_entry_uids in cache' do
       before do
         @cached_result = '765432'
         ModuleThatIncludesIncrementalSearch.save_var('highest_entry_uids', @cached_result)
@@ -410,6 +410,18 @@ describe 'a module that includes IncrementalSearch' do
           ModuleThatIncludesIncrementalSearch.highest_entry_uids
         end
       end
+
+      context 'and true passed in as argument' do
+        before do
+          ModuleThatIncludesIncrementalSearch.save_var('highest_entry_uids', ['H553311','P1234'])
+        end
+
+        it "should ignore cached value" do
+          ModuleThatIncludesIncrementalSearch.should_receive(:highest_entry_uid_result).with(:prefix => 'H').with(:prefix => 'P')
+
+          ModuleThatIncludesIncrementalSearch.highest_entry_uids(true)
+        end
+      end
     end
 
   end

data/spec/lib/helpers/register_methods_spec.rb

@@ -230,6 +230,19 @@ describe 'a module that includes RegisterMethods' do
     it "should return true" do
       ModuleThatIncludesRegisterMethods.prepare_and_save_data(@params).should be_truthy
     end
+
+    context 'and SQLite3::BusyException raised' do
+      it 'should retry up to 3 times' do
+        ModuleThatIncludesRegisterMethods.should_receive(:insert_or_update).exactly(4).times.and_raise(SQLite3::BusyException)
+        lambda { ModuleThatIncludesRegisterMethods.prepare_and_save_data(@params) }.should raise_error(SQLite3::BusyException)
+      end
+      it 'should not raise error if successful before limit' do
+        ModuleThatIncludesRegisterMethods.should_receive(:insert_or_update).exactly(3).times.ordered.and_raise(SQLite3::BusyException)
+        ModuleThatIncludesRegisterMethods.should_receive(:insert_or_update).ordered
+        lambda { ModuleThatIncludesRegisterMethods.prepare_and_save_data(@params) }.should_not raise_error
+      end
+    end
+
   end
 
 
@@ -355,8 +368,24 @@ describe 'a module that includes RegisterMethods' do
         end
 
         it "should raise exception if true not passed as second argument" do
-          lambda { ModuleThatIncludesRegisterMethods.update_datum(@uid)}.should raise_error('something went wrong')
+          lambda { ModuleThatIncludesRegisterMethods.update_datum(@uid)}.should raise_error("something went wrong updating entry with uid: #{@uid}")
+        end
+      end
+
+      context 'and process_datum returns nil' do
+        before do
+          ModuleThatIncludesRegisterMethods.stub(:process_datum).and_return(nil)
+        end
+
+        it 'should return nil' do
+          ModuleThatIncludesRegisterMethods.update_datum(@uid)
         end
+
+        it 'should not validate_datum' do
+          ModuleThatIncludesRegisterMethods.should_not_receive(:validate_datum)
+          ModuleThatIncludesRegisterMethods.update_datum(@uid)
+        end
+
       end
     end
   end
@@ -402,7 +431,7 @@ describe 'a module that includes RegisterMethods' do
     end
 
     it "should check json version of datum against given schema" do
-      JSON::Validator.should_receive(:fully_validate).with(File.expand_path("../../../../schemas/schemas/company-schema.json", __FILE__), @valid_params.to_json, anything)
+      JSON::Validator.should_receive(:fully_validate).with('company-schema.json', @valid_params.to_json, anything)
       ModuleThatIncludesRegisterMethods.validate_datum(@valid_params)
     end
 

data/spec/schemas/company-schema_spec.rb

@@ -332,35 +332,35 @@ describe 'company-schema' do
       require_all_attributes_attribute_to_be_string_or_nil(:registered_agent_address)
     end
 
-    it "should require number_of_employees to be an positive" do
-      valid_params =
+    it "should require number_of_employees to be a positive" do
+      valid_params_1 =
           { :name => 'Foo Inc',
             :company_number => '12345',
             :jurisdiction_code => 'ie',
             :all_attributes => {:number_of_employees => 42}
           }
-      invalid_params_1 =
+      valid_params_2 =
           { :name => 'Foo Inc',
             :company_number => '12345',
             :jurisdiction_code => 'ie',
-            :all_attributes => {:number_of_employees => ''}
+            :all_attributes => {:number_of_employees => '1-5'}
           }
-      invalid_params_2 =
+      invalid_params_1 =
           { :name => 'Foo Inc',
             :company_number => '12345',
             :jurisdiction_code => 'ie',
-            :all_attributes => {:number_of_employees => 'foo'}
+            :all_attributes => {:number_of_employees => ''}
           }
-      invalid_params_3 =
+      invalid_params_2 =
           { :name => 'Foo Inc',
             :company_number => '12345',
             :jurisdiction_code => 'ie',
             :all_attributes => {:number_of_employees => -1}
           }
-      validate_datum_and_return_errors(valid_params).should be_empty
+      validate_datum_and_return_errors(valid_params_1).should be_empty
+      validate_datum_and_return_errors(valid_params_2).should be_empty
       validate_datum_and_return_errors(invalid_params_1).should_not be_empty
       validate_datum_and_return_errors(invalid_params_2).should_not be_empty
-      validate_datum_and_return_errors(invalid_params_3).should_not be_empty
     end
   end
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: openc_bot
 version: !ruby/object:Gem::Version
-  version: 0.0.18
-  prerelease: 
+  version: 0.0.26
 platform: ruby
 authors:
 - Chris Taggart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-15 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: backports
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: scraperwiki
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: perftools.rb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -182,7 +160,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -253,21 +230,6 @@ files:
 - lib/simple_openc_bot.rb
 - openc_bot.gemspec
 - publish.sh
-- spec/dummy_classes/foo_bot.rb
-- spec/lib/bot_data_validator_spec.rb
-- spec/lib/company_fetcher_bot_spec.rb
-- spec/lib/exceptions_spec.rb
-- spec/lib/helpers/alpha_search_spec.rb
-- spec/lib/helpers/dates_spec.rb
-- spec/lib/helpers/incremental_search_spec.rb
-- spec/lib/helpers/register_methods_spec.rb
-- spec/lib/helpers/text_spec.rb
-- spec/lib/openc_bot/db/.gitkeep
-- spec/lib/openc_bot/incrementers/common_spec.rb
-- spec/lib/openc_bot_spec.rb
-- spec/schemas/company-schema_spec.rb
-- spec/simple_openc_bot_spec.rb
-- spec/spec_helper.rb
 - schemas/.gitignore
 - schemas/.travis.yml
 - schemas/Gemfile
@@ -354,6 +316,21 @@ files:
 - schemas/spec/sample-data/invalid/company-53.json
 - schemas/spec/sample-data/invalid/company-54.json
 - schemas/spec/sample-data/invalid/company-55.json
+- schemas/spec/sample-data/invalid/company-56.json
+- schemas/spec/sample-data/invalid/company-57.json
+- schemas/spec/sample-data/invalid/company-58.json
+- schemas/spec/sample-data/invalid/company-59.json
+- schemas/spec/sample-data/invalid/company-60.json
+- schemas/spec/sample-data/invalid/company-61.json
+- schemas/spec/sample-data/invalid/company-62.json
+- schemas/spec/sample-data/invalid/company-63.json
+- schemas/spec/sample-data/invalid/company-64.json
+- schemas/spec/sample-data/invalid/company-65.json
+- schemas/spec/sample-data/invalid/company-66.json
+- schemas/spec/sample-data/invalid/company-67.json
+- schemas/spec/sample-data/invalid/company-68.json
+- schemas/spec/sample-data/invalid/company-69.json
+- schemas/spec/sample-data/invalid/company-70.json
 - schemas/spec/sample-data/invalid/financial-payment-01.json
 - schemas/spec/sample-data/invalid/licence-01.json
 - schemas/spec/sample-data/invalid/licence-02.json
@@ -368,7 +345,11 @@ files:
 - schemas/spec/sample-data/invalid/simple-licence-01.json
 - schemas/spec/sample-data/invalid/simple-licence-02.json
 - schemas/spec/sample-data/invalid/simple-licence-03.json
+- schemas/spec/sample-data/invalid/simple-licence-04.json
+- schemas/spec/sample-data/invalid/simple-licence-05.json
+- schemas/spec/sample-data/invalid/simple-licence-06.json
 - schemas/spec/sample-data/invalid/simple-subsidiary-01.json
+- schemas/spec/sample-data/invalid/simple-subsidiary-02.json
 - schemas/spec/sample-data/licence-schema.json.old
 - schemas/spec/sample-data/valid/company-01.json
 - schemas/spec/sample-data/valid/company-02.json
@@ -412,6 +393,17 @@ files:
 - schemas/spec/sample-data/valid/company-40.json
 - schemas/spec/sample-data/valid/company-41.json
 - schemas/spec/sample-data/valid/company-42.json
+- schemas/spec/sample-data/valid/company-43.json
+- schemas/spec/sample-data/valid/company-44.json
+- schemas/spec/sample-data/valid/company-45.json
+- schemas/spec/sample-data/valid/company-46.json
+- schemas/spec/sample-data/valid/company-47.json
+- schemas/spec/sample-data/valid/company-48.json
+- schemas/spec/sample-data/valid/company-49.json
+- schemas/spec/sample-data/valid/company-50.json
+- schemas/spec/sample-data/valid/company-51.json
+- schemas/spec/sample-data/valid/company-52.json
+- schemas/spec/sample-data/valid/company-53.json
 - schemas/spec/sample-data/valid/financial-payment-01.json
 - schemas/spec/sample-data/valid/financial-payment-02.json
 - schemas/spec/sample-data/valid/licence-01.json
@@ -428,30 +420,44 @@ files:
 - schemas/spec/sample-data/valid/subsidiary-relationship-01.json
 - schemas/spec/spec_helper.rb
 - schemas/spec/validation_spec.rb
+- spec/dummy_classes/foo_bot.rb
+- spec/lib/bot_data_validator_spec.rb
+- spec/lib/company_fetcher_bot_spec.rb
+- spec/lib/exceptions_spec.rb
+- spec/lib/helpers/alpha_search_spec.rb
+- spec/lib/helpers/dates_spec.rb
+- spec/lib/helpers/incremental_search_spec.rb
+- spec/lib/helpers/register_methods_spec.rb
+- spec/lib/helpers/text_spec.rb
+- spec/lib/openc_bot/db/.gitkeep
+- spec/lib/openc_bot/incrementers/common_spec.rb
+- spec/lib/openc_bot_spec.rb
+- spec/schemas/company-schema_spec.rb
+- spec/simple_openc_bot_spec.rb
+- spec/spec_helper.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 - lib/openc_bot/helpers
 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.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Helper gem for writing external bots for OpenCorporates
 test_files:
 - spec/dummy_classes/foo_bot.rb
@@ -469,3 +475,4 @@ test_files:
 - spec/schemas/company-schema_spec.rb
 - spec/simple_openc_bot_spec.rb
 - spec/spec_helper.rb
+has_rdoc: