geokit-rails 2.3.2 → 2.5.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.github/workflows/ci.yml +80 -0
- data/.gitignore +44 -37
- data/CHANGELOG.md +106 -96
- data/CONFIG.markdown +67 -67
- data/Gemfile +3 -3
- data/MIT-LICENSE +19 -19
- data/README.markdown +726 -726
- data/Rakefile +17 -17
- data/gemfiles/rails7.1.gemfile +11 -0
- data/gemfiles/{rails3.gemfile → rails7.2.gemfile} +7 -7
- data/gemfiles/{rails4.gemfile → rails8.0.gemfile} +7 -8
- data/gemfiles/{rails5.gemfile → rails8.1.gemfile} +7 -8
- data/geokit-rails.gemspec +34 -33
- data/lib/generators/geokit_rails/install_generator.rb +13 -13
- data/lib/generators/templates/geokit_config.rb +100 -100
- data/lib/geokit-rails/acts_as_mappable/class_methods.rb +299 -0
- data/lib/geokit-rails/acts_as_mappable/glue.rb +54 -0
- data/lib/geokit-rails/acts_as_mappable.rb +78 -425
- data/lib/geokit-rails/adapters/abstract.rb +30 -30
- data/lib/geokit-rails/adapters/mysql.rb +21 -21
- data/lib/geokit-rails/adapters/mysql2.rb +8 -8
- data/lib/geokit-rails/adapters/mysql2spatial.rb +8 -8
- data/lib/geokit-rails/adapters/oracleenhanced.rb +32 -32
- data/lib/geokit-rails/adapters/postgresql.rb +21 -21
- data/lib/geokit-rails/adapters/sqlite.rb +53 -53
- data/lib/geokit-rails/adapters/sqlserver.rb +45 -45
- data/lib/geokit-rails/{core_extensions.rb → distance_collection.rb} +8 -8
- data/lib/geokit-rails/geocoder_control.rb +19 -19
- data/lib/geokit-rails/ip_geocode_lookup.rb +44 -48
- data/lib/geokit-rails/railtie.rb +37 -37
- data/lib/geokit-rails/version.rb +3 -3
- data/lib/geokit-rails.rb +11 -9
- data/test/acts_as_mappable_test.rb +486 -478
- data/test/adapter_resolution_test.rb +46 -0
- data/test/boot.rb +40 -32
- data/test/database.yml +31 -28
- data/test/distance_collection_test.rb +42 -0
- data/test/dummy/Rakefile +6 -0
- data/test/dummy/app/assets/images/.keep +0 -0
- data/test/dummy/app/assets/stylesheets/application.css +1 -0
- data/test/dummy/app/channels/application_cable/channel.rb +4 -0
- data/test/dummy/app/channels/application_cable/connection.rb +4 -0
- data/test/dummy/app/controllers/application_controller.rb +3 -0
- data/test/dummy/app/controllers/concerns/.keep +0 -0
- data/test/dummy/app/controllers/location_aware_controller.rb +43 -0
- data/test/dummy/app/helpers/application_helper.rb +2 -0
- data/test/dummy/app/jobs/application_job.rb +7 -0
- data/test/dummy/app/mailers/application_mailer.rb +4 -0
- data/test/dummy/app/models/application_record.rb +3 -0
- data/test/dummy/app/models/concerns/.keep +0 -0
- data/test/dummy/app/views/layouts/application.html.erb +15 -0
- data/test/dummy/app/views/layouts/mailer.html.erb +13 -0
- data/test/dummy/app/views/layouts/mailer.text.erb +1 -0
- data/test/dummy/bin/rails +4 -0
- data/test/dummy/bin/rake +4 -0
- data/test/dummy/bin/setup +33 -0
- data/test/dummy/config/application.rb +22 -0
- data/test/dummy/config/boot.rb +5 -0
- data/test/dummy/config/cable.yml +10 -0
- data/test/dummy/config/database.yml +25 -0
- data/test/dummy/config/environment.rb +5 -0
- data/test/dummy/config/environments/development.rb +68 -0
- data/test/dummy/config/environments/production.rb +87 -0
- data/test/dummy/config/environments/test.rb +60 -0
- data/test/dummy/config/initializers/content_security_policy.rb +25 -0
- data/test/dummy/config/initializers/filter_parameter_logging.rb +8 -0
- data/test/dummy/config/initializers/inflections.rb +16 -0
- data/test/dummy/config/initializers/permissions_policy.rb +11 -0
- data/test/dummy/config/locales/en.yml +33 -0
- data/test/dummy/config/puma.rb +43 -0
- data/test/dummy/config/routes.rb +6 -0
- data/test/dummy/config/storage.yml +34 -0
- data/test/dummy/config.ru +6 -0
- data/test/dummy/lib/assets/.keep +0 -0
- data/test/dummy/log/.keep +0 -0
- data/test/dummy/public/404.html +67 -0
- data/test/dummy/public/422.html +67 -0
- data/test/dummy/public/500.html +66 -0
- data/test/dummy/public/apple-touch-icon-precomposed.png +0 -0
- data/test/dummy/public/apple-touch-icon.png +0 -0
- data/test/dummy/public/favicon.ico +0 -0
- data/test/dummy/storage/.keep +0 -0
- data/test/dummy/tmp/.keep +0 -0
- data/test/dummy/tmp/pids/.keep +0 -0
- data/test/dummy/tmp/storage/.keep +0 -0
- data/test/fixtures/companies.yml +9 -9
- data/test/fixtures/custom_locations.yml +61 -61
- data/test/fixtures/locations.yml +61 -61
- data/test/fixtures/mock_addresses.yml +16 -16
- data/test/fixtures/mock_families.yml +2 -2
- data/test/fixtures/mock_houses.yml +8 -8
- data/test/fixtures/mock_organizations.yml +4 -4
- data/test/fixtures/mock_people.yml +4 -4
- data/test/ip_geocode_lookup_test.rb +53 -0
- data/test/models/company.rb +2 -2
- data/test/models/custom_location.rb +11 -11
- data/test/models/location.rb +3 -3
- data/test/models/mock_address.rb +3 -3
- data/test/models/mock_family.rb +4 -4
- data/test/models/mock_house.rb +2 -2
- data/test/models/mock_organization.rb +5 -5
- data/test/models/mock_person.rb +6 -6
- data/test/models/store.rb +2 -2
- data/test/schema.rb +61 -61
- data/test/tasks.rake +37 -37
- data/test/test_helper.rb +83 -56
- metadata +137 -37
- data/.travis.yml +0 -29
- data/test/ip_geocode_lookup_test.disabled.rb +0 -82
data/test/fixtures/locations.yml
CHANGED
|
@@ -1,61 +1,61 @@
|
|
|
1
|
-
a:
|
|
2
|
-
id: 1
|
|
3
|
-
company_id: 1
|
|
4
|
-
street: 7979 N MacArthur Blvd
|
|
5
|
-
city: Irving
|
|
6
|
-
state: TX
|
|
7
|
-
postal_code: 75063
|
|
8
|
-
lat: 32.918593
|
|
9
|
-
lng: -96.958444
|
|
10
|
-
b:
|
|
11
|
-
id: 2
|
|
12
|
-
company_id: 1
|
|
13
|
-
street: 7750 N Macarthur Blvd # 160
|
|
14
|
-
city: Irving
|
|
15
|
-
state: TX
|
|
16
|
-
postal_code: 75063
|
|
17
|
-
lat: 32.914144
|
|
18
|
-
lng: -96.958444
|
|
19
|
-
c:
|
|
20
|
-
id: 3
|
|
21
|
-
company_id: 1
|
|
22
|
-
street: 5904 N Macarthur Blvd # 160
|
|
23
|
-
city: Irving
|
|
24
|
-
state: TX
|
|
25
|
-
postal_code: 75039
|
|
26
|
-
lat: 32.895155
|
|
27
|
-
lng: -96.958444
|
|
28
|
-
d:
|
|
29
|
-
id: 4
|
|
30
|
-
company_id: 1
|
|
31
|
-
street: 817 S Macarthur Blvd # 145
|
|
32
|
-
city: Coppell
|
|
33
|
-
state: TX
|
|
34
|
-
postal_code: 75019
|
|
35
|
-
lat: 32.951613
|
|
36
|
-
lng: -96.958444
|
|
37
|
-
e:
|
|
38
|
-
id: 5
|
|
39
|
-
company_id: 1
|
|
40
|
-
street: 106 N Denton Tap Rd # 350
|
|
41
|
-
city: Coppell
|
|
42
|
-
state: TX
|
|
43
|
-
postal_code: 75019
|
|
44
|
-
lat: 32.969527
|
|
45
|
-
lng: -96.990159
|
|
46
|
-
f:
|
|
47
|
-
id: 6
|
|
48
|
-
company_id: 2
|
|
49
|
-
street: 5904 N Macarthur Blvd # 160
|
|
50
|
-
city: Irving
|
|
51
|
-
state: TX
|
|
52
|
-
postal_code: 75039
|
|
53
|
-
lat: 32.895155
|
|
54
|
-
lng: -96.958444
|
|
55
|
-
g:
|
|
56
|
-
id: 7
|
|
57
|
-
company_id: 2
|
|
58
|
-
street: 4711 N Macarthur Blvd # 160
|
|
59
|
-
city: Nowhere
|
|
60
|
-
state: TX
|
|
61
|
-
postal_code: 12345
|
|
1
|
+
a:
|
|
2
|
+
id: 1
|
|
3
|
+
company_id: 1
|
|
4
|
+
street: 7979 N MacArthur Blvd
|
|
5
|
+
city: Irving
|
|
6
|
+
state: TX
|
|
7
|
+
postal_code: 75063
|
|
8
|
+
lat: 32.918593
|
|
9
|
+
lng: -96.958444
|
|
10
|
+
b:
|
|
11
|
+
id: 2
|
|
12
|
+
company_id: 1
|
|
13
|
+
street: 7750 N Macarthur Blvd # 160
|
|
14
|
+
city: Irving
|
|
15
|
+
state: TX
|
|
16
|
+
postal_code: 75063
|
|
17
|
+
lat: 32.914144
|
|
18
|
+
lng: -96.958444
|
|
19
|
+
c:
|
|
20
|
+
id: 3
|
|
21
|
+
company_id: 1
|
|
22
|
+
street: 5904 N Macarthur Blvd # 160
|
|
23
|
+
city: Irving
|
|
24
|
+
state: TX
|
|
25
|
+
postal_code: 75039
|
|
26
|
+
lat: 32.895155
|
|
27
|
+
lng: -96.958444
|
|
28
|
+
d:
|
|
29
|
+
id: 4
|
|
30
|
+
company_id: 1
|
|
31
|
+
street: 817 S Macarthur Blvd # 145
|
|
32
|
+
city: Coppell
|
|
33
|
+
state: TX
|
|
34
|
+
postal_code: 75019
|
|
35
|
+
lat: 32.951613
|
|
36
|
+
lng: -96.958444
|
|
37
|
+
e:
|
|
38
|
+
id: 5
|
|
39
|
+
company_id: 1
|
|
40
|
+
street: 106 N Denton Tap Rd # 350
|
|
41
|
+
city: Coppell
|
|
42
|
+
state: TX
|
|
43
|
+
postal_code: 75019
|
|
44
|
+
lat: 32.969527
|
|
45
|
+
lng: -96.990159
|
|
46
|
+
f:
|
|
47
|
+
id: 6
|
|
48
|
+
company_id: 2
|
|
49
|
+
street: 5904 N Macarthur Blvd # 160
|
|
50
|
+
city: Irving
|
|
51
|
+
state: TX
|
|
52
|
+
postal_code: 75039
|
|
53
|
+
lat: 32.895155
|
|
54
|
+
lng: -96.958444
|
|
55
|
+
g:
|
|
56
|
+
id: 7
|
|
57
|
+
company_id: 2
|
|
58
|
+
street: 4711 N Macarthur Blvd # 160
|
|
59
|
+
city: Nowhere
|
|
60
|
+
state: TX
|
|
61
|
+
postal_code: 12345
|
|
@@ -1,17 +1,17 @@
|
|
|
1
|
-
address_starbucks:
|
|
2
|
-
addressable: starbucks (MockOrganization)
|
|
3
|
-
street: 106 N Denton Tap Rd # 350
|
|
4
|
-
city: Coppell
|
|
5
|
-
state: TX
|
|
6
|
-
postal_code: 75019
|
|
7
|
-
lat: 32.969527
|
|
8
|
-
lng: -96.990159
|
|
9
|
-
|
|
10
|
-
address_barnes_and_noble:
|
|
11
|
-
addressable: barnes_and_noble (MockOrganization)
|
|
12
|
-
street: 5904 N Macarthur Blvd # 160
|
|
13
|
-
city: Irving
|
|
14
|
-
state: TX
|
|
15
|
-
postal_code: 75039
|
|
16
|
-
lat: 32.895155
|
|
1
|
+
address_starbucks:
|
|
2
|
+
addressable: starbucks (MockOrganization)
|
|
3
|
+
street: 106 N Denton Tap Rd # 350
|
|
4
|
+
city: Coppell
|
|
5
|
+
state: TX
|
|
6
|
+
postal_code: 75019
|
|
7
|
+
lat: 32.969527
|
|
8
|
+
lng: -96.990159
|
|
9
|
+
|
|
10
|
+
address_barnes_and_noble:
|
|
11
|
+
addressable: barnes_and_noble (MockOrganization)
|
|
12
|
+
street: 5904 N Macarthur Blvd # 160
|
|
13
|
+
city: Irving
|
|
14
|
+
state: TX
|
|
15
|
+
postal_code: 75039
|
|
16
|
+
lat: 32.895155
|
|
17
17
|
lng: -96.958444
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
my_family:
|
|
2
|
-
mock_house: my_house
|
|
1
|
+
my_family:
|
|
2
|
+
mock_house: my_house
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
another_house:
|
|
2
|
-
address: 106 N Denton Tap Rd # 350
|
|
3
|
-
lat: 32.969527
|
|
4
|
-
lng: -96.990159
|
|
5
|
-
|
|
6
|
-
my_house:
|
|
7
|
-
address: 5904 N Macarthur Blvd # 160
|
|
8
|
-
lat: 32.895155
|
|
1
|
+
another_house:
|
|
2
|
+
address: 106 N Denton Tap Rd # 350
|
|
3
|
+
lat: 32.969527
|
|
4
|
+
lng: -96.990159
|
|
5
|
+
|
|
6
|
+
my_house:
|
|
7
|
+
address: 5904 N Macarthur Blvd # 160
|
|
8
|
+
lat: 32.895155
|
|
9
9
|
lng: -96.958444
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
starbucks:
|
|
2
|
-
name: Starbucks
|
|
3
|
-
|
|
4
|
-
barnes_and_noble:
|
|
1
|
+
starbucks:
|
|
2
|
+
name: Starbucks
|
|
3
|
+
|
|
4
|
+
barnes_and_noble:
|
|
5
5
|
name: Barnes & Noble
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
father:
|
|
2
|
-
mock_family: my_family
|
|
3
|
-
|
|
4
|
-
mother:
|
|
1
|
+
father:
|
|
2
|
+
mock_family: my_family
|
|
3
|
+
|
|
4
|
+
mother:
|
|
5
5
|
mock_family: my_family
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
require 'test_helper'
|
|
2
|
+
|
|
3
|
+
class IpGeocodeLookupTest < ActionDispatch::IntegrationTest#ActiveSupport::TestCase#ActionController::TestCase
|
|
4
|
+
# tests LocationAwareController
|
|
5
|
+
|
|
6
|
+
def setup
|
|
7
|
+
# @controller = LocationAwareController
|
|
8
|
+
@success = Geokit::GeoLoc.new
|
|
9
|
+
@success.provider = "hostip"
|
|
10
|
+
@success.lat = 41.7696
|
|
11
|
+
@success.lng = -88.4588
|
|
12
|
+
@success.city = "Sugar Grove"
|
|
13
|
+
@success.state = "IL"
|
|
14
|
+
@success.country_code = "US"
|
|
15
|
+
@success.success = true
|
|
16
|
+
|
|
17
|
+
@failure = Geokit::GeoLoc.new
|
|
18
|
+
@failure.provider = "hostip"
|
|
19
|
+
@failure.city = "(Private Address)"
|
|
20
|
+
@failure.success = false
|
|
21
|
+
end
|
|
22
|
+
|
|
23
|
+
def test_no_location_in_cookie_or_session
|
|
24
|
+
Geokit::Geocoders::MultiGeocoder.expects(:geocode).with("good ip").returns(@success)
|
|
25
|
+
get '/'
|
|
26
|
+
assert_response :success
|
|
27
|
+
assert_equal @success, @request.session[:geo_location]
|
|
28
|
+
assert_not_nil cookies[:geo_location]
|
|
29
|
+
assert_equal @success.to_json, cookies[:geo_location]
|
|
30
|
+
end
|
|
31
|
+
|
|
32
|
+
def test_location_in_cookie
|
|
33
|
+
Geokit::Geocoders::MultiGeocoder.expects(:geocode).with('good ip')
|
|
34
|
+
.returns(@success)
|
|
35
|
+
get '/cookietest'
|
|
36
|
+
assert_not_nil cookies[:geo_location]
|
|
37
|
+
assert_equal @success.to_json, cookies[:geo_location]
|
|
38
|
+
end
|
|
39
|
+
|
|
40
|
+
def test_location_in_session
|
|
41
|
+
Geokit::Geocoders::MultiGeocoder.expects(:geocode).with('good ip')
|
|
42
|
+
.returns(@success)
|
|
43
|
+
get '/sessiontest'
|
|
44
|
+
assert_response :success
|
|
45
|
+
assert_equal @success, Geokit::GeoLoc.new(JSON.parse(session[:geo_location]).transform_keys(&:to_sym))
|
|
46
|
+
end
|
|
47
|
+
|
|
48
|
+
def test_ip_not_located
|
|
49
|
+
Geokit::Geocoders::MultiGeocoder.expects(:geocode).with("bad ip").returns(@failure)
|
|
50
|
+
get '/failtest'
|
|
51
|
+
assert_nil @request.session[:geo_location]
|
|
52
|
+
end
|
|
53
|
+
end
|
data/test/models/company.rb
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
class Company < ActiveRecord::Base
|
|
2
|
-
has_many :locations
|
|
1
|
+
class Company < ActiveRecord::Base
|
|
2
|
+
has_many :locations
|
|
3
3
|
end
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
class CustomLocation < ActiveRecord::Base
|
|
2
|
-
belongs_to :company
|
|
3
|
-
acts_as_mappable :distance_column_name => 'dist',
|
|
4
|
-
:default_units => :kms,
|
|
5
|
-
:default_formula => :flat,
|
|
6
|
-
:lat_column_name => 'latitude',
|
|
7
|
-
:lng_column_name => 'longitude'
|
|
8
|
-
|
|
9
|
-
def to_s
|
|
10
|
-
"lat: #{latitude} lng: #{longitude} dist: #{dist}"
|
|
11
|
-
end
|
|
1
|
+
class CustomLocation < ActiveRecord::Base
|
|
2
|
+
belongs_to :company
|
|
3
|
+
acts_as_mappable :distance_column_name => 'dist',
|
|
4
|
+
:default_units => :kms,
|
|
5
|
+
:default_formula => :flat,
|
|
6
|
+
:lat_column_name => 'latitude',
|
|
7
|
+
:lng_column_name => 'longitude'
|
|
8
|
+
|
|
9
|
+
def to_s
|
|
10
|
+
"lat: #{latitude} lng: #{longitude} dist: #{dist}"
|
|
11
|
+
end
|
|
12
12
|
end
|
data/test/models/location.rb
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
class Location < ActiveRecord::Base
|
|
2
|
-
belongs_to :company
|
|
3
|
-
acts_as_mappable
|
|
1
|
+
class Location < ActiveRecord::Base
|
|
2
|
+
belongs_to :company
|
|
3
|
+
acts_as_mappable
|
|
4
4
|
end
|
data/test/models/mock_address.rb
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
class MockAddress < ActiveRecord::Base
|
|
2
|
-
belongs_to :addressable, :polymorphic => true
|
|
3
|
-
acts_as_mappable
|
|
1
|
+
class MockAddress < ActiveRecord::Base
|
|
2
|
+
belongs_to :addressable, :polymorphic => true
|
|
3
|
+
acts_as_mappable
|
|
4
4
|
end
|
data/test/models/mock_family.rb
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
require 'models/mock_house'
|
|
2
|
-
|
|
3
|
-
class MockFamily < ActiveRecord::Base
|
|
4
|
-
belongs_to :mock_house
|
|
1
|
+
require 'models/mock_house'
|
|
2
|
+
|
|
3
|
+
class MockFamily < ActiveRecord::Base
|
|
4
|
+
belongs_to :mock_house
|
|
5
5
|
end
|
data/test/models/mock_house.rb
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
class MockHouse < ActiveRecord::Base
|
|
2
|
-
acts_as_mappable
|
|
1
|
+
class MockHouse < ActiveRecord::Base
|
|
2
|
+
acts_as_mappable
|
|
3
3
|
end
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
require 'models/mock_address'
|
|
2
|
-
|
|
3
|
-
class MockOrganization < ActiveRecord::Base
|
|
4
|
-
has_one :mock_address, :as => :addressable
|
|
5
|
-
acts_as_mappable :through => :mock_address
|
|
1
|
+
require 'models/mock_address'
|
|
2
|
+
|
|
3
|
+
class MockOrganization < ActiveRecord::Base
|
|
4
|
+
has_one :mock_address, :as => :addressable
|
|
5
|
+
acts_as_mappable :through => :mock_address
|
|
6
6
|
end
|
data/test/models/mock_person.rb
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
require 'models/mock_family'
|
|
2
|
-
require 'models/mock_house'
|
|
3
|
-
|
|
4
|
-
class MockPerson < ActiveRecord::Base
|
|
5
|
-
belongs_to :mock_family
|
|
6
|
-
acts_as_mappable :through => { :mock_family => :mock_house }
|
|
1
|
+
require 'models/mock_family'
|
|
2
|
+
require 'models/mock_house'
|
|
3
|
+
|
|
4
|
+
class MockPerson < ActiveRecord::Base
|
|
5
|
+
belongs_to :mock_family
|
|
6
|
+
acts_as_mappable :through => { :mock_family => :mock_house }
|
|
7
7
|
end
|
data/test/models/store.rb
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
class Store < ActiveRecord::Base
|
|
2
|
-
acts_as_mappable :auto_geocode => true
|
|
1
|
+
class Store < ActiveRecord::Base
|
|
2
|
+
acts_as_mappable :auto_geocode => true
|
|
3
3
|
end
|
data/test/schema.rb
CHANGED
|
@@ -1,61 +1,61 @@
|
|
|
1
|
-
ActiveRecord::Schema.define(:version => 0) do
|
|
2
|
-
create_table :companies, :force => true do |t|
|
|
3
|
-
t.column :name, :string
|
|
4
|
-
t.column :max_distance, :float
|
|
5
|
-
end
|
|
6
|
-
|
|
7
|
-
create_table :locations, :force => true do |t|
|
|
8
|
-
t.column :company_id, :integer, :default => 0, :null => false
|
|
9
|
-
t.column :street, :string, :limit => 60
|
|
10
|
-
t.column :city, :string, :limit => 60
|
|
11
|
-
t.column :state, :string, :limit => 2
|
|
12
|
-
t.column :postal_code, :string, :limit => 16
|
|
13
|
-
t.column :lat, :decimal, :precision => 15, :scale => 10
|
|
14
|
-
t.column :lng, :decimal, :precision => 15, :scale => 10
|
|
15
|
-
end
|
|
16
|
-
|
|
17
|
-
create_table :custom_locations, :force => true do |t|
|
|
18
|
-
t.column :company_id, :integer, :default => 0, :null => false
|
|
19
|
-
t.column :street, :string, :limit => 60
|
|
20
|
-
t.column :city, :string, :limit => 60
|
|
21
|
-
t.column :state, :string, :limit => 2
|
|
22
|
-
t.column :postal_code, :string, :limit => 16
|
|
23
|
-
t.column :latitude, :decimal, :precision => 15, :scale => 10
|
|
24
|
-
t.column :longitude, :decimal, :precision => 15, :scale => 10
|
|
25
|
-
end
|
|
26
|
-
|
|
27
|
-
create_table :stores, :force=> true do |t|
|
|
28
|
-
t.column :address, :string
|
|
29
|
-
t.column :lat, :decimal, :precision => 15, :scale => 10
|
|
30
|
-
t.column :lng, :decimal, :precision => 15, :scale => 10
|
|
31
|
-
end
|
|
32
|
-
|
|
33
|
-
create_table :mock_organizations, :force => true do |t|
|
|
34
|
-
t.column :name, :string
|
|
35
|
-
end
|
|
36
|
-
|
|
37
|
-
create_table :mock_addresses, :force => true do |t|
|
|
38
|
-
t.column :addressable_id, :integer, :null => false
|
|
39
|
-
t.column :addressable_type, :string, :null => false
|
|
40
|
-
t.column :street, :string, :limit => 60
|
|
41
|
-
t.column :city, :string, :limit => 60
|
|
42
|
-
t.column :state, :string, :limit => 2
|
|
43
|
-
t.column :postal_code, :string, :limit => 16
|
|
44
|
-
t.column :lat, :decimal, :precision => 15, :scale => 10
|
|
45
|
-
t.column :lng, :decimal, :precision => 15, :scale => 10
|
|
46
|
-
end
|
|
47
|
-
|
|
48
|
-
create_table :mock_houses, :force=> true do |t|
|
|
49
|
-
t.column :address, :string
|
|
50
|
-
t.column :lat, :decimal, :precision => 15, :scale => 10
|
|
51
|
-
t.column :lng, :decimal, :precision => 15, :scale => 10
|
|
52
|
-
end
|
|
53
|
-
|
|
54
|
-
create_table :mock_families, :force => true do |t|
|
|
55
|
-
t.belongs_to :mock_house
|
|
56
|
-
end
|
|
57
|
-
|
|
58
|
-
create_table :mock_people, :force => true do |t|
|
|
59
|
-
t.belongs_to :mock_family
|
|
60
|
-
end
|
|
61
|
-
end
|
|
1
|
+
ActiveRecord::Schema.define(:version => 0) do
|
|
2
|
+
create_table :companies, :force => true do |t|
|
|
3
|
+
t.column :name, :string
|
|
4
|
+
t.column :max_distance, :float
|
|
5
|
+
end
|
|
6
|
+
|
|
7
|
+
create_table :locations, :force => true do |t|
|
|
8
|
+
t.column :company_id, :integer, :default => 0, :null => false
|
|
9
|
+
t.column :street, :string, :limit => 60
|
|
10
|
+
t.column :city, :string, :limit => 60
|
|
11
|
+
t.column :state, :string, :limit => 2
|
|
12
|
+
t.column :postal_code, :string, :limit => 16
|
|
13
|
+
t.column :lat, :decimal, :precision => 15, :scale => 10
|
|
14
|
+
t.column :lng, :decimal, :precision => 15, :scale => 10
|
|
15
|
+
end
|
|
16
|
+
|
|
17
|
+
create_table :custom_locations, :force => true do |t|
|
|
18
|
+
t.column :company_id, :integer, :default => 0, :null => false
|
|
19
|
+
t.column :street, :string, :limit => 60
|
|
20
|
+
t.column :city, :string, :limit => 60
|
|
21
|
+
t.column :state, :string, :limit => 2
|
|
22
|
+
t.column :postal_code, :string, :limit => 16
|
|
23
|
+
t.column :latitude, :decimal, :precision => 15, :scale => 10
|
|
24
|
+
t.column :longitude, :decimal, :precision => 15, :scale => 10
|
|
25
|
+
end
|
|
26
|
+
|
|
27
|
+
create_table :stores, :force=> true do |t|
|
|
28
|
+
t.column :address, :string
|
|
29
|
+
t.column :lat, :decimal, :precision => 15, :scale => 10
|
|
30
|
+
t.column :lng, :decimal, :precision => 15, :scale => 10
|
|
31
|
+
end
|
|
32
|
+
|
|
33
|
+
create_table :mock_organizations, :force => true do |t|
|
|
34
|
+
t.column :name, :string
|
|
35
|
+
end
|
|
36
|
+
|
|
37
|
+
create_table :mock_addresses, :force => true do |t|
|
|
38
|
+
t.column :addressable_id, :integer, :null => false
|
|
39
|
+
t.column :addressable_type, :string, :null => false
|
|
40
|
+
t.column :street, :string, :limit => 60
|
|
41
|
+
t.column :city, :string, :limit => 60
|
|
42
|
+
t.column :state, :string, :limit => 2
|
|
43
|
+
t.column :postal_code, :string, :limit => 16
|
|
44
|
+
t.column :lat, :decimal, :precision => 15, :scale => 10
|
|
45
|
+
t.column :lng, :decimal, :precision => 15, :scale => 10
|
|
46
|
+
end
|
|
47
|
+
|
|
48
|
+
create_table :mock_houses, :force=> true do |t|
|
|
49
|
+
t.column :address, :string
|
|
50
|
+
t.column :lat, :decimal, :precision => 15, :scale => 10
|
|
51
|
+
t.column :lng, :decimal, :precision => 15, :scale => 10
|
|
52
|
+
end
|
|
53
|
+
|
|
54
|
+
create_table :mock_families, :force => true do |t|
|
|
55
|
+
t.belongs_to :mock_house
|
|
56
|
+
end
|
|
57
|
+
|
|
58
|
+
create_table :mock_people, :force => true do |t|
|
|
59
|
+
t.belongs_to :mock_family
|
|
60
|
+
end
|
|
61
|
+
end
|
data/test/tasks.rake
CHANGED
|
@@ -1,37 +1,37 @@
|
|
|
1
|
-
require 'rake/testtask'
|
|
2
|
-
|
|
3
|
-
class EnvTestTask < Rake::TestTask
|
|
4
|
-
attr_accessor :env
|
|
5
|
-
|
|
6
|
-
def ruby(*args)
|
|
7
|
-
env.each { |key, value| ENV[key] = value } if env
|
|
8
|
-
super
|
|
9
|
-
env.keys.each { |key| ENV.delete(key) } if env
|
|
10
|
-
end
|
|
11
|
-
|
|
12
|
-
end
|
|
13
|
-
|
|
14
|
-
desc 'Test the Geokit plugin.'
|
|
15
|
-
Rake::TestTask.new(:test) do |test|
|
|
16
|
-
test.libs << 'lib' << 'test'
|
|
17
|
-
test.pattern = 'test/*_test.rb'
|
|
18
|
-
test.verbose = true
|
|
19
|
-
end
|
|
20
|
-
|
|
21
|
-
%w(mysql postgresql sqlserver sqlite).each do |configuration|
|
|
22
|
-
EnvTestTask.new("test_#{configuration}") do |t|
|
|
23
|
-
t.pattern = 'test/*_test.rb'
|
|
24
|
-
t.verbose = true
|
|
25
|
-
t.env = { 'DB' => configuration }
|
|
26
|
-
t.libs << 'test'
|
|
27
|
-
end
|
|
28
|
-
end
|
|
29
|
-
|
|
30
|
-
desc 'Test available databases.'
|
|
31
|
-
task :test_databases => %w(test_mysql test_postgresql test_sqlserver test_sqlite)
|
|
32
|
-
|
|
33
|
-
desc "Generate SimpleCov test coverage and open in your browser"
|
|
34
|
-
task :coverage do
|
|
35
|
-
ENV['COVERAGE'] = 'true'
|
|
36
|
-
Rake::Task['test'].invoke
|
|
37
|
-
end
|
|
1
|
+
require 'rake/testtask'
|
|
2
|
+
|
|
3
|
+
class EnvTestTask < Rake::TestTask
|
|
4
|
+
attr_accessor :env
|
|
5
|
+
|
|
6
|
+
def ruby(*args)
|
|
7
|
+
env.each { |key, value| ENV[key] = value } if env
|
|
8
|
+
super
|
|
9
|
+
env.keys.each { |key| ENV.delete(key) } if env
|
|
10
|
+
end
|
|
11
|
+
|
|
12
|
+
end
|
|
13
|
+
|
|
14
|
+
desc 'Test the Geokit plugin.'
|
|
15
|
+
Rake::TestTask.new(:test) do |test|
|
|
16
|
+
test.libs << 'lib' << 'test'
|
|
17
|
+
test.pattern = 'test/*_test.rb'
|
|
18
|
+
test.verbose = true
|
|
19
|
+
end
|
|
20
|
+
|
|
21
|
+
%w(mysql postgresql sqlserver sqlite).each do |configuration|
|
|
22
|
+
EnvTestTask.new("test_#{configuration}") do |t|
|
|
23
|
+
t.pattern = 'test/*_test.rb'
|
|
24
|
+
t.verbose = true
|
|
25
|
+
t.env = { 'DB' => configuration }
|
|
26
|
+
t.libs << 'test'
|
|
27
|
+
end
|
|
28
|
+
end
|
|
29
|
+
|
|
30
|
+
desc 'Test available databases.'
|
|
31
|
+
task :test_databases => %w(test_mysql test_postgresql test_sqlserver test_sqlite)
|
|
32
|
+
|
|
33
|
+
desc "Generate SimpleCov test coverage and open in your browser"
|
|
34
|
+
task :coverage do
|
|
35
|
+
ENV['COVERAGE'] = 'true'
|
|
36
|
+
Rake::Task['test'].invoke
|
|
37
|
+
end
|