pco-url 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5ad5229c15a12077f471c25fca3288c285b2c687
-  data.tar.gz: aadeaab05a5ea105f5ad32d30fabbfd32c00cb6c
+SHA256:
+  metadata.gz: 4731a995e9e8f3944ba316db910452830ba0a0606f0a9cc07db1a6a51ef7890c
+  data.tar.gz: 436e8ac79dcfe60f89d81676b5b2149269561510e827c90548f2d3c804dd5f1e
 SHA512:
-  metadata.gz: 27e08f5cdc63de25d4cfcedfde96a4c8b06612adee3553c5d7ed43b5b37734ec70c609b9aaf1a3578f5b5d13769aa282460d4d8cb02af5ca49d16cf6c8b03053
-  data.tar.gz: 6a055c9dbb973275dceb0e909e3abea22dc7513b8d633e8f97b1ee2cd3bc485040d973e64525f9d4e1f76087ffdaac372c2e40d219152cdda8c75ad51719aa28
+  metadata.gz: d587df8300f3b0ff06db697ee73a7c6375a6e1b29122cb67a0730691fb56da073d466fce254f76fee308c17500beeca68731179d02eb18510fbb3b7f265153e5
+  data.tar.gz: b1fc2d8431d4b6abe9b0b21ddef546c095de4b0afdb7d7e168dce643a168dc9bad1692739d3219326a641db467e9a11d6801d44e00c29d3f9d2cacb287267d3c

data/.gitignore

@@ -12,3 +12,4 @@
 *.o
 *.a
 mkmf.log
+log

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# v2.1.0 (2019-11-05)
+
+* Feature: Add support in dev for any TLD [Tim Morgan]
+
+# v2.0.2 (2019-01-21)
+
+* Fix: Repair downcased encrypted params even better
+
+# v2.0.1 (2013-01-21)
+
+* Fix: Repair downcased encrypted params
+
 # v2.0.0 (2018-09-21)
 
 * Chore: inline URLcrypt for threadsafety

data/lib/pco/url.rb

@@ -2,6 +2,7 @@ require_relative "url/version"
 require_relative "url/church_center"
 require_relative "url/get"
 require_relative "url/encryption"
+require_relative "url/engine"
 require "uri"
 
 module PCO
@@ -85,7 +86,7 @@ module PCO
       when "production", "staging"
         "planningcenteronline.com"
       when "development", "test"
-        "pco.test"
+        PCO::URL::Engine.domain || "pco.test"
       end
     end
 

data/lib/pco/url/encryption.rb

@@ -75,7 +75,7 @@ module PCO
 
         def decrypt(data, key: @default_key)
           raise MissingKeyError, "default key or key: argument must be set" if key.nil?
-          iv, encrypted = data.split("Z").map { |part| decode(part) }
+          iv, encrypted = case_corrected(data).split("Z").map { |part| decode(part) }
           raise DecryptError, "not a valid string to decrypt" unless iv && encrypted
           decrypter = cipher(:decrypt, key: key)
           decrypter.iv = iv
@@ -91,6 +91,11 @@ module PCO
 
         private
 
+        def case_corrected(data)
+          return data unless data[26] == "z"
+          data.tr("a", "A").sub(/\A([#{TABLE}]{26})z/, '\1Z')
+        end
+
         def chunks(str, size)
           result = []
           bytes = str.bytes

data/lib/pco/url/engine.rb

@@ -0,0 +1,19 @@
+require_relative "./engine/domain_middleware"
+
+module PCO
+  class URL
+    class Engine < Rails::Engine
+      def self.domain
+        Thread.current[:pco_url_domain]
+      end
+
+      def self.domain=(d)
+        Thread.current[:pco_url_domain] = d
+      end
+
+      initializer "pco_url.add_middleware" do |app|
+        app.middleware.use PCO::URL::Engine::DomainMiddleware if Rails.env.development? || Rails.env.test?
+      end
+    end
+  end
+end

data/lib/pco/url/engine/domain_middleware.rb

@@ -0,0 +1,16 @@
+module PCO
+  class URL
+    class Engine < Rails::Engine
+      class DomainMiddleware
+        def initialize(app)
+          @app = app
+        end
+
+        def call(env)
+          PCO::URL::Engine.domain = env["SERVER_NAME"].downcase.match(/[a-z0-9-]+\.[a-z]+$/).to_s
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/pco/url/version.rb

@@ -1,5 +1,5 @@
 module PCO
   class URL
-    VERSION = "2.0.0".freeze
+    VERSION = "2.1.0".freeze
   end
 end

data/pco-url.gemspec

@@ -18,7 +18,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "rails", "~> 5.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", ">= 3.0.0", "< 4"
+  spec.add_development_dependency "rspec-rails", "~> 3.9.0"
   spec.add_development_dependency "rubocop", "0.54.0"
 end

data/spec/dummy/config/application.rb

@@ -0,0 +1,22 @@
+require_relative "./boot"
+require "action_controller/railtie"
+
+require 'pco/url'
+
+module Dummy
+  class Application < Rails::Application
+    config.eager_load = false
+  end
+end
+
+Dummy::Application.initialize!
+
+class TestsController < ActionController::Base
+  def show
+    render plain: PCO::URL.people
+  end
+end
+
+Rails.application.routes.draw do
+  resource :test
+end

data/spec/dummy/config/boot.rb

@@ -0,0 +1,5 @@
+gemfile = File.expand_path('../../../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] = gemfile
+require 'bundler'
+Bundler.setup
+$LOAD_PATH.unshift(File.expand_path('../../../../lib', __FILE__))

data/spec/pco/url/encryption_spec.rb

@@ -30,6 +30,16 @@ describe PCO::URL::Encryption do
 
         expect(described_class.decrypt(encrypted)).to eq("Horseman")
       end
+
+      context "when the encrypted string gets downcased for some dumb reason" do
+        it "decrypts correctly" do
+          described_class.default_key = TEST_DEFAULT_KEY
+          encrypted = described_class.encrypt("Butterscotch").downcase
+          decrypted = described_class.decrypt(encrypted)
+
+          expect(decrypted).to eq("Butterscotch")
+        end
+      end
     end
 
     context "when no default key is set" do

data/spec/requests/dev_domain_spec.rb

@@ -0,0 +1,57 @@
+require "spec_helper"
+
+describe PCO::URL::Engine::DomainMiddleware, type: :request do
+  context "in development mode" do
+    before do
+      ENV["DEPLOY_ENV"] = Rails.env = "development"
+    end
+
+    it "sets the generated URL domain to be the same as the host" do
+      host! "accounts.pco.test"
+      get "/test"
+      expect(response.body).to eq("http://people.pco.test")
+      host! "accounts.pco.codes"
+      get "/test"
+      expect(response.body).to eq("http://people.pco.codes")
+    end
+  end
+
+  context "in test mode" do
+    before do
+      ENV["DEPLOY_ENV"] = Rails.env = "test"
+    end
+
+    it "sets the generated URL domain to be the same as the host" do
+      host! "accounts.pco.test"
+      get "/test"
+      expect(response.body).to eq("http://people.pco.test")
+      host! "accounts.pco.codes"
+      get "/test"
+      expect(response.body).to eq("http://people.pco.codes")
+    end
+  end
+
+  context "in staging mode" do
+    before do
+      ENV["DEPLOY_ENV"] = Rails.env = "staging"
+    end
+
+    it "does not change the domain based on host" do
+      host! "accounts.pco.test"
+      get "/test"
+      expect(response.body).to eq("https://people-staging.planningcenteronline.com")
+    end
+  end
+
+  context "in production mode" do
+    before do
+      ENV["DEPLOY_ENV"] = Rails.env = "production"
+    end
+
+    it "does not change the domain based on host" do
+      host! "accounts.pco.test"
+      get "/test"
+      expect(response.body).to eq("https://people.planningcenteronline.com")
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,8 @@
+require "rails"
+require File.expand_path("dummy/config/application", __dir__)
+
 require "rspec"
+require "rspec/rails"
 require "pco/url"
 
 RSpec.configure do |config|
@@ -11,9 +15,3 @@ RSpec.configure do |config|
     PCO::URL::Encryption.remove_instance_variable(:@default_key)
   end
 end
-
-class Rails
-  class << self
-    attr_accessor :env
-  end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pco-url
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - James Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-24 00:00:00.000000000 Z
+date: 2019-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +72,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -92,13 +120,18 @@ files:
 - lib/pco/url.rb
 - lib/pco/url/church_center.rb
 - lib/pco/url/encryption.rb
+- lib/pco/url/engine.rb
+- lib/pco/url/engine/domain_middleware.rb
 - lib/pco/url/get.rb
 - lib/pco/url/version.rb
 - pco-url.gemspec
 - spec/.rubocop.yml
+- spec/dummy/config/application.rb
+- spec/dummy/config/boot.rb
 - spec/pco/url/church_center_spec.rb
 - spec/pco/url/encryption_spec.rb
 - spec/pco_url_spec.rb
+- spec/requests/dev_domain_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/ministrycentered/pco-url
 licenses:
@@ -119,14 +152,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Generate URLs for PCO apps in all environments
 test_files:
 - spec/.rubocop.yml
+- spec/dummy/config/application.rb
+- spec/dummy/config/boot.rb
 - spec/pco/url/church_center_spec.rb
 - spec/pco/url/encryption_spec.rb
 - spec/pco_url_spec.rb
+- spec/requests/dev_domain_spec.rb
 - spec/spec_helper.rb