Browse Source

Merge branch 'master' of https://github.com/TechEmpower/FrameworkBenchmarks

Vishal Rana 9 years ago
parent
commit
0f4e214f05
100 changed files with 133 additions and 2970 deletions
  1. 2 1
      .travis.yml
  2. 1 1
      README.md
  3. 0 1
      benchmark.cfg.example
  4. 1 1
      deployment/vagrant-common/custom_motd.sh
  5. 2 2
      deployment/vagrant-development/README.md
  6. 1 1
      deployment/vagrant-production/README.md
  7. 2 0
      frameworks/C++/cpoll_cppsp/.gitignore
  8. 1 0
      frameworks/C++/ffead-cpp/.gitignore
  9. 1 0
      frameworks/C++/poco/.gitignore
  10. 1 0
      frameworks/C++/silicon/.gitignore
  11. 2 0
      frameworks/C++/wt/.gitignore
  12. 3 1
      frameworks/C/duda/.gitignore
  13. 2 0
      frameworks/C/onion/.gitignore
  14. 3 0
      frameworks/CSharp/revenj/Revenj.Bench/RestService.cs
  15. 12 11
      frameworks/Clojure/compojure/hello/src/hello/handler.clj
  16. 11 10
      frameworks/Clojure/http-kit/hello/src/hello/handler.clj
  17. 11 8
      frameworks/Crystal/crystal-raw/server.cr
  18. 0 23
      frameworks/Crystal/kemal/benchmark_config.json
  19. 7 7
      frameworks/Crystal/kemal/shard.yml
  20. 1 0
      frameworks/D/vibed/.gitignore
  21. 1 0
      frameworks/Dart/start/.gitignore
  22. 1 0
      frameworks/Dart/stream/.gitignore
  23. 1 0
      frameworks/Erlang/chicagoboss/.gitignore
  24. 1 0
      frameworks/Erlang/misultin/.gitignore
  25. 1 0
      frameworks/Erlang/mochiweb/.gitignore
  26. 2 0
      frameworks/Go/beego/.gitignore
  27. 2 0
      frameworks/Go/echo/.gitignore
  28. 2 0
      frameworks/Go/falcore/.gitignore
  29. 2 0
      frameworks/Go/fasthttp-mysql/.gitignore
  30. 2 0
      frameworks/Go/fasthttp-postgresql/.gitignore
  31. 2 0
      frameworks/Go/gin/.gitignore
  32. 2 0
      frameworks/Go/go-std-mongodb/.gitignore
  33. 2 0
      frameworks/Go/go-std-mysql/.gitignore
  34. 1 0
      frameworks/Go/revel-qbs/.gitignore
  35. 1 0
      frameworks/Go/revel/.gitignore
  36. 3 0
      frameworks/Go/webgo/.gitignore
  37. 2 0
      frameworks/Haskell/snap/.gitignore
  38. 2 0
      frameworks/Haskell/wai/.gitignore
  39. 2 0
      frameworks/Haskell/yesod/.gitignore
  40. 1 0
      frameworks/Java/beyondj/.gitignore
  41. 1 1
      frameworks/Java/gemini/start.sh
  42. 1 0
      frameworks/Java/grizzly-jersey/.gitignore
  43. 2 0
      frameworks/Java/play1/.gitignore
  44. 4 1
      frameworks/Java/revenj/src/main/java/hello/UpdatesServlet.java
  45. 1 0
      frameworks/Java/undertow-jersey-c3p0/.gitignore
  46. 1 0
      frameworks/Java/undertow-jersey-hikaricp/.gitignore
  47. 1 1
      frameworks/JavaScript/express/package.json
  48. 1 1
      frameworks/JavaScript/hapi/package.json
  49. 4 1
      frameworks/JavaScript/nodejs/handlers/redis.js
  50. 3 4
      frameworks/JavaScript/nodejs/package.json
  51. 1 1
      frameworks/JavaScript/nodejs/source_code
  52. 2 1
      frameworks/PHP/clancats/.gitignore
  53. 3 4
      frameworks/PHP/cygnite-php-framework/.gitignore
  54. 1 0
      frameworks/PHP/fat-free/.gitignore
  55. 2 0
      frameworks/PHP/hhvm/.gitignore
  56. 1 0
      frameworks/PHP/lithium/.gitignore
  57. 0 0
      frameworks/PHP/lithium/app/resources/g11n/empty
  58. 0 0
      frameworks/PHP/lithium/app/resources/tmp/cache/templates/empty
  59. 0 31
      frameworks/PHP/lithium/app/resources/tmp/cache/templates/template_views_layouts_default.html_0_1365705000_831.php
  60. 0 257
      frameworks/PHP/lithium/app/resources/tmp/cache/templates/template_views_pages_home.html_0_1365705000_8876.php
  61. 0 0
      frameworks/PHP/lithium/app/resources/tmp/logs/empty
  62. 0 0
      frameworks/PHP/lithium/app/resources/tmp/tests/empty
  63. 1 0
      frameworks/PHP/micromvc/.gitignore
  64. 2 0
      frameworks/PHP/phalcon-micro/.gitignore
  65. 0 0
      frameworks/PHP/phalcon-micro/compiled-templates/.keepit
  66. 0 1
      frameworks/PHP/phalcon-micro/compiled-templates/_home_tfb_frameworkbenchmarks_php-phalcon-micro_views_bench_fortunes.volt.c
  67. 0 1
      frameworks/PHP/phalcon-micro/compiled-templates/_home_tfb_frameworkbenchmarks_php-phalcon-micro_views_layouts_bench.volt.c
  68. 2 0
      frameworks/PHP/phalcon/.gitignore
  69. 0 0
      frameworks/PHP/phalcon/app/compiled-templates/.keepit
  70. 0 1
      frameworks/PHP/phalcon/app/compiled-templates/_home_tfb_frameworkbenchmarks_php-phalcon_app_views_bench_fortunes.volt.compiled
  71. 0 1
      frameworks/PHP/phalcon/app/compiled-templates/_home_tfb_frameworkbenchmarks_php-phalcon_app_views_layouts_bench.volt.compiled
  72. 2 0
      frameworks/PHP/phpixie/.gitignore
  73. 0 7
      frameworks/PHP/phpixie/vendor/autoload.php
  74. 0 246
      frameworks/PHP/phpixie/vendor/composer/ClassLoader.php
  75. 0 36
      frameworks/PHP/phpixie/vendor/composer/autoload_classmap.php
  76. 0 10
      frameworks/PHP/phpixie/vendor/composer/autoload_namespaces.php
  77. 0 43
      frameworks/PHP/phpixie/vendor/composer/autoload_real.php
  78. 0 150
      frameworks/PHP/phpixie/vendor/composer/installed.json
  79. 0 4
      frameworks/PHP/phpixie/vendor/phpixie/core/README.md
  80. 0 126
      frameworks/PHP/phpixie/vendor/phpixie/core/assets/views/debug.php
  81. 0 166
      frameworks/PHP/phpixie/vendor/phpixie/core/classes/PHPixie/Config.php
  82. 0 111
      frameworks/PHP/phpixie/vendor/phpixie/core/classes/PHPixie/Controller.php
  83. 0 106
      frameworks/PHP/phpixie/vendor/phpixie/core/classes/PHPixie/Debug.php
  84. 0 9
      frameworks/PHP/phpixie/vendor/phpixie/core/classes/PHPixie/Exception/PageNotFound.php
  85. 0 281
      frameworks/PHP/phpixie/vendor/phpixie/core/classes/PHPixie/Pixie.php
  86. 0 200
      frameworks/PHP/phpixie/vendor/phpixie/core/classes/PHPixie/Request.php
  87. 0 71
      frameworks/PHP/phpixie/vendor/phpixie/core/classes/PHPixie/Response.php
  88. 0 98
      frameworks/PHP/phpixie/vendor/phpixie/core/classes/PHPixie/Route.php
  89. 0 132
      frameworks/PHP/phpixie/vendor/phpixie/core/classes/PHPixie/Router.php
  90. 0 119
      frameworks/PHP/phpixie/vendor/phpixie/core/classes/PHPixie/Session.php
  91. 0 106
      frameworks/PHP/phpixie/vendor/phpixie/core/classes/PHPixie/View.php
  92. 0 26
      frameworks/PHP/phpixie/vendor/phpixie/core/composer.json
  93. 0 10
      frameworks/PHP/phpixie/vendor/phpixie/core/tests/bootstrap.php
  94. 0 108
      frameworks/PHP/phpixie/vendor/phpixie/core/tests/configTest.php
  95. 0 58
      frameworks/PHP/phpixie/vendor/phpixie/core/tests/controllerTest.php
  96. 0 1
      frameworks/PHP/phpixie/vendor/phpixie/core/tests/phpunit.xml
  97. 0 105
      frameworks/PHP/phpixie/vendor/phpixie/core/tests/pixieTest.php
  98. 0 158
      frameworks/PHP/phpixie/vendor/phpixie/core/tests/requestTest.php
  99. 0 66
      frameworks/PHP/phpixie/vendor/phpixie/core/tests/responseTest.php
  100. 0 43
      frameworks/PHP/phpixie/vendor/phpixie/core/tests/routeTest.php

+ 2 - 1
.travis.yml

@@ -231,4 +231,5 @@ script:
 
 
 cache:
 cache:
   directories:
   directories:
-  - /home/testrunner/.m2/repository
+    - $HOME/.m2/repository
+    - $HOME/.cache/pip

+ 1 - 1
README.md

