excursion 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee64e15f8d7724efbe4740ea2df2536c720a2865
-  data.tar.gz: 45927cde8ec41918fca4bcc1144075d0e40d0c4f
+  metadata.gz: 31ae3beacdf213dacf60c6fe3030b3e7a15edc8e
+  data.tar.gz: 06beac4115e7521cc821013cbdb17b8e11f55ff3
 SHA512:
-  metadata.gz: 039ba40d1e6aa5f66f262a751f64b65a04f03eed7a0f3237d020850e942790826644d2d6d2453b20aa839e4c85a210e35f4016497b5c24ea7ce30052b6166955
-  data.tar.gz: 0d2ba1e113445f529f6c86e1a78b014eed8554987b524cb4142e08de997968caf20f13d4fb2401f59d2af978fe6b6045e5f6dc39874a2ac1ef83702a80bcc325
+  metadata.gz: 6b4f9dc9c685b6d9c0ebff8565a057342c7ba05c154ddd59567c5d584c6801fb297d297f151c7dc6064163c7e8bb0f183afe652008f26b6b3c6fcc8d073be384
+  data.tar.gz: 025ef5e40dc828570a9b1094bdd1ceca843ebf879a5b10aeec3f61d9477ab70c1189ebb0ee7f6c3d376bf4d53b5ca6f1b1666891a96365df64e97e977bd467e1

data/lib/excursion/pool/application.rb

@@ -1,7 +1,7 @@
 module Excursion
   module Pool
     class Application
-      attr_reader :name, :default_url_options
+      attr_accessor :name, :default_url_options
 
       def self.from_cache(cached)
         new(cached[:name], cached) unless cached.nil?
@@ -11,6 +11,11 @@ module Excursion
         routes[key.to_sym]
       end
 
+      def add_route(key, route)
+        route = journey_route(key, Rails.application, journey_path(route), {required_defaults: []}) unless route.is_a?(journey_route_class)
+        routes.add(key.to_sym, route)
+      end
+
       def routes
         @routes ||= ActionDispatch::Routing::RouteSet::NamedRouteCollection.new
       end
@@ -20,7 +25,8 @@ module Excursion
         raise ArgumentError, 'routes must be a Hash or NamedRouteCollection' unless routes.is_a?(Hash)
         @routes = ActionDispatch::Routing::RouteSet::NamedRouteCollection.new
         routes.each do |name, route|
-          @routes.add(name, route)
+          route = journey_route(name, Rails.application, journey_path(route), {required_defaults: []}) unless route.is_a?(journey_route_class)
+          @routes.add(name.to_sym, route)
         end
       end
 
@@ -54,7 +60,7 @@ module Excursion
       def routes_from_cache(routes)
         collection = ActionDispatch::Routing::RouteSet::NamedRouteCollection.new
         routes.each do |name, path|
-          collection.add(name, journey_route(name, Rails.application, journey_path(path), {required_defaults: []}))
+          collection.add(name.to_sym, journey_route(name, Rails.application, journey_path(path), {required_defaults: []}))
         end
         collection
       end

data/lib/excursion/pool/dsl.rb

@@ -0,0 +1,30 @@
+module Excursion
+  module Pool
+    class DSL
+
+      def self.block_eval(app=nil, &block)
+        @application = app.is_a?(Excursion::Pool::Application) ? app : Excursion::Pool::Application.new('', {})
+        instance_eval &block if block_given?
+
+        raise "You must assign a name to the application" if @application.name.blank?
+        @application
+      end
+
+      def self.name(name_str)
+        @application.name = name_str
+      end
+
+      def self.default_url_options(url_options)
+        @application.default_url_options = url_options
+      end
+
+      def self.routes(route_hash)
+        @application.routes = route_hash
+      end
+
+      def self.route(name, path)
+        @application.add_route(name.to_sym, path)
+      end
+    end
+  end
+end

data/lib/excursion/pool.rb

@@ -1,4 +1,5 @@
 require 'excursion/pool/application'
+require 'excursion/pool/dsl'
 require 'excursion/exceptions/pool'
 require 'excursion/exceptions/datastores'
 
@@ -7,7 +8,9 @@ module Excursion
     @@applications = {}
 
     def self.all_applications
-      datastore.all_apps
+      datastore.all_apps.each do |app|
+        @@applications[app.name] = app
+      end
     end
 
     def self.application(name)
@@ -16,14 +19,39 @@ module Excursion
       @@applications[name] = datastore.app(name)
     end
 
-    def self.register_application(app)
-      raise ArgumentError, "app must be an instance of Rails::Application" unless app.is_a?(Rails::Application)
+    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 = {cache: true}.merge(opts)
       
-      name = app.class.name.underscore.split("/").first
-      config = {default_url_options: Excursion.configuration.default_url_options}
+      if app.is_a?(Rails::Application)
+        name = app.class.name.underscore.split("/").first
+        config = {default_url_options: Excursion.configuration.default_url_options}
+        routes = app.routes.named_routes
+        @@applications[name] = Application.new(name, config, routes)
+      end
+      
+      if block_given?
+        if @@applications.has_key?(name)
+          DSL.block_eval(@@applications[name], &block)
+        else
+          block_app = DSL.block_eval(&block)
+          name = block_app.name
+          @@applications[name] = block_app
+        end
+      end
       
-      @@applications[name] = Application.new(name, config, app.routes.named_routes)
-      datastore.set(name, @@applications[name].to_cache)
+      datastore.set(name, @@applications[name].to_cache) if opts[:cache]
+      @@applications[name]
+    end
+
+    def self.register_hash(app_hash)
+      raise ArgumentError, "you must provide at minimum a hash with a :name key" unless app_hash.is_a?(Hash) && app_hash.has_key?(:name)
+      
+      app_hash = {default_url_options: Excursion.configuration.default_url_options, routes: {}, registered_at: Time.now}.merge(app_hash)
+      name = app_hash[:name]
+
+      datastore.set(name, app_hash)
+      @@applications[name] = datastore.app(name)
     end
 
     def self.remove_application(app)

data/lib/excursion/version.rb

@@ -1,3 +1,3 @@
 module Excursion
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 end

data/spec/dummy/config/application.rb

@@ -53,7 +53,7 @@ module Dummy
     # 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
+    #config.active_record.whitelist_attributes = true
 
     # Enable the asset pipeline
     config.assets.enabled = true

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

@@ -21,11 +21,11 @@ Dummy::Application.configure do
   config.action_dispatch.best_standards_support = :builtin
 
   # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  #config.active_record.mass_assignment_sanitizer = :strict
 
   # 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
+  #config.active_record.auto_explain_threshold_in_seconds = 0.5
 
   # Do not compress assets
   config.assets.compress = false

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

@@ -28,7 +28,7 @@ Dummy::Application.configure do
   config.action_mailer.delivery_method = :test
 
   # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  #config.active_record.mass_assignment_sanitizer = :strict
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr