From 8391476e8b8ba2d8d809464165092318fe6ae98d Mon Sep 17 00:00:00 2001 From: nex2hex Date: Tue, 30 Oct 2012 17:28:53 +0600 Subject: [PATCH 1/8] rename files to PSR-0 standart --- classes/{jelly.php => Jelly.php} | 0 classes/{jelly/behavior.php => Jelly/Behavior.php} | 0 classes/{jelly/builder.php => Jelly/Builder.php} | 0 classes/{jelly/collection.php => Jelly/Collection.php} | 0 classes/{jelly/core.php => Jelly/Core.php} | 0 classes/{jelly/core/behavior.php => Jelly/Core/Behavior.php} | 0 classes/{jelly/core/builder.php => Jelly/Core/Builder.php} | 0 classes/{jelly/core/collection.php => Jelly/Core/Collection.php} | 0 classes/{jelly/core/event.php => Jelly/Core/Event.php} | 0 classes/{jelly/core/event/data.php => Jelly/Core/Event/Data.php} | 0 classes/{jelly/core/field.php => Jelly/Core/Field.php} | 0 .../core/field/belongsto.php => Jelly/Core/Field/Belongsto.php} | 0 .../core/field/boolean.php => Jelly/Core/Field/Boolean.php} | 0 .../{jelly/core/field/email.php => Jelly/Core/Field/Email.php} | 0 classes/{jelly/core/field/enum.php => Jelly/Core/Field/Enum.php} | 0 .../core/field/expression.php => Jelly/Core/Field/Expression.php} | 0 classes/{jelly/core/field/file.php => Jelly/Core/Field/File.php} | 0 .../{jelly/core/field/float.php => Jelly/Core/Field/Float.php} | 0 .../core/field/hasmany.php => Jelly/Core/Field/Hasmany.php} | 0 .../{jelly/core/field/hasone.php => Jelly/Core/Field/Hasone.php} | 0 .../{jelly/core/field/image.php => Jelly/Core/Field/Image.php} | 0 .../core/field/integer.php => Jelly/Core/Field/Integer.php} | 0 .../core/field/manytomany.php => Jelly/Core/Field/Manytomany.php} | 0 .../core/field/password.php => Jelly/Core/Field/Password.php} | 0 .../field/polymorphic.php => Jelly/Core/Field/Polymorphic.php} | 0 .../core/field/primary.php => Jelly/Core/Field/Primary.php} | 0 .../core/field/serialized.php => Jelly/Core/Field/Serialized.php} | 0 classes/{jelly/core/field/slug.php => Jelly/Core/Field/Slug.php} | 0 .../{jelly/core/field/string.php => Jelly/Core/Field/String.php} | 0 .../addremove.php => Jelly/Core/Field/Supports/Addremove.php} | 0 .../field/supports/has.php => Jelly/Core/Field/Supports/Has.php} | 0 .../supports/join.php => Jelly/Core/Field/Supports/Join.php} | 0 .../supports/save.php => Jelly/Core/Field/Supports/Save.php} | 0 .../supports/with.php => Jelly/Core/Field/Supports/With.php} | 0 classes/{jelly/core/field/text.php => Jelly/Core/Field/Text.php} | 0 .../core/field/timestamp.php => Jelly/Core/Field/Timestamp.php} | 0 classes/{jelly/core/meta.php => Jelly/Core/Meta.php} | 0 classes/{jelly/core/model.php => Jelly/Core/Model.php} | 0 classes/{jelly/core/validation.php => Jelly/Core/Validation.php} | 0 .../exception.php => Jelly/Core/Validation/Exception.php} | 0 classes/{jelly/event.php => Jelly/Event.php} | 0 classes/{jelly/event/data.php => Jelly/Event/Data.php} | 0 classes/{jelly/field.php => Jelly/Field.php} | 0 classes/{jelly/field/belongsto.php => Jelly/Field/Belongsto.php} | 0 classes/{jelly/field/boolean.php => Jelly/Field/Boolean.php} | 0 classes/{jelly/field/email.php => Jelly/Field/Email.php} | 0 classes/{jelly/field/enum.php => Jelly/Field/Enum.php} | 0 .../{jelly/field/expression.php => Jelly/Field/Expression.php} | 0 classes/{jelly/field/file.php => Jelly/Field/File.php} | 0 classes/{jelly/field/float.php => Jelly/Field/Float.php} | 0 classes/{jelly/field/hasmany.php => Jelly/Field/Hasmany.php} | 0 classes/{jelly/field/hasone.php => Jelly/Field/Hasone.php} | 0 classes/{jelly/field/image.php => Jelly/Field/Image.php} | 0 classes/{jelly/field/integer.php => Jelly/Field/Integer.php} | 0 .../{jelly/field/manytomany.php => Jelly/Field/Manytomany.php} | 0 classes/{jelly/field/password.php => Jelly/Field/Password.php} | 0 .../{jelly/field/polymorphic.php => Jelly/Field/Polymorphic.php} | 0 classes/{jelly/field/primary.php => Jelly/Field/Primary.php} | 0 .../{jelly/field/serialized.php => Jelly/Field/Serialized.php} | 0 classes/{jelly/field/slug.php => Jelly/Field/Slug.php} | 0 classes/{jelly/field/string.php => Jelly/Field/String.php} | 0 .../supports/addremove.php => Jelly/Field/Supports/Addremove.php} | 0 .../field/supports/has.php => Jelly/Field/Supports/Has.php} | 0 .../field/supports/join.php => Jelly/Field/Supports/Join.php} | 0 .../field/supports/save.php => Jelly/Field/Supports/Save.php} | 0 .../field/supports/with.php => Jelly/Field/Supports/With.php} | 0 classes/{jelly/field/text.php => Jelly/Field/Text.php} | 0 classes/{jelly/field/timestamp.php => Jelly/Field/Timestamp.php} | 0 classes/{jelly/meta.php => Jelly/Meta.php} | 0 classes/{jelly/model.php => Jelly/Model.php} | 0 classes/{jelly/validation.php => Jelly/Validation.php} | 0 .../validation/exception.php => Jelly/Validation/Exception.php} | 0 72 files changed, 0 insertions(+), 0 deletions(-) rename classes/{jelly.php => Jelly.php} (100%) rename classes/{jelly/behavior.php => Jelly/Behavior.php} (100%) rename classes/{jelly/builder.php => Jelly/Builder.php} (100%) rename classes/{jelly/collection.php => Jelly/Collection.php} (100%) rename classes/{jelly/core.php => Jelly/Core.php} (100%) rename classes/{jelly/core/behavior.php => Jelly/Core/Behavior.php} (100%) rename classes/{jelly/core/builder.php => Jelly/Core/Builder.php} (100%) rename classes/{jelly/core/collection.php => Jelly/Core/Collection.php} (100%) rename classes/{jelly/core/event.php => Jelly/Core/Event.php} (100%) rename classes/{jelly/core/event/data.php => Jelly/Core/Event/Data.php} (100%) rename classes/{jelly/core/field.php => Jelly/Core/Field.php} (100%) rename classes/{jelly/core/field/belongsto.php => Jelly/Core/Field/Belongsto.php} (100%) rename classes/{jelly/core/field/boolean.php => Jelly/Core/Field/Boolean.php} (100%) rename classes/{jelly/core/field/email.php => Jelly/Core/Field/Email.php} (100%) rename classes/{jelly/core/field/enum.php => Jelly/Core/Field/Enum.php} (100%) rename classes/{jelly/core/field/expression.php => Jelly/Core/Field/Expression.php} (100%) rename classes/{jelly/core/field/file.php => Jelly/Core/Field/File.php} (100%) rename classes/{jelly/core/field/float.php => Jelly/Core/Field/Float.php} (100%) rename classes/{jelly/core/field/hasmany.php => Jelly/Core/Field/Hasmany.php} (100%) rename classes/{jelly/core/field/hasone.php => Jelly/Core/Field/Hasone.php} (100%) rename classes/{jelly/core/field/image.php => Jelly/Core/Field/Image.php} (100%) rename classes/{jelly/core/field/integer.php => Jelly/Core/Field/Integer.php} (100%) rename classes/{jelly/core/field/manytomany.php => Jelly/Core/Field/Manytomany.php} (100%) rename classes/{jelly/core/field/password.php => Jelly/Core/Field/Password.php} (100%) rename classes/{jelly/core/field/polymorphic.php => Jelly/Core/Field/Polymorphic.php} (100%) rename classes/{jelly/core/field/primary.php => Jelly/Core/Field/Primary.php} (100%) rename classes/{jelly/core/field/serialized.php => Jelly/Core/Field/Serialized.php} (100%) rename classes/{jelly/core/field/slug.php => Jelly/Core/Field/Slug.php} (100%) rename classes/{jelly/core/field/string.php => Jelly/Core/Field/String.php} (100%) rename classes/{jelly/core/field/supports/addremove.php => Jelly/Core/Field/Supports/Addremove.php} (100%) rename classes/{jelly/core/field/supports/has.php => Jelly/Core/Field/Supports/Has.php} (100%) rename classes/{jelly/core/field/supports/join.php => Jelly/Core/Field/Supports/Join.php} (100%) rename classes/{jelly/core/field/supports/save.php => Jelly/Core/Field/Supports/Save.php} (100%) rename classes/{jelly/core/field/supports/with.php => Jelly/Core/Field/Supports/With.php} (100%) rename classes/{jelly/core/field/text.php => Jelly/Core/Field/Text.php} (100%) rename classes/{jelly/core/field/timestamp.php => Jelly/Core/Field/Timestamp.php} (100%) rename classes/{jelly/core/meta.php => Jelly/Core/Meta.php} (100%) rename classes/{jelly/core/model.php => Jelly/Core/Model.php} (100%) rename classes/{jelly/core/validation.php => Jelly/Core/Validation.php} (100%) rename classes/{jelly/core/validation/exception.php => Jelly/Core/Validation/Exception.php} (100%) rename classes/{jelly/event.php => Jelly/Event.php} (100%) rename classes/{jelly/event/data.php => Jelly/Event/Data.php} (100%) rename classes/{jelly/field.php => Jelly/Field.php} (100%) rename classes/{jelly/field/belongsto.php => Jelly/Field/Belongsto.php} (100%) rename classes/{jelly/field/boolean.php => Jelly/Field/Boolean.php} (100%) rename classes/{jelly/field/email.php => Jelly/Field/Email.php} (100%) rename classes/{jelly/field/enum.php => Jelly/Field/Enum.php} (100%) rename classes/{jelly/field/expression.php => Jelly/Field/Expression.php} (100%) rename classes/{jelly/field/file.php => Jelly/Field/File.php} (100%) rename classes/{jelly/field/float.php => Jelly/Field/Float.php} (100%) rename classes/{jelly/field/hasmany.php => Jelly/Field/Hasmany.php} (100%) rename classes/{jelly/field/hasone.php => Jelly/Field/Hasone.php} (100%) rename classes/{jelly/field/image.php => Jelly/Field/Image.php} (100%) rename classes/{jelly/field/integer.php => Jelly/Field/Integer.php} (100%) rename classes/{jelly/field/manytomany.php => Jelly/Field/Manytomany.php} (100%) rename classes/{jelly/field/password.php => Jelly/Field/Password.php} (100%) rename classes/{jelly/field/polymorphic.php => Jelly/Field/Polymorphic.php} (100%) rename classes/{jelly/field/primary.php => Jelly/Field/Primary.php} (100%) rename classes/{jelly/field/serialized.php => Jelly/Field/Serialized.php} (100%) rename classes/{jelly/field/slug.php => Jelly/Field/Slug.php} (100%) rename classes/{jelly/field/string.php => Jelly/Field/String.php} (100%) rename classes/{jelly/field/supports/addremove.php => Jelly/Field/Supports/Addremove.php} (100%) rename classes/{jelly/field/supports/has.php => Jelly/Field/Supports/Has.php} (100%) rename classes/{jelly/field/supports/join.php => Jelly/Field/Supports/Join.php} (100%) rename classes/{jelly/field/supports/save.php => Jelly/Field/Supports/Save.php} (100%) rename classes/{jelly/field/supports/with.php => Jelly/Field/Supports/With.php} (100%) rename classes/{jelly/field/text.php => Jelly/Field/Text.php} (100%) rename classes/{jelly/field/timestamp.php => Jelly/Field/Timestamp.php} (100%) rename classes/{jelly/meta.php => Jelly/Meta.php} (100%) rename classes/{jelly/model.php => Jelly/Model.php} (100%) rename classes/{jelly/validation.php => Jelly/Validation.php} (100%) rename classes/{jelly/validation/exception.php => Jelly/Validation/Exception.php} (100%) diff --git a/classes/jelly.php b/classes/Jelly.php similarity index 100% rename from classes/jelly.php rename to classes/Jelly.php diff --git a/classes/jelly/behavior.php b/classes/Jelly/Behavior.php similarity index 100% rename from classes/jelly/behavior.php rename to classes/Jelly/Behavior.php diff --git a/classes/jelly/builder.php b/classes/Jelly/Builder.php similarity index 100% rename from classes/jelly/builder.php rename to classes/Jelly/Builder.php diff --git a/classes/jelly/collection.php b/classes/Jelly/Collection.php similarity index 100% rename from classes/jelly/collection.php rename to classes/Jelly/Collection.php diff --git a/classes/jelly/core.php b/classes/Jelly/Core.php similarity index 100% rename from classes/jelly/core.php rename to classes/Jelly/Core.php diff --git a/classes/jelly/core/behavior.php b/classes/Jelly/Core/Behavior.php similarity index 100% rename from classes/jelly/core/behavior.php rename to classes/Jelly/Core/Behavior.php diff --git a/classes/jelly/core/builder.php b/classes/Jelly/Core/Builder.php similarity index 100% rename from classes/jelly/core/builder.php rename to classes/Jelly/Core/Builder.php diff --git a/classes/jelly/core/collection.php b/classes/Jelly/Core/Collection.php similarity index 100% rename from classes/jelly/core/collection.php rename to classes/Jelly/Core/Collection.php diff --git a/classes/jelly/core/event.php b/classes/Jelly/Core/Event.php similarity index 100% rename from classes/jelly/core/event.php rename to classes/Jelly/Core/Event.php diff --git a/classes/jelly/core/event/data.php b/classes/Jelly/Core/Event/Data.php similarity index 100% rename from classes/jelly/core/event/data.php rename to classes/Jelly/Core/Event/Data.php diff --git a/classes/jelly/core/field.php b/classes/Jelly/Core/Field.php similarity index 100% rename from classes/jelly/core/field.php rename to classes/Jelly/Core/Field.php diff --git a/classes/jelly/core/field/belongsto.php b/classes/Jelly/Core/Field/Belongsto.php similarity index 100% rename from classes/jelly/core/field/belongsto.php rename to classes/Jelly/Core/Field/Belongsto.php diff --git a/classes/jelly/core/field/boolean.php b/classes/Jelly/Core/Field/Boolean.php similarity index 100% rename from classes/jelly/core/field/boolean.php rename to classes/Jelly/Core/Field/Boolean.php diff --git a/classes/jelly/core/field/email.php b/classes/Jelly/Core/Field/Email.php similarity index 100% rename from classes/jelly/core/field/email.php rename to classes/Jelly/Core/Field/Email.php diff --git a/classes/jelly/core/field/enum.php b/classes/Jelly/Core/Field/Enum.php similarity index 100% rename from classes/jelly/core/field/enum.php rename to classes/Jelly/Core/Field/Enum.php diff --git a/classes/jelly/core/field/expression.php b/classes/Jelly/Core/Field/Expression.php similarity index 100% rename from classes/jelly/core/field/expression.php rename to classes/Jelly/Core/Field/Expression.php diff --git a/classes/jelly/core/field/file.php b/classes/Jelly/Core/Field/File.php similarity index 100% rename from classes/jelly/core/field/file.php rename to classes/Jelly/Core/Field/File.php diff --git a/classes/jelly/core/field/float.php b/classes/Jelly/Core/Field/Float.php similarity index 100% rename from classes/jelly/core/field/float.php rename to classes/Jelly/Core/Field/Float.php diff --git a/classes/jelly/core/field/hasmany.php b/classes/Jelly/Core/Field/Hasmany.php similarity index 100% rename from classes/jelly/core/field/hasmany.php rename to classes/Jelly/Core/Field/Hasmany.php diff --git a/classes/jelly/core/field/hasone.php b/classes/Jelly/Core/Field/Hasone.php similarity index 100% rename from classes/jelly/core/field/hasone.php rename to classes/Jelly/Core/Field/Hasone.php diff --git a/classes/jelly/core/field/image.php b/classes/Jelly/Core/Field/Image.php similarity index 100% rename from classes/jelly/core/field/image.php rename to classes/Jelly/Core/Field/Image.php diff --git a/classes/jelly/core/field/integer.php b/classes/Jelly/Core/Field/Integer.php similarity index 100% rename from classes/jelly/core/field/integer.php rename to classes/Jelly/Core/Field/Integer.php diff --git a/classes/jelly/core/field/manytomany.php b/classes/Jelly/Core/Field/Manytomany.php similarity index 100% rename from classes/jelly/core/field/manytomany.php rename to classes/Jelly/Core/Field/Manytomany.php diff --git a/classes/jelly/core/field/password.php b/classes/Jelly/Core/Field/Password.php similarity index 100% rename from classes/jelly/core/field/password.php rename to classes/Jelly/Core/Field/Password.php diff --git a/classes/jelly/core/field/polymorphic.php b/classes/Jelly/Core/Field/Polymorphic.php similarity index 100% rename from classes/jelly/core/field/polymorphic.php rename to classes/Jelly/Core/Field/Polymorphic.php diff --git a/classes/jelly/core/field/primary.php b/classes/Jelly/Core/Field/Primary.php similarity index 100% rename from classes/jelly/core/field/primary.php rename to classes/Jelly/Core/Field/Primary.php diff --git a/classes/jelly/core/field/serialized.php b/classes/Jelly/Core/Field/Serialized.php similarity index 100% rename from classes/jelly/core/field/serialized.php rename to classes/Jelly/Core/Field/Serialized.php diff --git a/classes/jelly/core/field/slug.php b/classes/Jelly/Core/Field/Slug.php similarity index 100% rename from classes/jelly/core/field/slug.php rename to classes/Jelly/Core/Field/Slug.php diff --git a/classes/jelly/core/field/string.php b/classes/Jelly/Core/Field/String.php similarity index 100% rename from classes/jelly/core/field/string.php rename to classes/Jelly/Core/Field/String.php diff --git a/classes/jelly/core/field/supports/addremove.php b/classes/Jelly/Core/Field/Supports/Addremove.php similarity index 100% rename from classes/jelly/core/field/supports/addremove.php rename to classes/Jelly/Core/Field/Supports/Addremove.php diff --git a/classes/jelly/core/field/supports/has.php b/classes/Jelly/Core/Field/Supports/Has.php similarity index 100% rename from classes/jelly/core/field/supports/has.php rename to classes/Jelly/Core/Field/Supports/Has.php diff --git a/classes/jelly/core/field/supports/join.php b/classes/Jelly/Core/Field/Supports/Join.php similarity index 100% rename from classes/jelly/core/field/supports/join.php rename to classes/Jelly/Core/Field/Supports/Join.php diff --git a/classes/jelly/core/field/supports/save.php b/classes/Jelly/Core/Field/Supports/Save.php similarity index 100% rename from classes/jelly/core/field/supports/save.php rename to classes/Jelly/Core/Field/Supports/Save.php diff --git a/classes/jelly/core/field/supports/with.php b/classes/Jelly/Core/Field/Supports/With.php similarity index 100% rename from classes/jelly/core/field/supports/with.php rename to classes/Jelly/Core/Field/Supports/With.php diff --git a/classes/jelly/core/field/text.php b/classes/Jelly/Core/Field/Text.php similarity index 100% rename from classes/jelly/core/field/text.php rename to classes/Jelly/Core/Field/Text.php diff --git a/classes/jelly/core/field/timestamp.php b/classes/Jelly/Core/Field/Timestamp.php similarity index 100% rename from classes/jelly/core/field/timestamp.php rename to classes/Jelly/Core/Field/Timestamp.php diff --git a/classes/jelly/core/meta.php b/classes/Jelly/Core/Meta.php similarity index 100% rename from classes/jelly/core/meta.php rename to classes/Jelly/Core/Meta.php diff --git a/classes/jelly/core/model.php b/classes/Jelly/Core/Model.php similarity index 100% rename from classes/jelly/core/model.php rename to classes/Jelly/Core/Model.php diff --git a/classes/jelly/core/validation.php b/classes/Jelly/Core/Validation.php similarity index 100% rename from classes/jelly/core/validation.php rename to classes/Jelly/Core/Validation.php diff --git a/classes/jelly/core/validation/exception.php b/classes/Jelly/Core/Validation/Exception.php similarity index 100% rename from classes/jelly/core/validation/exception.php rename to classes/Jelly/Core/Validation/Exception.php diff --git a/classes/jelly/event.php b/classes/Jelly/Event.php similarity index 100% rename from classes/jelly/event.php rename to classes/Jelly/Event.php diff --git a/classes/jelly/event/data.php b/classes/Jelly/Event/Data.php similarity index 100% rename from classes/jelly/event/data.php rename to classes/Jelly/Event/Data.php diff --git a/classes/jelly/field.php b/classes/Jelly/Field.php similarity index 100% rename from classes/jelly/field.php rename to classes/Jelly/Field.php diff --git a/classes/jelly/field/belongsto.php b/classes/Jelly/Field/Belongsto.php similarity index 100% rename from classes/jelly/field/belongsto.php rename to classes/Jelly/Field/Belongsto.php diff --git a/classes/jelly/field/boolean.php b/classes/Jelly/Field/Boolean.php similarity index 100% rename from classes/jelly/field/boolean.php rename to classes/Jelly/Field/Boolean.php diff --git a/classes/jelly/field/email.php b/classes/Jelly/Field/Email.php similarity index 100% rename from classes/jelly/field/email.php rename to classes/Jelly/Field/Email.php diff --git a/classes/jelly/field/enum.php b/classes/Jelly/Field/Enum.php similarity index 100% rename from classes/jelly/field/enum.php rename to classes/Jelly/Field/Enum.php diff --git a/classes/jelly/field/expression.php b/classes/Jelly/Field/Expression.php similarity index 100% rename from classes/jelly/field/expression.php rename to classes/Jelly/Field/Expression.php diff --git a/classes/jelly/field/file.php b/classes/Jelly/Field/File.php similarity index 100% rename from classes/jelly/field/file.php rename to classes/Jelly/Field/File.php diff --git a/classes/jelly/field/float.php b/classes/Jelly/Field/Float.php similarity index 100% rename from classes/jelly/field/float.php rename to classes/Jelly/Field/Float.php diff --git a/classes/jelly/field/hasmany.php b/classes/Jelly/Field/Hasmany.php similarity index 100% rename from classes/jelly/field/hasmany.php rename to classes/Jelly/Field/Hasmany.php diff --git a/classes/jelly/field/hasone.php b/classes/Jelly/Field/Hasone.php similarity index 100% rename from classes/jelly/field/hasone.php rename to classes/Jelly/Field/Hasone.php diff --git a/classes/jelly/field/image.php b/classes/Jelly/Field/Image.php similarity index 100% rename from classes/jelly/field/image.php rename to classes/Jelly/Field/Image.php diff --git a/classes/jelly/field/integer.php b/classes/Jelly/Field/Integer.php similarity index 100% rename from classes/jelly/field/integer.php rename to classes/Jelly/Field/Integer.php diff --git a/classes/jelly/field/manytomany.php b/classes/Jelly/Field/Manytomany.php similarity index 100% rename from classes/jelly/field/manytomany.php rename to classes/Jelly/Field/Manytomany.php diff --git a/classes/jelly/field/password.php b/classes/Jelly/Field/Password.php similarity index 100% rename from classes/jelly/field/password.php rename to classes/Jelly/Field/Password.php diff --git a/classes/jelly/field/polymorphic.php b/classes/Jelly/Field/Polymorphic.php similarity index 100% rename from classes/jelly/field/polymorphic.php rename to classes/Jelly/Field/Polymorphic.php diff --git a/classes/jelly/field/primary.php b/classes/Jelly/Field/Primary.php similarity index 100% rename from classes/jelly/field/primary.php rename to classes/Jelly/Field/Primary.php diff --git a/classes/jelly/field/serialized.php b/classes/Jelly/Field/Serialized.php similarity index 100% rename from classes/jelly/field/serialized.php rename to classes/Jelly/Field/Serialized.php diff --git a/classes/jelly/field/slug.php b/classes/Jelly/Field/Slug.php similarity index 100% rename from classes/jelly/field/slug.php rename to classes/Jelly/Field/Slug.php diff --git a/classes/jelly/field/string.php b/classes/Jelly/Field/String.php similarity index 100% rename from classes/jelly/field/string.php rename to classes/Jelly/Field/String.php diff --git a/classes/jelly/field/supports/addremove.php b/classes/Jelly/Field/Supports/Addremove.php similarity index 100% rename from classes/jelly/field/supports/addremove.php rename to classes/Jelly/Field/Supports/Addremove.php diff --git a/classes/jelly/field/supports/has.php b/classes/Jelly/Field/Supports/Has.php similarity index 100% rename from classes/jelly/field/supports/has.php rename to classes/Jelly/Field/Supports/Has.php diff --git a/classes/jelly/field/supports/join.php b/classes/Jelly/Field/Supports/Join.php similarity index 100% rename from classes/jelly/field/supports/join.php rename to classes/Jelly/Field/Supports/Join.php diff --git a/classes/jelly/field/supports/save.php b/classes/Jelly/Field/Supports/Save.php similarity index 100% rename from classes/jelly/field/supports/save.php rename to classes/Jelly/Field/Supports/Save.php diff --git a/classes/jelly/field/supports/with.php b/classes/Jelly/Field/Supports/With.php similarity index 100% rename from classes/jelly/field/supports/with.php rename to classes/Jelly/Field/Supports/With.php diff --git a/classes/jelly/field/text.php b/classes/Jelly/Field/Text.php similarity index 100% rename from classes/jelly/field/text.php rename to classes/Jelly/Field/Text.php diff --git a/classes/jelly/field/timestamp.php b/classes/Jelly/Field/Timestamp.php similarity index 100% rename from classes/jelly/field/timestamp.php rename to classes/Jelly/Field/Timestamp.php diff --git a/classes/jelly/meta.php b/classes/Jelly/Meta.php similarity index 100% rename from classes/jelly/meta.php rename to classes/Jelly/Meta.php diff --git a/classes/jelly/model.php b/classes/Jelly/Model.php similarity index 100% rename from classes/jelly/model.php rename to classes/Jelly/Model.php diff --git a/classes/jelly/validation.php b/classes/Jelly/Validation.php similarity index 100% rename from classes/jelly/validation.php rename to classes/Jelly/Validation.php diff --git a/classes/jelly/validation/exception.php b/classes/Jelly/Validation/Exception.php similarity index 100% rename from classes/jelly/validation/exception.php rename to classes/Jelly/Validation/Exception.php From bd146345a430e7139484eefa609abae9b7e68875 Mon Sep 17 00:00:00 2001 From: nex2hex Date: Tue, 30 Oct 2012 20:06:27 +0600 Subject: [PATCH 2/8] compatibility issues --- classes/Jelly/Core.php | 5 ++--- classes/Jelly/Core/Builder.php | 2 +- classes/Jelly/Core/Field/{Belongsto.php => BelongsTo.php} | 0 classes/Jelly/Core/Field/{Hasmany.php => HasMany.php} | 0 classes/Jelly/Core/Field/{Hasone.php => HasOne.php} | 0 classes/Jelly/Core/Field/{Manytomany.php => ManyToMany.php} | 0 .../Core/Field/Supports/{Addremove.php => AddRemove.php} | 0 classes/Jelly/Field/{Belongsto.php => BelongsTo.php} | 0 classes/Jelly/Field/{Hasmany.php => HasMany.php} | 0 classes/Jelly/Field/{Hasone.php => HasOne.php} | 0 classes/Jelly/Field/{Manytomany.php => ManyToMany.php} | 0 .../Jelly/Field/Supports/{Addremove.php => AddRemove.php} | 0 12 files changed, 3 insertions(+), 4 deletions(-) rename classes/Jelly/Core/Field/{Belongsto.php => BelongsTo.php} (100%) rename classes/Jelly/Core/Field/{Hasmany.php => HasMany.php} (100%) rename classes/Jelly/Core/Field/{Hasone.php => HasOne.php} (100%) rename classes/Jelly/Core/Field/{Manytomany.php => ManyToMany.php} (100%) rename classes/Jelly/Core/Field/Supports/{Addremove.php => AddRemove.php} (100%) rename classes/Jelly/Field/{Belongsto.php => BelongsTo.php} (100%) rename classes/Jelly/Field/{Hasmany.php => HasMany.php} (100%) rename classes/Jelly/Field/{Hasone.php => HasOne.php} (100%) rename classes/Jelly/Field/{Manytomany.php => ManyToMany.php} (100%) rename classes/Jelly/Field/Supports/{Addremove.php => AddRemove.php} (100%) diff --git a/classes/Jelly/Core.php b/classes/Jelly/Core.php index a49248b..0cac42f 100644 --- a/classes/Jelly/Core.php +++ b/classes/Jelly/Core.php @@ -194,11 +194,11 @@ public static function class_name($model) { if ($model instanceof Jelly_Model) { - return strtolower(get_class($model)); + return get_class($model); } else { - return strtolower(Jelly::$_model_prefix.$model); + return Jelly::$_model_prefix.$model; } } @@ -255,5 +255,4 @@ public static function behavior_prefix() { return Jelly::$_behavior_prefix; } - } // End Jelly_Core \ No newline at end of file diff --git a/classes/Jelly/Core/Builder.php b/classes/Jelly/Core/Builder.php index c722711..246226e 100644 --- a/classes/Jelly/Core/Builder.php +++ b/classes/Jelly/Core/Builder.php @@ -337,7 +337,7 @@ public function execute($db = NULL, $type = NULL, $ignored = NULL) * @param string|null $type * @return string */ - public function compile(Database $db, $type = NULL) + public function compile($db = NULL, $type = NULL) { $type === NULL AND $type = $this->_type; diff --git a/classes/Jelly/Core/Field/Belongsto.php b/classes/Jelly/Core/Field/BelongsTo.php similarity index 100% rename from classes/Jelly/Core/Field/Belongsto.php rename to classes/Jelly/Core/Field/BelongsTo.php diff --git a/classes/Jelly/Core/Field/Hasmany.php b/classes/Jelly/Core/Field/HasMany.php similarity index 100% rename from classes/Jelly/Core/Field/Hasmany.php rename to classes/Jelly/Core/Field/HasMany.php diff --git a/classes/Jelly/Core/Field/Hasone.php b/classes/Jelly/Core/Field/HasOne.php similarity index 100% rename from classes/Jelly/Core/Field/Hasone.php rename to classes/Jelly/Core/Field/HasOne.php diff --git a/classes/Jelly/Core/Field/Manytomany.php b/classes/Jelly/Core/Field/ManyToMany.php similarity index 100% rename from classes/Jelly/Core/Field/Manytomany.php rename to classes/Jelly/Core/Field/ManyToMany.php diff --git a/classes/Jelly/Core/Field/Supports/Addremove.php b/classes/Jelly/Core/Field/Supports/AddRemove.php similarity index 100% rename from classes/Jelly/Core/Field/Supports/Addremove.php rename to classes/Jelly/Core/Field/Supports/AddRemove.php diff --git a/classes/Jelly/Field/Belongsto.php b/classes/Jelly/Field/BelongsTo.php similarity index 100% rename from classes/Jelly/Field/Belongsto.php rename to classes/Jelly/Field/BelongsTo.php diff --git a/classes/Jelly/Field/Hasmany.php b/classes/Jelly/Field/HasMany.php similarity index 100% rename from classes/Jelly/Field/Hasmany.php rename to classes/Jelly/Field/HasMany.php diff --git a/classes/Jelly/Field/Hasone.php b/classes/Jelly/Field/HasOne.php similarity index 100% rename from classes/Jelly/Field/Hasone.php rename to classes/Jelly/Field/HasOne.php diff --git a/classes/Jelly/Field/Manytomany.php b/classes/Jelly/Field/ManyToMany.php similarity index 100% rename from classes/Jelly/Field/Manytomany.php rename to classes/Jelly/Field/ManyToMany.php diff --git a/classes/Jelly/Field/Supports/Addremove.php b/classes/Jelly/Field/Supports/AddRemove.php similarity index 100% rename from classes/Jelly/Field/Supports/Addremove.php rename to classes/Jelly/Field/Supports/AddRemove.php From 73491bfde557e361ced6ecc858aa06ed666119ca Mon Sep 17 00:00:00 2001 From: nex2hex Date: Wed, 31 Oct 2012 14:39:48 +0600 Subject: [PATCH 3/8] COUNT(*) must be instance of DB::expr() --- classes/Jelly/Core/Builder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Jelly/Core/Builder.php b/classes/Jelly/Core/Builder.php index 246226e..a2a4a09 100644 --- a/classes/Jelly/Core/Builder.php +++ b/classes/Jelly/Core/Builder.php @@ -296,7 +296,7 @@ public function count($db = NULL) // Find the count $result = (int) $query - ->select(array('COUNT("*")', 'total')) + ->select(array(DB::expr('COUNT("*")'), 'total')) ->execute($db) ->get('total'); From 6f3bea01f09de56d01e1446f340392ea5f5938ea Mon Sep 17 00:00:00 2001 From: nex2hex Date: Thu, 1 Nov 2012 14:20:52 +0400 Subject: [PATCH 4/8] Fix class loading --- classes/Jelly/Core.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/classes/Jelly/Core.php b/classes/Jelly/Core.php index 0cac42f..f82ed2c 100644 --- a/classes/Jelly/Core.php +++ b/classes/Jelly/Core.php @@ -198,7 +198,7 @@ public static function class_name($model) } else { - return Jelly::$_model_prefix.$model; + return Jelly::get_class_name(Jelly::$_model_prefix.$model); } } @@ -255,4 +255,14 @@ public static function behavior_prefix() { return Jelly::$_behavior_prefix; } + + public static function get_class_name ($class_name) + { + $class_name = explode ('_', $class_name); + foreach ($class_name as &$name) { + $name = UTF8::ucfirst ($name); + } + + return implode ('_', $class_name); + } } // End Jelly_Core \ No newline at end of file From 986ff89c5c889bb250b75fa41817727dd76c7209 Mon Sep 17 00:00:00 2001 From: nex2hex Date: Fri, 1 Feb 2013 15:42:41 +0400 Subject: [PATCH 5/8] strict check field value in save() method --- classes/Jelly/Core/Model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Jelly/Core/Model.php b/classes/Jelly/Core/Model.php index a06997b..ab4f417 100644 --- a/classes/Jelly/Core/Model.php +++ b/classes/Jelly/Core/Model.php @@ -633,7 +633,7 @@ public function save($validation = NULL) $value = $field->save($this, $value, $key); // Only set the value to be saved if it's changed from the original - if ($value !== $this->_original[$column]) + if ($field->set($value) !== $this->_original[$column]) { $values[$field->name] = $value; } From 79afd2a8f0387e6fcb82a4ca44ef916e432c8fd5 Mon Sep 17 00:00:00 2001 From: nex2hex Date: Tue, 12 Mar 2013 13:19:39 +0400 Subject: [PATCH 6/8] Add DateTime field. Fix Jelly_Collection->as_array() method to return array of models. Methods to get raw values in Jelly_Model (u can use it to get key value in HasOne field). --- classes/Jelly/Core/Builder.php | 22 +++++++++++++ classes/Jelly/Core/Collection.php | 28 ++++++++++++++-- classes/Jelly/Core/Field/DateTime.php | 44 +++++++++++++++++++++++++ classes/Jelly/Core/Model.php | 46 +++++++++++++++++++++++++++ classes/Jelly/Field/DateTime.php | 3 ++ 5 files changed, 141 insertions(+), 2 deletions(-) create mode 100644 classes/Jelly/Core/Field/DateTime.php create mode 100644 classes/Jelly/Field/DateTime.php diff --git a/classes/Jelly/Core/Builder.php b/classes/Jelly/Core/Builder.php index a2a4a09..03501ce 100644 --- a/classes/Jelly/Core/Builder.php +++ b/classes/Jelly/Core/Builder.php @@ -1011,6 +1011,28 @@ protected function _field_alias($field, $value = NULL, $join_if_sure = TRUE) return $join ? ($alias.'.'.$column) : $column; } + public function field_alias($field) + { + return $this->_field_alias($field); + } + + /** + * Return table name in query, table alias and table model + * + * @param $field + * @return mixed + */ + public function with_alias($field) + { + $field = $this->_meta->field($field); + + $table = $this->_meta->table(); + + $key = $field->foreign['model'].'.'.$table.':'.$field->name; + + return $this->_model_cache[$key]; + } + /** * Resolves meta-aliases. * diff --git a/classes/Jelly/Core/Collection.php b/classes/Jelly/Core/Collection.php index 58f0c8f..0b3541f 100644 --- a/classes/Jelly/Core/Collection.php +++ b/classes/Jelly/Core/Collection.php @@ -91,7 +91,7 @@ public function meta() } /** - * Return all of the rows in the result as an array. + * Return all of the models in array. * * @param string $key column for associative keys * @param string $value column for values @@ -99,7 +99,31 @@ public function meta() */ public function as_array($key = NULL, $value = NULL) { - return $this->_result->as_array($key, $value); + if ($value === NULL) + { + $result = array(); + + if ($key === NULL) + { + foreach ($this as $obj) + { + $result[] = $obj; + } + } + else + { + foreach ($this as $obj) + { + $result[$obj->$key] = $obj; + } + } + + return $result; + } + else + { + return $this->_result->as_array($key, $value); + } } /** diff --git a/classes/Jelly/Core/Field/DateTime.php b/classes/Jelly/Core/Field/DateTime.php new file mode 100644 index 0000000..678333d --- /dev/null +++ b/classes/Jelly/Core/Field/DateTime.php @@ -0,0 +1,44 @@ +format('Y-m-d H:i:s'); + } + return $value; + } +} diff --git a/classes/Jelly/Core/Model.php b/classes/Jelly/Core/Model.php index ab4f417..648624b 100644 --- a/classes/Jelly/Core/Model.php +++ b/classes/Jelly/Core/Model.php @@ -265,6 +265,36 @@ public function get($name) } } + /** + * Gets the value from db for a field, no relationships supports, + * returned raw data only. + * + * @param string $name The field's name + * @return string + */ + public function get_raw($name) + { + if ($field = $this->_meta->field($name)) + { + // Alias the name to its actual name + $name = $field->name; + + if (array_key_exists($name, $this->_changed)) + { + return $this->_changed[$name]; + } + else + { + return $this->original_raw($name); + } + } + // Return unmapped data from custom queries + elseif (isset($this->_unmapped[$name])) + { + return $this->_unmapped[$name]; + } + } + /** * Returns the original value of a field, before it was changed. * @@ -283,6 +313,22 @@ public function original($field) } } + /** + * Returns the original value of a field, before it was changed, + * no relationships supports, returned raw data only. + * + * @param string $field The field's or alias name + * @return string + */ + public function original_raw($field) + { + if ($field = $this->_meta->field($field)) + { + // Alias the name to its actual name + return $this->_original[$field->name]; + } + } + /** * Returns an array of values in the fields. * diff --git a/classes/Jelly/Field/DateTime.php b/classes/Jelly/Field/DateTime.php new file mode 100644 index 0000000..7c76ef2 --- /dev/null +++ b/classes/Jelly/Field/DateTime.php @@ -0,0 +1,3 @@ + Date: Tue, 12 Mar 2013 15:21:55 +0600 Subject: [PATCH 7/8] Update README.md --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index af33d59..e1c6e30 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,8 @@ IMPORTANT Jelly requires the following Kohana versions per Git branch: * `3.1/develop` and `3.1/master` branches: Kohana 3.1.3+ -* `3.2/develop` and `3.2/master` branches: Kohana 3.2+ +* `3.2/develop` and `3.2/master` branches: Kohana 3.2 +* `3.3/master` branch: Kohana 3.3+ **Useful stuff**: @@ -58,4 +59,4 @@ Remember: * **No circular references** — Fields are well-designed to prevent the infinite loop problem that sometimes plagues Sprig. It's even possible to have same-table child/parent references out of the box without intermediate - models. \ No newline at end of file + models. From df25cd35300b94b462f35e1092bb98669c470c69 Mon Sep 17 00:00:00 2001 From: nex2hex Date: Tue, 12 Mar 2013 13:34:34 +0400 Subject: [PATCH 8/8] Rename inflector to Inflector. fix count() with PostgreSQL. --- classes/Jelly/Core/Builder.php | 2 +- classes/Jelly/Core/Field/HasMany.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/Jelly/Core/Builder.php b/classes/Jelly/Core/Builder.php index 03501ce..e1b53e1 100644 --- a/classes/Jelly/Core/Builder.php +++ b/classes/Jelly/Core/Builder.php @@ -296,7 +296,7 @@ public function count($db = NULL) // Find the count $result = (int) $query - ->select(array(DB::expr('COUNT("*")'), 'total')) + ->select(array(DB::expr('COUNT(*)'), 'total')) ->execute($db) ->get('total'); diff --git a/classes/Jelly/Core/Field/HasMany.php b/classes/Jelly/Core/Field/HasMany.php index 63917ed..d7b1635 100644 --- a/classes/Jelly/Core/Field/HasMany.php +++ b/classes/Jelly/Core/Field/HasMany.php @@ -67,7 +67,7 @@ public function initialize($model, $column) // of this field, and the field defaults to this field's model's foreign key if (empty($this->foreign)) { - $this->foreign = inflector::singular($this->name).'.'.$model.':foreign_key'; + $this->foreign = Inflector::singular($this->name).'.'.$model.':foreign_key'; } // We have a model? Default the field to this field's model's foreign key elseif (FALSE === strpos($this->foreign, '.'))