@@ -74,4 +74,4 @@ can be found in the [TFB documentation](http://frameworkbenchmarks.readthedocs.o
 
 
 Join in the conversation at our 
 Join in the conversation at our 
 [Google Group](https://groups.google.com/forum/?fromgroups=#!forum/framework-benchmarks), 
 [Google Group](https://groups.google.com/forum/?fromgroups=#!forum/framework-benchmarks), 
-or chat with us on [Freenode](https://freenode.net/faq.shtml#whatwhy) at `#techempower-fwbm`. 
+or chat with us on [Freenode](https://webchat.freenode.net/) at `#techempower-fwbm`. 

+ 0 - 1
benchmark.cfg.example

@@ -20,7 +20,6 @@ concurrency_levels=[8, 16, 32, 64, 128, 256]
 query_levels=[1, 5,10,15,20]
 query_levels=[1, 5,10,15,20]
 threads=8
 threads=8
 mode=benchmark
 mode=benchmark
-name=ec2
 os=linux
 os=linux
 password_prompt=False
 password_prompt=False
 server_host=127.0.0.1
 server_host=127.0.0.1

+ 1 - 1
deployment/vagrant-common/custom_motd.sh

@@ -6,7 +6,7 @@ echo ""
 echo "  To get started, perhaps try this:"
 echo "  To get started, perhaps try this:"
 echo "    \$ cd FrameworkBenchmarks"
 echo "    \$ cd FrameworkBenchmarks"
 echo "    \$ toolset/run-tests.py --install server --test go"
 echo "    \$ toolset/run-tests.py --install server --test go"
-echo "    \$ cat results/ec2/latest/logs/go/out.txt"
+echo "    \$ cat results/latest/logs/go/out.txt"
 echo ""
 echo ""
 echo "  You can get lots of help:"
 echo "  You can get lots of help:"
 echo "    \$ toolset/run-tests.py --help"
 echo "    \$ toolset/run-tests.py --help"

+ 2 - 2
deployment/vagrant-development/README.md

@@ -51,7 +51,7 @@ Welcome to the FrameworkBenchmarks project!
 To get started, perhaps try this:
 To get started, perhaps try this:
    $ cd FrameworkBenchmarks
    $ cd FrameworkBenchmarks
    $ toolset/run-tests.py --install server --test go
    $ toolset/run-tests.py --install server --test go
-   $ cat results/ec2/latest/logs/go/out.txt
+   $ cat results/latest/logs/go/out.txt
 
 
 You can get lots of help:
 You can get lots of help:
    $ toolset/run-tests.py --help
    $ toolset/run-tests.py --help
@@ -71,7 +71,7 @@ usernames, or private key files, as so:
     <log for installing software needed for go test>
     <log for installing software needed for go test>
     <log for launching go framework>
     <log for launching go framework>
     <log for verifying go framework meets requirements>
     <log for verifying go framework meets requirements>
-    $ cat results/ec2/latest/logs/go/out.txt
+    $ cat results/latest/logs/go/out.txt
     <log with stdout from framework go>
     <log with stdout from framework go>
 
 
 # Using Amazon-powered Virtual Machine
 # Using Amazon-powered Virtual Machine

+ 1 - 1
deployment/vagrant-production/README.md

@@ -46,7 +46,7 @@ Welcome to the FrameworkBenchmarks project!
 To get started, perhaps try this:
 To get started, perhaps try this:
    $ cd FrameworkBenchmarks
    $ cd FrameworkBenchmarks
    $ toolset/run-tests.py --install server --test go
    $ toolset/run-tests.py --install server --test go
-   $ cat results/ec2/latest/logs/go/out.txt
+   $ cat results/latest/logs/go/out.txt
 
 
 You can get lots of help:
 You can get lots of help:
    $ toolset/run-tests.py --help
    $ toolset/run-tests.py --help

+ 2 - 0
frameworks/C++/cpoll_cppsp/.gitignore

@@ -0,0 +1,2 @@
+/www/*.so
+/www/*.txt

+ 1 - 0
frameworks/C++/ffead-cpp/.gitignore

@@ -0,0 +1 @@
+/ffead-cpp-2.0/

+ 1 - 0
frameworks/C++/poco/.gitignore

@@ -0,0 +1 @@
+/poco

+ 1 - 0
frameworks/C++/silicon/.gitignore

@@ -0,0 +1 @@
+/build/

+ 2 - 0
frameworks/C++/wt/.gitignore

@@ -0,0 +1,2 @@
+/benchmark.wt
+/benchmark_postgres.wt

+ 3 - 1
frameworks/C/duda/.gitignore

@@ -1,3 +1,5 @@
 *.o
 *.o
 *~
 *~
-
+/Makefile
+/main.d
+/ws.duda

+ 2 - 0
frameworks/C/onion/.gitignore

@@ -0,0 +1,2 @@
+/assets.h
+/onion

+ 3 - 0
frameworks/CSharp/revenj/Revenj.Bench/RestService.cs

@@ -129,6 +129,8 @@ namespace Revenj.Bench
 			return cms;
 			return cms;
 		}
 		}
 
 
+		private static readonly Comparison<World> ASC = (l, r) => l.id - r.id;
+
 		public Stream Updates(string count)
 		public Stream Updates(string count)
 		{
 		{
 			int repeat;
 			int repeat;
@@ -141,6 +143,7 @@ namespace Revenj.Bench
 			Array.Copy(ctx.Worlds, result, repeat);
 			Array.Copy(ctx.Worlds, result, repeat);
 			for (int i = 0; i < result.Length; i++)
 			for (int i = 0; i < result.Length; i++)
 				result[i].randomNumber = Random.Next(10000) + 1;
 				result[i].randomNumber = Random.Next(10000) + 1;
+			Array.Sort(result, ASC);
 			ctx.Repository.Update(result);
 			ctx.Repository.Update(result);
 			var cms = ctx.Stream;
 			var cms = ctx.Stream;
 			result.Serialize(cms);
 			result.Serialize(cms);

+ 12 - 11
frameworks/Clojure/compojure/hello/src/hello/handler.clj

@@ -143,23 +143,24 @@
   "Using Korma: Changes the :randomNumber of a number of world entities.
   "Using Korma: Changes the :randomNumber of a number of world entities.
   Persists the changes to sql then returns the updated entities"
   Persists the changes to sql then returns the updated entities"
   [queries]
   [queries]
-(let [results (run-queries queries)]
-    (for [w results]
-      (update-in w [:randomNumber (inc (rand-int 9999))]
-        (update world
-                (set-fields {:randomNumber (:randomNumber w)})
-                (where {:id [:id w]}))))
+  (let [results (map #(assoc % :randomNumber (inc (rand-int 9999))) (run-queries queries))]
+    (doseq [{:keys [id randomNumber]} results]
+      (update world
+              (set-fields {:randomNumber randomNumber})
+              (where {:id id})))
     results))
     results))
 
 
 (defn update-and-persist-raw
 (defn update-and-persist-raw
   "Using JDBC: Changes the :randomNumber of a number of world entities.
   "Using JDBC: Changes the :randomNumber of a number of world entities.
   Persists the changes to sql then returns the updated entities"
   Persists the changes to sql then returns the updated entities"
   [queries]
   [queries]
-(let [results (run-queries queries)]
-    (for [w results]
-      (update-in w [:randomNumber (inc (rand-int 9999))]
-        (jdbc/update! (db-mysql-raw) :world {:randomNumber (:randomNumber w)} ["id = ?" (:id w)])))
-    results))
+  (let [world (map #(assoc % :randomnumber (inc (rand-int 9999))) (run-queries-raw queries))]
+    (doseq [{:keys [id randomnumber]} world]
+      (jdbc/update!
+       (db-mysql-raw)
+       :world {:randomnumber randomnumber}
+       ["id = ?" id]))
+    world))
 
 
 (defn json-serialization
 (defn json-serialization
   "Test 1: JSON serialization"
   "Test 1: JSON serialization"

+ 11 - 10
frameworks/Clojure/http-kit/hello/src/hello/handler.clj

@@ -145,23 +145,24 @@
   "Using Korma: Changes the :randomNumber of a number of world entities.
   "Using Korma: Changes the :randomNumber of a number of world entities.
   Persists the changes to sql then returns the updated entities"
   Persists the changes to sql then returns the updated entities"
   [queries]
   [queries]
-(let [results (run-queries queries)]
-    (for [w results]
-      (update-in w [:randomNumber (inc (rand-int 9999))]
+  (let [results (map #(assoc % :randomNumber (inc (rand-int 9999))) (run-queries queries))]
+    (doseq [{:keys [id randomNumber]} results]
         (update world
         (update world
-                (set-fields {:randomNumber (:randomNumber w)})
-                (where {:id [:id w]}))))
+              (set-fields {:randomNumber randomNumber})
+              (where {:id id})))
     results))
     results))
 
 
 (defn update-and-persist-raw
 (defn update-and-persist-raw
   "Using JDBC: Changes the :randomNumber of a number of world entities.
   "Using JDBC: Changes the :randomNumber of a number of world entities.
   Persists the changes to sql then returns the updated entities"
   Persists the changes to sql then returns the updated entities"
   [queries]
   [queries]
-(let [results (run-queries queries)]
-    (for [w results]
-      (update-in w [:randomNumber (inc (rand-int 9999))]
-        (jdbc/update! (db-mysql-raw) :world {:randomNumber (:randomNumber w)} ["id = ?" (:id w)])))
-    results))
+  (let [world (map #(assoc % :randomnumber (inc (rand-int 9999))) (run-queries-raw queries))]
+    (doseq [{:keys [id randomnumber]} world]
+      (jdbc/update!
+       (db-mysql-raw)
+       :world {:randomnumber randomnumber}
+       ["id = ?" id]))
+    world))
 
 
 (defn json-serialization
 (defn json-serialization
   "Test 1: JSON serialization"
   "Test 1: JSON serialization"

+ 11 - 8
frameworks/Crystal/crystal-raw/server.cr

@@ -1,17 +1,20 @@
 require "http/server"
 require "http/server"
 require "json"
 require "json"
 
 
-server = HTTP::Server.new(8080) do |request|
-  headers = HTTP::Headers{"Server": "Crystal", "Date": Time.utc_now.to_s}
-  case request.path
+server = HTTP::Server.new(8080) do |context|
+  response = context.response
+  response.headers.merge!({"Server": "Crystal", "Date": Time.utc_now.to_s})
+  case context.request.path
   when "/json"
   when "/json"
-    headers.add("Content-Type", "application/json")
-    HTTP::Response.new 200, {message: "Hello, World!"}.to_json, headers
+    response.status_code = 200
+    response.headers["Content-Type"] = "application/json"
+    response.print({message: "Hello, World!"}.to_json)
   when "/plaintext"
   when "/plaintext"
-    headers.add("Content-Type", "text/plain")
-    HTTP::Response.new 200, "Hello, world!", headers
+    response.status_code = 200
+    response.headers["Content-Type"] = "text/plain"
+    response.print "Hello, World!"
   else
   else
-    HTTP::Response.not_found
+    response.status_code = 404
   end
   end
 end
 end
 
 

+ 0 - 23
frameworks/Crystal/kemal/benchmark_config.json

@@ -2,29 +2,6 @@
   "framework": "kemal",
   "framework": "kemal",
   "tests": [{
   "tests": [{
     "default": {
     "default": {
-      "setup_file": "setup-redis",
-      "json_url": "/json",
-      "db_url": "/db",
-      "query_url": "/queries?queries=",
-      "fortune_url": "/fortunes",
-      "update_url": "/updates?queries=",
-      "plaintext_url": "/plaintext",
-      "port": 3000,
-      "approach": "Realistic",
-      "classification": "Fullstack",
-      "database": "Redis",
-      "framework": "kemal",
-      "language": "Crystal",
-      "orm": "micro",
-      "platform": "Crystal",
-      "webserver": "None",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "Kemal",
-      "notes": "",
-      "versus": "ruby"
-    },
-    "postgres": {
       "setup_file": "setup-postgres",
       "setup_file": "setup-postgres",
       "json_url": "/json",
       "json_url": "/json",
       "db_url": "/db",
       "db_url": "/db",

+ 7 - 7
frameworks/Crystal/kemal/shard.yml

@@ -3,17 +3,17 @@ version: "0.0.1"
 
 
 dependencies:
 dependencies:
   pg:
   pg:
-    github: will/crystal-pg
-    version: 0.5.0
+    github: "will/crystal-pg"
+    version: "0.5.0"
   pool:
   pool:
-    github: ysbaddaden/pool
-    branch: master
+    github: "ysbaddaden/pool"
+    version: "0.2.1"
   kemal:
   kemal:
     github: "sdogruyol/kemal"
     github: "sdogruyol/kemal"
-    version: 0.10.0
+    version: "0.10.0"
   redis:
   redis:
     github: "stefanwille/crystal-redis"
     github: "stefanwille/crystal-redis"
     version: "~> 1.3.1"
     version: "~> 1.3.1"
   html_builder:
   html_builder:
-    github: crystal-lang/html_builder
-license: MIT
+    github: "crystal-lang/html_builder"
+license: "MIT"

+ 1 - 0
frameworks/D/vibed/.gitignore

@@ -5,3 +5,4 @@ __dummy.html
 *.obj
 *.obj
 *.dll
 *.dll
 *.exe
 *.exe
+/fwb

+ 1 - 0
frameworks/Dart/start/.gitignore

@@ -1 +1,2 @@
 packages/*
 packages/*
+/nginx.conf

+ 1 - 0
frameworks/Dart/stream/.gitignore

@@ -1 +1,2 @@
 packages/*
 packages/*
+/nginx.conf

+ 1 - 0
frameworks/Erlang/chicagoboss/.gitignore

@@ -2,3 +2,4 @@ erl_crash.dump
 deps
 deps
 ebin
 ebin
 .rebar
 .rebar
+/log/

+ 1 - 0
frameworks/Erlang/misultin/.gitignore

@@ -5,3 +5,4 @@ ebin
 *.beam
 *.beam
 *.plt
 *.plt
 erl_crash.dump
 erl_crash.dump
+/.rebar/

+ 1 - 0
frameworks/Erlang/mochiweb/.gitignore

@@ -5,3 +5,4 @@ ebin
 *.beam
 *.beam
 *.plt
 *.plt
 erl_crash.dump
 erl_crash.dump
+/.rebar/

+ 2 - 0
frameworks/Go/beego/.gitignore

@@ -0,0 +1,2 @@
+/src/github.com/
+/pkg/linux_amd64/

+ 2 - 0
frameworks/Go/echo/.gitignore

@@ -0,0 +1,2 @@
+/pkg/
+/src/

+ 2 - 0
frameworks/Go/falcore/.gitignore

@@ -0,0 +1,2 @@
+/pkg/linux_amd64/
+/src/github.com/

+ 2 - 0
frameworks/Go/fasthttp-mysql/.gitignore

@@ -0,0 +1,2 @@
+/pkg/
+/src/github.com/

+ 2 - 0
frameworks/Go/fasthttp-postgresql/.gitignore

@@ -0,0 +1,2 @@
+/pkg/
+/src/github.com/

+ 2 - 0
frameworks/Go/gin/.gitignore

@@ -0,0 +1,2 @@
+/pkg/
+/src/

+ 2 - 0
frameworks/Go/go-std-mongodb/.gitignore

@@ -0,0 +1,2 @@
+/pkg/
+/src/gopkg.in/

+ 2 - 0
frameworks/Go/go-std-mysql/.gitignore

@@ -0,0 +1,2 @@
+/pkg/
+/src/github.com/

+ 1 - 0
frameworks/Go/revel-qbs/.gitignore

@@ -0,0 +1 @@
+/src/github.com/

+ 1 - 0
frameworks/Go/revel/.gitignore

@@ -0,0 +1 @@
+/src/github.com/

+ 3 - 0
frameworks/Go/webgo/.gitignore

@@ -0,0 +1,3 @@
+/pkg/linux_amd64/
+/src/github.com/
+/src/golang.org/

+ 2 - 0
frameworks/Haskell/snap/.gitignore

@@ -1 +1,3 @@
 dist/
 dist/
+/bench/.cabal-sandbox/
+/bench/cabal.sandbox.config

+ 2 - 0
frameworks/Haskell/wai/.gitignore

@@ -1,2 +1,4 @@
 bench/cabal-dev
 bench/cabal-dev
 bench/dist
 bench/dist
+/bench/.cabal-sandbox/
+/bench/cabal.sandbox.config

+ 2 - 0
frameworks/Haskell/yesod/.gitignore

@@ -1 +1,3 @@
 bench/cabal-dev
 bench/cabal-dev
+/bench/.cabal-sandbox/
+/bench/cabal.sandbox.config

+ 1 - 0
frameworks/Java/beyondj/.gitignore

@@ -0,0 +1 @@
+beyondj-launcher/deploy

+ 1 - 1
frameworks/Java/gemini/start.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #!/bin/bash
 
 
-fw_depends java resin maven
+fw_depends java resin maven ant
 
 
 sed -i 's|db.ConnectString = .*/|db.ConnectString = '"$DBHOST"':3306/|g' Docroot/WEB-INF/GeminiHello.conf
 sed -i 's|db.ConnectString = .*/|db.ConnectString = '"$DBHOST"':3306/|g' Docroot/WEB-INF/GeminiHello.conf
 sed -i 's|root-directory=".*/FrameworkBenchmarks/frameworks/Java/gemini|root-directory="'"$TROOT"'|g' Docroot/WEB-INF/resin.xml
 sed -i 's|root-directory=".*/FrameworkBenchmarks/frameworks/Java/gemini|root-directory="'"$TROOT"'|g' Docroot/WEB-INF/resin.xml

+ 1 - 0
frameworks/Java/grizzly-jersey/.gitignore

@@ -0,0 +1 @@
+/dependency-reduced-pom.xml

+ 2 - 0
frameworks/Java/play1/.gitignore

@@ -1 +1,3 @@
 precompiled/*
 precompiled/*
+/server.pid
+/tmp/

+ 4 - 1
frameworks/Java/revenj/src/main/java/hello/UpdatesServlet.java

@@ -6,10 +6,12 @@ import dsl.FrameworkBench.World;
 import javax.servlet.ServletException;
 import javax.servlet.ServletException;
 import javax.servlet.http.*;
 import javax.servlet.http.*;
 import java.io.IOException;
 import java.io.IOException;
-import java.util.ArrayList;
+import java.util.*;
 
 
 public class UpdatesServlet extends HttpServlet {
 public class UpdatesServlet extends HttpServlet {
 
 
+	private static final Comparator<World> ASC = (l, r) -> l.getId() - r.getId();
+
 	@Override
 	@Override
 	protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
 	protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
 		res.setContentType("application/json");
 		res.setContentType("application/json");
@@ -22,6 +24,7 @@ public class UpdatesServlet extends HttpServlet {
 		for (int i = 0; i < count; i++) {
 		for (int i = 0; i < count; i++) {
 			changed.add(worlds[i].setRandomNumber(ctx.getRandom10k()));
 			changed.add(worlds[i].setRandomNumber(ctx.getRandom10k()));
 		}
 		}
+		Collections.sort(changed, ASC);
 		ctx.repository.update(changed);
 		ctx.repository.update(changed);
 		json.serialize(worlds, count);
 		json.serialize(worlds, count);
 		json.toStream(res.getOutputStream());
 		json.toStream(res.getOutputStream());

+ 1 - 0
frameworks/Java/undertow-jersey-c3p0/.gitignore

@@ -0,0 +1 @@
+/dependency-reduced-pom.xml

+ 1 - 0
frameworks/Java/undertow-jersey-hikaricp/.gitignore

@@ -0,0 +1 @@
+/dependency-reduced-pom.xml

+ 1 - 1
frameworks/JavaScript/express/package.json

@@ -1,5 +1,5 @@
 {
 {
-  "name": "application-name",
+  "name": "express",
   "version": "0.0.1",
   "version": "0.0.1",
   "private": true,
   "private": true,
   "dependencies": {
   "dependencies": {

+ 1 - 1
frameworks/JavaScript/hapi/package.json

@@ -1,5 +1,5 @@
 {
 {
-  "name": "application-name",
+  "name": "hapi",
   "version": "0.0.1",
   "version": "0.0.1",
   "private": true,
   "private": true,
   "dependencies": {
   "dependencies": {

+ 4 - 1
frameworks/JavaScript/nodejs/handlers/redis.js

@@ -2,7 +2,10 @@ var h = require('../helper');
 var async = require('async');
 var async = require('async');
 // "If hiredis [pure C library] is installed, node_redis will use it by default.
 // "If hiredis [pure C library] is installed, node_redis will use it by default.
 // Otherwise, a pure JavaScript parser will be used."
 // Otherwise, a pure JavaScript parser will be used."
-// >> hiredis is installed for these tests
+// >> Previous versions of this project installed hiredis; however, hiredis now has
+// >> installation issues and redis is no longer tested, so the hiredis dependency was taken out.
+// >> If redis tests are re-instated, try to re-add hiredis dependency; however, if it does
+// >> not install correctly, the tests will still work with the redis default JS parser
 var redis = require('redis');
 var redis = require('redis');
 var client = redis.createClient(6379, '127.0.0.1', {});
 var client = redis.createClient(6379, '127.0.0.1', {});
 
 

+ 3 - 4
frameworks/JavaScript/nodejs/package.json

@@ -1,12 +1,11 @@
 {
 {
-  "name": "application-name",
+  "name": "nodejs",
   "version": "0.0.1",
   "version": "0.0.1",
   "private": true,
   "private": true,
   "dependencies": {
   "dependencies": {
     "async": "1.5.0",
     "async": "1.5.0",
     "bluebird": "^2.9.27",
     "bluebird": "^2.9.27",
     "handlebars": "^3.0.3",
     "handlebars": "^3.0.3",
-    "hiredis": "^0.4.0",
     "mongodb": "2.1.2",
     "mongodb": "2.1.2",
     "mongoose": "4.3.4",
     "mongoose": "4.3.4",
     "mysql": "2.7.0",
     "mysql": "2.7.0",
@@ -14,7 +13,7 @@
     "pg": "^4.4.3",
     "pg": "^4.4.3",
     "pg-hstore": "^2.3.2",
     "pg-hstore": "^2.3.2",
     "redis": "^0.12.1",
     "redis": "^0.12.1",
-    "sequelize": "3.1.1"
+    "sequelize": "3.6.0"
   },
   },
-  "main": "hello.js"
+  "main": "app.js"
 }
 }

+ 1 - 1
frameworks/JavaScript/nodejs/source_code

@@ -1 +1 @@
-./nodejs/hello.js
+./nodejs/app.js

+ 2 - 1
frameworks/PHP/clancats/.gitignore

@@ -9,4 +9,5 @@ composer.lock
 phpunit.xml
 phpunit.xml
 phpunit.phar
 phpunit.phar
 report/
 report/
-run
+run
+/clancatsapp/

+ 3 - 4
frameworks/PHP/cygnite-php-framework/.gitignore

@@ -1,5 +1,3 @@
-
-
 #Build System
 #Build System
 **/builds/*
 **/builds/*
 
 
@@ -58,6 +56,7 @@ intermediate
 publish
 publish
 .idea
 .idea
 
 
-
 #Arcanist
 #Arcanist
-.arcconfig
+.arcconfig
+
+/deploy/php-fpm.pid

+ 1 - 0
frameworks/PHP/fat-free/.gitignore

@@ -0,0 +1 @@
+/deploy/php-fpm.pid

+ 2 - 0
frameworks/PHP/hhvm/.gitignore

@@ -0,0 +1,2 @@
+/.hhvm.bbhc
+/hhvm.pid

+ 1 - 0
frameworks/PHP/lithium/.gitignore

@@ -9,3 +9,4 @@
 .idea
 .idea
 vendor
 vendor
 deploy/php-fpm.pid
 deploy/php-fpm.pid
+/app/resources/

+ 0 - 0
frameworks/PHP/lithium/app/resources/g11n/empty


+ 0 - 0
frameworks/PHP/lithium/app/resources/tmp/cache/templates/empty


+ 0 - 31
frameworks/PHP/lithium/app/resources/tmp/cache/templates/template_views_layouts_default.html_0_1365705000_831.php

@@ -1,31 +0,0 @@
-<?php
-/**
- * Lithium: the most rad php framework
- *
- * @copyright     Copyright 2013, Union of RAD (http://union-of-rad.org)
- * @license       http://opensource.org/licenses/bsd-license.php The BSD License
- */
-?>
-<!doctype html>
-<html>
-<head>
-	<?php echo $this->html->charset();?>
-	<title>Application &gt; <?php echo $this->title(); ?></title>
-	<?php echo $this->html->style(array('debug', 'lithium')); ?>
-	<?php echo $this->scripts(); ?>
-	<?php echo $this->html->link('Icon', null, array('type' => 'icon')); ?>
-</head>
-<body class="app">
-	<div id="container">
-		<div id="header">
-			<h1>Application</h1>
-			<h2>
-				Powered by <?php echo $this->html->link('Lithium', 'http://lithify.me/'); ?>.
-			</h2>
-		</div>
-		<div id="content">
-			<?php echo $this->content(); ?>
-		</div>
-	</div>
-</body>
-</html>

+ 0 - 257
frameworks/PHP/lithium/app/resources/tmp/cache/templates/template_views_pages_home.html_0_1365705000_8876.php

@@ -1,257 +0,0 @@
-<?php
-/**
- * Lithium: the most rad php framework
- *
- * @copyright     Copyright 2013, Union of RAD (http://union-of-rad.org)
- * @license       http://opensource.org/licenses/bsd-license.php The BSD License
- */
-
-use lithium\core\Libraries;
-use lithium\core\Environment;
-use lithium\data\Connections;
-
-$this->title('Home');
-
-$self = $this;
-
-$notify = function($status, $message, $solution = null) {
-	$html  = "<div class=\"test-result test-result-{$status}\">{$message}</div>";
-	$html .= "<div class=\"test-result solution\">{$solution}</div>";
-	return $html;
-};
-
-$support = function($classes) {
-	$result = '<ul class="indicated">';
-
-	foreach ($classes as $class => $enabled) {
-		$name = substr($class, strrpos($class, '\\') + 1);
-		$url = 'http://lithify.me/docs/' . str_replace('\\', '/', $class);
-		$class = $enabled ? 'enabled' : 'disabled';
-		$title = $enabled ? "Adapter `{$name}` is enabled." : "Adapter `{$name}` is disabled.";
-
-		$result .= "<li><a href=\"{$url}\" title=\"{$title}\" class=\"{$class}\">{$name}</a></li>";
-	}
-	$result .= '</ul>';
-
-	return $result;
-};
-
-$compiled = function($flag) {
-	ob_start();
-	phpinfo(INFO_GENERAL);
-	return strpos(ob_get_clean(), $flag) !== false;
-};
-
-$checks = array(
-	'resourcesWritable' => function() use ($notify) {
-		if (is_writable($path = Libraries::get(true, 'resources'))) {
-			return $notify('success', 'Resources directory is writable');
-		}
-		$path = str_replace(dirname(LITHIUM_APP_PATH) . '/', null, $path);
-		$solution = null;
-
-		if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') {
-			$solution  = 'To fix this, run the following from the command line: ';
-			$solution .= "<code>$ chmod -R 0777 {$path}</code>.";
-		} else {
-			$path = realpath($path);
-			$solution  = 'To fix this, give <code>modify</code> rights to the user ';
-			$solution .= "<code>Everyone</code> on directory <code>{$path}</code>.";
-		}
-		return $notify(
-			'fail',
-			'Your resource path is not writeable',
-			$solution
-		);
-	},
-	'magicQuotes' => function() use ($notify) {
-		if (!get_magic_quotes_gpc()) {
-			return;
-		}
-		return $notify(
-			'fail',
-			'Magic quotes are enabled in your PHP configuration',
-			'Please set <code>magic_quotes_gpc = Off</code> in your <code>php.ini</code> settings.'
-		);
-	},
-	'registerGlobals' => function() use ($notify) {
-		if (!ini_get('register_globals')) {
-			return;
-		}
-		return $notify(
-			'fail',
-			'Register globals is enabled in your PHP configuration',
-			'Please set <code>register_globals = Off</code> in your <code>php.ini</code> settings.'
-		);
-	},
-	'curlwrappers' => function() use ($notify, $compiled) {
-		if (!$compiled('with-curlwrappers')) {
-			return;
-		}
-		return $notify(
-			'fail',
-			'Curlwrappers are enabled, some things might not work as expected.',
-			"This is an expiremental and usually broken feature of PHP.
-			Please recompile your PHP binary without using the <code>--with-curlwrappers</code>
-			flag or use a precompiled binary that was compiled without the flag."
-		);
-	},
-	'shortOpenTag' => function() use ($notify, $compiled) {
-		if (!ini_get('short_open_tag')) {
-			return;
-		}
-		return $notify(
-			'notice',
-			'Short open tags are enabled, you may want to disable them.',
-			"It is recommended to not rely on this option being enabled.
-			To increase the portability of your code disable this option by setting
-			<code>short_open_tag = Off</code> in your <code>php.ini</code>."
-		);
-	},
-	'dbSupport' => function() use ($notify, $support) {
-		$paths = array('data.source', 'adapter.data.source.database', 'adapter.data.source.http');
-		$list = array();
-
-		foreach ($paths as $path) {
-			$list = array_merge($list, Libraries::locate($path, null, array('recursive' => false)));
-		}
-		$list = array_filter($list, function($class) { return method_exists($class, 'enabled'); });
-		$map = array_combine($list, array_map(function($c) { return $c::enabled(); }, $list));
-
-		return $notify('notice', 'Database support', $support($map));
-	},
-	'cacheSupport' => function() use ($notify, $support) {
-		$list = Libraries::locate('adapter.storage.cache', null, array('recursive' => false));
-		$list = array_filter($list, function($class) { return method_exists($class, 'enabled'); });
-		$map = array_combine($list, array_map(function($c) { return $c::enabled(); }, $list));
-
-		return $notify('notice', 'Cache support', $support($map));
-	},
-	'database' => function() use ($notify) {
-		if ($config = Connections::config()) {
-			return $notify('success', 'Database connection(s) configured');
-		}
-		return $notify(
-			'notice',
-			'No database connection defined',
-			"To create a database connection:
-			<ol>
-				<li>Edit the file <code>config/bootstrap.php</code>.</li>
-				<li>
-					Uncomment the line having
-					<code>require __DIR__ . '/bootstrap/connections.php';</code>.
-				</li>
-				<li>Edit the file <code>config/bootstrap/connections.php</code>.</li>
-			</ol>"
-		);
-	},
-	'change' => function() use ($notify, $self) {
-		$template = $self->html->link('template', 'http://lithify.me/docs/lithium/template');
-
-		return $notify(
-			'notice',
-			"You're using the application's default home page",
-			"To change this {$template}, edit the file
-			<code>views/pages/home.html.php</code>.
-			To change the layout,
-			(that is what's wrapping content)
-			edit the file <code>views/layouts/default.html.php</code>."
-		);
-	},
-	'routing' => function() use ($notify, $self) {
-		$routing = $self->html->link('routing', 'http://lithify.me/docs/lithium/net/http/Router');
-
-		return $notify(
-			'notice',
-			'Use custom routing',
-			"Routes allow you to map custom URLs to your application code. To change the
-			{$routing}, edit the file <code>config/routes.php</code>."
-		);
-	},
-	'tests' => function() use ($notify, $self) {
-		if (Environment::is('production')) {
-			$docsLink = $self->html->link(
-				'the documentation',
-				'http://lithify.me/docs/lithium/core/Environment::is()'
-			);
-
-			return $notify(
-				'fail',
-				"Can't run tests",
-				"<p>Lithium's default environment detection rules have determined that you are
-				running in production mode. Therefore, you will not be able to run tests from the
-				web interface. You can do any of the following to remedy this:</p>
-				<ul>
-					<li>Run this application locally</li>
-					<li>Run tests from the console, using the <code>li3 test</code> command</li>
-					<li>
-						Implementing custom environment detection rules;
-						see {$docsLink} for examples
-					</li>
-				</ul>"
-			);
-		}
-		$tests = $self->html->link('run all tests', array(
-			'controller' => 'lithium\test\Controller',
-			'args' => 'all'
-		));
-		$dashboard = $self->html->link('test dashboard', array(
-			'controller' => 'lithium\test\Controller'
-		));
-		$ticket = $self->html->link(
-			'file a ticket', 'https://github.com/UnionOfRAD/lithium/issues'
-		);
-
-		return $notify(
-			'notice',
-			'Run the tests',
-			"Check the builtin {$dashboard} or {$tests} now to ensure Lithium
-			is working as expected. Do not hesitate to {$ticket} in case a test fails."
-		);
-	}
-);
-
-?>
-
-<?php foreach ($checks as $check): ?>
-	<?php echo $check(); ?>
-<?php endforeach; ?>
-
-<ul class="additional-resources">
-	<li>
-		<div class="test-result test-result-notice">Getting started</div>
-		<div class="test-result solution">
-			<?php echo $this->html->link(
-				'Quickstart', 'http://lithify.me/docs/manual/quickstart'
-			); ?> is a guide for PHP users who are looking to get a good idea of what Lithium can
-			do. The guide is part of the official Lithium manual, <?php echo $this->html->link(
-				'The Definitive Guide', 'http://lithify.me/docs/manual'
-			); ?>.
-		</div>
-	</li>
-	<li>
-		<div class="test-result test-result-notice">Learn more</div>
-		<div class="test-result solution">
-			The
-			<?php echo $this->html->link('API documentation', 'http://lithify.me/docs/lithium'); ?>
-			has all the implementation details you've been looking for.
-		</div>
-	</li>
-	<li>
-		Chat with other Lithium users and the team developing Lithium.
-		For <em>general support</em> hop on the
-		<?php echo $this->html->link('#li3 channel', 'irc://irc.freenode.net/#li3'); ?>
-		or read the
-		<?php echo $this->html->link('logs', 'http://lithify.me/bot/logs/li3'); ?>.
-		For <em>core discussions</em> join us in the
-		<?php echo $this->html->link('#li3-core channel', 'irc://irc.freenode.net/#li3-core'); ?>
-		or read the
-		<?php echo $this->html->link('logs', 'http://lithify.me/bot/logs/li3-core'); ?>.
-	</li>
-	<li>
-		Browse the Lithium
-		<?php echo $this->html->link('Repository', 'https://github.com/UnionOfRAD/lithium'); ?>
-		or read the
-		<?php echo $this->html->link('Wiki', 'https://github.com/UnionOfRAD/lithium/wiki'); ?>.
-	</li>
-</ul>

+ 0 - 0
frameworks/PHP/lithium/app/resources/tmp/logs/empty


+ 0 - 0
frameworks/PHP/lithium/app/resources/tmp/tests/empty


+ 1 - 0
frameworks/PHP/micromvc/.gitignore

@@ -7,3 +7,4 @@
 .DS_Store
 .DS_Store
 /tags
 /tags
 .idea
 .idea
+/deploy/php-fpm.pid

+ 2 - 0
frameworks/PHP/phalcon-micro/.gitignore

@@ -0,0 +1,2 @@
+/compiled-templates/
+/deploy/php-fpm.pid

+ 0 - 0
frameworks/PHP/phalcon-micro/compiled-templates/.keepit


+ 0 - 1
frameworks/PHP/phalcon-micro/compiled-templates/_home_tfb_frameworkbenchmarks_php-phalcon-micro_views_bench_fortunes.volt.c

@@ -1 +0,0 @@
-<table><tr><th>id</th><th>message</th></tr><?php foreach ($fortunes as $fortune) { ?><tr><td><?php echo $fortune['id']; ?></td><td><?php echo $this->escaper->escapeHtml($fortune['message']); ?></td></tr><?php } ?></table>

+ 0 - 1
frameworks/PHP/phalcon-micro/compiled-templates/_home_tfb_frameworkbenchmarks_php-phalcon-micro_views_layouts_bench.volt.c

@@ -1 +0,0 @@
-<!DOCTYPE html><html><head><title>Fortunes</title></head><body><?php echo $this->getContent(); ?></body></html>

+ 2 - 0
frameworks/PHP/phalcon/.gitignore

@@ -1,5 +1,6 @@
 /app/cache
 /app/cache
 /app/logs
 /app/logs
+/app/compiled-templates/
 /bin
 /bin
 /vendors
 /vendors
 /build
 /build
@@ -7,3 +8,4 @@
 .DS_Store
 .DS_Store
 /tags
 /tags
 .idea
 .idea
+/deploy/php-fpm.pid

+ 0 - 0
frameworks/PHP/phalcon/app/compiled-templates/.keepit


+ 0 - 1
frameworks/PHP/phalcon/app/compiled-templates/_home_tfb_frameworkbenchmarks_php-phalcon_app_views_bench_fortunes.volt.compiled

@@ -1 +0,0 @@
-<table><tr><th>id</th><th>message</th></tr><?php foreach ($fortunes as $fortune) { ?><tr><td><?php echo $fortune['id']; ?></td><td><?php echo $this->escaper->escapeHtml($fortune['message']); ?></td></tr><?php } ?></table>

+ 0 - 1
frameworks/PHP/phalcon/app/compiled-templates/_home_tfb_frameworkbenchmarks_php-phalcon_app_views_layouts_bench.volt.compiled

@@ -1 +0,0 @@
-<!DOCTYPE html><html><head><title>Fortunes</title></head><body><?php echo $this->getContent(); ?></body></html>

+ 2 - 0
frameworks/PHP/phpixie/.gitignore

@@ -0,0 +1,2 @@
+/deploy/php-fpm.pid
+/vendor/

+ 0 - 7
frameworks/PHP/phpixie/vendor/autoload.php

@@ -1,7 +0,0 @@
-<?php
-
-// autoload.php @generated by Composer
-
-require_once __DIR__ . '/composer' . '/autoload_real.php';
-
-return ComposerAutoloaderInitf7f56072c6b4cbd174b02f65e83ee57a::getLoader();

+ 0 - 246
frameworks/PHP/phpixie/vendor/composer/ClassLoader.php

@@ -1,246 +0,0 @@
-<?php
-
-/*
- * This file is part of Composer.
- *
- * (c) Nils Adermann <[email protected]>
- *     Jordi Boggiano <[email protected]>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Composer\Autoload;
-
-/**
- * ClassLoader implements a PSR-0 class loader
- *
- * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
- *
- *     $loader = new \Composer\Autoload\ClassLoader();
- *
- *     // register classes with namespaces
- *     $loader->add('Symfony\Component', __DIR__.'/component');
- *     $loader->add('Symfony',           __DIR__.'/framework');
- *
- *     // activate the autoloader
- *     $loader->register();
- *
- *     // to enable searching the include path (eg. for PEAR packages)
- *     $loader->setUseIncludePath(true);
- *
- * In this example, if you try to use a class in the Symfony\Component
- * namespace or one of its children (Symfony\Component\Console for instance),
- * the autoloader will first look for the class under the component/
- * directory, and it will then fallback to the framework/ directory if not
- * found before giving up.
- *
- * This class is loosely based on the Symfony UniversalClassLoader.
- *
- * @author Fabien Potencier <[email protected]>
- * @author Jordi Boggiano <[email protected]>
- */
-class ClassLoader
-{
-    private $prefixes = array();
-    private $fallbackDirs = array();
-    private $useIncludePath = false;
-    private $classMap = array();
-
-    public function getPrefixes()
-    {
-        return call_user_func_array('array_merge', $this->prefixes);
-    }
-
-    public function getFallbackDirs()
-    {
-        return $this->fallbackDirs;
-    }
-
-    public function getClassMap()
-    {
-        return $this->classMap;
-    }
-
-    /**
-     * @param array $classMap Class to filename map
-     */
-    public function addClassMap(array $classMap)
-    {
-        if ($this->classMap) {
-            $this->classMap = array_merge($this->classMap, $classMap);
-        } else {
-            $this->classMap = $classMap;
-        }
-    }
-
-    /**
-     * Registers a set of classes, merging with any others previously set.
-     *
-     * @param string       $prefix  The classes prefix
-     * @param array|string $paths   The location(s) of the classes
-     * @param bool         $prepend Prepend the location(s)
-     */
-    public function add($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            if ($prepend) {
-                $this->fallbackDirs = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirs
-                );
-            } else {
-                $this->fallbackDirs = array_merge(
-                    $this->fallbackDirs,
-                    (array) $paths
-                );
-            }
-
-            return;
-        }
-
-        $first = $prefix[0];
-        if (!isset($this->prefixes[$first][$prefix])) {
-            $this->prefixes[$first][$prefix] = (array) $paths;
-
-            return;
-        }
-        if ($prepend) {
-            $this->prefixes[$first][$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixes[$first][$prefix]
-            );
-        } else {
-            $this->prefixes[$first][$prefix] = array_merge(
-                $this->prefixes[$first][$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of classes, replacing any others previously set.
-     *
-     * @param string       $prefix The classes prefix
-     * @param array|string $paths  The location(s) of the classes
-     */
-    public function set($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirs = (array) $paths;
-
-            return;
-        }
-        $this->prefixes[substr($prefix, 0, 1)][$prefix] = (array) $paths;
-    }
-
-    /**
-     * Turns on searching the include path for class files.
-     *
-     * @param bool $useIncludePath
-     */
-    public function setUseIncludePath($useIncludePath)
-    {
-        $this->useIncludePath = $useIncludePath;
-    }
-
-    /**
-     * Can be used to check if the autoloader uses the include path to check
-     * for classes.
-     *
-     * @return bool
-     */
-    public function getUseIncludePath()
-    {
-        return $this->useIncludePath;
-    }
-
-    /**
-     * Registers this instance as an autoloader.
-     *
-     * @param bool $prepend Whether to prepend the autoloader or not
-     */
-    public function register($prepend = false)
-    {
-        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-    }
-
-    /**
-     * Unregisters this instance as an autoloader.
-     */
-    public function unregister()
-    {
-        spl_autoload_unregister(array($this, 'loadClass'));
-    }
-
-    /**
-     * Loads the given class or interface.
-     *
-     * @param  string    $class The name of the class
-     * @return bool|null True if loaded, null otherwise
-     */
-    public function loadClass($class)
-    {
-        if ($file = $this->findFile($class)) {
-            include $file;
-
-            return true;
-        }
-    }
-
-    /**
-     * Finds the path to the file where the class is defined.
-     *
-     * @param string $class The name of the class
-     *
-     * @return string|false The path if found, false otherwise
-     */
-    public function findFile($class)
-    {
-        // work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
-        if ('\\' == $class[0]) {
-            $class = substr($class, 1);
-        }
-
-        if (isset($this->classMap[$class])) {
-            return $this->classMap[$class];
-        }
-
-        if (false !== $pos = strrpos($class, '\\')) {
-            // namespaced class name
-            $classPath = strtr(substr($class, 0, $pos), '\\', DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
-            $className = substr($class, $pos + 1);
-        } else {
-            // PEAR-like class name
-            $classPath = null;
-            $className = $class;
-        }
-
-        $classPath .= strtr($className, '_', DIRECTORY_SEPARATOR) . '.php';
-
-        $first = $class[0];
-        if (isset($this->prefixes[$first])) {
-            foreach ($this->prefixes[$first] as $prefix => $dirs) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($dirs as $dir) {
-                        if (file_exists($dir . DIRECTORY_SEPARATOR . $classPath)) {
-                            return $dir . DIRECTORY_SEPARATOR . $classPath;
-                        }
-                    }
-                }
-            }
-        }
-
-        foreach ($this->fallbackDirs as $dir) {
-            if (file_exists($dir . DIRECTORY_SEPARATOR . $classPath)) {
-                return $dir . DIRECTORY_SEPARATOR . $classPath;
-            }
-        }
-
-        if ($this->useIncludePath && $file = stream_resolve_include_path($classPath)) {
-            return $file;
-        }
-
-        return $this->classMap[$class] = false;
-    }
-}

+ 0 - 36
frameworks/PHP/phpixie/vendor/composer/autoload_classmap.php

@@ -1,36 +0,0 @@
-<?php
-
-// autoload_classmap.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-    'PHPixie\\Config' => $vendorDir . '/phpixie/core/classes/PHPixie/Config.php',
-    'PHPixie\\Controller' => $vendorDir . '/phpixie/core/classes/PHPixie/Controller.php',
-    'PHPixie\\DB' => $vendorDir . '/phpixie/db/classes/PHPixie/DB.php',
-    'PHPixie\\DB\\Connection' => $vendorDir . '/phpixie/db/classes/PHPixie/DB/Connection.php',
-    'PHPixie\\DB\\Expression' => $vendorDir . '/phpixie/db/classes/PHPixie/DB/Expression.php',
-    'PHPixie\\DB\\Mysql\\Connection' => $vendorDir . '/phpixie/db/classes/PHPixie/DB/Mysql/Connection.php',
-    'PHPixie\\DB\\Mysql\\Query' => $vendorDir . '/phpixie/db/classes/PHPixie/DB/Mysql/Query.php',
-    'PHPixie\\DB\\Mysql\\Result' => $vendorDir . '/phpixie/db/classes/PHPixie/DB/Mysql/Result.php',
-    'PHPixie\\DB\\PDO\\Connection' => $vendorDir . '/phpixie/db/classes/PHPixie/DB/PDO/Connection.php',
-    'PHPixie\\DB\\PDO\\Query' => $vendorDir . '/phpixie/db/classes/PHPixie/DB/PDO/Query.php',
-    'PHPixie\\DB\\PDO\\Result' => $vendorDir . '/phpixie/db/classes/PHPixie/DB/PDO/Result.php',
-    'PHPixie\\DB\\Query' => $vendorDir . '/phpixie/db/classes/PHPixie/DB/Query.php',
-    'PHPixie\\DB\\Result' => $vendorDir . '/phpixie/db/classes/PHPixie/DB/Result.php',
-    'PHPixie\\Debug' => $vendorDir . '/phpixie/core/classes/PHPixie/Debug.php',
-    'PHPixie\\Exception\\PageNotFound' => $vendorDir . '/phpixie/core/classes/PHPixie/Exception/PageNotFound.php',
-    'PHPixie\\ORM' => $vendorDir . '/phpixie/orm/classes/PHPixie/ORM.php',
-    'PHPixie\\ORM\\Extension' => $vendorDir . '/phpixie/orm/classes/PHPixie/ORM/Extension.php',
-    'PHPixie\\ORM\\Extension\\Nested' => $vendorDir . '/phpixie/orm/classes/PHPixie/ORM/Extension/Nested.php',
-    'PHPixie\\ORM\\Model' => $vendorDir . '/phpixie/orm/classes/PHPixie/ORM/Model.php',
-    'PHPixie\\ORM\\Result' => $vendorDir . '/phpixie/orm/classes/PHPixie/ORM/Result.php',
-    'PHPixie\\Pixie' => $vendorDir . '/phpixie/core/classes/PHPixie/Pixie.php',
-    'PHPixie\\Request' => $vendorDir . '/phpixie/core/classes/PHPixie/Request.php',
-    'PHPixie\\Response' => $vendorDir . '/phpixie/core/classes/PHPixie/Response.php',
-    'PHPixie\\Route' => $vendorDir . '/phpixie/core/classes/PHPixie/Route.php',
-    'PHPixie\\Router' => $vendorDir . '/phpixie/core/classes/PHPixie/Router.php',
-    'PHPixie\\Session' => $vendorDir . '/phpixie/core/classes/PHPixie/Session.php',
-    'PHPixie\\View' => $vendorDir . '/phpixie/core/classes/PHPixie/View.php',
-);

+ 0 - 10
frameworks/PHP/phpixie/vendor/composer/autoload_namespaces.php

@@ -1,10 +0,0 @@
-<?php
-
-// autoload_namespaces.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-    'PHPixie' => array($vendorDir . '/phpixie/core/classes', $vendorDir . '/phpixie/db/classes', $vendorDir . '/phpixie/orm/classes'),
-);

+ 0 - 43
frameworks/PHP/phpixie/vendor/composer/autoload_real.php

@@ -1,43 +0,0 @@
-<?php
-
-// autoload_real.php @generated by Composer
-
-class ComposerAutoloaderInitf7f56072c6b4cbd174b02f65e83ee57a
-{
-    private static $loader;
-
-    public static function loadClassLoader($class)
-    {
-        if ('Composer\Autoload\ClassLoader' === $class) {
-            require __DIR__ . '/ClassLoader.php';
-        }
-    }
-
-    public static function getLoader()
-    {
-        if (null !== self::$loader) {
-            return self::$loader;
-        }
-
-        spl_autoload_register(array('ComposerAutoloaderInitf7f56072c6b4cbd174b02f65e83ee57a', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInitf7f56072c6b4cbd174b02f65e83ee57a', 'loadClassLoader'));
-
-        $vendorDir = dirname(__DIR__);
-        $baseDir = dirname($vendorDir);
-
-        $map = require __DIR__ . '/autoload_namespaces.php';
-        foreach ($map as $namespace => $path) {
-            $loader->set($namespace, $path);
-        }
-
-        $classMap = require __DIR__ . '/autoload_classmap.php';
-        if ($classMap) {
-            $loader->addClassMap($classMap);
-        }
-
-        $loader->register(true);
-
-        return $loader;
-    }
-}

+ 0 - 150
frameworks/PHP/phpixie/vendor/composer/installed.json

@@ -1,150 +0,0 @@
-[
-    {
-        "name": "phpixie/core",
-        "version": "dev-master",
-        "version_normalized": "9999999-dev",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/dracony/PHPixie-Core.git",
-            "reference": "11092a22456ecb30f488fc246def5a16ffa47abf"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/dracony/PHPixie-Core/zipball/11092a22456ecb30f488fc246def5a16ffa47abf",
-            "reference": "11092a22456ecb30f488fc246def5a16ffa47abf",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.0"
-        },
-        "time": "2013-07-17 12:57:49",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.*-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "PHPixie": "classes/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD"
-        ],
-        "authors": [
-            {
-                "name": "Roman Tsiupa",
-                "email": "[email protected]",
-                "homepage": "http://dracony.org"
-            }
-        ],
-        "description": "PHPixie Framework",
-        "homepage": "http://phpixie.com",
-        "keywords": [
-            "framework"
-        ]
-    },
-    {
-        "name": "phpixie/db",
-        "version": "dev-master",
-        "version_normalized": "9999999-dev",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/dracony/PHPixie-DB.git",
-            "reference": "4a3706193b0064a18d5c3115e6f1831c9f14de2e"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/dracony/PHPixie-DB/zipball/4a3706193b0064a18d5c3115e6f1831c9f14de2e",
-            "reference": "4a3706193b0064a18d5c3115e6f1831c9f14de2e",
-            "shasum": ""
-        },
-        "require": {
-            "phpixie/core": "2.*@dev"
-        },
-        "time": "2013-06-22 22:25:03",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "PHPixie": "classes/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD"
-        ],
-        "authors": [
-            {
-                "name": "Roman Tsiupa",
-                "email": "[email protected]",
-                "homepage": "http://dracony.org"
-            }
-        ],
-        "description": "PHPixie Database library",
-        "homepage": "http://phpixie.com",
-        "keywords": [
-            "database",
-            "mysql",
-            "postgresql",
-            "sqlite"
-        ]
-    },
-    {
-        "name": "phpixie/orm",
-        "version": "dev-master",
-        "version_normalized": "9999999-dev",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/dracony/PHPixie-ORM.git",
-            "reference": "c6c379b9efd17e021a9659f01ed2f75027e3a2fc"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/dracony/PHPixie-ORM/zipball/c6c379b9efd17e021a9659f01ed2f75027e3a2fc",
-            "reference": "c6c379b9efd17e021a9659f01ed2f75027e3a2fc",
-            "shasum": ""
-        },
-        "require": {
-            "phpixie/db": "2.*@dev"
-        },
-        "time": "2013-07-15 23:35:57",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "PHPixie": "classes/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD"
-        ],
-        "authors": [
-            {
-                "name": "Roman Tsiupa",
-                "email": "[email protected]",
-                "homepage": "http://dracony.org"
-            }
-        ],
-        "description": "ORM library for PHPixie",
-        "homepage": "http://phpixie.com",
-        "keywords": [
-            "database",
-            "orm"
-        ]
-    }
-]

+ 0 - 4
frameworks/PHP/phpixie/vendor/phpixie/core/README.md

@@ -1,4 +0,0 @@
-PHPixie-Core
-============
-
-PHPixie framework core

+ 0 - 126
frameworks/PHP/phpixie/vendor/phpixie/core/assets/views/debug.php

@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<title>Error</title>
-		<style>
-			html{
-				width:100%;
-				min-height:100%;
-				font-family:'Verdana';
-				font-size:14px;
-			}
-			body{
-
-				min-height:100%;
-				background: #a90329; /* Old browsers */
-				background: -moz-radial-gradient(center, ellipse cover, #a90329 0%, #6d0019 100%); /* FF3.6+ */
-				background: -webkit-radial-gradient(center, ellipse cover, #a90329 0%,#6d0019 100%); /* Chrome10+,Safari5.1+ */
-			}
-			#content{
-				width:1000px;
-				margin:auto;
-				padding:10px 0px;
-				background:#eee;
-			}
-			.file{
-				font-weight:bold;
-			}
-			.block{
-				border-bottom:1px solid #000;
-				margin:10px;
-			}
-			.code{
-				
-				padding:10px;
-			}
-			.highlight{
-				background:#efecd0;
-			}
-			#exception{
-				font-size:25px;
-				font-weight:bold;
-				padding:10px;
-			}
-			#debug{
-				border-bottom: 1px solid black;
-				margin: 10px;
-			}
-			#log{
-				font-size:15px;
-				font-weight:bold;
-				padding:5px;
-			}
-			.log{
-				padding:10px;
-				border-bottom: 1px solid black;
-			}
-			.log.odd{
-				
-			}
-			pre{
-				margin:0px;
-			}
-			.thick{
-				border-width:2px;
-			}
-		</style>
-	</head>
-	<body>
-		<?php 
-			$rawblocks=array_merge(array(array(
-				'file'=>$exception->getFile(),
-				'line'=>$exception->getLine()
-			)), $exception->getTrace());
-			$blocks = array();
-			foreach($rawblocks as $block){
-				if(!isset($block['file']))
-					continue;
-				//avoid duplicates
-				if(count($blocks)>0){
-					$last=$blocks[count($blocks)-1];
-					if($block['file']==$last['file'] && $block['line']==$last['line'])
-						continue;
-				}
-				$blocks[]=$block;
-			}
-			
-			
-		?>
-		<div id="content">
-			<div id="exception"><?php echo str_replace("\n",'<br/>',$exception->getMessage()); ?></div>
-			<div id="blocks">
-				<?php foreach($blocks as $bkey=>$block):	?>
-					<div class="block <?php echo (!empty($log)&&$bkey==0)?'thick':''; ?>">
-						<div class="file"><?php echo $block['file'];?></div>
-						<div class="code">
-							<?php 
-								$line=$block['line']-1;
-								$code = explode("\n", file_get_contents($block['file']));
-								$start = $line - 3;
-								if ($start < 0) $start = 0;
-								$end = $line + 3;
-								if($end>=count($code)) $end=count($code)-1;
-								$code=array_slice($code,$start,$end-$start,true);
-							?>
-							
-							<?php foreach($code as $n=>$text):?>
-							<pre class="line <?php echo $n==$line?'highlight':''; ?>"><?php echo ($n+1).'    '.htmlspecialchars($text); ?></pre>
-							<?php endforeach;?>
-						</div>
-					</div>
-					<?php if($bkey==0&&!empty($log)):?>
-						<div id="debug">
-							<div id="log">Logged values:</div>
-							<?php foreach($log as $key=>$val):?>
-								<div class="log <?php echo $key%2?'odd':''; ?>">
-									<pre><?php var_export($val);?></pre>
-								</div>
-							<?php endforeach;?>
-						</div>
-						<div id="log">Call stack:</div>
-					<?php endif;?>
-				<?php endforeach;?>
-			</div>
-		</div>
-	</body>
-</html>

