pco-url 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 004aee9017d42a66e9eeeef2365c6dfc033f966b
-  data.tar.gz: 6353fd59875302f9849ed3c6821a5607e19c78cf
+  metadata.gz: 8cd5c1701dc11bca36cd95692deaf7890af3d5ec
+  data.tar.gz: 5cd53a34ae90fcad2937255cdc6150d678fb9f3e
 SHA512:
-  metadata.gz: dcc5a0eb716b9677104abcbf3ad42728205edbb68f661214993d7223a861d87b7a0b2093b94aa18b700f27b4d4cae7c38c961266b8bb1d024c2a107c416f6c27
-  data.tar.gz: 7625c45373ef6139fa8dad3934615ac54b808ef9a6f0719e8c416c37bddd58815cab1f2328e803a5f6536342b166e93b53d0b7b3c3e9dbb05aaf16e4b26a770a
+  metadata.gz: c1e1eaa9547e8dae3ff58e8e09d7ef7b4f5e9a114283603c99830ba80152b9b68dc8ea9c193df491a9323160d31cb8741af4f3c6488a2126d8e26c5b3906a048
+  data.tar.gz: 6804c37316401818e169d6bddd145c12f9076289667dfb661c3a5d80d6bc5355de522c9fbd2cbae313a27c7c0505db711ac6dd41a23cead682bf53165ce09265

data/.editorconfig

@@ -0,0 +1,10 @@
+# editorconfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+charset = utf-8
+insert_final_newline = true
+trim_trailing_whitespace = true

data/.rubocop.yml

@@ -0,0 +1,12 @@
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: double_quotes
+
+Metrics/LineLength:
+  Max: 120
+
+Style/Documentation:
+  Enabled: false
+
+Style/SingleSpaceBeforeFirstArg:
+  Enabled: false

data/lib/pco/url.rb

@@ -1,4 +1,6 @@
-require "pco/url/version"
+require_relative "url/version"
+require_relative "url/church_center"
+require_relative "url/get"
 require "uri"
 require "URLcrypt"
 
@@ -10,32 +12,37 @@ module PCO
       end
 
       def parse(string)
-        if uri = URI.parse(string)
+        if (uri = URI.parse(string))
           app_name = uri.host.match(/(\w+)(-staging)?/)[1]
 
           if uri.query
-            if encrypted_part = encrypted_query_string(uri.query)
+            if (encrypted_part = encrypted_query_string(uri.query))
               uri.query.sub!("_e=#{encrypted_part}", decrypt_query_params(encrypted_part))
             end
           end
 
           new(app_name: app_name, path: uri.path, query: uri.query)
         else
-          raise InvalidPCOURLString, "Unrecognized PCO::URL url string"
+          fail InvalidPCOURLString, "Unrecognized PCO::URL url string"
         end
       end
 
       def method_missing(method_name, *args)
-        path = args.map { |p| p.sub(/\A\/+/, "").sub(/\/+\Z/, "") }.join("/")
-        new(app_name: method_name, path: path).to_s
+        path = args.map { |p| p.sub(%r{\A/+}, "").sub(%r{/+\Z}, "") }.join("/")
+        case method_name
+        when :church_center
+          PCO::URL::ChurchCenter.new(path: path).to_s
+        when :get
+          PCO::URL::Get.new(path: path).to_s
+        else
+          new(app_name: method_name, path: path).to_s
+        end
       end
 
       private
 
       def encrypted_query_string(query_params)
-        if query_params =~ encrypted_params_regex
-          Regexp.last_match(:param)
-        end
+        Regexp.last_match(:param) if query_params =~ encrypted_params_regex
       end
 
       def encrypted_params_regex
@@ -48,7 +55,7 @@ module PCO
     attr_reader :query
 
     def initialize(app_name:, path: nil, query: nil, encrypt_query_params: false, domain: nil)
-      @app_name = app_name.to_s.gsub("_", "-")
+      @app_name = app_name.to_s.tr("_", "-")
       @path     = path
       @domain   = domain
 
@@ -98,7 +105,7 @@ module PCO
 
     def uri
       q = query ? "?#{query}" : nil
-      url_string = "#{scheme}://#{hostname}/#{path}#{q}".sub(/(\/)+$/,'')
+      url_string = "#{scheme}://#{hostname}/#{path}#{q}".sub(%r{(/)+$}, "")
       URI(url_string)
     end
 

data/lib/pco/url/church_center.rb

