pco-url 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffffc4ec52600a23d033d2b75f4a7f0bc74db900
-  data.tar.gz: 7cd6fae8170dc6493aaffc2ad12ad776142cefcc
+  metadata.gz: 1a6bcb896c6899ae3d2c38e9e6f0bdf3a4101a38
+  data.tar.gz: de4d8e15837e4d36336f8abdd69f26d588cf2683
 SHA512:
-  metadata.gz: fffaf131fa4586c17340d679e0545a314167dea60c1c027cac95b87ef0ad663295259e89d5a61b6fba0e337f96febd86e3ac6c49b64aecfffbf02dfa1f101c09
-  data.tar.gz: 67595608b41b2d9ea1493dac83bb938986f5def9834b6a6dd5328017bb4f59b4847068cce870b310f69907dc5f80a8ce46725c21010494d38457be4660924f8d
+  metadata.gz: 13b1f0a753ad9d5fdd13833f036101d0b852b94548e62c4a9c984cfa60b8a1f88d61b48333dcd9b953a2680f7f9ff260ca57183368937f96abeca51f2ff754a5
+  data.tar.gz: 6f4d1334ab40d917974c7c0a55c6a50f66d4d13a8d3d9899ac03c48ebbeb7e767c82836be2688352feb27b700df560efd6589be78de038ba78fe63dd1c43ee2f

data/README.md

@@ -32,3 +32,18 @@ PCO::URL.accounts
 PCO::URL.services
 # => "https://services-staging.planningcenteronline.com"
 ```
+
+
+You can also specify the path:
+
+
+```ruby
+PCO::URL.accounts("/test")
+# => "https://accounts-test1.planningcenteronline.com/test"
+
+PCO::URL.accounts("test")
+# => "https://accounts-test1.planningcenteronline.com/test"
+
+PCO::URL.accounts("test", "working")
+# => "https://accounts-test1.planningcenteronline.com/test/working"
+```

data/lib/pco/url.rb

@@ -1,15 +1,12 @@
 require "pco/url/version"
+require 'uri'
 
 module PCO
   class URL
 
     class << self
-      def method_missing(method_name)
-        app_name = method_name.to_s.gsub("_", "-")
-        env_var  = method_name.to_s.upcase + "_URL"
-
-        # Try "CHECK_INS_URL" then url_for_app("check-ins")
-        ENV[env_var] || url_for_app(app_name)
+      def method_missing(method_name, *args)
+        url_for_app_with_path(method_name, args)
       end
 
       private
@@ -18,7 +15,22 @@ module PCO
         ENV["DEPLOY_ENV"] || Rails.env
       end
 
+      def env_url(app_name)
+        env_var  = app_name.to_s.upcase + "_URL"
+        ENV[env_var]
+      end
+
+      def url_for_app_with_path(app_name, paths)
+        path = paths.map { |p| p.sub(/\A\/+/, "").sub(/\/+\Z/, "") }.join("/")
+
+        URI::join(url_for_app(app_name), path).to_s
+      end
+
       def url_for_app(app_name)
+        # Try "CHECK_INS_URL" then url_for_app("check-ins")
+        return env_url(app_name) if env_url(app_name)
+
+        app_name = app_name.to_s.gsub("_", "-")
         case env
         when "production"
           "https://#{app_name}.planningcenteronline.com"

data/lib/pco/url/version.rb

@@ -1,5 +1,5 @@
 module PCO
   class URL
-    VERSION = "1.2.0"
+    VERSION = "1.3.0"
   end
 end

data/spec/pco_url_spec.rb

@@ -61,6 +61,35 @@ describe PCO::URL do
     end
   end
 
+  context "with path starting with /" do
+    Applications.map(&:to_s).each do |app|
+      it "has an #{app} URL with path" do
+        expect(PCO::URL.send(app, "/test")).to eq("http://#{app.gsub('_','-')}.pco.test/test")
+      end
+    end
+  end
+
+  context "with path NOT starting with /" do
+    Applications.map(&:to_s).each do |app|
+      it "has an #{app} URL with path" do
+        expect(PCO::URL.send(app, "test")).to eq("http://#{app.gsub('_','-')}.pco.test/test")
+      end
+    end
+  end
+
+  context "with multiple path arguments" do
+    Applications.map(&:to_s).each do |app|
+      it "has an #{app} URL with path" do
+        expect(PCO::URL.send(app, "test", "test2")).to eq("http://#{app.gsub('_','-')}.pco.test/test/test2")
+        expect(PCO::URL.send(app, "test/", "test2")).to eq("http://#{app.gsub('_','-')}.pco.test/test/test2")
+        expect(PCO::URL.send(app, "test", "/test2")).to eq("http://#{app.gsub('_','-')}.pco.test/test/test2")
+        expect(PCO::URL.send(app, "/test/", "test2")).to eq("http://#{app.gsub('_','-')}.pco.test/test/test2")
+        expect(PCO::URL.send(app, "/test/test2")).to eq("http://#{app.gsub('_','-')}.pco.test/test/test2")
+      end
+    end
+  end
+
+
   describe "overrides" do
     describe "development with accounts URL override" do
       before do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pco-url
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - James Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Generate URLs for app PCO apps in all environments