datamapper 0.2.3 → 0.2.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (121) hide show
  1. data/example.rb +5 -5
  2. data/lib/data_mapper/adapters/abstract_adapter.rb +2 -2
  3. data/lib/data_mapper/adapters/data_object_adapter.rb +141 -147
  4. data/lib/data_mapper/adapters/mysql_adapter.rb +14 -1
  5. data/lib/data_mapper/adapters/postgresql_adapter.rb +123 -18
  6. data/lib/data_mapper/adapters/sql/coersion.rb +21 -9
  7. data/lib/data_mapper/adapters/sql/commands/load_command.rb +36 -19
  8. data/lib/data_mapper/adapters/sql/mappings/column.rb +111 -17
  9. data/lib/data_mapper/adapters/sql/mappings/schema.rb +27 -0
  10. data/lib/data_mapper/adapters/sql/mappings/table.rb +256 -29
  11. data/lib/data_mapper/adapters/sqlite3_adapter.rb +93 -8
  12. data/lib/data_mapper/associations/belongs_to_association.rb +53 -54
  13. data/lib/data_mapper/associations/has_and_belongs_to_many_association.rb +157 -25
  14. data/lib/data_mapper/associations/has_many_association.rb +45 -15
  15. data/lib/data_mapper/associations/has_n_association.rb +79 -20
  16. data/lib/data_mapper/associations/has_one_association.rb +2 -2
  17. data/lib/data_mapper/associations/reference.rb +1 -1
  18. data/lib/data_mapper/auto_migrations.rb +40 -0
  19. data/lib/data_mapper/base.rb +201 -98
  20. data/lib/data_mapper/context.rb +16 -10
  21. data/lib/data_mapper/database.rb +22 -11
  22. data/lib/data_mapper/dependency_queue.rb +28 -0
  23. data/lib/data_mapper/embedded_value.rb +61 -17
  24. data/lib/data_mapper/property.rb +4 -0
  25. data/lib/data_mapper/support/active_record_impersonation.rb +13 -5
  26. data/lib/data_mapper/support/errors.rb +5 -0
  27. data/lib/data_mapper/support/serialization.rb +8 -4
  28. data/lib/data_mapper/validatable_extensions/errors.rb +12 -0
  29. data/lib/data_mapper/validatable_extensions/macros.rb +7 -0
  30. data/lib/data_mapper/validatable_extensions/validatable_instance_methods.rb +62 -0
  31. data/lib/data_mapper/validatable_extensions/validation_base.rb +18 -0
  32. data/lib/data_mapper/validatable_extensions/validations/formats/email.rb +43 -0
  33. data/lib/data_mapper/validatable_extensions/validations/validates_acceptance_of.rb +7 -0
  34. data/lib/data_mapper/validatable_extensions/validations/validates_confirmation_of.rb +7 -0
  35. data/lib/data_mapper/validatable_extensions/validations/validates_each.rb +7 -0
  36. data/lib/data_mapper/validatable_extensions/validations/validates_format_of.rb +28 -0
  37. data/lib/data_mapper/validatable_extensions/validations/validates_length_of.rb +15 -0
  38. data/lib/data_mapper/validatable_extensions/validations/validates_numericality_of.rb +7 -0
  39. data/lib/data_mapper/validatable_extensions/validations/validates_presence_of.rb +7 -0
  40. data/lib/data_mapper/validatable_extensions/validations/validates_true_for.rb +7 -0
  41. data/lib/data_mapper/validatable_extensions/validations/validates_uniqueness_of.rb +33 -0
  42. data/lib/data_mapper/validations.rb +20 -0
  43. data/lib/data_mapper.rb +39 -34
  44. data/performance.rb +24 -18
  45. data/plugins/dataobjects/do_rb +0 -0
  46. data/rakefile.rb +12 -2
  47. data/spec/active_record_impersonation_spec.rb +133 -0
  48. data/spec/acts_as_tree_spec.rb +25 -9
  49. data/spec/associations_spec.rb +124 -4
  50. data/spec/attributes_spec.rb +13 -0
  51. data/spec/auto_migrations_spec.rb +44 -0
  52. data/spec/base_spec.rb +189 -1
  53. data/spec/column_spec.rb +85 -7
  54. data/spec/conditions_spec.rb +2 -2
  55. data/spec/dependency_spec.rb +25 -0
  56. data/spec/embedded_value_spec.rb +123 -3
  57. data/spec/fixtures/animals.yaml +1 -0
  58. data/spec/fixtures/careers.yaml +5 -0
  59. data/spec/fixtures/comments.yaml +1 -0
  60. data/spec/fixtures/people.yaml +14 -9
  61. data/spec/fixtures/projects.yaml +4 -0
  62. data/spec/fixtures/sections.yaml +5 -0
  63. data/spec/fixtures/serializers.yaml +6 -0
  64. data/spec/fixtures/users.yaml +1 -0
  65. data/spec/load_command_spec.rb +5 -4
  66. data/spec/mock_adapter.rb +2 -2
  67. data/spec/models/animal.rb +2 -1
  68. data/spec/models/animals_exhibit.rb +2 -2
  69. data/spec/models/career.rb +6 -0
  70. data/spec/models/comment.rb +4 -0
  71. data/spec/models/exhibit.rb +4 -0
  72. data/spec/models/person.rb +3 -13
  73. data/spec/models/project.rb +1 -1
  74. data/spec/models/serializer.rb +3 -0
  75. data/spec/models/user.rb +4 -0
  76. data/spec/models/zoo.rb +8 -1
  77. data/spec/natural_key_spec.rb +36 -0
  78. data/spec/paranoia_spec.rb +36 -0
  79. data/spec/property_spec.rb +70 -0
  80. data/spec/schema_spec.rb +10 -2
  81. data/spec/serialization_spec.rb +6 -3
  82. data/spec/serialize_spec.rb +19 -0
  83. data/spec/single_table_inheritance_spec.rb +7 -1
  84. data/spec/spec_helper.rb +26 -8
  85. data/spec/table_spec.rb +33 -0
  86. data/spec/validates_confirmation_of_spec.rb +20 -4
  87. data/spec/validates_format_of_spec.rb +22 -8
  88. data/spec/validates_length_of_spec.rb +26 -13
  89. data/spec/validates_uniqueness_of_spec.rb +18 -5
  90. data/spec/validations_spec.rb +55 -10
  91. data/tasks/fixtures.rb +13 -7
  92. metadata +189 -153
  93. data/lib/data_mapper/validations/confirmation_validator.rb +0 -53
  94. data/lib/data_mapper/validations/contextual_validations.rb +0 -50
  95. data/lib/data_mapper/validations/format_validator.rb +0 -85
  96. data/lib/data_mapper/validations/formats/email.rb +0 -78
  97. data/lib/data_mapper/validations/generic_validator.rb +0 -22
  98. data/lib/data_mapper/validations/length_validator.rb +0 -76
  99. data/lib/data_mapper/validations/required_field_validator.rb +0 -41
  100. data/lib/data_mapper/validations/unique_validator.rb +0 -56
  101. data/lib/data_mapper/validations/validation_errors.rb +0 -37
  102. data/lib/data_mapper/validations/validation_helper.rb +0 -77
  103. data/plugins/dataobjects/REVISION +0 -1
  104. data/plugins/dataobjects/Rakefile +0 -9
  105. data/plugins/dataobjects/do.rb +0 -348
  106. data/plugins/dataobjects/do_mysql.rb +0 -212
  107. data/plugins/dataobjects/do_postgres.rb +0 -196
  108. data/plugins/dataobjects/do_sqlite3.rb +0 -157
  109. data/plugins/dataobjects/spec/do_spec.rb +0 -150
  110. data/plugins/dataobjects/spec/spec_helper.rb +0 -81
  111. data/plugins/dataobjects/swig_mysql/extconf.rb +0 -45
  112. data/plugins/dataobjects/swig_mysql/mysql_c.c +0 -16602
  113. data/plugins/dataobjects/swig_mysql/mysql_c.i +0 -67
  114. data/plugins/dataobjects/swig_mysql/mysql_supp.i +0 -46
  115. data/plugins/dataobjects/swig_postgres/extconf.rb +0 -29
  116. data/plugins/dataobjects/swig_postgres/postgres_c.c +0 -8185
  117. data/plugins/dataobjects/swig_postgres/postgres_c.i +0 -73
  118. data/plugins/dataobjects/swig_sqlite/extconf.rb +0 -9
  119. data/plugins/dataobjects/swig_sqlite/sqlite3_c.c +0 -4725
  120. data/plugins/dataobjects/swig_sqlite/sqlite_c.i +0 -168
  121. data/tasks/drivers.rb +0 -20
@@ -1,168 +0,0 @@
1
- %module sqlite3_c
2
- %include "typemaps.i"
3
- %{
4
- #include <sqlite3.h>
5
- typedef void BLOB;
6
- typedef void VALBLOB;
7
- %}
8
-
9
- %typemap(in,numinputs=0) sqlite3 **OUTPUT(sqlite3 *) {
10
- $1 = (sqlite3**)malloc( sizeof( sqlite3* ) );
11
- };
12
- %typemap(argout,fragment="output_helper") sqlite3 **OUTPUT (sqlite3 *) {
13
- $result = output_helper($result, SWIG_NewPointerObj( *$1, SWIGTYPE_p_sqlite3, 0 ));
14
- }
15
- %typemap(freearg) sqlite3 ** {
16
- free((sqlite3 *)$1);
17
- }
18
-
19
- %typemap(in,numinputs=0) sqlite3_stmt **OUTPUT(sqlite3_stmt *) {
20
- $1 = (sqlite3_stmt**)malloc( sizeof( sqlite3_stmt* ) );
21
- };
22
- %typemap(argout,fragment="output_helper") sqlite3_stmt **OUTPUT (sqlite3_stmt *) {
23
- $result = output_helper($result, SWIG_NewPointerObj( *$1, SWIGTYPE_p_sqlite3_stmt, 0 ));
24
- }
25
- %typemap(freearg) sqlite3_stmt ** {
26
- free((sqlite3_stmt *)$1);
27
- }
28
-
29
- %typemap(in,numinputs=0) char **OUTPUT(char *) {
30
- $1 = (char**)malloc( sizeof( char* ) );
31
- };
32
- %typemap(argout,fragment="output_helper") char **OUTPUT (char *) {
33
- $result = output_helper($result, rb_str_new2(*$1));
34
- }
35
- %typemap(freearg) char ** {
36
- free((char *)$1);
37
- }
38
-
39
- %typemap(out) sqlite_int64 {
40
- $result = LONG2NUM(result);
41
- }
42
-
43
- const char *sqlite3_libversion(void);
44
- int sqlite3_close(sqlite3*);
45
-
46
- sqlite_int64 sqlite3_last_insert_rowid(sqlite3*);
47
-
48
- int sqlite3_changes(sqlite3*);
49
- int sqlite3_total_changes(sqlite3*);
50
- void sqlite3_interrupt(sqlite3*);
51
-
52
- int sqlite3_complete(const char*);
53
- int sqlite3_complete16(const void *str);
54
-
55
- int sqlite3_busy_handler(sqlite3*, int(*)(void*,int), void*);
56
- int sqlite3_busy_timeout(sqlite3*,int);
57
- int sqlite3_set_authorizer(sqlite3*, int(*)(void*,int,const char*,const char*,const char*,const char*), void*);
58
- int sqlite3_trace(sqlite3*, void(*)(void*,const char*), void*);
59
-
60
- int sqlite3_open(const char *filename, sqlite3 **OUTPUT);
61
- int sqlite3_open16(const void *filename, sqlite3 **);
62
-
63
- int sqlite3_errcode(sqlite3*);
64
- const char *sqlite3_errmsg(sqlite3*);
65
- const void *sqlite3_errmsg16(sqlite3*);
66
-
67
- int sqlite3_prepare(sqlite3*,const char* sql,int,sqlite3_stmt**OUTPUT,const char**OUTPUT);
68
- int sqlite3_prepare_v2(sqlite3*,const char* sql,int,sqlite3_stmt**OUTPUT,const char**OUTPUT);
69
- int sqlite3_prepare16(sqlite3*,const void* sql,int,sqlite3_stmt**,const void**);
70
-
71
- int sqlite3_bind_blob(sqlite3_stmt*,int,const void *blob,int,void(*free)(void*));
72
- int sqlite3_bind_double(sqlite3_stmt*,int,double);
73
- int sqlite3_bind_int(sqlite3_stmt*,int,int);
74
- int sqlite3_bind_int64(sqlite3_stmt*,int,sqlite_int64);
75
- int sqlite3_bind_null(sqlite3_stmt*,int);
76
- int sqlite3_bind_text(sqlite3_stmt*,int,const char*text,int,void(*free)(void*));
77
- int sqlite3_bind_text16(sqlite3_stmt*,int,const void*utf16,int,void(*free)(void*));
78
-
79
- int sqlite3_bind_parameter_count(sqlite3_stmt*);
80
- const char *sqlite3_bind_parameter_name(sqlite3_stmt*,int);
81
- int sqlite3_bind_parameter_index(sqlite3_stmt*,const char*);
82
-
83
- int sqlite3_column_count(sqlite3_stmt*);
84
- const char *sqlite3_column_name(sqlite3_stmt*,int);
85
- const void *sqlite3_column_name16(sqlite3_stmt*,int);
86
- const char *sqlite3_column_decltype(sqlite3_stmt*,int);
87
- const void *sqlite3_column_decltype16(sqlite3_stmt*,int);
88
-
89
- int sqlite3_step(sqlite3_stmt*);
90
-
91
- int sqlite3_data_count(sqlite3_stmt*);
92
-
93
- const BLOB *sqlite3_column_blob(sqlite3_stmt*,int);
94
- int sqlite3_column_bytes(sqlite3_stmt*,int);
95
- int sqlite3_column_bytes16(sqlite3_stmt*,int);
96
- double sqlite3_column_double(sqlite3_stmt*,int);
97
- double sqlite3_column_int(sqlite3_stmt*,int);
98
- sqlite_int64 sqlite3_column_int64(sqlite3_stmt*,int);
99
- const char *sqlite3_column_text(sqlite3_stmt*,int);
100
- const void *sqlite3_column_text16(sqlite3_stmt*,int);
101
- int sqlite3_column_type(sqlite3_stmt*,int);
102
-
103
- int sqlite3_finalize(sqlite3_stmt*);
104
- int sqlite3_reset(sqlite3_stmt*);
105
-
106
- int sqlite3_create_function(sqlite3*,const char*str,int,int,void*,void(*func)(sqlite3_context*,int,sqlite3_value**),void(*step)(sqlite3_context*,int,sqlite3_value**),void(*final)(sqlite3_context*));
107
-
108
- int sqlite3_create_function16(sqlite3*,const void*str,int,int,void*,void(*func)(sqlite3_context*,int,sqlite3_value**),void(*step)(sqlite3_context*,int,sqlite3_value**),void(*final)(sqlite3_context*));
109
-
110
- int sqlite3_aggregate_count(sqlite3_context*);
111
-
112
- const VALBLOB *sqlite3_value_blob(sqlite3_value*);
113
- int sqlite3_value_bytes(sqlite3_value*);
114
- int sqlite3_value_bytes16(sqlite3_value*);
115
- double sqlite3_value_double(sqlite3_value*);
116
- int sqlite3_value_int(sqlite3_value*);
117
- sqlite_int64 sqlite3_value_int64(sqlite3_value*);
118
- const char *sqlite3_value_text(sqlite3_value*);
119
- const void *sqlite3_value_text16(sqlite3_value*);
120
- const void *sqlite3_value_text16le(sqlite3_value*);
121
- const void *sqlite3_value_text16be(sqlite3_value*);
122
- int sqlite3_value_type(sqlite3_value*);
123
-
124
- void sqlite3_result_blob(sqlite3_context*,const void *blob,int,void(*free)(void*));
125
- void sqlite3_result_double(sqlite3_context*,double);
126
- void sqlite3_result_error(sqlite3_context*,const char *text,int);
127
- void sqlite3_result_error16(sqlite3_context*,const void *blob,int);
128
- void sqlite3_result_int(sqlite3_context*,int);
129
- void sqlite3_result_int64(sqlite3_context*,sqlite_int64);
130
- void sqlite3_result_text(sqlite3_context*,const char* text,int,void(*free)(void*));
131
- void sqlite3_result_text16(sqlite3_context*,const void* utf16,int,void(*free)(void*));
132
- void sqlite3_result_text16le(sqlite3_context*,const void* utf16,int,void(*free)(void*));
133
- void sqlite3_result_text16be(sqlite3_context*,const void* utf16,int,void(*free)(void*));
134
- void sqlite3_result_value(sqlite3_context*,sqlite3_value*);
135
-
136
- VALUE *sqlite3_aggregate_context(sqlite3_context*,int data_size);
137
-
138
- #define SQLITE_OK 0 /* Successful result */
139
- /* beginning-of-error-codes */
140
- #define SQLITE_ERROR 1 /* SQL error or missing database */
141
- #define SQLITE_INTERNAL 2 /* NOT USED. Internal logic error in SQLite */
142
- #define SQLITE_PERM 3 /* Access permission denied */
143
- #define SQLITE_ABORT 4 /* Callback routine requested an abort */
144
- #define SQLITE_BUSY 5 /* The database file is locked */
145
- #define SQLITE_LOCKED 6 /* A table in the database is locked */
146
- #define SQLITE_NOMEM 7 /* A malloc() failed */
147
- #define SQLITE_READONLY 8 /* Attempt to write a readonly database */
148
- #define SQLITE_INTERRUPT 9 /* Operation terminated by sqlite3_interrupt()*/
149
- #define SQLITE_IOERR 10 /* Some kind of disk I/O error occurred */
150
- #define SQLITE_CORRUPT 11 /* The database disk image is malformed */
151
- #define SQLITE_NOTFOUND 12 /* NOT USED. Table or record not found */
152
- #define SQLITE_FULL 13 /* Insertion failed because database is full */
153
- #define SQLITE_CANTOPEN 14 /* Unable to open the database file */
154
- #define SQLITE_PROTOCOL 15 /* NOT USED. Database lock protocol error */
155
- #define SQLITE_EMPTY 16 /* Database is empty */
156
- #define SQLITE_SCHEMA 17 /* The database schema changed */
157
- #define SQLITE_TOOBIG 18 /* String or BLOB exceeds size limit */
158
- #define SQLITE_CONSTRAINT 19 /* Abort due to constraint violation */
159
- #define SQLITE_MISMATCH 20 /* Data type mismatch */
160
- #define SQLITE_MISUSE 21 /* Library used incorrectly */
161
- #define SQLITE_NOLFS 22 /* Uses OS features not supported on host */
162
- #define SQLITE_AUTH 23 /* Authorization denied */
163
- #define SQLITE_FORMAT 24 /* Auxiliary database format error */
164
- #define SQLITE_RANGE 25 /* 2nd parameter to sqlite3_bind out of range */
165
- #define SQLITE_NOTADB 26 /* File opened that is not a database file */
166
- #define SQLITE_ROW 100 /* sqlite3_step() has another row ready */
167
- #define SQLITE_DONE 101 /* sqlite3_step() has finished executing */
168
- /* end-of-error-codes */
data/tasks/drivers.rb DELETED
@@ -1,20 +0,0 @@
1
- namespace :dm do
2
- namespace :install do
3
-
4
- desc 'Install DataObjects.rb Mysql Driver'
5
- task :mysql do
6
- %x(cd #{File.dirname(__FILE__) + '/../plugins/dataobjects/swig_mysql/'} && ruby extconf.rb && make && sudo make install)
7
- end
8
-
9
- desc 'Install DataObjects.rb SQLite3 Driver'
10
- task :sqlite3 do
11
- %x(cd #{File.dirname(__FILE__) + '/../plugins/dataobjects/swig_sqlite/'} && ruby extconf.rb && make && sudo make install)
12
- end
13
-
14
- desc 'Install DataObjects.rb PostgreSQL Driver'
15
- task :postgresql do
16
- %x(cd #{File.dirname(__FILE__) + '/../plugins/dataobjects/swig_postgres/'} && ruby extconf.rb && make && sudo make install)
17
- end
18
-
19
- end
20
- end