excursion 0.1.9 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f54a5ae49c613a5b03dd6a6a09b72cc13aecd4f
-  data.tar.gz: 475c88b18b43769b611930528500ca54f415fd86
+  metadata.gz: 247f6d9899025734c8fa19d644009f701d9afb14
+  data.tar.gz: ddce03accc06bb78099ecd0f5935e11a0dc03006
 SHA512:
-  metadata.gz: 47386cc6e490b53c5217d87d420d106288c4989256e5b75d7739462ff25a0caac61e39d8f4f31c3dd55e1a69d3ab0a62220da9a39f7a45235ffe894324f91133
-  data.tar.gz: 190c8ac2bafebff86605562730ef575532bf9864e9c6301f1cc1482bb388d4fb8b47454d498d5b2041546d0ce8b68e1ca0a05f52df1857b98853194aafac8757
+  metadata.gz: a70fcbc556abaf862e7779639eef2d682ec1dddef96b5db19bfca367baff57ff9c6bfb83e8de6ed8810c8f6506ef189bde0931fcb4e098944b515e572298bede
+  data.tar.gz: 0dce8684d71b0b456a1375be1d82e60e4bc0361f0c57f5c21aed17d1a2873265bcfce0259f880779e2ab59bc784c9a3477a2cc321112d51653df813b623a31c9

data/app/assets/javascripts/excursion.js

@@ -169,11 +169,21 @@ Base64 = (function() {
           return replaced;
         };
         thisApp[routeName + '_url'] = function() {
-          var urlOpts = window.location.protocol + '//' + thisApp.default_url_options.host;
-          if (thisApp.default_url_options.port && parseInt(thisApp.default_url_options.port) != 80)
-            urlOpts += ':' + thisApp.default_url_options.port;
+          var args = Array.prototype.slice.call(arguments);
+
+          if (args.length > 0 && args[args.length - 1].host) {
+            var urlArgs = args.pop();
+            if (!urlArgs.port)
+              urlArgs.port = thisApp.default_url_options.port;
+          } else {
+            var urlArgs = thisApp.default_url_options;
+          }
+            
+          var urlOpts = window.location.protocol + '//' + urlArgs.host;
+          if (urlArgs.port && parseInt(urlArgs.port) != 80)
+            urlOpts += ':' + urlArgs.port;
           
-          return urlOpts + thisApp[routeName + '_path'](arguments);
+          return urlOpts + thisApp[routeName + '_path'](args);
         };
       }(this));
     }

data/lib/excursion.rb

@@ -27,4 +27,3 @@ require 'excursion/builders'
 require 'excursion/engine'
 require 'excursion/railtie'
 require 'excursion/cors'
-require 'excursion/asset_middleware'

data/lib/excursion/builders/application_builder.rb

@@ -34,6 +34,3 @@ module Excursion
     end
   end
 end
-      
-ActionController::Base.send :include, Excursion::Builders::ApplicationBuilder
-ActionController::Base.send :helper, Excursion::Builders::ApplicationBuilder

data/lib/excursion/builders/url_builder.rb

@@ -10,19 +10,20 @@ module Excursion
         application.routes
       end
 
+      def url_for(route, *args)
+        ActionDispatch::Http::URL.url_for(route_options(route, *args))
+      end
+
       def method_missing(meth, *args)
         route = application.route(route_name_from_method(meth))
-        if route.nil?
-          super
-        else
+        if route
           if meth.to_s.match(/_url\Z/)
-            url_opts = (application.default_url_options || {}).clone
-            url_opts.merge!(args.slice!(args.length-1)) if args.last.is_a?(Hash) #&& args.last.has_key?(:host)
-              
-            ActionDispatch::Http::URL.url_for(url_opts.merge({path: replaced_path(route, args)}))
+            url_for(route, *args)
           elsif meth.to_s.match(/_path\Z/)
-            replaced_path(route, args)
+            replaced_path(route, *args)
           end
+        else
+          super
         end
       end
 
@@ -36,6 +37,11 @@ module Excursion
         @appname = app_name
       end
 
+      def route_options(route, *args)
+        opts = args.extract_options!
+        application.default_url_options.merge(opts).merge({path: replaced_path(route, *args)})
+      end
+
       def route_name_from_method(meth)
         meth.to_s.gsub(/_(url|path)\Z/,'').to_sym
       end
@@ -43,7 +49,7 @@ module Excursion
       # Very hacky method to replace path parts with values
       #
       # Needs work, particularly around formatting which is basically ignored right now.
