ae_page_objects 0.1.2 → 0.1.3.rl1

data/lib/ae_page_objects.rb

@@ -5,16 +5,12 @@ require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/object/try'
 require 'active_support/core_ext/class'
-require 'active_support/dependencies'
+require 'active_support/core_ext/module/introspection'
 
 require 'ae_page_objects/version'
 
 module AePageObjects
   autoload :Universe,             'ae_page_objects/core/universe'
-  autoload :ConstantResolver,     'ae_page_objects/core/constant_resolver'
-  autoload :DependenciesHook,     'ae_page_objects/core/dependencies_hook'
-  autoload :Installable,          'ae_page_objects/core/installable'
-  autoload :Configuration,        'ae_page_objects/core/configuration'
   autoload :Singleton,            'ae_page_objects/core/singleton'
   autoload :Application,          'ae_page_objects/core/application'
   autoload :ApplicationRouter,    'ae_page_objects/core/application_router'
@@ -44,8 +40,6 @@ module AePageObjects
   autoload :Checkbox,          'ae_page_objects/elements/checkbox'  
 end
 
-ActiveSupport::Dependencies.extend AePageObjects::DependenciesHook
-
 
 
 

data/lib/ae_page_objects/core/application.rb

@@ -5,19 +5,11 @@ module AePageObjects
     class << self
       private :new
 
-      attr_accessor :called_from
-
       delegate :initialize!, :to => :instance
-      delegate :config,      :to => :instance
 
       def inherited(application_class)
         super
 
-        application_class.called_from = begin
-          call_stack = caller.map { |p| p.sub(/:\d+.*/, '') }
-          File.dirname(call_stack.detect { |p| p !~ %r[railties[\w.-]*/lib/rails|rack[\w.-]*/lib/rack] })
-        end
-
         application_class.universe.send(:include, Universe)
         application_class.universe.page_objects_application_class = application_class
       end
@@ -41,42 +33,14 @@ module AePageObjects
 
     delegate :universe, :to => 'self.class'
 
-    delegate :paths,  :to => :config
-    delegate :router, :to => :config
-
     delegate :path_recognizes_url?, :to => :router
     delegate :generate_path,        :to => :router
 
-    def config
-      @config ||= Configuration.new(self)
+    def router
+      @router ||= ApplicationRouter.new
     end
 
     def initialize!
-      ActiveSupport::Dependencies.autoload_paths.unshift(*paths)
-      eager_load!
-    end
-
-    def resolve_constant(from_mod, const_name)
-      resolver = ConstantResolver.new(self, from_mod, const_name)
-
-      resolved = nil
-      paths.each do |path|
-        break if resolved = resolver.load_constant_from_path(path)
-      end
-      resolved
-    end
-
-  private
-
-    def eager_load!
-      paths.each do |path|
-        matcher = /\A#{Regexp.escape(path)}\/(.*)\.rb\Z/
-
-        Dir.glob("#{path}/**/*.rb").sort.each do |file|
-          dependency_name = file.sub(matcher, '\1')
-          require_dependency dependency_name
-        end
-      end
     end
   end
 end

data/lib/ae_page_objects/element.rb

@@ -20,7 +20,7 @@ module AePageObjects
       raise ArgumentError, ":name or :locator is required" unless @name || @locator
       
       @locator ||= default_locator
-      
+
       super(scoped_node)
     end
     
@@ -38,7 +38,7 @@ module AePageObjects
 
     def __full_name__
       if parent.respond_to?(:__full_name__)
-        [ parent.__full_name__, __name__ ].compact.join('_')
+        [ parent.__full_name__, __name__ ].compact.presence.try(:join, '_')
       else
         __name__
       end

data/lib/ae_page_objects/version.rb

@@ -1,3 +1,3 @@
 module AePageObjects
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3.rl1'.freeze
 end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ae_page_objects
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
+  hash: -262409518
+  prerelease: 6
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  - rl
+  - 1
+  version: 0.1.3.rl1
 platform: ruby
 authors: 
 - Donnie Tognazzini
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-12 00:00:00 Z
+date: 2013-06-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -126,9 +128,6 @@ files:
 - lib/ae_page_objects/concerns/visitable.rb
 - lib/ae_page_objects/core/application.rb
 - lib/ae_page_objects/core/application_router.rb
-- lib/ae_page_objects/core/configuration.rb
-- lib/ae_page_objects/core/constant_resolver.rb
-- lib/ae_page_objects/core/dependencies_hook.rb
 - lib/ae_page_objects/core/dsl/collection.rb
 - lib/ae_page_objects/core/dsl/element.rb
 - lib/ae_page_objects/core/dsl/form_for.rb

data/lib/ae_page_objects/core/configuration.rb

@@ -1,15 +0,0 @@
-module AePageObjects
-  class Configuration
-    attr_accessor :router, :paths
-    
-    def initialize(application)
-      @application = application
-      @paths       = [application.class.called_from]
-    end
-
-    def router
-      @router ||= ApplicationRouter.new
-    end
-  end
-end
-

data/lib/ae_page_objects/core/constant_resolver.rb

@@ -1,38 +0,0 @@
-module AePageObjects
-  class ConstantResolver
-    def initialize(application, from_mod, const_name)
-      @application = application
-      @from_mod    = from_mod
-      @const_name  = const_name
-
-      @path_for_constant = path_for_constant
-    end
-
-    def load_constant_from_path(path)
-      file_path = File.join(path, "#{@path_for_constant}.rb").sub(/(\.rb)?$/, ".rb")
-
-      if File.file?(file_path) && ! ActiveSupport::Dependencies.loaded.include?(File.expand_path(file_path))
-        ActiveSupport::Dependencies.require_or_load file_path
-
-        unless ActiveSupport::Dependencies.local_const_defined?(@from_mod, @const_name)
-          qualified_name = ActiveSupport::Dependencies.qualified_name_for(@from_mod, @const_name)
-          raise LoadError, "Expected #{@file_path} to define #{qualified_name}"
-        end
-
-        @from_mod.const_get(@const_name)
-      end
-    end
-
-  private
-
-    def path_for_constant
-      name_within_universe = ""
-      if @application.universe != @from_mod
-        name_within_universe = @from_mod.name.split("#{@application.universe.name}::")[1]
-      end
-
-      name_within_universe += "::#{@const_name}"
-      name_within_universe.underscore
-    end
-  end
-end

data/lib/ae_page_objects/core/dependencies_hook.rb

@@ -1,7 +0,0 @@
-module AePageObjects
-  module DependenciesHook
-    def load_missing_constant(from_mod, const_name)
-      Application.from(from_mod).try(:resolve_constant, from_mod, const_name) || super
-    end
-  end
-end