+ 0 - 166
frameworks/PHP/phpixie/vendor/phpixie/core/classes/PHPixie/Config.php

@@ -1,166 +0,0 @@
-<?php
-
-namespace PHPixie;
-
-/**
- * Handles retrieving of the configuration options.
- * You can add configuration files to /assets/config folder
- * and later access them via the get() method.
- * @package Core
- */
-class Config
-{
-
-	/**
-	 * Pixie Dependancy Container
-	 * @var \PHPixie\Pixie
-	 */
-	protected $pixie;
-	
-	/**
-	 * Array of configuration files and values loaded from them
-	 * @var array
-	 */
-	protected $groups = array();
-
-	/**
-	 * Constructs a config handler
-	 *
-	 * @param \PHPixie\Pixie $pixie Pixie dependency container
-	 */
-	public function __construct($pixie) {
-		$this->pixie = $pixie;
-	}
-	
-	/**
-	 * Loads a group configuration file it has not been loaded before and
-	 * returns its options. If the group doesn't exist creates an empty one
-	 *
-	 * @param string    $name Name of the configuration group to load
-	 * @return array    Array of options for this group
-	 */
-	public function get_group($name)
-	{
-
-		if (!isset($this->groups[$name]))
-		{
-			$file = $this->pixie->find_file('config', $name);
-			$this->load_group($name, $file);
-		}
-
-		return $this->groups[$name]['options'];
-	}
-
-	/**
-	 * Loads group from file
-	 *
-	 * @param string $name Name to assign the loaded group
-	 * @param string $file File to load
-	 */
-	public function load_group($name, $file)
-	{
-		
-		if(!empty($file)){
-			$options = include($file);
-			if (!is_array($options))
-				$options = array();
-		}else {
-			$options = array();
-			$file = $this->pixie-> root_dir.'assets/config/'.$name.'.php';
-		}
-		
-		$this->groups[$name] = array(
-			'file' => $file,
-			'options' => $options
-		);
-	}
-
-	/**
-	 * Retrieves a configuration value. You can use a dot notation
-	 * to access properties in group arrays. The first part of the key
-	 * specifies the configuration file from which options should be loaded from
-	 * <code>
-	 *     //Loads ['default']['user'] option
-	 *     //from database.php configuration file
-	 *     $this->pixie->config->get('database.default.user');
-	 * </code>
-	 *
-	 * @param string    $key Configuration key to retrieve.
-	 * @param string    $default Default value to return if the key is not found.
-	 * @return mixed    Configuration value
-	 * @throws \Exception If default value is not specified and the key is not found
-	 */
-	public function get()
-	{
-		$p = func_get_args();
-
-		$keys = explode('.', $p[0]);
-		$group_name = array_shift($keys);
-		$group = $this->get_group($group_name);
-		if (empty($keys))
-			return $group;
-
-		$total = count($keys);
-		foreach ($keys as $i => $key)
-		{
-			if (isset($group[$key]))
-			{
-				if ($i == $total - 1)
-					return $group[$key];
-				$group = &$group[$key];
-			}else
-			{
-				if (array_key_exists(1, $p))
-					return $p[1];
-				throw new \Exception("Configuration not set for {$p[0]}.");
-			}
-		}
-	}
-
-	/**
-	 * Sets a configuration option.
-	 *
-	 * @param string    $key    Configuration key to set
-	 * @param string    $value  Value to set for this option
-	 */
-	public function set($key, $value)
-	{
-		$keys = explode('.', $key);
-		$group_name = array_shift($keys);
-		$group = $this->get_group($group_name);
-		$subgroup = &$group;
-		$last_key = count($keys) - 1;
-		foreach ($keys as $i => $key)
-		{
-
-			if ($i == $last_key)
-			{
-
-				$subgroup[$key] = $value;
-			}
-			else
-			{
-
-				if (!isset($subgroup[$key]) || !is_array($subgroup[$key])) 
-					$subgroup[$key] = array();
-				
-				$subgroup = & $subgroup[$key];
-			}
-		}
-
-		$this->groups[$group_name]['options'] = $group;
-	}
-
-	/**
-	 * Writes a configuration group back to the file it was loaded from
-	 *
-	 * @param string    $group    Name of the group to write
-	 */
-	public function write($group)
-	{
-		$this->get_group($group);
-		$group = $this->groups[$group];
-		file_put_contents($group['file'], "<?php\r\nreturn ".var_export($group['options'], true).";");
-	}
-
-}

+ 0 - 111
frameworks/PHP/phpixie/vendor/phpixie/core/classes/PHPixie/Controller.php

@@ -1,111 +0,0 @@
-<?php
-
-namespace PHPixie;
-
-/**
- * Base Controller class. Controllers contain the  logic of your website,
- * each action representing a reply to a particular request, e.g. a single page.
- * @package Core
- */
-class Controller
-{
-	
-	/**
-	 * Pixie Dependancy Container
-	 * @var \PHPixie\Pixie
-	 */
-	protected $pixie;
-	
-	/**
-	 * Request for this controller. Holds all input data.
-	 * @var \PHPixie\Request
-	 */
-	public $request;
-
-	/**
-	 * Response for this controller. It will be updated with headers and
-	 * response body during controller execution
-	 * @var \PHPixie\Response
-	 */
-	public $response;
-
-	/**
-	 * If set to False stops controller execution
-	 * @var boolean
-	 */
-	public $execute = true;
-
-	/**
-	 * This method is called before the action.
-	 * You can override it if you need to,
-	 * it doesn't do anything by default.
-	 *
-	 * @return void
-	 */
-	public function before()
-	{
-
-	}
-
-	/**
-	 * This method is called after the action.
-	 * You can override it if you need to,
-	 * it doesn't do anything by default.
-	 *
-	 * @return void
-	 */
-	public function after()
-	{
-
-	}
-
-	/**
-	 * Creates new Controller
-	 *
-	 */
-	public function __construct($pixie)
-	{
-		$this->pixie = $pixie;
-		$this->response = new Response;
-	}
-
-	/**
-	 * Shortcut for redirecting the user.
-	 * Use like this:
-	 * <code>
-	 *     return $this->redirect($url);
-	 * </code>
-	 *
-	 * @param string $url URL to redirect to.
-	 * @return void
-	 */
-	public function redirect($url) {
-		$this->response-> redirect($url);
-		$this->execute = false;
-	}
-	
-	/**
-	 * Runs the appropriate action.
-	 * It will execute the before() method before the action
-	 * and after() method after the action finishes.
-	 *
-	 * @param string    $action Name of the action to execute.
-	 * @return void
-	 * @throws \PHPixie\Exception\PageNotFound If the specified action doesn't exist
-	 */
-	public function run($action)
-	{
-		$action = 'action_'.$action;
-		
-		if (!method_exists($this, $action))
-			throw new \PHPixie\Exception\PageNotFound("Method {$action} doesn't exist in ".get_class($this));
-			
-		$this->execute = true;
-		$this->before();
-		if ($this->execute)
-			$this->$action();
-		if ($this->execute)
-			$this->after();
-	}
-
-}

+ 0 - 106
frameworks/PHP/phpixie/vendor/phpixie/core/classes/PHPixie/Debug.php

@@ -1,106 +0,0 @@
-<?php
-
-namespace PHPixie;
-
-/**
- * Handles error reporting and debugging.
- * @package Core
- */
-class Debug
-{
-
-	/**
-	 * Pixie Dependancy Container
-	 * @var \PHPixie\Pixie
-	 */
-	protected $pixie;
-	
-	/**
-	 * An array of logged items
-	 * @var array
-	 */
-	public $logged = array();
-	
-	/**
-	 * Flag that determines if the errors are displayed
-	 * @var boolean
-	 */
-	public $display_errors = true;
-	
-	/**
-	 * Constructs a debugger
-	 *
-	 * @param \PHPixie\Pixie $pixie Pixie dependency container
-	 */
-	public function __construct($pixie) {
-		$this->pixie = $pixie;
-	}
-	
-	/**
-	 * Displays the error page. If you set $display_errors to false
-	 * only a small error message will be displayed.
-	 *
-	 * @param \Exception $exception Exception to display
-	 * @return void
-	 */
-	public function render_exception_page($exception)
-	{
-		if (ob_get_length() > 0)
-			ob_end_clean();
-
-		$status = '503 Service Temporarily Unavailable';
-		
-		if ($exception instanceof \PHPixie\Exception\PageNotFound)
-			$status = '404 Not Found';
-			
-		header($_SERVER["SERVER_PROTOCOL"].' '.$status);
-		header("Status: {$status}");
-
-		if (!$this->display_errors) {
-			echo $status;
-		}else{
-			$view = $this->pixie->view('debug');
-			$view->exception = $exception;
-			$view->log = $this->logged;
-			echo $view->render();
-		}
-		
-	}
-
-	/**
-	 * Converts PHP Errors to Exceptions
-	 *
-	 * @param string        $errno   Error number
-	 * @param string        $errstr  Error message
-	 * @param string        $errfile File in which the error occurred
-	 * @param string        $errline Line at which the error occurred
-	 * @return void
-	 * @throws \ErrorException Throws converted exception to be immediately caught
-	 */
-	public function error_handler($errno, $errstr, $errfile, $errline)
-	{
-		throw new \ErrorException($errstr, $errno, 0, $errfile, $errline);
-	}
-
-	/**
-	 * Initializes the error handler
-	 *
-	 * @return void
-	 */
-	public function init()
-	{
-		set_error_handler(array($this, 'error_handler'), E_ALL);
-	}
-
-	/**
-	 * Adds an item to the log.
-	 *
-	 * @param mixed $val Item to be logged
-	 * @return void
-	 */
-	public function log($val)
-	{
-		array_unshift($this->logged, $val);
-	}
-
-}

+ 0 - 9
frameworks/PHP/phpixie/vendor/phpixie/core/classes/PHPixie/Exception/PageNotFound.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace PHPixie\Exception;
-
-/**
- * This exception is throw when none of the routes matched
- * or the specified controller or action wasn't found.
- */
-class PageNotFound extends \Exception {}

+ 0 - 281
frameworks/PHP/phpixie/vendor/phpixie/core/classes/PHPixie/Pixie.php