@@ -0,0 +1,38 @@
+module PCO
+  class URL
+    class ChurchCenter < URL
+      def initialize(app_name: "church-center", path: nil, query: nil, encrypt_query_params: false, domain: nil, subdomain: nil)
+        super(
+          app_name: app_name,
+          path: path,
+          query: query,
+          encrypt_query_params: encrypt_query_params,
+          domain: domain
+        )
+        @subdomain = subdomain
+      end
+
+      def domain
+        return @domain if @domain
+        case env
+        when "production", "staging"
+          "churchcenteronline.com"
+        when "development"
+          "churchcenter.dev"
+        when "test"
+          "churchcenter.test"
+        end
+      end
+
+      def hostname
+        super if env_overridden_hostname
+        sub = "#{@subdomain}." if @subdomain
+        if env == "staging"
+          "#{sub}staging.#{domain}"
+        else
+          "#{sub}#{domain}"
+        end
+      end
+    end
+  end
+end

data/lib/pco/url/get.rb

@@ -0,0 +1,13 @@
+module PCO
+  class URL
+    class Get < URL
+      def initialize(app_name: "get", path: nil, query: nil, encrypt_query_params: false, domain: nil)
+        super
+      end
+
+      def scheme
+        "http"
+      end
+    end
+  end
+end

data/lib/pco/url/version.rb

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

data/spec/pco/url/church_center_spec.rb

@@ -0,0 +1,75 @@
+require "spec_helper"
+
+describe PCO::URL::ChurchCenter do
+  context "when the env is production" do
+    before do
+      Rails.env = "production"
+    end
+
+    describe "#to_s" do
+      context "given a subdomain" do
+        subject { described_class.new(subdomain: "foo") }
+
+        it "returns the proper URL" do
+          expect(subject.to_s).to eq("https://foo.churchcenteronline.com")
+        end
+      end
+
+      context "given no subdomain" do
+        subject { described_class.new }
+
+        it "returns the proper URL" do
+          expect(subject.to_s).to eq("https://churchcenteronline.com")
+        end
+      end
+    end
+  end
+
+  context "when the env is staging" do
+    before do
+      Rails.env = "staging"
+    end
+
+    describe "#to_s" do
+      context "given a subdomain" do
+        subject { described_class.new(subdomain: "foo") }
+
+        it "returns the proper URL" do
+          expect(subject.to_s).to eq("https://foo.staging.churchcenteronline.com")
+        end
+      end
+
+      context "given no subdomain" do
+        subject { described_class.new }
+
+        it "returns the proper URL" do
+          expect(subject.to_s).to eq("https://staging.churchcenteronline.com")
+        end
+      end
+    end
+  end
+
+  context "when the env is development" do
+    before do
+      Rails.env = "development"
+    end
+
+    describe "#to_s" do
+      context "given a subdomain" do
+        subject { described_class.new(subdomain: "foo") }
+
+        it "returns the proper URL" do
+          expect(subject.to_s).to eq("http://foo.churchcenter.dev")
+        end
+      end
+
+      context "given no subdomain" do
+        subject { described_class.new }
+
+        it "returns the proper URL" do
+          expect(subject.to_s).to eq("http://churchcenter.dev")
+        end
+      end
+    end
+  end
+end

