pco-url 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be3eb46f919cb623fbb6232e443ab60a6313c84a
-  data.tar.gz: 9b18a5461d22051ea2922280b96413b2419a79c4
+  metadata.gz: 004aee9017d42a66e9eeeef2365c6dfc033f966b
+  data.tar.gz: 6353fd59875302f9849ed3c6821a5607e19c78cf
 SHA512:
-  metadata.gz: 25db8d4fe497d0cabf40702822877b6528fdf9c9da48a49e004541077bdae1154fe2a2732caa98276ffcfe3855df63a54352e1b1e56dd0c4287405cb97a709e2
-  data.tar.gz: 073305bdf03bccc3d17ce0d6ed8ab83ff685a34ec3714fed009ee3f321de61db96742f3649f0b4dc2cefc7eebe0b66c07d0bf739788fe04469de263999142720
+  metadata.gz: dcc5a0eb716b9677104abcbf3ad42728205edbb68f661214993d7223a861d87b7a0b2093b94aa18b700f27b4d4cae7c38c961266b8bb1d024c2a107c416f6c27
+  data.tar.gz: 7625c45373ef6139fa8dad3934615ac54b808ef9a6f0719e8c416c37bddd58815cab1f2328e803a5f6536342b166e93b53d0b7b3c3e9dbb05aaf16e4b26a770a

data/lib/pco/url/version.rb

@@ -1,5 +1,5 @@
 module PCO
   class URL
-    VERSION = "1.5.0"
+    VERSION = "1.6.0"
   end
 end

data/lib/pco/url.rb

@@ -47,9 +47,10 @@ module PCO
     attr_reader :path
     attr_reader :query
 
-    def initialize(app_name:, path: nil, query: nil, encrypt_query_params: false)
+    def initialize(app_name:, path: nil, query: nil, encrypt_query_params: false, domain: nil)
       @app_name = app_name.to_s.gsub("_", "-")
       @path     = path
+      @domain   = domain
 
       @path = @path[1..-1] if @path && @path[0] == "/"
 
@@ -70,25 +71,34 @@ module PCO
       end
     end
 
+    def domain
+      return @domain if @domain
+
+      case env
+      when "production", "staging"
+        "planningcenteronline.com"
+      when "development"
+        "pco.dev"
+      when "test"
+        "pco.test"
+      end
+    end
+
     def hostname
       # Try "CHECK_INS_URL" then url_for_app("check-ins")
       return env_overridden_hostname.split("://")[1] if env_overridden_hostname
 
       case env
-      when "production"
-        "#{@app_name}.planningcenteronline.com"
       when "staging"
-        "#{@app_name}-staging.planningcenteronline.com"
-      when "development"
-        "#{@app_name}.pco.dev"
-      when "test"
-        "#{@app_name}.pco.test"
+        "#{app_name}-staging.#{domain}"
+      else
+        "#{app_name}.#{domain}"
       end
     end
 
     def uri
-      query = @query ? "?#{@query}" : nil
-      url_string = "#{scheme}://#{hostname}/#{@path}#{query}".sub(/(\/)+$/,'')
+      q = query ? "?#{query}" : nil
+      url_string = "#{scheme}://#{hostname}/#{path}#{q}".sub(/(\/)+$/,'')
       URI(url_string)
     end
 
@@ -103,7 +113,7 @@ module PCO
     end
 
     def env_overridden_hostname
-      env_var = @app_name.to_s.upcase + "_URL"
+      env_var = app_name.to_s.upcase + "_URL"
       ENV[env_var]
     end
   end

data/spec/pco_url_spec.rb

@@ -66,6 +66,12 @@ describe PCO::URL do
     end
   end
 
+  describe "custom domains" do
+    it "returns a URL with a custom domain" do
+      expect(PCO::URL.new(app_name: "us-east", domain: "pcocdn.com").to_s).to eq("http://us-east.pcocdn.com")
+    end
+  end
+
   context "with path starting with /" do
     Applications.map(&:to_s).each do |app|
       it "has an #{app} URL with path" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pco-url
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - James Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: urlcrypt