@@ -1,281 +0,0 @@
-<?php
-
-namespace PHPixie;
-
-/**
- * The core of the framework and it's dependancy container.
- * It holds references to all framework wide instances, like Config,
- * Session, Debug etc. Instead of calling a class constructor you call 
- * a wrapping function of this class to construct the object for you.
- * You can extend this class adding porperties that you want to be accessible
- * all around your app.
- *
- * @property-read \PHPixie\Config $config Configuration handler
- * @property-read \PHPixie\Debug $debug Error handler and logger
- * @property-read \PHPixie\Router $router Router
- * @property-read \PHPixie\Session $session Session handler
- */
-
- class Pixie {
-	
-  	/**
-	 * Instance definitions
-	 * @var array
-	 */
-	protected $instance_classes = array(
-		'config'  => '\PHPixie\Config',
-		'debug'   => '\PHPixie\Debug',
-		'router'  => '\PHPixie\Router',
-		'session' => '\PHPixie\Session',
-	);
-	
- 	/**
-	 * Instanced classes
-	 * @var array
-	 */
-	protected $instances = array();
-	
-	/**
-	 * Module definitions
-	 * @var array
-	 */
-	protected $modules = array();
-	
- 	/**
-	 * Directories to look for assets in
-	 * @var array
-	 */
-	public $assets_dirs = array();
-	
- 	/**
-	 * Root directory of the application
-	 * @var array
-	 */
-	public $root_dir;
-	
-	/**
-	 * Namespace of the application
-	 * @var array
-	 */
-	public $app_namespace;
-	
-	/**
-	 * Base URL of the application
-	 * @var string
-	 */
-	public $basepath = '/';
-	
-	/**
-	 * Gets a property by name. Returns defined class and module instances
-	 *
-	 * @param string $name Property namw
-	 * @return mixed Instance of defined class or module
-	 */
-	public function __get($name) {
-		if (isset($this->instances[$name]))
-			return $this->instances[$name];
-			
-		if (isset($this->instance_classes[$name]))
-			return $this->instances[$name] = new $this->instance_classes[$name]($this);
-			
-		if (isset($this->modules[$name]))
-			return $this->instances[$name] = new $this->modules[$name]($this);
-			
-		throw new \Exception("Property {$name} not found on ".get_class($this));
-	}		
-
-	/**
-	 * Constructs a controller by class name
-	 *
-	 * @param string $class Controller class
-	 * @return \PHPixie\Controller
-	 * @throw  \PHPixie\Exception\PageNotFound If the controller class is not found
-	 */
-	public function controller($class) {
-		if (!class_exists($class))
-			throw new \PHPixie\Exception\PageNotFound("Class {$class} doesn't exist");
-			
-		return new $class($this);
-	}
-	
-	/**
-	 * Constructs a request
-	 *
-	 * @param  Route  $route  Route for this request
-	 * @param  string $method HTTP method for the request (e.g. GET, POST)
-	 * @param  array  $post   Array of POST data
-	 * @param  array  $get    Array of GET data
-	 * @param  array  $server Array of SERVER data
-	 * @return \PHPixie\Request
-	 */
-	public function request($route, $method = "GET", $post = array(), $get = array(), $param=array(), $server = array()) {
-		return new \PHPixie\Request($this, $route, $method, $post, $get, $param, $server);
-	}
-	
-	/**
-	 * Constructs a response
-	 *
-	 * @return \PHPixie\Response
-	 */
-	public function response() {
-		return new \PHPixie\Response;
-	}
-	
-	/**
-	 * Constructs a route
-	 *
-	 * @param string $name Name of the route
-	 * @param mixed $rule Rule for this route
-	 * @param array $defaults Default parameters for the route
-	 * @param mixed $methods Methods to restrict this route to.
-	 *                       Either a single method or an array of them.
-	 * @return \PHPixie\Route
-	 */
-	public function route($name, $rule, $defaults, $methods = null) {
-		return new \PHPixie\Route($name, $rule, $defaults, $methods);
-	}
-	
-	/**
-	 * Constructs a view
-	 *
-	 * @param string   $name The name of the template to use
-	 * @return \PHPixie\View
-	 */
-	public function view($name)
-	{
-		return new \PHPixie\View($this, $name);
-	}
-	
-	/**
-	 * Retrieve value from array by key, with default value support.
-	 *
-	 * @param array  $array   Input array
-	 * @param string $key     Key to retrieve from the array
-	 * @param mixed  $default Default value to return if the key is not found
-	 * @return mixed An array value if it was found or default value if it is not
-	 */
-	public function arr($array, $key, $default = null)
-	{
-		if (isset($array[$key]))
-			return $array[$key];
-		return $default;
-	}
-	
-	/**
-	 * Finds full path to a specified file in the /assets folders.
-	 * It will search in the application folder first, then in all enabled modules
-	 * and then the /assets folder of the framework.
-	 *
-	 * @param string  $subfolder  Subfolder to search in e.g. 'classes' or 'views'
-	 * @param string  $name       Name of the file without extension
-	 * @param string  $extension  File extension
-	 * @param boolean $return_all If 'true' returns all mathced files as array,
-	 *                            otherwise returns the first file found
-	 * @return mixed  Full path to the file or False if it is not found
-	 */
-	public function find_file($subfolder, $name, $extension = 'php', $return_all = false)
-	{
-		
-		$fname = $name.'.'.$extension;
-		$found_files = array();
-		foreach ($this->assets_dirs as $folder)
-		{
-			$file = $folder.$subfolder.'/'.$fname;
-			if (file_exists($file))
-			{
-				if (!$return_all)
-					return($file);
-					
-				$found_files[] = $file;
-			}
-		}
-		
-		if (!empty($found_files))
-			return $found_files;
-
-		return false;
-	}
-	
-	/**
-	 * Creates a Request representing current HTTP request.
-	 *
-	 * @return \PHPixie\Request
-	 */
-	public function http_request()
-	{
-		$uri = $_SERVER['REQUEST_URI'];
-		$uri = preg_replace("#^{$this->basepath}(?:index\.php/)?#i", '/', $uri);
-		$url_parts = parse_url($uri);
-		$route_data = $this->router->match($url_parts['path'], $_SERVER['REQUEST_METHOD']);
-		return $this->request($route_data['route'], $_SERVER['REQUEST_METHOD'], $_POST, $_GET, $route_data['params'], $_SERVER);
-	}
-	
-	/**
-	 * Processes HTTP request, executes it and sends back the response.
-	 *
-	 * @return void
-	 */
-	public function handle_http_request() {
-		try {
-		
-			$request =  $this->http_request();
-			$response = $request->execute();
-			$response->send_headers()->send_body();
-			
-		}catch (\Exception $e) {
-			$this->handle_exception($e);
-		}
-		
-	}
-	
-	/**
-	 * Exception handler. By default displays the error page.
-	 * If you want your exceptions to be handled in a specific way
-	 * you should override this method.
-	 *
-	 * @param \Exception $exception Exception to handle
-	 * @return void
-	 */
-	public function handle_exception($exception) {
-		$this->debug->render_exception_page($exception);
-	}
-	
-	/**
-	 * Bootstraps the project
-	 *
-	 * @param  string $root_dir Root directory of the application
-	 * @return void
-	 */
-	public function bootstrap($root_dir) {
-		if (substr($root_dir, -1) != '/')
-			$root_dir.= '/';
-			
-		$this->root_dir = $root_dir;
-		
-		if ($this->app_namespace === null) {
-			$class_name = get_class($this);
-			$this->app_namespace = substr($class_name, 0, strpos($class_name, "\\")+1);
-		}
-		$this->assets_dirs[] = dirname(dirname(dirname(__FILE__))).'/assets/';
-		$this->debug->init();
-		foreach($this->modules as $name=>$class) {
-			$this->$name = new $class($this);
-		}
-		array_unshift($this->assets_dirs, $this->root_dir.'assets/');
-		foreach($this->config->get('routes') as $name => $rule) 
-			$this->router->add($this->route($name, $rule[0], $rule[1], $this->arr($rule, 2, null)));
-			
-		$this->after_bootstrap();
-		
-		return $this;
-	}
-	
-	/**
-	 * Perform some initialization after bootstrap finished
-	 *
-	 * @return void
-	 */
-	protected function after_bootstrap() {}
-	
-		
-}

+ 0 - 200
frameworks/PHP/phpixie/vendor/phpixie/core/classes/PHPixie/Request.php

@@ -1,200 +0,0 @@
-<?php
-
-namespace PHPixie;
-
-/**
- * Handles client request.
- * @package Core
- */
-class Request
-{
-
-	/**
-	 * Pixie Dependancy Container
-	 * @var \PHPixie\Pixie
-	 */
-	protected $pixie;
-	
-	/**
-	 * Stores POST data
-	 * @var array
-	 */
-	protected $_post;
-
-	/**
-	 * Stores GET data
-	 * @var array
-	 */
-	protected $_get;
-
-	/**
-	 * Stores GET data
-	 * @var array
-	 */
-	protected $_param;
-	
-	/**
-	 * Current Route
-	 * @var Route
-	 */
-	public $route;
-
-	/**
-	 * Request method
-	 * @var string
-	 */
-	public $method;
-
-	/**
-	 * Creates a new request
-	 *
-	 * @param \PHPixie\Pixie $pixie Pixie dependency container
-	 * @param \PHPixie\Route  $route  Route for this request
-	 * @param  string $method HTTP method for the request (e.g. GET, POST)
-	 * @param  array  $post   Array of POST data
-	 * @param  array  $get    Array of GET data
-	 * @param  array  $server Array of SERVER data
-	 * @return Request Initialized request
-	 *
-	 */
-	public function __construct($pixie, $route, $method = "GET", $post = array(), $get = array(), $param=array(), $server = array())
-	{
-		$this->pixie = $pixie;
-		$this->route = $route;
-		$this->method = $method;
-		$this->_post = $post;
-		$this->_get = $get;
-		$this->_param = $param;
-		$this->_server = $server;
-	}
-
-	/**
-	 * Retrieves a GET parameter
-	 *
-	 * @param string $key    Parameter key
-	 * @param mixed $default Default value
-	 * @param bool  $filter_xss Whether to filter input for XSS protection
-	 * @return mixed Returns a value if a key is specified,
-	 *               or an array of GET parameters if it isn't.
-	 */
-	public function get($key = null, $default = null, $filter_xss=true)
-	{
-		if ($key == null)
-			return $this->_get;
-		$val = $this->pixie->arr($this->_get, $key, $default);
-		
-		if ($filter_xss)
-			return $this->filter_xss($val);
-			
-		return $val;
-	}
-
-	/**
-	 * Retrieves a POST parameter
-	 *
-	 * @param string $key    Parameter key
-	 * @param mixed $default Default value
-	 * @param bool  $filter_xss Whether to filter input for XSS protection
-	 * @return mixed Returns a value if a key is specified,
-	 *               or an array of POST parameters if it isn't.
-	 */
-	public function post($key = null, $default = null, $filter_xss=true)
-	{
-		if ($key == null)
-			return $this->_post;
-		$val = $this->pixie->arr($this->_post, $key, $default);
-		
-		if ($filter_xss)
-			return $this->filter_xss($val);
-			
-		return $val;
-	}
-
-	/**
-	 * Filters input to prevent XSS attacks.
-	 * If an array is passed, filters all its elements recursively.
-	 *
-	 * @param mixed $val  Input to sanitize.
-	 * @return mixed Filtered values
-	 */
-	public function filter_xss($val) {
-		if (is_array($val)) {
-			array_walk_recursive($val, function( &$str) {
-				$str = strip_tags($str);
-			});
-		}else {
-			$val = strip_tags($val);
-		}
-		
-		return $val;
-	}
-	
-	/**
-	 * Retrieves a SERVER parameter
-	 *
-	 * @param string $key    Parameter key
-	 * @param mixed  $default Default value
-	 * @return mixed Returns a value if a key is specified,
-	 *               or an array of SERVER parameters if it isn't.
-	 */
-	public function server($key = null, $default = null)
-	{
-		if ($key == null)
-			return $this->_server;
-		return $this->pixie->arr($this->_server, $key, $default);
-	}
-
-	/**
-	 * Retrieves a URL parameter
-	 *
-	 * @param string $key    Parameter key
-	 * @param mixed $default Default value
-	 * @param bool  $filter_xss Whether to filter input for XSS protection
-	 * @return mixed Returns a value if a key is specified,
-	 *               or an array of POST parameters if it isn't.
-	 */
-	public function param($key = null, $default = null, $filter_xss=true)
-	{
-		if ($key == null)
-			return $this->_param;
-		$val = $this->pixie->arr($this->_param, $key, $default);
-		
-		if ($filter_xss)
-			return $this->filter_xss($val);
-			
-		return $val;
-	}
-
-	/**
-	 * Initializes the routed Controller and executes specified action
-	 *
-	 * @return \PHPixie\Response A Response object with the body and headers set
-	 */
-	public function execute()
-	{
-		$class = $this->param('namespace',$this->pixie->app_namespace).'Controller\\'.ucfirst($this->param('controller'));
-		$controller = $this->pixie->controller($class);
-		$controller->request = $this;
-		$controller->run($this->param('action'));
-		return $controller->response;
-	}
-
-	/**
-	 * Gets request URL
-	 *
-	 * @param bool $with_params Whether to preserve URL parameters
-	 * @return string URL of this request
-	 */
-	public function url($with_params = false) {
-		$url = $this->server('HTTPS') == 'on' ? 'https://':'http://';
-		$url.= $this->server('HTTP_HOST').$this->server('REQUEST_URI');
-
-		if (!$with_params) {
-			$pos = strpos($url, '?');
-			if ($pos !== false)
-				$url = substr($url, 0, $pos);
-		}
-		return $url;
-	}
-	
-}

+ 0 - 71
frameworks/PHP/phpixie/vendor/phpixie/core/classes/PHPixie/Response.php

@@ -1,71 +0,0 @@
-<?php
-
-namespace PHPixie;
-
-/**
- * Handles the response that is sent back to the client.
- * @package Core
- */
-class Response
-{
-
-	/**
-	 * Headers for the response
-	 * @var array
-	 */
-	public $headers = array(
-		'Content-Type: text/html; charset=utf-8'
-	);
-
-	/**
-	 * Response body
-	 * @var string
-	 */
-	public $body;
-
-	/**
-	 * Add header to the response
-	 *
-	 * @param string $header Header content
-	 * @return void
-	 */
-	public function add_header($header)
-	{
-		$this->headers[] = $header;
-	}
-
-	/**
-	 * Add redirection header
-	 *
-	 * @param string $url URL to redirect the client to
-	 * @return void
-	 */
-	public function redirect($url)
-	{
-		$this->add_header("Location: $url");
-	}
-
-	/**
-	 * Sends headers to the client
-	 *
-	 * @return \PHPixie\Response Resturns itself
-	 */
-	public function send_headers()
-	{
-		foreach ($this->headers as $header)
-			header($header);
-		return $this;
-	}
-
-	/**
-	 * Send response body to the client
-	 *
-	 * @return \PHPixie\Response Resturns itself
-	 */
-	public function send_body()
-	{
-		echo $this->body;
-		return $this;
-	}
-
-}

+ 0 - 98
frameworks/PHP/phpixie/vendor/phpixie/core/classes/PHPixie/Route.php

