inline_forms 1.2.9 → 1.3.0

data/lib/app/controllers/geo_code_curacao_controller.rb

@@ -1,12 +1,9 @@
   # Used in autocomplete
   #
   class GeoCodeCuracaoController < ApplicationController
-    def index
+    def list_streets
       @term = params[:term]
-      respond_to do |format|
-        format.html { render 'inline_forms/_list', :layout => 'inline_forms' } unless @Klass.not_accessible_through_html?
-        format.js { render :list }
-      end
+      @streets = GeoCodeCuracao.lookup('%' + @term + '%')
     end
 
   end

data/lib/app/helpers/form_elements/geo_code_curacao.rb

@@ -10,7 +10,7 @@ def geo_code_curacao_edit(object, attribute)
   out = text_field_tag attribute, attribute_value
   out << '<script>
 		$( "#geo_code_curacao" ).autocomplete({
-			source: "/clients",
+			source: "/geo_code_curacao",
 			minLength: 2,
 			});
 	</script>'.html_safe
@@ -18,7 +18,7 @@ end
 
 def geo_code_curacao_update(object, attribute)
   # extract the geocode
-  geo_code = params[attribute.to_sym][:street].scan(/\d\d\d\d\d\d/).to_s || nil
+  geo_code = params[attribute].scan(/\d\d\d\d\d\d/).to_s || nil
   object[attribute.to_sym] = GeoCodeCuracao.new(geo_code).valid? ? geo_code : nil
 end
 

data/lib/app/models/geo_code_curacao.rb

@@ -22,7 +22,6 @@ class GeoCodeCuracao
     zone_code = decoded[0]
     neighbourhood_code = decoded[1]
     street_code = decoded[2]
-    #Hash[*['zone','neighbourhood','street'].zip(gecode.to_s.scan(/\d\d/).map(&:to_i)).flatten]
     self.street = Street.find_by_ZONECODE_and_NBRHCODE_and_STREETCODE(zone_code,neighbourhood_code,street_code)
     self.neighbourhood = Neighbourhood.find_by_ZONECODE_and_NBRHCODE(zone_code,neighbourhood_code) if self.street
     self.zone = Zone.find_by_ZONECODE(zone_code) if self.street
@@ -36,13 +35,9 @@ class GeoCodeCuracao
     "#{street.name}, #{zone.name}"
   end
 
-  def self.find(*args)
-    find_options = args.extract_options!
-    if args.first.to_s == "all"
-      # ActiveRecord::Base.sanitize_sql_for_conditions can not be called from here. Why?
-      # http://www.ruby-forum.com/topic/80357, active_record/connection_adapter/Quoting.rb
-      street = find_options[:conditions][1].gsub(/\\/, '\&\&').gsub(/'/, "''") 
-      sql = "select CONCAT( CONCAT_WS( ', ', S.NAME, B.NAME, Z.NAME), ' (', LPAD( S.ZONECODE, 2, '0' ), LPAD( S.NBRHCODE, 2, '0' ), LPAD( S.STREETCODE, 2, '0' ), ')' ) AS street
+  def self.lookup(term)
+    street = term.gsub(/\\/, '\&\&').gsub(/'/, "''")
+    sql = "select CONCAT( CONCAT_WS( ', ', S.NAME, B.NAME, Z.NAME), ' (', LPAD( S.ZONECODE, 2, '0' ), LPAD( S.NBRHCODE, 2, '0' ), LPAD( S.STREETCODE, 2, '0' ), ')' ) 
               FROM Straatcode S,  Buurten B, Zones Z
               WHERE 
                   B.RECORDTYPE='NBRHOOD'
@@ -52,8 +47,10 @@ class GeoCodeCuracao
               AND S.NBRHCODE = B.NBRHCODE
               AND S.NAME LIKE '#{street}'
               ORDER BY S.NAME"
-      ids = ActiveRecord::Base.connection.execute(sql)
+    q = []
+    ActiveRecord::Base.connection.execute(sql).to_a.each do |r|
+      q << { :label => r[0] }
     end
+    q.to_json.html_safe
   end
-
 end

data/lib/app/views/geo_code_curacao/list_streets.html.erb

@@ -0,0 +1 @@
+<%= @streets.each { |s| puts s} %>

data/lib/app/views/geo_code_curacao/list_streets.js.erb

@@ -0,0 +1 @@
+<%= @streets %>

data/lib/inline_forms/version.rb

@@ -1,3 +1,3 @@
 module InlineForms
-  VERSION = "1.2.9"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inline_forms
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 27
   prerelease: 
   segments: 
   - 1
-  - 2
-  - 9
-  version: 1.2.9
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Ace Suares
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-01 00:00:00 Z
+date: 2012-02-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
@@ -182,6 +182,8 @@ files:
 - lib/app/views/devise/sessions/new.html.erb
 - lib/app/views/devise/shared/_links.erb
 - lib/app/views/devise/unlocks/new.html.erb
+- lib/app/views/geo_code_curacao/list_streets.html.erb
+- lib/app/views/geo_code_curacao/list_streets.js.erb
 - lib/app/views/inline_forms/_close.html.erb
 - lib/app/views/inline_forms/_edit.html.erb
 - lib/app/views/inline_forms/_header.html.erb