Moved everything into lib instead.

kaspernj · May 28, 2014 · 9ad5600 · 9ad5600
1 parent 61c8d2e
commit 9ad5600
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 6 deletions.
diff --git a/lib/php_process.rb b/lib/php_process.rb
@@ -14,11 +14,13 @@
 class PhpProcess
   #Autoloader for subclasses.
   def self.const_missing(name)
-    path = "#{File.dirname(__FILE__)}/../include/#{::StringCases.camel_to_snake(name)}.rb"
-    raise LoadError, "Does not exist: '#{path}'." unless File.exists?(path)
-    require path
-    raise LoadError, "Still not defined after autoload: '#{name}'." unless ::PhpProcess.const_defined?(name)
-    return ::PhpProcess.const_get(name)
+    path = "#{File.dirname(__FILE__)}/php_process/#{::StringCases.camel_to_snake(name)}.rb"
+    if File.exists?(path)
+      require path
+      return ::PhpProcess.const_get(name) if ::PhpProcess.const_defined?(name)
+    end
+
+    super
   end
 
   #Returns the path to the gem.
@@ -252,7 +254,7 @@ def php_cmd_as_string
       end
     end
 
-    cmd_str << " \"#{File.dirname(__FILE__)}/php_script.php\""
+    cmd_str << " \"#{File.dirname(__FILE__)}/php_process/php_script.php\""
 
     return cmd_str
   end

diff --git a/include/communicator.rb → lib/php_process/communicator.rb b/include/communicator.rb → lib/php_process/communicator.rb
diff --git a/include/created_function.rb → lib/php_process/created_function.rb b/include/created_function.rb → lib/php_process/created_function.rb
diff --git a/include/destroyed_error.rb → lib/php_process/destroyed_error.rb b/include/destroyed_error.rb → lib/php_process/destroyed_error.rb
diff --git a/include/fatal_error.rb → lib/php_process/fatal_error.rb b/include/fatal_error.rb → lib/php_process/fatal_error.rb
diff --git a/include/objects_handler.rb → lib/php_process/objects_handler.rb b/include/objects_handler.rb → lib/php_process/objects_handler.rb
diff --git a/include/php_error.rb → lib/php_process/php_error.rb b/include/php_error.rb → lib/php_process/php_error.rb
diff --git a/lib/php_script.php → lib/php_process/php_script.php b/lib/php_script.php → lib/php_process/php_script.php
diff --git a/include/proxy_object.rb → lib/php_process/proxy_object.rb b/include/proxy_object.rb → lib/php_process/proxy_object.rb
diff --git a/include/stderr_handler.rb → lib/php_process/stderr_handler.rb b/include/stderr_handler.rb → lib/php_process/stderr_handler.rb