page_speed 0.1.4 → 0.1.5

data/.travis.yml

@@ -0,0 +1,5 @@
+rvm:
+  - 1.8.7
+  - 1.8.7-ree # (current default)
+  - 1.9.2
+script: "bundle exec rspec spec/"

data/lib/page_speed.rb

@@ -1,7 +1,16 @@
 require "page_speed/version"
 
-require 'json'
 require 'open-uri'
+require 'json' unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
+
+# Hack that allows us to avoid certification validations in Ruby Enterprise Editions
+require 'openssl'
+module OpenSSL
+  module SSL
+    remove_const :VERIFY_PEER
+  end
+end
+OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
 
 API_URL = "https://www.googleapis.com/pagespeedonline/v1/runPagespeed"
 
@@ -23,7 +32,6 @@ module PageSpeed
 
       rescue OpenURI::HTTPError
         puts "The API you used is not correct. Use the -k option to replace it."
-        puts ""
         reset_api_key
         help
 
@@ -63,7 +71,8 @@ module PageSpeed
       begin
         get_api_key
         true
-      rescue Exception
+      rescue Exception => e
+        p e
         false
       end
     end
@@ -120,12 +129,8 @@ module PageSpeed
     end
 
     def api_key_path
-      dir = testing ? "/tmp" : File.expand_path("~")
-      dir + "/.page_speed"
-    end
-
-    def testing
-      ! defined?(ENV['page_speed_env']).nil? && ENV['page_speed_env'] == "test"
+      folder = ENV["TESTING"] ? "/tmp" : "~"
+      File.expand_path("#{folder}/.page_speed")
     end
   end
 end

data/lib/page_speed/version.rb

@@ -1,3 +1,3 @@
 module PageSpeed
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/page_speed.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
-  s.add_development_dependency "rspec", "2.3.0"
-  s.add_development_dependency "ZenTest", "4.4.2"
+  s.add_dependency "json"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "ZenTest"
 end

data/spec/integration/page_speed_spec.rb

@@ -1,11 +1,12 @@
 require 'spec_helper'
 
-ENV['page_speed_env'] = "test"
 API_KEY = "AIzaSyCT0PgAW-FjLF0Nfx81DqU6laCSiXkIHFs"
+TMP_FILE = "/tmp/.page_speed"
 
 describe PageSpeed do
   before do
-    File.open("/tmp/.page_speed", 'w') {|f| f.write(API_KEY) } # Use a correct API KEY
+    ENV["TESTING"] = "TRUE"
+    File.open(TMP_FILE, 'w') {|f| f.write(API_KEY) } # Use a correct API KEY
   end
 
   it "should point to help when no parameter is provided" do
@@ -51,7 +52,7 @@ describe PageSpeed do
 
     it "should success with a URL without www" do
       result = `bin/page_speed google.com`
-      result.should include("Google Page Speed for http://google.com: 98 (Desktop) / 96 (Mobile)")
+      result.should include("Google Page Speed for http://google.com: 98 (Desktop) / 97 (Mobile)")
     end
 
     it "should success with a URL with www" do
@@ -62,14 +63,14 @@ describe PageSpeed do
 
   context "API key control" do
     it "should prompt the API key when is not found" do
-      File.delete("/tmp/.page_speed")
+      File.delete(TMP_FILE)
       result = `bin/page_speed google.com`
       result.should include("PI key not set. Use the -k option to set the key.")
     end
 
     context "when API key is corrupted" do
       before do
-        File.open("/tmp/.page_speed", 'w') {|f| f.write(API_KEY.chop) } # Use a corrupt API KEY
+        File.open(TMP_FILE, 'w') {|f| f.write(API_KEY.chop) } # Use a corrupt API KEY
         @result = `bin/page_speed google.com`
       end
 
@@ -79,12 +80,31 @@ describe PageSpeed do
 
       it "should have deleted the file where the API key is and ask for a new one" do
         @result = `bin/page_speed google.com`
-        @result.should include("PI key not set. Use the -k option to set the key.")
+        @result.should include("API key not set. Use the -k option to set the key.")
+      end
+
+      it "should have indeed deleted the file" do
+        @result = `bin/page_speed google.com`
+        File.exists?(TMP_FILE).should == false
       end
     end
   end
 
   context "key" do
+    before do
+      @result = `bin/page_speed -k DO_THE_CUCA`
+    end
+
+    it "should be set and the user should get feedback" do
+      @result.should include("API key set.")
+    end
+
+    it "should be correctly set" do
+      PageSpeed::get_api_key.should == "DO_THE_CUCA"
+    end
+  end
 
+  after do
+    File.delete(TMP_FILE) if File.exists?(TMP_FILE)
   end
 end

metadata

@@ -1,53 +1,60 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: page_speed
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.5
   prerelease: 
-  version: 0.1.4
 platform: ruby
-authors: 
+authors:
 - Albert Bellonch
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-26 00:00:00 +02:00
-default_executable: page_speed
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
+date: 2011-10-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70151869961940 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *70151869961940
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70151869959960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 2.3.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ZenTest
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70151869959960
+- !ruby/object:Gem::Dependency
+  name: ZenTest
+  requirement: &70151869959460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 4.4.2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-description: "-"
-email: 
+  prerelease: false
+  version_requirements: *70151869959460
+description: ! '-'
+email:
 - albert@itnig.net
-executables: 
+executables:
 - page_speed
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
-- .rvmrc
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -57,34 +64,30 @@ files:
 - page_speed.gemspec
 - spec/integration/page_speed_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://itnig.net
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: page_speed
-rubygems_version: 1.6.1
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A simple port for Google Page Speed's scores
-test_files: 
+test_files:
 - spec/integration/page_speed_spec.rb
 - spec/spec_helper.rb

data/.rvmrc

@@ -1 +0,0 @@
-rvm 1.9.2rvm 1.9.2