openc_bot 0.0.11 → 0.0.16

data/Rakefile

@@ -1,6 +1,4 @@
 require "bundler/gem_tasks"
-# load 'lib/tasks/openc_bot.rake'
-# require 'lib/tasks'
 require 'openc_bot/tasks'
 
 
@@ -9,6 +7,10 @@ $LOAD_PATH.unshift File.dirname(__FILE__) + '/../../lib'
 
 Dir.glob('lib/tasks/*.rake').each { |r| import r }
 
-require 'rspec/core/rake_task'
-task :default => :spec
-RSpec::Core::RakeTask.new
+begin
+  require 'rspec/core/rake_task'
+  task :default => :spec
+  RSpec::Core::RakeTask.new
+rescue LoadError
+  #do nothing
+end

data/lib/openc_bot/bot_data_validator.rb

@@ -5,7 +5,7 @@ module OpencBot
     extend self
     def validate(datum)
       datum.kind_of?(Hash) and
-      datum[:company][:name] and
+      not datum[:company][:name].nil? and
       not datum[:company][:name].strip.empty? and
       not datum[:source_url].strip.empty? and
       not datum[:data].empty? and

data/lib/openc_bot/company_fetcher_bot.rb

@@ -32,6 +32,12 @@ module OpencBot
       super(default_options.merge(entity_info))
     end
 
+    def save_entity!(entity_info)
+      return if entity_info.blank?
+      default_options = {:jurisdiction_code => inferred_jurisdiction_code}
+      super(default_options.merge(entity_info))
+    end
+
     def schema_name
       super || 'company-schema'
     end

data/lib/openc_bot/helpers/register_methods.rb

@@ -102,13 +102,17 @@ module OpencBot
       # and then saving it. It assumes the methods for doing this (#fetch_datum and #process_datum) are implemented
       # in the module that includes this method.
       #
-      # If no second argument is passed to this method, or false is passed, the
-      # method will return the processed data hash
+      # If no second argument is passed to this method (i.e. output_as_json is not
+       # requested), or false is passed, the method will return the processed data hash.
       # If true is passed as the second argument, the method will output the
       # updated result as json to STDOUT, which can then be consumed by, say,
       # something which triggered this method, for example if it was called by
       # a rake task, which in turn might have been called by the main
       # OpenCorporates application
+      #
+      # If the data to be saved is invalid then either the exception is raised,
+      # or, if output_as_json is requested then the validation error is included
+      # in the JSON error message
       def update_datum(uid, output_as_json=false,replace_existing_data=false)
         return unless raw_data = fetch_datum(uid)
         default_options = {primary_key_name => uid, :retrieved_at => Time.now}
@@ -122,7 +126,12 @@ module OpencBot
           processed_data
         end
       rescue Exception => e
-        output_json_error_message(e) if output_as_json
+        if output_as_json
+          output_json_error_message(e)
+        else
+          puts e.inspect if verbose?
+          raise e
+        end
       end
 
       def update_stale(stale_count=nil)

data/lib/openc_bot/version.rb

@@ -1,3 +1,3 @@
 module OpencBot
-  VERSION = "0.0.11"
+  VERSION = "0.0.16"
 end

data/lib/simple_openc_bot.rb

@@ -1,3 +1,4 @@
+require 'active_support'
 require 'active_support/core_ext'
 require 'openc_bot'
 require 'json-schema'
@@ -58,7 +59,7 @@ class SimpleOpencBot
           STDOUT.print(".")
           STDOUT.flush
         end
-      ensure 
+      ensure
         sqlite_magic_connection.execute("COMMIT") if sqlite_magic_connection.database.transaction_active?
       end
     end
@@ -97,7 +98,7 @@ class SimpleOpencBot
 
   def all_stored_records(opts={})
     if opts[:only_unexported]
-      opts[:limit] ||= opts[:batch] 
+      opts[:limit] ||= opts[:batch]
     end
 
     select = opts[:select] || "ocdata.*"

data/openc_bot.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib",'lib/openc_bot/helpers']
 
   gem.add_dependency "rake"
-  gem.add_dependency "activesupport", "3.2.17"
+  gem.add_dependency "activesupport", "4.1.4"
   gem.add_dependency "nokogiri"
   # gem.add_dependency "sqlite3"
   gem.add_dependency "json"

data/schemas/company-schema.json

@@ -59,12 +59,24 @@
         "$ref": "includes/filing.json"
       }
     },
+    "industry_codes": {
+      "type": "array",
+      "items": {
+        "$ref": "includes/industry_code.json"
+      }
+    },
     "previous_names": {
       "type": "array",
       "items": {
         "$ref": "includes/previous_name.json"
       }
     },
+    "alternative_names": {
+      "type": "array",
+      "items": {
+        "$ref": "includes/alternative_name.json"
+      }
+    },
     "branch": {
       "type": ["string","null"],
       "description": "A flag to denote whether a company is a branch entity. This should only be set if the company is a type of branch (otherwise should be null). In general the only option here is 'F' for a 'Foreign' branch, i.e. an out-of-jurisdiction entity that has registered as having a presence in the jurisdiction. In the US this is sometimes called a Foreign Corporation",

data/schemas/includes/alternative_name.json

@@ -0,0 +1,13 @@
+{
+  "name": "AlternativeName",
+  "description": "An alternative name of a company, e.g. abbreviation, trading (including dba or doing business as), legal. As well as trading names etc, it can be used for storing alternative language representations of the legal name, in which case the language should be represented as two-letter ISO-639 code",
+  "type": "object",
+  "properties": { "company_name": { "type": "string", "minLength": 1 },
+                  "start_date": { "type": "date" },
+                  "end_date": { "type": "date" },
+                  "language": { "type": "string", "minLength": 2, "maxLength": 2 },
+                  "type": { "type": "string", "enum": ["trading", "abbreviation", "legal"] }
+  },
+  "required": [ "company_name" ]
+}
+

data/schemas/includes/industry_code.json

@@ -0,0 +1,13 @@
+{
+  "name": "IndustryCode",
+  "description": "An industry code from a standard code list (e.g. NAICS 2007 or NACE 2)",
+  "type": "object",
+  "properties": { "name": { "type": "string" },
+                  "code": { "type": "string" },
+                  "code_scheme_id": { "type": "string", "enum": ["eu_nace_2", "uk_sic_2003", "uk_sic_2007", "us_naics_2002", "us_naics_2007", "be_nace_2008"] },
+                  "start_date":  { "type": "date" },
+                  "end_date":  { "type": "date" }
+  },
+  "required": [ "code", "code_scheme_id" ]
+}
+

data/spec/lib/bot_data_validator_spec.rb

@@ -22,47 +22,47 @@ describe OpencBot::BotDataValidator do
 
     end
     it 'should return true if data is valid' do
-      OpencBot::BotDataValidator.validate(@valid_data).should be_true
+      OpencBot::BotDataValidator.validate(@valid_data).should be true
     end
 
     it 'should return false if data is not a hash' do
-      OpencBot::BotDataValidator.validate(nil).should be_false
-      OpencBot::BotDataValidator.validate('foo').should be_false
-      OpencBot::BotDataValidator.validate(['foo']).should be_false
+      OpencBot::BotDataValidator.validate(nil).should be false
+      OpencBot::BotDataValidator.validate('foo').should be false
+      OpencBot::BotDataValidator.validate(['foo']).should be false
     end
 
     it 'should return false if company_data is blank' do
-      OpencBot::BotDataValidator.validate(@valid_data.merge(:company => nil)).should be_false
-      OpencBot::BotDataValidator.validate(@valid_data.merge(:company => '  ')).should be_false
+      OpencBot::BotDataValidator.validate(@valid_data.merge(:company => nil)).should be false
+      OpencBot::BotDataValidator.validate(@valid_data.merge(:company => '  ')).should be false
     end
 
     it 'should return false if company_data is missing name' do
-      OpencBot::BotDataValidator.validate(@valid_data.merge(:company => {:name => nil})).should be_false
-      OpencBot::BotDataValidator.validate(@valid_data.merge(:company => {:name => ' '})).should be_false
+      OpencBot::BotDataValidator.validate(@valid_data.merge(:company => {:name => nil})).should be false
+      OpencBot::BotDataValidator.validate(@valid_data.merge(:company => {:name => ' '})).should be false
     end
 
     it 'should return false if source_url is blank' do
-      OpencBot::BotDataValidator.validate(@valid_data.merge(:source_url => nil)).should be_false
-      OpencBot::BotDataValidator.validate(@valid_data.merge(:source_url => '  ')).should be_false
+      OpencBot::BotDataValidator.validate(@valid_data.merge(:source_url => nil)).should be false
+      OpencBot::BotDataValidator.validate(@valid_data.merge(:source_url => '  ')).should be false
     end
 
     it 'should return false if data is empty' do
-      OpencBot::BotDataValidator.validate(@valid_data.merge(:data => nil)).should be_false
-      OpencBot::BotDataValidator.validate(@valid_data.merge(:data => [])).should be_false
+      OpencBot::BotDataValidator.validate(@valid_data.merge(:data => nil)).should be false
+      OpencBot::BotDataValidator.validate(@valid_data.merge(:data => [])).should be false
     end
 
     it 'should return false if data is missing data_type' do
       OpencBot::BotDataValidator.validate(@valid_data.merge(:data => [{:data_type => nil,
-                                                            :properties => {:foo => 'bar'}}])).should be_false
+                                                            :properties => {:foo => 'bar'}}])).should be false
       OpencBot::BotDataValidator.validate(@valid_data.merge(:data => [{:data_type => '  ',
-                                                            :properties => {:foo => 'bar'}}])).should be_false
+                                                            :properties => {:foo => 'bar'}}])).should be false
     end
 
     it 'should return false if properties is blank' do
       OpencBot::BotDataValidator.validate(@valid_data.merge(:data => [{:data_type => :subsidiary_relationship,
-                                                            :properties => {}}])).should be_false
+                                                            :properties => {}}])).should be false
       OpencBot::BotDataValidator.validate(@valid_data.merge(:data => [{:data_type => :subsidiary_relationship,
-                                                            :properties => nil}])).should be_false
+                                                            :properties => nil}])).should be false
     end
 
   end

