radiant-vapor-extension 2.1.3 → 2.1.4

data/README.md

@@ -1,4 +1,4 @@
-# Vapor
+# Vapor [![Build Status](https://secure.travis-ci.org/saturnflyer/radiant-vapor-extension.png?branch=master)](http://travis-ci.org/saturnflyer/radiant-vapor-extension)
 
 The Vapor extension provides an interface to redirect URLs. 
 

data/app/models/flow_meter.rb

@@ -125,7 +125,7 @@ class FlowMeter < ActiveRecord::Base
   end
   
   def clean_redirect_url
-    clean_url(:redirect_url) unless redirect_url.blank? or redirect_url.match('^http://')
+    clean_url(:redirect_url) unless redirect_url.blank? or redirect_url.match('^https?://')
   end
   
   def clean_url(att)

data/lib/radiant-vapor-extension.rb

@@ -1,5 +1,5 @@
 module RadiantVaporExtension
-  VERSION     = "2.1.3"
+  VERSION     = "2.1.4"
   SUMMARY     = "User managed redirects."
   DESCRIPTION = "User managed redirects."
   URL         = "http://saturnflyer.com/"

data/spec/models/flow_meter_spec.rb

@@ -95,6 +95,12 @@ describe FlowMeter do
     @flow_meter.redirect_url.should == 'http://www.saturnflyer.com/'
   end
 
+  it "should allow a redirect_url formatted like 'https://secure.saturnflyer.com/'" do
+    @flow_meter.redirect_url = 'https://secure.saturnflyer.com/'
+    @flow_meter.save!
+    @flow_meter.redirect_url.should == 'https://secure.saturnflyer.com/'
+  end
+
   it "should provide a catch_url_for_display which includes a leading slash" do
     @flow_meter.catch_url_for_display.should == '/stuff'
   end
@@ -108,6 +114,11 @@ describe FlowMeter do
     @flow_meter.redirect_url_for_display.should == "http://www.saturnflyer.com"
   end
 
+  it "should provide the actual redirect_url_for_display if it begins with 'https://'" do
+    @flow_meter.redirect_url = "https://secure.saturnflyer.com"
+    @flow_meter.redirect_url_for_display.should == "https://secure.saturnflyer.com"
+  end
+
   it "should err with 'Catch URL and Redirect URL may not be the same.' when given a catch_url that matches the redirect_url" do
     @flow_meter.redirect_url = "/stuff"
     lambda {@flow_meter.save!}.should raise_error(FlowMeter::DataMismatch, "Catch URL and Redirect URL may not be the same.")

metadata

@@ -1,33 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: radiant-vapor-extension
-version: !ruby/object:Gem::Version 
-  hash: 13
+version: !ruby/object:Gem::Version
+  version: 2.1.4
   prerelease: 
-  segments: 
-  - 2
-  - 1
-  - 3
-  version: 2.1.3
 platform: ruby
-authors: 
+authors:
 - Jim Gay
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-09 00:00:00 Z
+date: 2012-05-10 00:00:00.000000000 Z
 dependencies: []
-
 description: User managed redirects.
-email: 
+email:
 - jim@saturnflyer.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - app/controllers/admin/flow_meters_controller.rb
 - app/helpers/admin/flow_meters_helper.rb
 - app/helpers/admin/page_node_alterations_helper.rb
@@ -65,38 +55,29 @@ files:
 - VERSION
 homepage: http://saturnflyer.com/
 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 
-      hash: 3
-      segments: 
-      - 0
-      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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: User managed redirects.
-test_files: 
+test_files:
 - test/test_helper.rb
 - spec/ci/before_script
 - spec/ci/script