data/spec/pco_url_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-Applications = [
+APPLICATIONS = [
   :accounts,
   :avatars,
   :services,
@@ -8,12 +8,14 @@ Applications = [
   :people,
   :registrations,
   :resources,
-  :giving
+  :giving,
+  :get
 ]
 
 describe PCO::URL do
   before :all do
-    URLcrypt.key = "984e9002e680dc9b9c2556434c47f7e4782191f52063277901e4a009797652e08f28be069dfb4d4a1e3c9ab09fedab59be2c9b6486748bf44030182815ee4987"
+    URLcrypt.key = "984e9002e680dc9b9c2556434c47f7e4782191f52063277901e4a009797652e0" \
+                   "8f28be069dfb4d4a1e3c9ab09fedab59be2c9b6486748bf44030182815ee4987"
   end
 
   describe "defaults" do
@@ -22,11 +24,15 @@ describe PCO::URL do
         Rails.env = "development"
       end
 
-      Applications.map(&:to_s).each do |app|
+      APPLICATIONS.map(&:to_s).each do |app|
         it "has an #{app} URL" do
-          expect(PCO::URL.send(app)).to eq("http://#{app.gsub('_','-')}.pco.dev")
+          expect(PCO::URL.send(app)).to eq("http://#{app.tr('_', '-')}.pco.dev")
         end
       end
+
+      it "has a church-center url" do
+        expect(PCO::URL.church_center).to eq("http://churchcenter.dev")
+      end
     end
 
     describe "staging" do
@@ -34,11 +40,20 @@ describe PCO::URL do
         Rails.env = "staging"
       end
 
-      Applications.map(&:to_s).each do |app|
+      APPLICATIONS.map(&:to_s).each do |app|
+        next if app == "get"
         it "has an #{app} URL" do
-          expect(PCO::URL.send(app)).to eq("https://#{app.gsub('_','-')}-staging.planningcenteronline.com")
+          expect(PCO::URL.send(app)).to eq("https://#{app.tr('_', '-')}-staging.planningcenteronline.com")
         end
       end
+
+      it "has an http get URL" do
+        expect(PCO::URL.send("get")).to eq("http://get-staging.planningcenteronline.com")
+      end
+
+      it "has a church-center url" do
+        expect(PCO::URL.church_center).to eq("https://staging.churchcenteronline.com")
+      end
     end
 
     describe "production" do
@@ -46,11 +61,20 @@ describe PCO::URL do
         Rails.env = "production"
       end
 
-      Applications.map(&:to_s).each do |app|
+      APPLICATIONS.map(&:to_s).each do |app|
+        next if app == "get"
         it "has an #{app} URL" do
-          expect(PCO::URL.send(app)).to eq("https://#{app.gsub('_','-')}.planningcenteronline.com")
+          expect(PCO::URL.send(app)).to eq("https://#{app.tr('_', '-')}.planningcenteronline.com")
         end
       end
+
+      it "has an http get URL" do
+        expect(PCO::URL.send("get")).to eq("http://get.planningcenteronline.com")
+      end
+
+      it "has a church-center url" do
+        expect(PCO::URL.church_center).to eq("https://churchcenteronline.com")
+      end
     end
 
     describe "test" do
@@ -58,11 +82,15 @@ describe PCO::URL do
         Rails.env = "test"
       end
 
-      Applications.map(&:to_s).each do |app|
+      APPLICATIONS.map(&:to_s).each do |app|
         it "has an #{app} URL" do
-          expect(PCO::URL.send(app)).to eq("http://#{app.gsub('_','-')}.pco.test")
+          expect(PCO::URL.send(app)).to eq("http://#{app.tr('_', '-')}.pco.test")
         end
       end
+
+      it "has a church-center url" do
+        expect(PCO::URL.church_center).to eq("http://churchcenter.test")
+      end
     end
   end
 
@@ -73,34 +101,33 @@ describe PCO::URL do
   end
 
   context "with path starting with /" do
-    Applications.map(&:to_s).each do |app|
+    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")
+        expect(PCO::URL.send(app, "/test")).to eq("http://#{app.tr('_', '-')}.pco.test/test")
       end
     end
   end
 
   context "with path NOT starting with /" do
-    Applications.map(&:to_s).each do |app|
+    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")
+        expect(PCO::URL.send(app, "test")).to eq("http://#{app.tr('_', '-')}.pco.test/test")
       end
     end
   end
 
   context "with multiple path arguments" do
-    Applications.map(&:to_s).each do |app|
+    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")
+        expect(PCO::URL.send(app, "test", "test2")).to   eq("http://#{app.tr('_', '-')}.pco.test/test/test2")
+        expect(PCO::URL.send(app, "test/", "test2")).to  eq("http://#{app.tr('_', '-')}.pco.test/test/test2")
+        expect(PCO::URL.send(app, "test", "/test2")).to  eq("http://#{app.tr('_', '-')}.pco.test/test/test2")
+        expect(PCO::URL.send(app, "/test/", "test2")).to eq("http://#{app.tr('_', '-')}.pco.test/test/test2")
+        expect(PCO::URL.send(app, "/test/test2")).to     eq("http://#{app.tr('_', '-')}.pco.test/test/test2")
       end
     end
   end
 
-
   describe "overrides" do
     describe "development with accounts URL override" do
       before do
@@ -145,7 +172,7 @@ describe PCO::URL do
       expect(subject.query).to_not eq("foo=bar")
     end
 
-    it 'puts the encrypted params into the _e key' do
+    it "puts the encrypted params into the _e key" do
       expect(subject.query).to match(/^_e=(.*)/)
     end
 
@@ -158,52 +185,62 @@ describe PCO::URL do
     end
   end
 
-  describe '.parse' do
+  describe ".parse" do
     subject { PCO::URL.parse("https://people-staging.planningcenteronline.com") }
 
-    it 'returns a PCO::URL object' do
+    it "returns a PCO::URL object" do
       expect(subject.class).to eq(PCO::URL)
     end
 
-    context 'when only a url string is passed' do
+    context "when only a url string is passed" do
       subject { PCO::URL.parse("http://people.pco.dev") }
 
-      it 'sets the app_name attr' do
-        expect(subject.app_name).to eq('people')
+      it "sets the app_name attr" do
+        expect(subject.app_name).to eq("people")
       end
 
-      it 'strips -staging if supplied' do
-        expect(PCO::URL.parse("https://people-staging.plannincenteronline.com").app_name).
-          to eq('people')
+      it "strips -staging if supplied" do
+        expect(PCO::URL.parse("https://people-staging.plannincenteronline.com").app_name).to eq("people")
       end
     end
 
-    context 'when a string and path is passed' do
+    context "when a string and path is passed" do
       subject { PCO::URL.parse("https://people.planningcenteronline.com/households/2.json") }
 
-      it 'sets the app_name and path attrs' do
-        expect(subject.app_name).to eq('people')
-        expect(subject.path).to eq('households/2.json')
+      it "sets the app_name and path attrs" do
+        expect(subject.app_name).to eq("people")
+        expect(subject.path).to eq("households/2.json")
       end
     end
 
-    context 'when a string, path and query are passed' do
-      let(:pco_url) { PCO::URL.new(app_name: :people, path: 'households/2.html', query: 'full_access=1&total_control=1', encrypt_query_params: true) }
+    context "when a string, path and query are passed" do
+      let(:pco_url) do
+        PCO::URL.new(
+          app_name: :people,
+          path: "households/2.html",
+          query: "full_access=1&total_control=1",
+          encrypt_query_params: true
+        )
+      end
 
-      subject { PCO::URL.parse("https://people.planningcenteronline.com/households/2.html?full_access=1&total_control=1") }
+      subject do
+        PCO::URL.parse(
+          "https://people.planningcenteronline.com/households/2.html?full_access=1&total_control=1"
+        )
+      end
 
-      it 'sets the app_name, path, and query attrs' do
-        expect(subject.app_name).to eq('people')
-        expect(subject.path).to eq('households/2.html')
-        expect(subject.query).to eq('full_access=1&total_control=1')
+      it "sets the app_name, path, and query attrs" do
+        expect(subject.app_name).to eq("people")
+        expect(subject.path).to eq("households/2.html")
+        expect(subject.query).to eq("full_access=1&total_control=1")
       end
 
-      context 'when the query is encrypted' do
+      context "when the query is encrypted" do
         subject { PCO::URL.parse(pco_url.to_s) }
 
-        it 'first decrypts the query' do
-          expect(pco_url.query).not_to eq('full_access=1&total_control=1')
-          expect(subject.query).to eq('full_access=1&total_control=1')
+        it "first decrypts the query" do
+          expect(pco_url.query).not_to eq("full_access=1&total_control=1")
+          expect(subject.query).to eq("full_access=1&total_control=1")
         end
       end
 
@@ -211,14 +248,15 @@ describe PCO::URL do
         subject { PCO::URL.parse(pco_url.to_s + "&foo=bar") }
 
         it "decrypts the encrypted portion and appends the unencrypted portion" do
-          expect(subject.query).to eq('full_access=1&total_control=1&foo=bar')
+          expect(subject.query).to eq("full_access=1&total_control=1&foo=bar")
         end
 
         it "returns the full url" do
-          expect(subject.to_s).to eq('https://people-staging.planningcenteronline.com/households/2.html?full_access=1&total_control=1&foo=bar')
+          expect(subject.to_s).to eq(
+            "https://people-staging.planningcenteronline.com/households/2.html?full_access=1&total_control=1&foo=bar"
+          )
         end
       end
     end
   end
-
 end

data/spec/spec_helper.rb

@@ -3,6 +3,8 @@ require "pco/url"
 
 RSpec.configure do |config|
   config.color = true
+  config.filter_run focus: true
+  config.run_all_when_everything_filtered = true
 end
 
 class Rails

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pco-url
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - James Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-17 00:00:00.000000000 Z
+date: 2015-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: urlcrypt
@@ -79,15 +79,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".gitignore"
+- ".rubocop.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - circle.yml
 - lib/pco/url.rb
+- lib/pco/url/church_center.rb
+- lib/pco/url/get.rb
 - lib/pco/url/version.rb
 - pco-url.gemspec
+- spec/pco/url/church_center_spec.rb
 - spec/pco_url_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/ministrycentered/pco-url
@@ -115,5 +120,7 @@ signing_key:
 specification_version: 4
 summary: Generate URLs for PCO apps in all environments
 test_files:
+- spec/pco/url/church_center_spec.rb
 - spec/pco_url_spec.rb
 - spec/spec_helper.rb
+has_rdoc: