ensure_domain 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25b4063243441d8631d94a628aad5120d57c7574
-  data.tar.gz: 6135ccd0f1b4b3c6f1190e285b98837789d251da
+  metadata.gz: b8aa693262d01850197cac3e707025b3e43fc6c7
+  data.tar.gz: dc75dd2e4a83d2d3cc94037edb466e98382808f3
 SHA512:
-  metadata.gz: f92f7231dc0025a3bb2f1e5f35fe836b8ac75b87b375b324a5ec20d8cc1b9dad75d0ce6b864da5a041df13ad3faf7ac066ac1f33af30796a05f5646eae3238bf
-  data.tar.gz: 13da2170a5dfb032c1bd4bf5d06b5a50ccd854a88033e7126c18cba408d2276b170d6ef3ff183c6759e78cf053b96183756ddebb9ae210448dfab19316e08214
+  metadata.gz: 6aea768500ff901e4c125f3f144f3da6633fe34dc3315e7c9e252f7b1476255a987f0d8ab877b3a576cad1407e5c73455a37d7df68ce5e02d0bf7d110077ad30
+  data.tar.gz: 16ec215df041eba6c4a40a8c66fe0368e3cdae54cb4ee9aa537e78325ee310fabce7579cc2d6631994d7ba4a48b944b76419ce02802b3f53910ef64857db2c60

data/.gitignore

@@ -15,3 +15,8 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Aske Hansen
+Copyright (c) 2014 Aske Hansen
 
 MIT License
 

data/README.md

@@ -0,0 +1,29 @@
+# EnsureDomain
+
+TODO: Write a gem description
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'ensure_domain'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install ensure_domain
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Contributing
+
+1. Fork it ( https://github.com/[my-github-username]/ensure_domain/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request

data/Rakefile

@@ -1 +1,2 @@
 require "bundler/gem_tasks"
+

data/ensure_domain.gemspec

@@ -8,16 +8,16 @@ Gem::Specification.new do |spec|
   spec.version       = EnsureDomain::VERSION
   spec.authors       = ["Aske Hansen"]
   spec.email         = ["aske@deeco.dk"]
-  spec.description   = "This gem helps your rails app redirect all request to your specified domain"
-  spec.summary       = "Ensures your specific domain"
+  spec.summary       = "Rack middleware for ensuring domain"
+  spec.description   = "Rack middleware that will redirect all request that are not from the specified domain"
   spec.homepage      = "https://github.com/askehansen/ensure_domain"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
 end

data/lib/ensure_domain.rb

@@ -1,17 +1,3 @@
 require "ensure_domain/version"
-
-module EnsureDomain
-  def self.included(base)
-    base.before_filter :ensure_domain
-  end
-
-  def ensure_domain
-    default_url_options = Weboptimist::Application.config.action_mailer.default_url_options
-    if default_url_options.nil?
-      puts "WARNING: You must set config.action_mailer.default_url_options = { host: 'www.yourdomain.com' } in order to the 'ensure_domain' gem to work as intended"
-    elsif Rails.env.production? && request.host != default_url_options[:host]
-      querystring = "?#{request.query_string}" unless request.query_string.empty?
-      redirect_to "#{request.protocol}#{default_url_options[:host]}#{request.path}#{querystring}", status: 301
-    end
-  end
-end
+require "ensure_domain/railtie" if defined?(Rails)
+require "ensure_domain/middleware"

data/lib/ensure_domain/middleware.rb

@@ -0,0 +1,29 @@
+module EnsureDomain
+  class Middleware
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      if ENV['APP_DOMAIN'] && env['HTTP_HOST'] != ENV['APP_DOMAIN']
+        [301, {'Location' => new_location(env), 'Content-Type' => 'text/html', 'Content-Length' => '0'}, []]
+      else
+        @app.call(env)
+      end
+    end
+
+    private
+
+      def new_location(env)
+        scheme = env['rack.url_scheme']
+        domain = ENV['APP_DOMAIN']
+        path = env['PATH_INFO']
+        query_string = env['QUERY_STRING'].to_s
+
+        location = "#{scheme}://#{domain}#{path}"
+        location << "?#{query_string}" unless query_string.empty?
+
+        location
+      end
+  end
+end

data/lib/ensure_domain/railtie.rb

@@ -0,0 +1,7 @@
+module EnsureDomain
+  class Railtie < Rails::Railtie
+    initializer "railtie.configure_rails_initialization" do
+      Rails.application.middleware.use EnsureDomain::Middleware
+    end
+  end
+end

data/lib/ensure_domain/version.rb

@@ -1,3 +1,3 @@
 module EnsureDomain
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,58 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: ensure_domain
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Aske Hansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2014-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: This gem helps your rails app redirect all request to your specified
-  domain
+description: Rack middleware that will redirect all request that are not from the
+  specified domain
 email:
 - aske@deeco.dk
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
 - ensure_domain.gemspec
 - lib/ensure_domain.rb
+- lib/ensure_domain/middleware.rb
+- lib/ensure_domain/railtie.rb
 - lib/ensure_domain/version.rb
 homepage: https://github.com/askehansen/ensure_domain
 licenses:
@@ -64,18 +66,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
-summary: Ensures your specific domain
+summary: Rack middleware for ensuring domain
 test_files: []

data/README.rdoc

@@ -1,32 +0,0 @@
-= EnsureDomain
-
-This gem helps your rails app redirect all request to your specified domain.
-
-Example: myhomepage.com => www.myhomepage.com
-
-== Installation
-1. Add gem in your gemfile:
-
-    gem "ensure_domain"
-
-2. include the module in your application_controller.rb file:
-
-    # app/controllers/application_controller.rb
-    
-    class ApplicationController < ActionController::Base
-      include EnsureDomain
-    end
-
-3. Specify your domain in your production.rb file:
-
-    # config/environments/production.rb
-    
-    MyApp::Application.configure do
-      config.action_mailer.default_url_options = { host: "www.myhomepage.com" }
-    end
-
-All requests should now redirect to www.myhomepage.com
-
-== License
-
-This project rocks and uses MIT-LICENSE.