@@ -1,98 +0,0 @@
-<?php
-
-namespace PHPixie;
-
-/**
- * Routing class to extract and parse request parameters from the URL.
- * @package Core
- */
-class Route
-{
-
-	/**
-	 * Name of the route.
-	 * @var string
-	 */
-	public $name;
-
-	/**
-	 * Rule for this route.
-	 * @var mixed
-	 */
-	public $rule;
-
-	/**
-	 * Default parameters for this route.
-	 * @var mixed
-	 */
-	public $defaults;
-
-	/**
-	 * Methods to restrict this route to.
-	 * @var array
-	 */
-	public $methods;
-
-	/**
-	 * Associative array of route instances.
-	 * @var array
-	 */
-	private static $routes = array();
-
-	/**
-	 * Constructs a route.
-	 *
-	 * @param string $name Name of the route
-	 * @param mixed $rule Rule for this route
-	 * @param array $defaults Default parameters for the route
-	 * @param mixed $methods Methods to restrict this route to.
-	 *                       Either a single method or an array of them.
-	 */
-	public function __construct($name, $rule, $defaults, $methods = null)
-	{
-		$this->name = $name;
-		$this->rule = $rule;
-		$this->defaults = $defaults;
-		if($methods != null){
-			if (is_string($methods))
-				$methods = array($methods);
-			$methods = array_map('strtoupper', $methods);
-		}
-		$this->methods = $methods;
-	}
-
-	/**
-	 * Generates a url for a route
-	 *
-	 * @param array $params    Parameters to substitute in the route
-	 * @param bool $absolute   Whether to return an absolute url
-	 * @param string $protocol	Protocol to use for absolute url
-	 * @return string Generated url
-	 */
-	public function url($params = array(), $absolute = false, $protocol = 'http')
-	{
-		if (is_callable($this->rule))
-			throw new \Exception("The rule for '{$this->name}' route is a function and cannot be reversed");
-
-		$url = is_array($this->rule) ? $this->rule[0] : $this->rule;
-
-		$replace = array();
-		$params = array_merge($this->defaults, $params);
-		foreach ($params as $key => $value)
-			$replace["<{$key}>"] = $value;
-		$url = str_replace(array_keys($replace), array_values($replace), $url);
-
-		$count = 1;
-		$chars = '[^\(\)]*?';
-		while ($count > 0)
-			$url = preg_replace("#\({$chars}<{$chars}>{$chars}\)#", '', $url, -1, $count);
-
-		$url = str_replace(array('(', ')'), '', $url);
-
-		if ($absolute)
-			$url = $protocol.'://'.$_SERVER['HTTP_HOST'].$url;
-
-		return $url;
-	}
-
-}

+ 0 - 132
frameworks/PHP/phpixie/vendor/phpixie/core/classes/PHPixie/Router.php

@@ -1,132 +0,0 @@
-<?php
-namespace PHPixie;
-
-/**
- * Router for matching URLs to corresponding Routes
- * @package Core
- */
-class Router {
-
-	/**
-	 * Pixie Dependancy Container
-	 * @var \PHPixie\Pixie
-	 */
-	protected $pixie;
-	
-	/**
-	 * Associative array of route instances.
-	 * @var array
-	 */
-	protected $routes = array();
-	
-	/**
-	 * Constructs a router
-	 *
-	 * @param \PHPixie\Pixie $pixie Pixie dependency container
-	 */
-	public function __construct($pixie) {
-		$this->pixie = $pixie;
-	}
-
-	
-	/**
-	 * Ads a route
-	 *
-	 * @param string $name     Name of the route. Routes with the same name will override one another.
-	 * @param mixed $rule     Either an expression to match URI against or a function that will
-	 *                        be passed the URI and must return either an associative array of
-	 *                        extracted parameters (if it matches) or False.
-	 * @param array   $defaults An associated array of default values.
-	 * @return void
-	 */
-	public function add($route)
-	{
-		$this->routes[$route->name] = $route;
-	}
-
-	/**
-	 * Gets route by name
-	 *
-	 * @param string $name Route name
-	 * @return \PHPixie\Route
-	 * @throws \Exception If specified route doesn't exist
-	 */
-	public function get($name)
-	{
-		if (!isset($this->routes[$name]))
-			throw new \Exception("Route {$name} not found.");
-
-		return $this->routes[$name];
-	}
-
-	/**
-	 * Matches the URI against available routes to find the correct one.
-	 *
-	 * @param string   $uri Request URI
-	 * @param string   $method Request method
-	 * @return array Array containing route and matched parameters
-	 * @throws \PHPixie\Exception\PageNotFound If no route matches the URI
-	 * @throws \PHPixie\Exception\PageNotFound If route matched but no Controller was defined for it
-	 * @throws \PHPixie\Exception\PageNotFound If route matched but no action was defined for it
-	 */
-	public function match($uri, $method = 'GET')
-	{
-		$matched = false;
-		$method = strtoupper($method);
-		foreach ($this->routes as $name => $route) {
-			if ($route-> methods != null && !in_array($method, $route->methods))
-				continue;
-			
-			$rule = $route->rule;
-			if (is_callable($rule))
-			{
-				if (($data = $rule($uri)) !== FALSE)
-				{
-					$matched = $name;
-					break;
-				}
-			}
-			else
-			{
-				$pattern = is_array($rule) ? $rule[0] : $rule;
-				$pattern = str_replace(')', ')?', $pattern);
-				$pixie=$this->pixie;
-				$pattern = preg_replace_callback('/<.*?>/', function($str) use ($rule, $pixie) {
-						$str = $str[0];
-						$regexp = '[a-zA-Z0-9\-\._]+';
-						if (is_array($rule))
-							$regexp = $pixie->arr($rule[1], str_replace(array('<', '>'), '', $str), $regexp);
-						return '(?P'.$str.$regexp.')';
-					}, $pattern);
-
-				preg_match('#^'.$pattern.'/?$#', $uri, $match);
-				if (!empty($match[0]))
-				{
-					$matched = $name;
-					$data = array();
-					foreach ($match as $k => $v)
-						if (!is_numeric($k))
-							$data[$k] = $v;
-					break;
-				}
-			}
-		}
-		if ($matched == false)
-			throw new \PHPixie\Exception\PageNotFound('No route matched your request');
-			
-		$route = $this->routes[$matched];
-		$params = array_merge($route->defaults, $data);
-		
-		if (!isset($params['controller']))
-			throw new \PHPixie\Exception\PageNotFound("Route {$matched} matched, but no controller was defined for this route");
-			
-		if (!isset($params['action']))
-			throw new \PHPixie\Exception\PageNotFound("Route {$matched} matched with controller {$params['controller']}, but no action was defined for this route");
-
-		return array(
-					'route'=>$route, 
-					'params'=>$params
-					);
-	}
-	
-}

+ 0 - 119
frameworks/PHP/phpixie/vendor/phpixie/core/classes/PHPixie/Session.php

@@ -1,119 +0,0 @@
-<?php
-
-namespace PHPixie;
-
-/**
- * Simple class for accessing session data
- * @package Core
- */
-class Session
-{
-
-	/**
-	 * Pixie Dependancy Container
-	 * @var \PHPixie\Pixie
-	 */
-	protected $pixie;
-	
-	/**
-	 * Constructs session handler
-	 *
-	 * @param \PHPixie\Pixie $pixie Pixie dependency container
-	 */
-	public function __construct($pixie) {
-		$this->pixie=$pixie;
-	}
-	/**
-	 * Makes sure the session is initialized
-	 *
-	 * @return void
-	 */
-	private function check()
-	{
-		if (!session_id())
-		{
-			session_start();
-		}
-	}
-
-	/**
-	 * Gets a session variable
-	 *
-	 * @param string $key     Variable name
-	 * @param mixed $default Default value
-	 * @return mixed Session value
-	 */
-	public function get($key, $default = null)
-	{
-		$this->check();
-		return $this->pixie->arr($_SESSION, $key, $default);
-	}
-
-	/**
-	 * Sets a session variable
-	 *
-	 * @param string $key Variable name
-	 * @param mixed $val Variable value
-	 * @return void
-	 */
-	public function set($key, $val)
-	{
-		$this->check();
-		$_SESSION[$key] = $val;
-	}
-
-	/**
-	 * Removes a session variable
-	 *
-	 * @param string $key Variable name
-	 * @return void
-	 */
-	public function remove($key)
-	{
-		$this->check();
-
-		if (!isset($_SESSION[$key]))
-			return;
-
-		$var = $_SESSION[$key];
-		unset($_SESSION[$key], $var);
-	}
-
-	/**
-	 * Resets the session
-	 *
-	 * @return void
-	 */
-	public function reset()
-	{
-		$this->check();
-		$_SESSION = array();
-	}
-
-	/**
-	 * Gets ot sets flash messages.
-	 * If the value parameter is passed the message is set, otherwise it is retrieved.
-	 * After the message is retrieved for the first time it is removed.
-	 *
-	 * @param $key  The name of the flash message
-	 * @param $val  Flash message content
-	 * @return mixed
-	 */
-	public function flash($key, $val = null)
-	{
-		$this->check();
-		$key = "flash_{$key}";
-		if ($val != null)
-		{
-			$this->set($key, $val);
-		}
-		else
-		{
-			$val = $this->get($key);
-			$this->remove($key);
-		}
-
-		return $val;
-	}
-
-}

+ 0 - 106
frameworks/PHP/phpixie/vendor/phpixie/core/classes/PHPixie/View.php

@@ -1,106 +0,0 @@
-<?php
-
-namespace PHPixie;
-
-/**
- * Manages passing variables to templates and rendering them
- * @package Core
- */
-class View
-{
-	/**
-	 * Pixie Dependancy Container
-	 * @var \PHPixie\Pixie
-	 */
-	protected $pixie;
-	
-	/**
-	 * Full path to template file
-	 * @var string
-	 */
-	protected $path;
-
-	/**
-	 * The name of the view.
-	 * @var string
-	 */
-	public $name;
-
-	/**
-	 * Stores all the variables passed to the view
-	 * @var array
-	 */
-	protected $_data = array();
-
-	/**
-	 * File extension of the templates
-	 * @var string
-	 */
-	protected $_extension = 'php';
-
-	/**
-	 * Constructs the view
-	 *
-	 * @param \PHPixie\Pixie $pixie Pixie dependency container
-	 * @param string   $name The name of the template to use
-	 * @throws \Exception If specified template is not found
-	 */
-	public function __construct($pixie, $name)
-	{
-		$this->pixie = $pixie;
-		$this->name = $name;
-		$file = $this->pixie->find_file('views', $name, $this->_extension);
-			
-		if ($file == false)
-			throw new \Exception("View {$name} not found.");
-
-		$this->path = $file;
-	}
-
-	/**
-	 * Manages storing the data passed to the view as properties
-	 *
-	 * @param string $key Property name
-	 * @param string $val Property value
-	 * @return void
-	 */
-	public function __set($key, $val)
-	{
-		$this->_data[$key] = $val;
-	}
-
-	/**
-	 * Manages accessing passed data as properties
-	 *
-	 * @param string   $key Property name
-	 * @return mixed	Property value
-	 * @throws \Exception If the property is not found
-	 */
-	public function __get($key)
-	{
-		if (isset($this->_data[$key]))
-			return $this->_data[$key];
-		throw new \Exception("Value {$key} not set for view {$this->name}");
-	}
-
-	/**
-	 * Renders the template, all dynamically set properties
-	 * will be available inside the view file as variables.
-	 * Example:
-	 * <code>
-	 * $view = $this->pixie->view('frontpage');
-	 * $view->title = "Page title";
-	 * echo $view->render();
-	 * </code>
-	 *
-	 * @return string Rendered template
-	 */
-	public function render()
-	{
-		extract($this->_data);
-		ob_start();
-		include($this->path);
-		return ob_get_clean();
-	}
-	
-}

+ 0 - 26
frameworks/PHP/phpixie/vendor/phpixie/core/composer.json

@@ -1,26 +0,0 @@
-{
-    "name": "phpixie/core",
-    "description": "PHPixie Framework",
-    "keywords": ["framework"],
-    "homepage": "http://phpixie.com",
-    "type": "library",
-    "license": "BSD",
-    "authors": [
-        {
-            "name": "Roman Tsiupa",
-            "email": "[email protected]",
-            "homepage": "http://dracony.org"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.0"
-    },
-    "autoload": {
-        "psr-0": {"PHPixie": "classes/"}
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.*-dev"
-        }
-    }
-}

+ 0 - 10
frameworks/PHP/phpixie/vendor/phpixie/core/tests/bootstrap.php

@@ -1,10 +0,0 @@
-<?php
-if(!defined('INIT')) {	
-	define('ROOT',dirname(dirname(dirname(dirname(dirname(__FILE__))))));
-	$loader = require_once(ROOT.'/vendor/autoload.php');
-	$loader->add('PHPixie', ROOT.'/vendor/phpixie/core/classes/');
-	$loader->add('PHPixie', ROOT.'/vendor/phpixie/db/classes/');
-	$loader->add('PHPixie',ROOT.'/vendor/phpixie/orm/classes/');
-	define('INIT', true);
-}
-	

+ 0 - 108
frameworks/PHP/phpixie/vendor/phpixie/core/tests/configTest.php

@@ -1,108 +0,0 @@
-<?php
-
-
-
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2013-02-06 at 09:17:25.
- */
-class configTest extends PHPUnit_Framework_TestCase
-{
-
-	/**
-	 * @var Config
-	 */
-	protected $object;
-
-	/**
-	 * Sets up the fixture, for example, opens a network connection.
-	 * This method is called before a test is executed.
-	 */
-	protected function setUp()
-	{
-		$this->file = $file = tempnam(sys_get_temp_dir(), 'view');
-		file_put_contents($file, "<?php return ".var_export(array(
-				'trees' => array(
-					'oak' => array(
-						'fairy' => 'Tinkerbell'
-					)
-				)
-				), true).';');
-		$pixie = $this->getMock("\\PHPixie\\Pixie", array('find_file'));
-		$pixie->expects($this->once())
-                 ->method('find_file')
-                 ->will($this->returnValue($this->file));
-		$this->object = new \PHPixie\Config($pixie);
-	}
-
-	/**
-	 * Tears down the fixture, for example, closes a network connection.
-	 * This method is called after a test is executed.
-	 */
-	protected function tearDown()
-	{
-		unlink($this->file);
-	}
-
-	/**
-	 * @covers $this->object->get_group
-	 * @todo   Implement testGet_group().
-	 */
-	public function testGet_group()
-	{
-		$group = $this->object->get_group('test');
-		$this->assertArrayHasKey('trees', $group);
-		$this->assertArrayHasKey('oak', $group['trees']);
-		$this->assertArrayHasKey('fairy', $group['trees']['oak']);
-		$this->assertEquals($group['trees']['oak']['fairy'], 'Tinkerbell');
-	}
-
-	/**
-	 * @covers $this->object->get
-	 * @todo   Implement testGet().
-	 */
-	public function testGet()
-	{
-		$this->assertEquals($this->object->get('test.trees.oak.fairy'), 'Tinkerbell');
-		$this->assertEquals($this->object->get('test.trees.oak.fairies', 'default'), 'default');
-	}
-
-	/**
-	 * @covers $this->object->set
-	 * @todo   Implement testSet().
-	 */
-	public function testSet()
-	{
-		$this->object->set('test.trees.oak.second_fairy', 'Trixie');
-		$this->assertEquals($this->object->get('test.trees.oak.second_fairy'), 'Trixie');
-	}
-
-	/**
-	 * @covers $this->object->write
-	 * @todo   Implement testWrite().
-	 */
-	public function testWrite()
-	{
-		$this->object->set('test.trees.oak.second_fairy', 'Trixie');
-		$this->object->write('test');
-		$group = include($this->file);
-		$this->assertArrayHasKey('trees', $group);
-		$this->assertArrayHasKey('oak', $group['trees']);
-		$this->assertArrayHasKey('second_fairy', $group['trees']['oak']);
-		$this->assertEquals($group['trees']['oak']['second_fairy'], 'Trixie');
-	}
-	
-	public function testEmpty()
-	{
-		file_put_contents($this->file, '');
-		$this->assertEquals($this->object->get('test.trees.oak.fairies', 'default'), 'default');
-		$this->object->set('test.trees.oak.second_fairy', 'Trixie');
-		$this->assertEquals($this->object->get('test.trees.oak.second_fairy'), 'Trixie');
-		$this->object->write('test');
-		$group = $this->object->get('test');
-		$this->assertArrayHasKey('trees', $group);
-		$this->assertArrayHasKey('oak', $group['trees']);
-		$this->assertArrayHasKey('second_fairy', $group['trees']['oak']);
-		$this->assertEquals($group['trees']['oak']['second_fairy'], 'Trixie');
-	}
-
-}

