openkvk 0.0.2 → 0.0.3

data/lib/openkvk/version.rb

@@ -1,3 +1,3 @@
 module OpenKVK
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/openkvk.rb

@@ -7,7 +7,7 @@ module OpenKVK
   class << self
     def find(options={})
       if options.is_a?(String)
-        options = {:conditions => ["bedrijfsnaam ILIKE '%#{options}%'"]}
+        options = {:conditions => ["bedrijfsnaam LIKE '%#{options}%'", "bedrijfsnaam LIKE '%#{options.to_s.upcase}%'", "bedrijfsnaam LIKE '%#{capitalize_and_format_each_word(options)}%'"], :match_condition => :any}
       end
       options = {:limit => 1000, :select => ["*"], :count => :all, :match_condition => :all}.merge(options)
       
@@ -17,15 +17,33 @@ module OpenKVK
       result
     end
     
-    %w{kvk bedrijfsnaam kvks adres postcode plaats type website}.each do |field|      
+    def find_by_bedrijfsnaam(name, options={})
+      # bedrijfsnaam is always a string, so we want to search for different formats of the string
+      options = {:conditions => ["bedrijfsnaam LIKE '%#{name}%'", "bedrijfsnaam LIKE '%#{name.to_s.upcase}%'", "bedrijfsnaam LIKE '%#{capitalize_and_format_each_word(name)}%'"], :match_condition => :any}.merge(options)
+      find(options)
+    end
+    
+    %w{kvk kvks adres postcode plaats type website}.each do |field|      
       define_method("find_by_#{field}") do |value, options={}|
         options = {:conditions => ["#{field} ILIKE '%#{value}%'"]}.merge(options)
         find(options)
       end
     end
+
+    private
     
-  end
-  
+    def capitalize_and_format_each_word(name)
+      # capitalize each word
+      name.gsub!(/\b('?[a-z])/) do |word| 
+        $1.capitalize
+      end
 
+      # format B.V. and N.V.
+      name.gsub!(/([b|n]\.?v\.?)$/i) do |match|
+        "#{match.to_s[0].upcase}.V."
+      end
+    end
+    
+  end
   
-end
+end

data/spec/openkvk_spec.rb

@@ -17,7 +17,7 @@ describe OpenKVK do
     end
     
     it "should find multiple companies" do
-      expect_query("SELECT * FROM kvk WHERE bedrijfsnaam ILIKE '%Zilverline%' LIMIT 1000", '[{"RESULT":{"TYPES":["bigint","varchar","int","int","varchar","varchar","varchar","varchar","varchar"],"HEADER":["kvk","bedrijfsnaam","kvks","sub","adres","postcode","plaats","type","website"],"ROWS":[["342838240000","Zilverline Beheer B.V.","34283824","0","Finsenstraat 56","1098RJ","Amsterdam","Hoofdvestiging",null],["343774520000","Zilverline B.V.","34377452","0","Molukkenstraat 200 E4","1098TW","Amsterdam","Hoofdvestiging",null]]}}]')
+      expect_query("SELECT * FROM kvk WHERE bedrijfsnaam LIKE '%Zilverline%' OR bedrijfsnaam LIKE '%ZILVERLINE%' OR bedrijfsnaam LIKE '%%' LIMIT 1000", '[{"RESULT":{"TYPES":["bigint","varchar","int","int","varchar","varchar","varchar","varchar","varchar"],"HEADER":["kvk","bedrijfsnaam","kvks","sub","adres","postcode","plaats","type","website"],"ROWS":[["342838240000","Zilverline Beheer B.V.","34283824","0","Finsenstraat 56","1098RJ","Amsterdam","Hoofdvestiging",null],["343774520000","Zilverline B.V.","34377452","0","Molukkenstraat 200 E4","1098TW","Amsterdam","Hoofdvestiging",null]]}}]')
       
       companies = OpenKVK.find("Zilverline")
       companies.size.should == 2
@@ -63,7 +63,7 @@ describe OpenKVK do
 
   describe ".find_by_bedrijfsnaam" do
     it "should find a company" do
-      expect_query("SELECT * FROM kvk WHERE bedrijfsnaam ILIKE '%Zilverline B.V.%' LIMIT 1", '[{"RESULT":{"TYPES":["bigint","varchar","int","int","varchar","varchar","varchar","varchar","varchar"],"HEADER":["kvk","bedrijfsnaam","kvks","sub","adres","postcode","plaats","type","website"],"ROWS":[["343774520000","Zilverline B.V.","34377452","0","Molukkenstraat 200 E4","1098TW","Amsterdam","Hoofdvestiging",null]]}}]')
+      expect_query("SELECT * FROM kvk WHERE bedrijfsnaam LIKE '%Zilverline B.V.%' OR bedrijfsnaam LIKE '%ZILVERLINE B.V.%' OR bedrijfsnaam LIKE '%Zilverline B.V.%' LIMIT 1", '[{"RESULT":{"TYPES":["bigint","varchar","int","int","varchar","varchar","varchar","varchar","varchar"],"HEADER":["kvk","bedrijfsnaam","kvks","sub","adres","postcode","plaats","type","website"],"ROWS":[["343774520000","Zilverline B.V.","34377452","0","Molukkenstraat 200 E4","1098TW","Amsterdam","Hoofdvestiging",null]]}}]')
     
       OpenKVK.find_by_bedrijfsnaam("Zilverline B.V.", :count => :first).bedrijfsnaam.should == "Zilverline B.V."
     end

metadata

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