data/spec/lib/company_fetcher_bot_spec.rb

@@ -90,4 +90,35 @@ describe "A module that extends CompanyFetcherBot" do
       TestCompaniesFetcher.save_entity(:name => 'Foo Corp', :company_number => '12345', :jurisdiction_code => 'xx')
     end
   end
+
+  describe "#save_entity!" do
+    before do
+      TestCompaniesFetcher.stub(:inferred_jurisdiction_code).and_return('ab_cd')
+    end
+
+    it "should save_entity with inferred_jurisdiction_code" do
+      TestCompaniesFetcher.should_receive(:prepare_and_save_data).with(:name => 'Foo Corp', :company_number => '12345', :jurisdiction_code => 'ab_cd')
+      TestCompaniesFetcher.save_entity!(:name => 'Foo Corp', :company_number => '12345')
+    end
+
+    it "should save_entity with given jurisdiction_code" do
+      TestCompaniesFetcher.should_receive(:prepare_and_save_data).with(:name => 'Foo Corp', :company_number => '12345', :jurisdiction_code => 'xx')
+      TestCompaniesFetcher.save_entity!(:name => 'Foo Corp', :company_number => '12345', :jurisdiction_code => 'xx')
+    end
+
+    context "and entity_data is not valid" do
+      before do
+        TestCompaniesFetcher.stub(:validate_datum).and_return([{:message=>'Not valid'}])
+      end
+
+      it "should not prepare and save data" do
+        TestCompaniesFetcher.should_not_receive(:prepare_and_save_data)
+        lambda {ModuleThatIncludesRegisterMethods.save_entity!(:name => 'Foo Corp', :company_number => '12345')}
+      end
+
+      it "should raise exception" do
+        lambda {TestCompaniesFetcher.save_entity!(:name => 'Foo Corp', :company_number => '12345')}.should raise_error(OpencBot::RecordInvalid)
+      end
+    end
+  end
 end

data/spec/lib/helpers/register_methods_spec.rb

@@ -41,11 +41,11 @@ describe 'a module that includes RegisterMethods' do
     it "should return true if result returned" do
       ModuleThatIncludesRegisterMethods.stub(:select).and_return([{'custom_uid' => '4567'}])
 
-      ModuleThatIncludesRegisterMethods.datum_exists?('4567').should be_true
+      ModuleThatIncludesRegisterMethods.datum_exists?('4567').should be true
     end
 
     it "should return false if result returned" do
-      ModuleThatIncludesRegisterMethods.datum_exists?('4567').should be_false
+      ModuleThatIncludesRegisterMethods.datum_exists?('4567').should be false
     end
   end
 
@@ -83,14 +83,14 @@ describe 'a module that includes RegisterMethods' do
   describe "#use_alpha_search" do
     context 'and no USE_ALPHA_SEARCH constant' do
       it "should not return true" do
-        ModuleThatIncludesRegisterMethods.use_alpha_search.should_not be_true
+        ModuleThatIncludesRegisterMethods.use_alpha_search.should_not be true
       end
     end
 
     context 'and USE_ALPHA_SEARCH constant set' do
       it "should return USE_ALPHA_SEARCH" do
         stub_const("ModuleThatIncludesRegisterMethods::USE_ALPHA_SEARCH", true)
-        ModuleThatIncludesRegisterMethods.use_alpha_search.should be_true
+        ModuleThatIncludesRegisterMethods.use_alpha_search.should be true
       end
     end
   end
@@ -228,7 +228,7 @@ describe 'a module that includes RegisterMethods' do
     end
 
     it "should return true" do
-      ModuleThatIncludesRegisterMethods.prepare_and_save_data(@params).should be_true
+      ModuleThatIncludesRegisterMethods.prepare_and_save_data(@params).should be_truthy
     end
   end
 
@@ -244,8 +244,9 @@ describe 'a module that includes RegisterMethods' do
       ModuleThatIncludesRegisterMethods.stub(:fetch_datum).and_return(@fetch_datum_response)
       ModuleThatIncludesRegisterMethods.stub(:process_datum).and_return(@processed_data)
       @processed_data_with_retrieved_at_and_uid = @processed_data.merge(:custom_uid => @uid, :retrieved_at => @dummy_time)
-      ModuleThatIncludesRegisterMethods.stub(:save_data)
+      ModuleThatIncludesRegisterMethods.stub(:save_data!)
       ModuleThatIncludesRegisterMethods.stub(:validate_datum).and_return([])
+      ModuleThatIncludesRegisterMethods.stub(:insert_or_update)
     end
 
     it "should fetch_datum for company number" do
@@ -264,7 +265,7 @@ describe 'a module that includes RegisterMethods' do
       end
 
       it "should not save data" do
-        ModuleThatIncludesRegisterMethods.should_not_receive(:save_data)
+        ModuleThatIncludesRegisterMethods.should_not_receive(:save_data!)
         ModuleThatIncludesRegisterMethods.update_datum(@uid)
       end
 
@@ -281,17 +282,17 @@ describe 'a module that includes RegisterMethods' do
       end
 
       it "should validate processed data" do
-        ModuleThatIncludesRegisterMethods.should_receive(:validate_datum).with(hash_including(@processed_data_with_retrieved_at_and_uid)).and_call_original
+        ModuleThatIncludesRegisterMethods.should_receive(:validate_datum).with(hash_including(@processed_data_with_retrieved_at_and_uid)).and_return([])
         ModuleThatIncludesRegisterMethods.update_datum(@uid)
       end
 
       it "should prepare processed data for saving including timestamp" do
-        ModuleThatIncludesRegisterMethods.should_receive(:prepare_for_saving).with(hash_including(@processed_data_with_retrieved_at_and_uid)).and_call_original
+        ModuleThatIncludesRegisterMethods.should_receive(:prepare_for_saving).with(hash_including(@processed_data_with_retrieved_at_and_uid)).and_return({})
         ModuleThatIncludesRegisterMethods.update_datum(@uid)
       end
 
       it "should include data in data to be prepared for saving" do
-        ModuleThatIncludesRegisterMethods.should_receive(:prepare_for_saving).with(hash_including(:data => @fetch_datum_response)).and_call_original
+        ModuleThatIncludesRegisterMethods.should_receive(:prepare_for_saving).with(hash_including(:data => @fetch_datum_response)).and_return({})
         ModuleThatIncludesRegisterMethods.update_datum(@uid)
       end
 
@@ -300,7 +301,7 @@ describe 'a module that includes RegisterMethods' do
         ModuleThatIncludesRegisterMethods.stub(:process_datum).
                                           and_return(@processed_data.merge(:retrieved_at => different_time))
         ModuleThatIncludesRegisterMethods.should_receive(:prepare_for_saving).