+ 0 - 58
frameworks/PHP/phpixie/vendor/phpixie/core/tests/controllerTest.php

@@ -1,58 +0,0 @@
-<?php
-require_once(ROOT.'/vendor/phpixie/core/classes/PHPixie/Controller.php');
-class TestController extends \PHPixie\Controller {
-	public $counter = 0;
-	public function before() {
-		$this->counter++;
-	}
-	public function action_index() {
-		$this->counter++;
-	}
-	public function after() {
-		$this->counter++;
-	}
-}
-
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2013-02-05 at 16:39:57.
- */
-class ControllerTest extends PHPUnit_Framework_TestCase
-{
-
-	/**
-	 * @var Controller
-	 */
-	protected $object;
-
-	/**
-	 * Sets up the fixture, for example, opens a network connection.
-	 * This method is called before a test is executed.
-	 */
-	protected function setUp()
-	{
-		$this->object = new TestController(null);
-	}
-	
-	public function testRedirect() {
-		$this->object->redirect('http://google.com');
-		$this->assertEquals(false,$this->object->execute);
-		$this->assertContains('Location: http://google.com', $this->object->response->headers);
-	}
-	public function testRun()
-	{
-		$this->object->run('index');
-		$this->assertEquals($this->object->counter, 3);
-	}
-
-	public function testException()
-	{
-		$except = false;
-		try {
-			$this->object->run('bogus');
-		} catch (\PHPixie\Exception\PageNotFound $e) {
-			$except = true;
-		}
-		$this->assertEquals($except, true);
-	}
-
-}

+ 0 - 1
frameworks/PHP/phpixie/vendor/phpixie/core/tests/phpunit.xml

@@ -1 +0,0 @@
-<phpunit bootstrap="bootstrap.php"></phpunit>

+ 0 - 105
frameworks/PHP/phpixie/vendor/phpixie/core/tests/pixieTest.php

@@ -1,105 +0,0 @@
-<?php
-namespace PixieTest {
-	require_once(ROOT.'/vendor/phpixie/core/classes/PHPixie/Pixie.php');
-	class Pixie extends \PHPixie\Pixie { 
-		public $basepath = '/tester/';
-		protected $modules = array(
-			'mod'=>'\PixieTest\PixieMod'
-		);
-		protected $instance_classes = array(
-		'config'  => '\PixieTest\Config',
-		'debug'   => '\PHPixie\Debug',
-		'router'  => '\PHPixie\Router'
-	);
-	}
-	class PixieMod { }
-	class Config {
-		public function get() {
-			return array();
-		}
-	}
-	class TestController extends \PHPixie\Controller {}
-}
-namespace {
-	/**
-	 * Generated by PHPUnit_SkeletonGenerator 1.2.0 on 2013-04-15 at 21:57:25.
-	 */
-	class PixieTest extends PHPUnit_Framework_TestCase
-	{
-		/**
-		 * @var Pixie
-		 */
-		protected $object;
-
-		/**
-		 * Sets up the fixture, for example, opens a network connection.
-		 * This method is called before a test is executed.
-		 */
-		protected function setUp()
-		{
-			$this->object = new \PixieTest\Pixie();
-			$this->object->bootstrap(sys_get_temp_dir());
-		}
-		
-		public function testBootstrap() {
-			$this->assertEquals("PixieTest\\", $this->object->app_namespace);
-			$this->assertEquals(true, $this->object->mod instanceof \PixieTest\PixieMod );
-			$this->assertEquals(true, $this->object->config instanceof \PixieTest\Config );
-			$this->assertEquals('/', substr($this->object->root_dir,-1));
-		}
-		
-		public function testArr() {
-			$this->assertEquals('a', $this->object->arr(array('c'=>'a'),'c','b'));
-			$this->assertEquals('b', $this->object->arr(array('c'=>'a'),'d','b'));
-		}
-		
-		public function testHttp_Request() {
-			$this->object->router->add(new \PHPixie\Route('default', '/<controller>/<action>', array()));
-			$_SERVER['REQUEST_URI'] = "/tester/home/index";
-			$_POST['post'] = "test";
-			$_GET['get'] = "test";
-			$_SERVER['REQUEST_METHOD'] = "POST";
-			$req = $this->object->http_request();
-			$this->assertEquals($req->get('get'), 'test');
-			$this->assertEquals($req->post('post'), 'test');
-			$this->assertEquals($req->server('REQUEST_METHOD'), 'POST');
-			$this->assertEquals($req->method, 'POST');
-			$this->assertEquals($req->param('controller'), 'home');
-			$this->assertEquals($req->param('action'), 'index');
-		}
-		
-		public function testFind_file() {
-			$dir = $this->object->root_dir.'/assets';
-			if(!is_dir($dir))
-				mkdir($dir);
-			file_put_contents($dir.'/test.php','');
-			$file = $this->object->find_file('','test');
-			$this->assertEquals(true, strpos($file, 'test.php') > 0);
-			unlink($dir.'/test.php');
-			rmdir($dir);
-		}
-		
-		public function testResponse() {
-			$this->assertEquals('PHPixie\Response', get_class($this->object->response()));
-		}
-		
-		public function testRoute() {
-			$route = $this->object->route('a','/',array(),'POST');
-			$this->assertEquals('PHPixie\Route', get_class($route));
-			$this->assertEquals('POST', $route->methods[0]);
-		}
-		public function testRequest() {
-			$this->assertEquals('PHPixie\Request', get_class($this->object->request(null)));
-		}
-		public function testController() {
-			$this->assertEquals('PixieTest\TestController', get_class($this->object->controller('\PixieTest\TestController')));
-		}
-		public function testView() {
-			$mock = $this->getMock('\PixieTest\Pixie', array('find_file'));
-			$mock->expects($this->once())
-                 ->method('find_file')
-                 ->will($this->returnValue('test'));
-			$this->assertEquals('PHPixie\View', get_class($mock->view('test')));
-		}
-	}
-}

+ 0 - 158
frameworks/PHP/phpixie/vendor/phpixie/core/tests/requestTest.php

@@ -1,158 +0,0 @@
-<?php
-namespace Controller {
-
-	class TestController extends \PHPixie\Controller {
-		public function action_index(){}
-	}
-}
-
-namespace {
-
-
-
-	/**
-	 * Generated by PHPUnit_SkeletonGenerator on 2013-02-06 at 16:12:22.
-	 */
-	class requestTest extends PHPUnit_Framework_TestCase
-	{
-
-		/**
-		 * @var Request
-		 */
-		protected $object;
-
-		/**
-		 * Sets up the fixture, for example, opens a network connection.
-		 * This method is called before a test is executed.
-		 */
-		protected function setUp()
-		{
-			$this->pixie = new \PHPixie\Pixie();
-			$this->pixie->app_namespace = "";
-			$this->object = new \PHPixie\Request(
-				$this->pixie,
-				new \PHPixie\Route('test',array(),array()),
-				'GET', 
-				array('fairy_post' => 'Trixie', 'xss' => 'a<div></div>','xss_arr'=>array(array('a<div></div>'))), 
-				array('fairy_get' => 'Trixie', 'xss' => 'a<div></div>', 'xss_arr' => array(array('a<div></div>'))), 
-				array('controller' => 'TestController', 'action' => 'index', 'fairy_param' => 'Trixie'),
-				array('fairy_server' => 'Trixie','HTTP_HOST'=>'phpixie.com','REQUEST_URI'=>'/test/?test=test')
-			);
-		}
-
-		/**
-		 * Tears down the fixture, for example, closes a network connection.
-		 * This method is called after a test is executed.
-		 */
-		protected function tearDown()
-		{
-
-		}
-		
-		/**
-		 * @covers Request::filter_xss
-		 * 
-		 */
-		public function testFilter_Xss()
-		{
-			$this->assertEquals($this->object->filter_xss('a<div></div>'), 'a');
-			$this->assertEquals(current(current($this->object->filter_xss(array(array('a<div></div>'))))), 'a');
-		}
-
-		/**
-		 * @covers Request::get
-		 * @todo   Implement testGet().
-		 */
-		public function testGet()
-		{
-			$this->assertEquals($this->object->get('fairy_get'), 'Trixie');
-			$this->assertEquals($this->object->get('bogus', 'default'), 'default');
-			$this->assertEquals($this->object->get('xss'), 'a');
-			$this->assertEquals($this->object->get('xss', null, false), 'a<div></div>');
-			$this->assertEquals(current(current($this->object->get('xss_arr', null, false))), 'a<div></div>');
-			$this->assertEquals(current(current($this->object->get('xss_arr'))), 'a');
-		}
-
-		/**
-		 * @covers Request::post
-		 * @todo   Implement testPost().
-		 */
-		public function testPost()
-		{
-			$this->assertEquals($this->object->post('fairy_post'), 'Trixie');
-			$this->assertEquals($this->object->post('bogus', 'default'), 'default');
-			$this->assertEquals($this->object->post('xss'), 'a');
-			$this->assertEquals($this->object->post('xss', null, false), 'a<div></div>');
-			$this->assertEquals(current(current($this->object->post('xss_arr', null, false))), 'a<div></div>');
-			$this->assertEquals(current(current($this->object->post('xss_arr'))), 'a');
-		}
-
-		/**
-		 * @covers Request::server
-		 * @todo   Implement testServer().
-		 */
-		public function testServer()
-		{
-			$this->assertEquals($this->object->server('fairy_server'), 'Trixie');
-			$this->assertEquals($this->object->server('bogus', 'default'), 'default');
-		}
-
-		/**
-		 * @covers Request::param
-		 * @todo   Implement testParam().
-		 */
-		public function testParam()
-		{
-			$this->assertEquals($this->object->param('fairy_param'), 'Trixie');
-			$this->assertEquals($this->object->param('bogus', 'default'), 'default');
-		}
-
-		/**
-		 * @covers Request::execute
-		 * @todo   Implement testExecute().
-		 */
-		public function testExecute()
-		{
-			$this->object->execute();
-		}
-
-		/**
-		 * @covers Request::url
-		 */
-		public function testUrl()
-		{
-			$this->assertEquals('http://phpixie.com/test/', $this->object->url());
-			$this->assertEquals('http://phpixie.com/test/?test=test', $this->object->url(true));
-			$this->object = new \PHPixie\Request($this->pixie, $this->object->route, 'GET', array(), array(), array(),
-				array('HTTPS' => 'on','HTTP_HOST'=>'phpixie.com','REQUEST_URI'=>'/test/?test=test')
-			);
-			$this->assertEquals('https://phpixie.com/test/', $this->object->url());
-			$this->assertEquals('https://phpixie.com/test/?test=test', $this->object->url(true));
-			
-		}
-		/**
-		 * @covers Request::execute
-		 * @todo   Implement testExecute().
-		 */
-		public function testExecuteException()
-		{
-			$req = new \PHPixie\Request(
-				$this->pixie,
-				new \PHPixie\Route('test',array(),array()),
-				'GET', 
-				array('fairy_post' => 'Trixie', 'xss' => 'a<div></div>','xss_arr'=>array(array('a<div></div>'))), 
-				array('fairy_get' => 'Trixie', 'xss' => 'a<div></div>', 'xss_arr' => array(array('a<div></div>'))), 
-				array('controller' => 'bogus', 'action' => 'index', 'fairy_param' => 'Trixie'),
-				array('fairy_server' => 'Trixie','HTTP_HOST'=>'phpixie.com','REQUEST_URI'=>'/test/?test=test')
-			);
-			$except = false;
-			try {
-				$req->execute();
-			} catch (Exception $e) {
-				$except = true;
-			}
-			$this->assertEquals($except, true);
-		}
-
-	}
-}

+ 0 - 66
frameworks/PHP/phpixie/vendor/phpixie/core/tests/responseTest.php

@@ -1,66 +0,0 @@
-<?php
-
-/**
- * Generated by PHPUnit_SkeletonGenerator 1.2.0 on 2013 - 02 - 05 at 23:08:34.
- */
-class ResponseTest extends PHPUnit_Framework_TestCase
-{
-
-	/**
-	 * @var Response
-	 */
-	protected $object;
-
-	/**
-	 * Sets up the fixture, for example, opens a network connection.
-	 * This method is called before a test is executed.
-	 */
-	protected function setUp()
-	{
-		$this->object = new \PHPixie\Response;
-	}
-
-	/**
-	 * Tears down the fixture, for example, closes a network connection.
-	 * This method is called after a test is executed.
-	 */
-	protected function tearDown()
-	{
-
-	}
-
-	/**
-	 * @covers Response::add_header
-	 * @todo   Implement testAdd_header().
-	 */
-	public function testAdd_header()
-	{
-		$this->object->add_header('test');
-		$this->assertEquals(end($this->object->headers), 'test');
-	}
-
-	/**
-	 * @covers Response::redirect
-	 * @todo   Implement testRedirect().
-	 */
-	public function testRedirect()
-	{
-		$this->object->redirect('http://google.com');
-		$this->assertContains('Location: http://google.com', $this->object->headers);
-	}
-
-	/**
-	 * @covers Response::send_body
-	 * @todo   Implement testSend_body().
-	 */
-	public function testSend_body()
-	{
-		$this->object->body = 'test';
-		ob_start();
-		$this->object->send_body();
-		$out = ob_get_contents();
-		ob_end_clean();
-		$this->assertEquals($out, 'test');
-	}
-
-}

+ 0 - 43
frameworks/PHP/phpixie/vendor/phpixie/core/tests/routeTest.php

@@ -1,43 +0,0 @@
-<?php
-
-/**
- * Generated by PHPUnit_SkeletonGenerator 1.2.0 on 2013-02-10 at 16:36:42.
- */
-class RoteTest extends PHPUnit_Framework_TestCase
-{
-
-	/**
-	 * @var Route
-	 */
-	protected $object;
-
-	/**
-	 * Sets up the fixture, for example, opens a network connection.
-	 * This method is called before a test is executed.
-	 */
-	protected function setUp()
-	{
-		$this->object = new \PHPixie\Route('url', '(/<controller>(/<action>(/<id>)))', array(
-			'controller' => 'home',
-			'action' => 'index'
-		),'test');
-	}
-
-	/**
-	 * Tears down the fixture, for example, closes a network connection.
-	 * This method is called after a test is executed.
-	 */
-	protected function tearDown()
-	{
-
-	}
-
-	public function testUrl()
-	{
-
-		$this->assertEquals('/home/index/5', $this->object->url(array('id' => 5)));
-		$this->assertEquals('/home/index', $this->object->url());
-		$this->assertEquals('TEST', $this->object->methods[0]);
-	}
-
-}

Some files were not shown because too many files changed in this diff