-      def replaced_path(route, args)
+      def replaced_path(route, *args)
         path = route.path.spec.to_s.dup
 
         route.required_parts.zip(args) do |part, arg|

data/lib/excursion/cors.rb

@@ -9,18 +9,28 @@ module Excursion
     end
 
     def cors_whitelisted?(origin)
-      return Excursion::Pool.all_applications.values.map { |app| app.default_url_options[:host] }.any? { |cw| cors_match? origin, cw } if Excursion.configuration.cors_whitelist == :pool
-      Excursion.configuration.cors_whitelist.nil? || Excursion.configuration.cors_whitelist.any? { |cw| cors_match? origin, cw }
+      if Excursion.configuration.cors_whitelist == :pool
+        Excursion::Pool.all_applications.values.map { |app| app.default_url_options[:host] }.any? { |cw| cors_match? origin, cw }
+      else
+        Excursion.configuration.cors_whitelist.nil? || Excursion.configuration.cors_whitelist.any? { |cw| cors_match? origin, cw }
+      end
     end
 
     def cors_blacklisted?(origin)
       !Excursion.configuration.cors_blacklist.nil? && !Excursion.configuration.cors_blacklist.any? { |cb| cors_match? origin, cb }
     end
 
+    def origin_header
+      request.headers['Origin'] || request.headers['HTTP_ORIGIN']
+    end
+
+    def origin_allowed?
+      !origin_header.nil? && cors_whitelisted?(origin_header) && !cors_blacklisted?(origin_header)
+    end
+
     def cors_headers
-      origin = request.headers['Origin'] || request.headers['HTTP_ORIGIN']
-      if !origin.nil? && cors_whitelisted?(origin) && !cors_blacklisted?(origin)
-        headers['Access-Control-Allow-Origin'] = request.headers['Origin']
+      if origin_allowed?
+        headers['Access-Control-Allow-Origin'] = origin_header
         headers['Access-Control-Allow-Methods'] = Excursion.configuration.cors_allow_methods.join(',')
         headers['Access-Control-Allow-Headers'] = Excursion.configuration.cors_allow_headers.join(', ')
         headers['Access-Control-Allow-Credentials'] = Excursion.configuration.cors_allow_credentials.to_s

data/lib/excursion/datastores/test.rb

@@ -12,10 +12,10 @@ module Excursion
       end
       
       def read(key)
-        return @pool[key.to_sym] if key.to_s.match(/^_.*/) && @pool.has_key?(key.to_sym)
+        return @pool[key.to_sym] if option_key?(key)
 
-        return unless Excursion.configuration.test_providers.nil? || Excursion.configuration.test_providers.map(&:to_sym).include?(key.to_sym)
-        @pool[key.to_sym] ||= application_class.new(key, {default_url_options: {host: 'www.example.com'}}, ActionDispatch::Routing::RouteSet::NamedRouteCollection.new).to_cache
+        return unless test_provider?(key)
+        @pool[key.to_sym] ||= application_class.new(key, default_options, ActionDispatch::Routing::RouteSet::NamedRouteCollection.new).to_cache
       end
       alias_method :get, :read
       
@@ -39,6 +39,18 @@ module Excursion
         @pool = {}
         @pool = pool.dup unless pool.nil?
       end
+
+      def test_provider?(key)
+        Excursion.configuration.test_providers.nil? || Excursion.configuration.test_providers.map(&:to_sym).include?(key.to_sym)
+      end
+
+      def default_options
+        {default_url_options: {host: 'www.example.com'}}
+      end
+
+      def option_key?(key)
+        key.to_s.match(/^_.*/) && @pool.has_key?(key.to_sym)
+      end
     end
   end
 end

data/lib/excursion/pool.rb

@@ -22,6 +22,10 @@ module Excursion
       @@applications[name.to_s] = app unless app.nil?
     end
 
+    def self.app_hash_defaults
+      {default_url_options: Excursion.configuration.default_url_options, routes: {}, registered_at: Time.now}
+    end
+
     def self.register_application(app=nil, opts={}, &block)
       raise ArgumentError, "app must be an instance of Rails::Application" unless app.is_a?(Rails::Application) || block_given?
       opts = {store: true}.merge(opts)
@@ -54,7 +58,7 @@ module Excursion
       raise ArgumentError, "you must provide at minimum a hash with a :name key" unless app_hash.is_a?(Hash) && app_hash.has_key?(:name)
       opts = {store: true}.merge(opts)
       
-      app_hash = {default_url_options: Excursion.configuration.default_url_options, routes: {}, registered_at: Time.now}.merge(app_hash)
+      app_hash = app_hash_defaults.merge(app_hash)
       name = app_hash[:name]
 
       if opts[:store]
@@ -77,23 +81,39 @@ module Excursion
       raise NoDatastoreError, "You must configure excursion with a datastore." if Excursion.configuration.datastore.nil?
       require "excursion/datastores/#{Excursion.configuration.datastore.to_s}"
 
-      case Excursion.configuration.datastore.to_sym
-      when :file
-        raise DatastoreConfigurationError, "You must configure the :file datastore with a datastore_file path" if Excursion.configuration.datastore_file.nil?
-        @@datastore ||= Excursion::Datastores::File.new(Excursion.configuration.datastore_file)
-      when :memcache
-        raise MemcacheConfigurationError, "You must configure the :memcache datastore with a memcache_server" if Excursion.configuration.memcache_server.nil?
-        @@datastore ||= Excursion::Datastores::Memcache.new(Excursion.configuration.memcache_server)
-      when :active_record
-        raise TableDoesNotExist, "To use the :active_record datastore you must first run `rails generate excursion:active_record` followed by `rake db:migrate` to create the storage table" unless Excursion::RoutePool.table_exists?
-        @@datastore ||= Excursion::Datastores::ActiveRecord.new
-      when :active_record_with_memcache
-        raise MemcacheConfigurationError, "You must configure the :active_record_with_memcache datastore with a memcache_server" if Excursion.configuration.memcache_server.nil?
-        raise TableDoesNotExist, "To use the :active_record_with_memcache datastore you must first run `rails generate excursion:active_record` followed by `rake db:migrate` to create the storage table" unless Excursion::RoutePool.table_exists?
-        @@datastore ||= Excursion::Datastores::ActiveRecord.new(Excursion.configuration.memcache_server)
-      when :test
+      send "#{Excursion.configuration.datastore.to_sym}_datastore"
+    end
+
+    def self.datastore_class(type)
+      "Excursion::Datastores::#{type.to_s.capitalize}".constantize
+    end
+
+    def self.simple_datastore(type, config_opt)
+      raise DatastoreConfigurationError, "You must configure the :#{type.to_s} datastore with a #{config_opt.to_s}" if Excursion.configuration.send(config_opt.to_sym).nil?
+      @@datastore ||= datastore_class(type).new(Excursion.configuration.send(config_opt.to_sym))
+    end
+
+    def self.file_datastore
+      simple_datastore(:file, :datastore_file)
+    end
+
+    def self.memcache_datastore
+      simple_datastore(:memcache, :memcache_server)
+    end
+
+    def self.active_record_datastore
+      raise TableDoesNotExist, "To use the :active_record datastore you must first run `rails generate excursion:active_record` followed by `rake db:migrate` to create the storage table" unless Excursion::RoutePool.table_exists?
+      @@datastore ||= Excursion::Datastores::ActiveRecord.new
+    end
+
+    def self.active_record_with_memcache_datastore
+      raise MemcacheConfigurationError, "You must configure the :active_record_with_memcache datastore with a memcache_server" if Excursion.configuration.memcache_server.nil?
+      raise TableDoesNotExist, "To use the :active_record_with_memcache datastore you must first run `rails generate excursion:active_record` followed by `rake db:migrate` to create the storage table" unless Excursion::RoutePool.table_exists?
+      @@datastore ||= Excursion::Datastores::ActiveRecord.new(Excursion.configuration.memcache_server)
+    end
+
+    def self.test_datastore
         @@datastore ||= Excursion::Datastores::Test.new
-      end
     end
 
     def self.pool_updated

data/lib/excursion/pool/application.rb

@@ -45,7 +45,7 @@ module Excursion
 
       def from_cache(cached)
         @routes = routes_from_cache(cached[:routes]) if cached.has_key?(:routes)
-        @default_url_options = cached[:default_url_options]
+        @default_url_options = cached[:default_url_options] || {}
         @registered_at = (Time.at(cached[:registered_at]) rescue Time.now)
       end
       

data/lib/excursion/railtie.rb

@@ -1,9 +1,5 @@
 module Excursion
   class Railtie < Rails::Railtie
-    initializer "excursion.asset_middleware" do |app|
-      app.config.middleware.use "Excursion::AssetMiddleware"
-    end
-
     config.after_initialize do |app|
       # Do not register on init when running a generator (is there a better way to detect this? Maybe $0 == 'rails' && ARGV.include?('generate') or 'g')
       # Do not register on init when running a rake task
@@ -12,6 +8,8 @@ module Excursion
         Excursion::Pool.register_application(app)
       end
 
+      ActionController::Base.send :include, Excursion::Builders::ApplicationBuilder
+      ActionView::Base.send       :include, Excursion::Builders::ApplicationBuilder
       ActionController::Base.send :include, Excursion::CORS if Excursion.configuration.enable_cors
     end
 
@@ -26,7 +24,7 @@ module Excursion
         desc "Remove this app and it's routes from the route pool"
         task :remove => :environment do
           Excursion::Pool.remove_application(Rails.application)
-          puts "Rmoved application #{app.name} from the #{Rails.env} route pool."
+          puts "Removed application #{app.name} from the #{Rails.env} route pool."
         end
       end
     end

data/lib/excursion/version.rb

@@ -1,3 +1,3 @@
 module Excursion
-  VERSION = '0.1.9'
+  VERSION = '0.2.1'
 end

data/spec/controllers/excursion_controller_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe ExcursionController do
+end

data/spec/dummy/config/application.rb

@@ -3,62 +3,18 @@ require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 
 if defined?(Bundler)
-  # If you precompile assets before deploying to production, use this line
-  Bundler.require(*Rails.groups(:assets => %w(development test)))
-  # If you want your assets lazily compiled in production, use this line
-  # Bundler.require(:default, :assets, Rails.env)
+  Bundler.require(:default, :assets, Rails.env)
 end
 
 require 'excursion'
 
 module Dummy
   class Application < Rails::Application
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
-
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
 
-    # Enable escaping HTML in JSON.
-    config.active_support.escape_html_entities_in_json = true
-
-    # Use SQL instead of Active Record's schema dumper when creating the database.
-    # This is necessary if your schema can't be completely dumped by the schema dumper,
-    # like if you have constraints or database-specific column types
-    # config.active_record.schema_format = :sql
-
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    #config.active_record.whitelist_attributes = true
-
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
   end
 end

data/spec/dummy/config/environments/development.rb

@@ -26,10 +26,4 @@ Dummy::Application.configure do
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)
   #config.active_record.auto_explain_threshold_in_seconds = 0.5
-
-  # Do not compress assets
-  config.assets.compress = false
-
-  # Expands the lines which load the assets
-  config.assets.debug = true
 end

data/spec/dummy/config/environments/production.rb

@@ -7,61 +7,11 @@ Dummy::Application.configure do
   # Full error reports are disabled and caching is turned on
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
-
-  # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
-
-  # Compress JavaScripts and CSS
-  config.assets.compress = true
-
-  # Don't fallback to assets pipeline if a precompiled asset is missed
-  config.assets.compile = false
-
-  # Generate digests for assets URLs
-  config.assets.digest = true
-
-  # Defaults to nil and saved in location specified by config.assets.prefix
-  # config.assets.manifest = YOUR_PATH
-
-  # Specifies the header that your server uses for sending files
-  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
-
-  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  # config.force_ssl = true
-
-  # See everything in the log (default is :info)
-  # config.log_level = :debug
-
-  # Prepend all log lines with the following tags
-  # config.log_tags = [ :subdomain, :uuid ]
-
-  # Use a different logger for distributed setups
-  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
-
-  # Use a different cache store in production
-  # config.cache_store = :mem_cache_store
-
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server
-  # config.action_controller.asset_host = "http://assets.example.com"
-
-  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
-  # config.assets.precompile += %w( search.js )
-
-  # Disable delivery errors, bad email addresses will be ignored
-  # config.action_mailer.raise_delivery_errors = false
-
-  # Enable threaded mode
-  # config.threadsafe!
-
+  
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation can not be found)
   config.i18n.fallbacks = true
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  # config.active_record.auto_explain_threshold_in_seconds = 0.5
 end

data/spec/dummy/config/environments/test.rb

@@ -8,10 +8,6 @@ Dummy::Application.configure do
   config.cache_classes = true
   config.eager_load = false
 
-  # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
@@ -27,9 +23,6 @@ Dummy::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Raise exception on mass assignment protection for Active Record models
-  #config.active_record.mass_assignment_sanitizer = :strict
-
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
 end