-                                          with(hash_including(:retrieved_at => different_time)).and_call_original
+                                          with(hash_including(:retrieved_at => different_time)).and_return({})
         ModuleThatIncludesRegisterMethods.update_datum(@uid)
       end
 
@@ -320,32 +321,41 @@ describe 'a module that includes RegisterMethods' do
         ModuleThatIncludesRegisterMethods.update_datum(@uid)
       end
 
+      RSpec::Matchers.define :jsonified_output do |expected_output|
+        match do |actual|
+          parsed_actual_json = JSON.parse(actual)
+          parsed_actual_json.except('retrieved_at') == expected_output.except('retrieved_at') and
+          parsed_actual_json['retrieved_at'].to_time.to_s == expected_output['retrieved_at'].to_time.to_s
+
+        end
+      end
+
       it "should output jsonified processed data to STDOUT if passed true as second argument" do
         expected_output = @processed_data_with_retrieved_at_and_uid.
-          merge(:retrieved_at => @processed_data_with_retrieved_at_and_uid[:retrieved_at].iso8601)
-        # json output is in different, unknown order, so we test output like this
-        ModuleThatIncludesRegisterMethods.should_receive(:puts) { |output| json_hash = JSON.parse(output); json_hash == expected_output }
+          merge(:retrieved_at => @processed_data_with_retrieved_at_and_uid[:retrieved_at].iso8601).stringify_keys
+        ModuleThatIncludesRegisterMethods.should_receive(:puts).with(jsonified_output(expected_output))
         ModuleThatIncludesRegisterMethods.update_datum(@uid, true)
       end
 
 
+      RSpec::Matchers.define :jsonified_error_details_including do |expected_output|
+        match { |actual| error_details = JSON.parse(actual)['error']; expected_output.all? { |k,v| error_details[k] == v } }
+      end
+
       context "and exception raised" do
         before do
           ModuleThatIncludesRegisterMethods.stub(:process_datum).and_raise('something went wrong')
         end
 
-        it "should output error message if true passes as second argument" do
-          ModuleThatIncludesRegisterMethods.should_receive(:puts).with(/error.+went wrong/m)
+        it "should output error message as JSON if true passes as second argument" do
+          ModuleThatIncludesRegisterMethods.should_receive(:puts).with(jsonified_error_details_including('message' => 'something went wrong', 'klass' => 'RuntimeError'))
+          # ModuleThatIncludesRegisterMethods.should_receive(:puts).
+          #                                   with{ |error_output| error_hash = JSON.parse(error_output); error_hash['error']['message'].should == 'something went wrong' }
           ModuleThatIncludesRegisterMethods.update_datum(@uid, true)
         end
 
-        it "should return nil if true not passed as second argument" do
-          ModuleThatIncludesRegisterMethods.update_datum(@uid).should be_nil
-        end
-
-        it "should output error message if true not passed as second argument" do
-          ModuleThatIncludesRegisterMethods.should_not_receive(:puts).with(/error/)
-          ModuleThatIncludesRegisterMethods.update_datum(@uid).should be_nil
+        it "should raise exception if true not passed as second argument" do
+          lambda { ModuleThatIncludesRegisterMethods.update_datum(@uid)}.should raise_error('something went wrong')
         end
       end
     end
@@ -434,7 +444,7 @@ describe 'a module that includes RegisterMethods' do
       end
 
       it "should return true" do
-        ModuleThatIncludesRegisterMethods.save_entity(@params).should be_true
+        ModuleThatIncludesRegisterMethods.save_entity(@params).should be_truthy
       end
     end
 
@@ -449,7 +459,7 @@ describe 'a module that includes RegisterMethods' do
       end
 
       it "should not return true" do
-        ModuleThatIncludesRegisterMethods.save_entity(@params).should_not be_true
+        ModuleThatIncludesRegisterMethods.save_entity(@params).should_not be true
       end
     end
   end
@@ -475,7 +485,7 @@ describe 'a module that includes RegisterMethods' do
       end
 
       it "should return true" do
-        ModuleThatIncludesRegisterMethods.save_entity!(@params).should be_true
+        ModuleThatIncludesRegisterMethods.save_entity!(@params).should be_truthy
       end
     end
 
@@ -532,7 +542,7 @@ describe 'a module that includes RegisterMethods' do
 
       it 'should not do anything with null value' do
         @processed_data[:serialised_field_6].should be_nil
-        @processed_data.has_key?(:serialised_field_6).should be_true
+        @processed_data.has_key?(:serialised_field_6).should be true
       end
     end
 
@@ -542,7 +552,7 @@ describe 'a module that includes RegisterMethods' do
       end
 
       it 'should remove value from result' do
-        @processed_data.has_key?(:serialised_field_6).should be_false
+        @processed_data.has_key?(:serialised_field_6).should be false
       end
     end
 

data/spec/lib/openc_bot_spec.rb

@@ -53,12 +53,12 @@ describe "A module that extends OpencBot" do
 
   describe '#verbose?' do
     it 'should return false if ENV["VERBOSE"] not set' do
-      FooBot.verbose?.should be_false
+      FooBot.verbose?.should be_falsey
     end
 
-    it 'should return false if ENV["VERBOSE"] set' do
+    it 'should return true if ENV["VERBOSE"] set' do
       ENV["VERBOSE"] = 'true'
-      FooBot.verbose?.should be_true
+      FooBot.verbose?.should be_truthy
       ENV["VERBOSE"] = nil # reset
     end
   end

data/spec/schemas/company-schema_spec.rb

@@ -604,10 +604,10 @@ describe 'company-schema' do
              { :number => 123 }
           }
         ]
-        valid_company_params.each do |valid_params|
-          errors = validate_datum_and_return_errors(valid_params)
-          errors.should be_empty, "Valid params were not valid: #{valid_params}.Errors = #{errors}"
-        end
+      valid_company_params.each do |valid_params|
+        errors = validate_datum_and_return_errors(valid_params)
+        errors.should be_empty, "Valid params were not valid: #{valid_params}.Errors = #{errors}"
+      end
     end
 
     it "should not validate if share_parcels are not valid" do
@@ -644,6 +644,123 @@ describe 'company-schema' do
     end
   end
 
+  context "and company has alternative_names" do
+    it "should validate if alternative_names are valid" do
+      valid_company_params=
+      [
+        { :name => 'Foo Inc',
+          :company_number => '12345',
+          :jurisdiction_code => 'ie',
+          :alternative_names =>
+           [{ :company_name => 'Foobar Inc',
+              :type => :trading },
+            { :company_name => 'Foobar Inc',
+               :type => :legal,
+               :language => 'fr' },
+           ]
+        },
+        { :name => 'Foo Inc',
+          :company_number => '12345',
+          :jurisdiction_code => 'ie',
+          :alternative_names =>[]
+        }
+      ]
+
+      invalid_company_params =
+        [
+          { :name => 'Foo Inc',
+            :company_number => '12345',
+            :jurisdiction_code => 'ie',
+            :alternative_names =>
+            [{ :company_name => 'Foobar Inc'}]
+          },
+          { :name => 'Foo Inc',
+            :company_number => '12345',
+            :jurisdiction_code => 'ie',
+            :alternative_names =>
+            [{ :company_name => 'Foobar Inc', :type => 'foobar'}]
+          },
+          { :name => 'Foo Inc',
+            :company_number => '12345',
+            :jurisdiction_code => 'ie',
+            :alternative_names =>
+            [{ :company_name => 'Foobar Inc', :language => 'French'}]
+          },
+          { :name => 'Foo Inc',
+            :company_number => '12345',
+            :jurisdiction_code => 'ie',
+            :alternative_names => 'foo name'
+          },
+          { :name => 'Foo Inc',
+            :company_number => '12345',
+            :jurisdiction_code => 'ie',
+            :alternative_names => ['foo name']
+          }
+        ]
+      valid_company_params.each do |valid_params|
+        errors = validate_datum_and_return_errors(valid_params)
+        errors.should be_empty, "Valid params were not valid: #{valid_params}.Errors = #{errors}"
+      end
+    end
+  end
+
+  context "and company has industry_codes" do
+    it "should validate if industry_codes are valid" do
+      valid_company_params =
+        [
+          { :name => 'Foo Inc',
+            :company_number => '12345',
+            :jurisdiction_code => 'ie',
+            :industry_codes => [
+              {:code => '1234', :code_scheme_id => 'eu_nace_2', :name => 'Some Industry' },
+              {:code => '22.11', :code_scheme_id => 'uk_sic_2007' },
+              {:code => '43.21', :code_scheme_id => 'us_naics_2007', :name => 'Another Industry', :start_date => '2010-12-22', :end_date => '2011-01-03' }]
+          },
+          { :name => 'Foo Inc',
+            :company_number => '12345',
+            :jurisdiction_code => 'ie',
+            # allow empty arrays
+            :industry_codes => []
+          }
+        ]
+        valid_company_params.each do |valid_params|
+          errors = validate_datum_and_return_errors(valid_params)
+          errors.should be_empty, "Valid params were not valid: #{valid_params}.Errors = #{errors}"
+        end
+    end
+
+    it "should not validate if industry_codes are not valid" do
+      invalid_company_params =
+        [
+          { :name => 'Foo Inc',
+            :company_number => '12345',
+            :jurisdiction_code => 'ie',
+            :industry_codes => [ {:code => '1234'}]
+          },
+          { :name => 'Foo Inc',
+            :company_number => '12345',
+            :jurisdiction_code => 'ie',
+            :industry_codes => [ {:code_scheme_id => '1234'}]
+          },
+          { :name => 'Foo Inc',
+            :company_number => '12345',
+            :jurisdiction_code => 'ie',
+            :industry_codes => 'foo code'
+          },
+          { :name => 'Foo Inc',
+            :company_number => '12345',
+            :jurisdiction_code => 'ie',
+            :industry_codes => ['foo filing']
+          }
+        ]
+      invalid_company_params.each do |invalid_params|
+        errors = validate_datum_and_return_errors(invalid_params)
+        errors.should_not be_empty, "Invalid params were not invalid: #{invalid_params}"
+      end
+    end
+
+  end
+
   def validate_datum_and_return_errors(record)
     errors = JSON::Validator.fully_validate(
       @schema,

data/spec/simple_openc_bot_spec.rb

@@ -203,7 +203,7 @@ describe SimpleOpencBot do
     end
 
     it "should return records converted to pipeline format" do
-      @bot.spotcheck_data.any? {|c| c[:company][:name] == @properties[0][:name]}.should be_true
+      @bot.spotcheck_data.any? {|c| c[:company][:name] == @properties[0][:name]}.should be true
     end
   end
 

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-require 'rspec/autorun'
+# require 'rspec/autorun'
 require 'debugger'
 
 RSpec.configure do |config|

metadata

@@ -1,116 +1,132 @@
 --- !ruby/object:Gem::Specification
 name: openc_bot
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.16
+  prerelease: 
 platform: ruby
 authors:
 - Chris Taggart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.17
+        version: 4.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.17
+        version: 4.1.4
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: backports
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: scraperwiki
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -125,43 +142,49 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: perftools.rb
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: This gem is to make the writing and running of bots for OpenCorporates
@@ -173,8 +196,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -230,9 +253,11 @@ files:
 - openc_bot.gemspec
 - schemas/company-schema.json
 - schemas/includes/address.json
+- schemas/includes/alternative_name.json
 - schemas/includes/base-statement.json
 - schemas/includes/company.json
 - schemas/includes/filing.json
+- schemas/includes/industry_code.json
 - schemas/includes/license-data.json
 - schemas/includes/officer.json
 - schemas/includes/previous_name.json
@@ -260,27 +285,28 @@ files:
 - 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: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Helper gem for writing external bots for OpenCorporates
 test_files:
 - spec/dummy_classes/foo_bot.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 2c2492325f145ede40b77b666ab93b99c47ba314
-  data.tar.gz: 7aa0dd5faf896d3a7e6a2217092ced8227084e8b
-SHA512:
-  metadata.gz: 9c2709f8c3cb91d06d6e356809e8adc2e16dd5499b5c85e217fe6637c2c4045b6e6add769ffded9844227ef16a04ea387f0d252a4d4ffeb80fd6cea5876f4faf
-  data.tar.gz: 94d5a2d6222a04164ee5f93cb266129790651f3aae587faa20c52af81d4fbdbb15d899b11eb42a2dd2f06aa075d80bf282e1a503d39b3400b07f9da016061271