openkvk 0.0.4 → 0.0.5

data/lib/openkvk/api.rb

@@ -8,6 +8,10 @@ module OpenKVK
   
   class API
     class << self
+      def search(keywords)
+        JSON.parse(get(keywords, "sphinx")).first["RESULT"]
+      end
+      
       def query(query)
         result = JSON.parse(get(query)).first["RESULT"]
         result["ROWS"].map { |row| Hashie::Mash.new(Hash[*result["HEADER"].zip(row).flatten]) }
@@ -15,11 +19,11 @@ module OpenKVK
       
       private
       
-      def get(query)
+      def get(query, service="api")
         begin
-          response = Net::HTTP.get_response(URI.parse("#{OpenKVK.host}json/#{URI.escape(query)}"))
+          response = Net::HTTP.get_response(URI.parse("http://#{service}.#{OpenKVK.host}/json/#{URI.escape(query)}"))
           if response.kind_of?(Net::HTTPRedirection)
-            response = Net::HTTP.get_response(URI.parse("#{OpenKVK.host}#{URI.escape(response["Location"])}"))
+            response = Net::HTTP.get_response(URI.parse("http://#{service}.#{OpenKVK.host}/#{URI.escape(response["Location"])}"))
           end
           response.body
         rescue Exception => e

data/lib/openkvk/configuration.rb

@@ -4,8 +4,8 @@ module OpenKVK
     # An array of valid keys in the options hash when configuring an {OpenKVK::API}
     VALID_OPTIONS_KEYS = [:host].freeze
 
-    # By default, set http://api.openkvk.nl/ as the server
-    DEFAULT_HOST = "http://api.openkvk.nl/".freeze
+    # By default, set openkvk.nl as the server
+    DEFAULT_HOST = "openkvk.nl".freeze
 
     # @private
     attr_accessor *VALID_OPTIONS_KEYS

data/lib/openkvk/version.rb

@@ -1,3 +1,3 @@
 module OpenKVK
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/openkvk.rb

@@ -5,6 +5,12 @@ module OpenKVK
   extend Configuration
     
   class << self
+    
+    def search(keywords)
+      numbers = API.search(keywords)
+      numbers.size > 0 ? API.query("SELECT * FROM kvk WHERE kvk IN (#{numbers.join(", ")})") : []
+    end
+    
     def find(options={})
       if options.is_a?(String)
         options = {:conditions => ["bedrijfsnaam LIKE '%#{options}%'", "bedrijfsnaam LIKE '%#{options.to_s.upcase}%'", "bedrijfsnaam LIKE '%#{capitalize_and_format_each_word(options)}%'"], :match_condition => :any}

data/spec/openkvk_spec.rb

@@ -59,7 +59,24 @@ describe OpenKVK do
       company.kvk.should == "343774520000"
     end
   end
-  
+
+  describe ".search" do
+    it "should search for a company with full text search" do
+      expect_search("ZiLvErLiNe", '[{"RESULT":[342838240000,343774520000]}]')
+      expect_query("SELECT * FROM kvk WHERE kvk IN (342838240000, 343774520000)", '[{"RESULT":{"TYPES":["bigint","varchar","int","int","varchar","varchar","varchar","varchar","varchar","varchar","bigint","varchar","decimal","decimal","date"],"HEADER":["kvk","bedrijfsnaam","kvks","sub","adres","postcode","plaats","type","status","website","vestiging","rechtsvorm","lat_rad","lon_rad","anbi"],"ROWS":[["343774520000","Zilverline B.V.","34377452",null,"Science Park 400","1098XH","Amsterdam","Hoofdvestiging",null,null,"19993846",null,"0.913791014","0.086494384",null],["342838240000","Zilverline Beheer B.V.","34283824",null,"Prins Hendriklaan 9","1404AR","Bussum","Hoofdvestiging",null,null,"5062055",null,"0.912472656","0.090085531",null]]}}]')
+
+      companies = OpenKVK.search("ZiLvErLiNe")
+      companies.size.should == 2
+      company = companies.first
+      company.bedrijfsnaam.should == "Zilverline B.V."
+      company.kvk.should == "343774520000"
+      company.adres.should == "Science Park 400"
+      company.postcode.should == "1098XH"
+      company.plaats.should == "Amsterdam"
+      company.type.should == "Hoofdvestiging"
+      company.website.should be nil
+    end
+  end
 
   describe ".find_by_bedrijfsnaam" do
     it "should find a company" do

data/spec/spec_helper.rb

@@ -14,4 +14,8 @@ def expect_query(sql, response)
   OpenKVK::API.expects(:get).with(sql).returns(response)
 end
 
+def expect_search(keywords, response)
+  OpenKVK::API.expects(:get).with(keywords, "sphinx").returns(response)
+end
+
 load File.expand_path('../../lib/openkvk.rb', __FILE__)

metadata

@@ -2,7 +2,7 @@
 name: openkvk
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Daniel van Hoesel
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-27 00:00:00 +02:00
+date: 2012-04-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency