rails_adserver 1.0.0 → 1.0.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. data/app/models/rails_adserver/advertisement.rb +3 -3
  2. data/lib/rails_adserver/version.rb +1 -1
  3. data/test/dummy/db/development.sqlite3 +0 -0
  4. data/test/dummy/log/development.log +36 -0
  5. metadata +17 -17
data/app/models/rails_adserver/advertisement.rb CHANGED
@@ -91,15 +91,15 @@ module RailsAdserver
91
91
  id = ad_ids[rand(ad_ids.length)]
92
92
  end
93
93
  def self.geo_city(city)
94
- ad_ids = self.where("city_name = ? AND is_active = ?", city, true).map(&:id)
94
+ ad_ids = self.where("city_name = ? AND is_active = ? AND geolocation_boolean = ?", city, true,true).map(&:id)
95
95
  id = ad_ids[rand(ad_ids.length)]
96
96
  end
97
97
  def self.geo_state(state)
98
- ad_ids = self.where("state_name = ? AND city_name = ? AND is_active = ?", state, nil, true).map(&:id)
98
+ ad_ids = self.where("state_name = ? AND city_name = ? AND is_active = ? AND geolocation_boolean = ?", state, nil, true, true).map(&:id)
99
99
  id = ad_ids[rand(ad_ids.length)]
100
100
  end
101
101
  def self.geo_country(country)
102
- ad_ids = self.where("country_name = ? AND state_name = ? AND city_name = ? AND is_active = ?", country, nil, nil, true).map(&:id)
102
+ ad_ids = self.where("country_name = ? AND state_name = ? AND city_name = ? AND is_active = ? AND geolocation_boolean = ?", country, nil, nil, true, true).map(&:id)
103
103
  id = ad_ids[rand(ad_ids.length)]
104
104
  end
105
105
  def self.backup_ad
data/lib/rails_adserver/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module RailsAdserver
2
- VERSION = "1.0.0"
2
+ VERSION = "1.0.1"
3
3
  end
data/test/dummy/db/development.sqlite3 CHANGED
Binary file
data/test/dummy/log/development.log CHANGED
@@ -26489,3 +26489,39 @@ Processing by RailsAdserver::AdvertisementsController#ad_space as HTML
26489
26489
  RailsAdserver::Advertisement Load (0.2ms) SELECT "rails_adserver_advertisements".* FROM "rails_adserver_advertisements" WHERE "rails_adserver_advertisements"."id" = ? LIMIT 1 [["id", 1]]
26490
26490
  Rendered /Users/thomasmuntaner/Desktop/Projects/Websites/adserver/app/views/rails_adserver/advertisements/_advertisement.html.haml (1.5ms)
26491
26491
  Completed 200 OK in 711ms (Views: 4.3ms | ActiveRecord: 6.2ms)
26492
+
26493
+
26494
+ Started GET "/rails_adserver/ad/space/1" for 127.0.0.1 at 2012-03-28 15:27:10 -0500
26495
+ DEPRECATION WARNING: ActiveSupport::Memoizable is deprecated and will be removed in future releases,simply use Ruby memoization pattern instead. (called from <class:Advertisement> at /Users/thomasmuntaner/Desktop/Projects/Websites/adserver/app/models/rails_adserver/advertisement.rb:5)
26496
+ Processing by RailsAdserver::AdvertisementsController#ad_space as HTML
26497
+ Parameters: {"adspace_id"=>"1"}
26498
+ RailsAdserver::Adspace Load (21.6ms) SELECT "rails_adserver_adspaces".* FROM "rails_adserver_adspaces" WHERE "rails_adserver_adspaces"."id" = ? LIMIT 1 [["id", "1"]]
26499
+ RailsAdserver::Advertisement Load (0.3ms) SELECT "rails_adserver_advertisements".* FROM "rails_adserver_advertisements" WHERE "rails_adserver_advertisements"."adspace_id" = 1 AND (city_name = NULL AND is_active = 't' AND geolocation_boolean = 't')
26500
+ RailsAdserver::Advertisement Load (0.4ms) SELECT "rails_adserver_advertisements".* FROM "rails_adserver_advertisements" WHERE "rails_adserver_advertisements"."adspace_id" = 1 AND (state_name = NULL AND city_name = NULL AND is_active = 't' AND geolocation_boolean = 't')
26501
+ RailsAdserver::Advertisement Load (0.6ms) SELECT "rails_adserver_advertisements".* FROM "rails_adserver_advertisements" WHERE "rails_adserver_advertisements"."adspace_id" = 1 AND (country_name = NULL AND state_name = NULL AND city_name = NULL AND is_active = 't' AND geolocation_boolean = 't')
26502
+ RailsAdserver::Advertisement Load (16.6ms) SELECT "rails_adserver_advertisements".* FROM "rails_adserver_advertisements" WHERE "rails_adserver_advertisements"."adspace_id" = 1 AND (is_active = 't' AND parameter_restriction_boolean = 'f' AND geolocation_boolean = 'f' AND backup = 'f')
26503
+ RailsAdserver::Advertisement Load (0.4ms) SELECT "rails_adserver_advertisements".* FROM "rails_adserver_advertisements" WHERE "rails_adserver_advertisements"."id" = ? LIMIT 1 [["id", 1]]
26504
+  (0.1ms) begin transaction
26505
+  (0.8ms) UPDATE "rails_adserver_advertisements" SET "impressions_count" = 27, "updated_at" = '2012-03-28 20:27:12.900161' WHERE "rails_adserver_advertisements"."id" = 1
26506
+  (1.8ms) commit transaction
26507
+ RailsAdserver::Advertisement Load (0.3ms) SELECT "rails_adserver_advertisements".* FROM "rails_adserver_advertisements" WHERE "rails_adserver_advertisements"."id" = ? LIMIT 1 [["id", 1]]
26508
+ Rendered /Users/thomasmuntaner/Desktop/Projects/Websites/adserver/app/views/rails_adserver/advertisements/_advertisement.html.haml (26.6ms)
26509
+ Completed 200 OK in 2663ms (Views: 91.3ms | ActiveRecord: 47.6ms)
26510
+
26511
+
26512
+ Started GET "/rails_adserver/ad/space/1/param/1" for 127.0.0.1 at 2012-03-28 15:27:28 -0500
26513
+ Processing by RailsAdserver::AdvertisementsController#ad_param as HTML
26514
+ Parameters: {"adspace_id"=>"1", "id"=>"1"}
26515
+ RailsAdserver::Adspace Load (0.3ms) SELECT "rails_adserver_adspaces".* FROM "rails_adserver_adspaces" WHERE "rails_adserver_adspaces"."id" = ? LIMIT 1 [["id", "1"]]
26516
+ RailsAdserver::Advertisement Load (11.6ms) SELECT "rails_adserver_advertisements".* FROM "rails_adserver_advertisements" WHERE "rails_adserver_advertisements"."adspace_id" = 1 AND (is_active = 't' AND param_restriction = '1' AND backup = 'f')
26517
+ RailsAdserver::Advertisement Load (0.4ms) SELECT "rails_adserver_advertisements".* FROM "rails_adserver_advertisements" WHERE "rails_adserver_advertisements"."adspace_id" = 1 AND (city_name = NULL AND is_active = 't' AND geolocation_boolean = 't')
26518
+ RailsAdserver::Advertisement Load (0.3ms) SELECT "rails_adserver_advertisements".* FROM "rails_adserver_advertisements" WHERE "rails_adserver_advertisements"."adspace_id" = 1 AND (state_name = NULL AND city_name = NULL AND is_active = 't' AND geolocation_boolean = 't')
26519
+ RailsAdserver::Advertisement Load (0.3ms) SELECT "rails_adserver_advertisements".* FROM "rails_adserver_advertisements" WHERE "rails_adserver_advertisements"."adspace_id" = 1 AND (country_name = NULL AND state_name = NULL AND city_name = NULL AND is_active = 't' AND geolocation_boolean = 't')
26520
+ RailsAdserver::Advertisement Load (0.3ms) SELECT "rails_adserver_advertisements".* FROM "rails_adserver_advertisements" WHERE "rails_adserver_advertisements"."adspace_id" = 1 AND (is_active = 't' AND parameter_restriction_boolean = 'f' AND geolocation_boolean = 'f' AND backup = 'f')
26521
+ RailsAdserver::Advertisement Load (0.2ms) SELECT "rails_adserver_advertisements".* FROM "rails_adserver_advertisements" WHERE "rails_adserver_advertisements"."id" = ? LIMIT 1 [["id", 1]]
26522
+  (0.1ms) begin transaction
26523
+  (0.5ms) UPDATE "rails_adserver_advertisements" SET "impressions_count" = 28, "updated_at" = '2012-03-28 20:27:28.598237' WHERE "rails_adserver_advertisements"."id" = 1
26524
+  (2.4ms) commit transaction
26525
+ RailsAdserver::Advertisement Load (0.2ms) SELECT "rails_adserver_advertisements".* FROM "rails_adserver_advertisements" WHERE "rails_adserver_advertisements"."id" = ? LIMIT 1 [["id", 1]]
26526
+ Rendered /Users/thomasmuntaner/Desktop/Projects/Websites/adserver/app/views/rails_adserver/advertisements/_advertisement.html.haml (2.1ms)
26527
+ Completed 200 OK in 581ms (Views: 4.5ms | ActiveRecord: 16.6ms)
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rails_adserver
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0
4
+ version: 1.0.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-03-28 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &70216967855740 !ruby/object:Gem::Requirement
16
+ requirement: &70272474199220 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 3.2.1
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70216967855740
24
+ version_requirements: *70272474199220
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: haml
27
- requirement: &70216967855240 !ruby/object:Gem::Requirement
27
+ requirement: &70272474198800 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70216967855240
35
+ version_requirements: *70272474198800
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: coffee-script
38
- requirement: &70216967854620 !ruby/object:Gem::Requirement
38
+ requirement: &70272474198340 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70216967854620
46
+ version_requirements: *70272474198340
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: carrierwave
49
- requirement: &70216967854120 !ruby/object:Gem::Requirement
49
+ requirement: &70272474197920 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70216967854120
57
+ version_requirements: *70272474197920
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: geokit
60
- requirement: &70216967853600 !ruby/object:Gem::Requirement
60
+ requirement: &70272474197500 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *70216967853600
68
+ version_requirements: *70272474197500
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: devise
71
- requirement: &70216967852920 !ruby/object:Gem::Requirement
71
+ requirement: &70272474197080 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *70216967852920
79
+ version_requirements: *70272474197080
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: sqlite3
82
- requirement: &70216967852480 !ruby/object:Gem::Requirement
82
+ requirement: &70272474196660 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
87
87
  version: '0'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *70216967852480
90
+ version_requirements: *70272474196660
91
91
  description: An adserver for rails
92
92
  email:
93
93
  - thomas.muntaner@gmail.com
@@ -281,7 +281,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
281
281
  version: '0'
282
282
  segments:
283
283
  - 0
284
- hash: 463402131044494372
284
+ hash: -4108443185933869331
285
285
  required_rubygems_version: !ruby/object:Gem::Requirement
286
286
  none: false
287
287
  requirements:
@@ -290,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
290
290
  version: '0'
291
291
  segments:
292
292
  - 0
293
- hash: 463402131044494372
293
+ hash: -4108443185933869331
294
294
  requirements: []
295
295
  rubyforge_project:
296
296
  rubygems_version: 1.8.15