ads-rails 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc4f63f20c74be0fb202c8f2080a6535511817eb
-  data.tar.gz: f092e62afffb675fa03fa1458c98e362f791a096
+  metadata.gz: a6d0f1ea9b9cf2d98de998c96c7bc067ede2a5eb
+  data.tar.gz: bd3590f80b3df8bc83dea55648e4ad5a385214ed
 SHA512:
-  metadata.gz: 0e5193606f4a9b161f70d5ebdc7392d8e17168f2570a7ce132ceae573f2cff1fcd0b39cb88e79e599cd90be269f8c360880f2d8abfdef02825661f93fd339495
-  data.tar.gz: 7b5e21dcace910806ef42be1874fb4bc32d29445dbaa7fd37861624d3254871ccbcdd87fc9e439fa612f15435d857a8f34a259eb6db60fd03df19c58be349295
+  metadata.gz: 51c79f5d902a01fe0e7beed9338e9ea7a2c351f3068c425f1218f9917858023059941dbb458420138556a098f942bd420fb7927d833260e29f7218350a772b32
+  data.tar.gz: a136d30c1b8cf4db5c8f1cd90f61a39163a685ea9f7f092b9bbfed58f96c689ddc4b942342ee9b50490f8dac53fa7ccf1e8d4b10166fbb750f78c11e79d60ca1

data/README.rdoc

@@ -17,7 +17,7 @@ Then bundle:
 In your view add a line like this wherever you like:
   <%= google_adsense_include_tag client: 'client', slot: 'slot', width: 'width', height: 'height' %>
 
-(Will only show the include tag in production and test env)
+(Will only show the include tag in production unless renderer has been set)
 
 = Configuration
 

data/lib/ads/rails/action_view/base.rb

@@ -5,7 +5,9 @@ module Ads
 
         def google_adsense_include_tag(*args)
           options = args.extract_options!
-          if ['production','test'].include? ::Rails.env
+          if ::Rails.application.config.ads.renderer.is_a? Proc
+            instance_exec(options, &::Rails.application.config.ads.renderer)
+          elsif ::Rails.env.production?
             script = <<-SCRIPT
               google_ad_client = '#{options[:client]}';
               google_ad_slot = '#{options[:slot]}'; 
@@ -13,13 +15,9 @@ module Ads
               google_ad_height = #{options[:height]};
             SCRIPT
             content_tag(:script, script.html_safe, type: 'text/javascript') +
-            content_tag(:script, nil, type: 'text/javascript', src: 'http://pagead2.googlesyndication.com/pagead/show_ads.js')
-          elsif ::Rails.env.development?
-            if ::Rails.application.config.ads.renderer.is_a? Proc
-              instance_exec(options, &::Rails.application.config.ads.renderer)
-            else
-              content_tag(:div, nil, style: "width:#{options[:width]}px;height:#{options[:height]}px;background:#c8c8c8;")
-            end
+            content_tag(:script, nil, type: 'text/javascript', src: "#{request.protocol}pagead2.googlesyndication.com/pagead/show_ads.js")
+          else
+            content_tag(:div, nil, style: "width:#{options[:width]}px;height:#{options[:height]}px;background:#c8c8c8;")
           end
         end
 

data/lib/ads/rails/version.rb

@@ -1,7 +1,7 @@
 module Ads
   module Rails
 
-    VERSION = '0.0.5'
+    VERSION = '0.0.6'
 
   end
 end

data/test/dummy/log/test.log

@@ -20,3 +20,16 @@ Processing by PagesController#index as HTML
   Rendered pages/index.html.erb within layouts/application (1.1ms)
 Completed 200 OK in 86ms (Views: 85.9ms | ActiveRecord: 0.0ms)
    (0.1ms)  rollback transaction
+   (0.3ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.2ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (0.1ms)  begin transaction
+--------------------------------------------
+IncludeTagTest: test_should_show_include_tag
+--------------------------------------------
+Started GET "/" for 127.0.0.1 at 2013-10-21 08:58:45 -0200
+Processing by PagesController#index as HTML
+  Rendered pages/index.html.erb within layouts/application (21.1ms)
+Completed 200 OK in 66ms (Views: 65.3ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction

data/test/include_tag_test.rb

@@ -5,7 +5,6 @@ class IncludeTagTest < ActionDispatch::IntegrationTest
   test "should show include tag" do
     get '/'
     assert_response :success
-    assert response.body.include?("google_ad_client = 'client'")
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ads-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Mattways
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-19 00:00:00.000000000 Z
+date: 2013-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails