Fix for mappings to work correctly in modules.

coldbox-modules · May 5, 2016 · 7502394 · 7502394
1 parent 9efbe5b
commit 7502394
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 39 deletions.
diff --git a/ModuleConfig.cfc b/ModuleConfig.cfc
@@ -4,9 +4,14 @@ component {
     this.author        = 'Eric Peterson';
     this.webURL        = 'https://github.com/elpete/quick';
     this.description   = 'Query builder for the rest of us';
-    this.version       = '1.0.0';
-    this.autoMapModels = false;
+    this.version       = '0.1.0';
+    this.autoMapModels = true;
+    this.cfmapping     = 'Quick';
 
-    function configure() {}
+    function configure() {
+        binder.map('Grammar@Quick')
+            // make this default grammar a setting
+            .to('#moduleMapping#.models.Query.Grammars.OracleGrammar');
+    }
 
 }
diff --git a/box.json b/box.json
@@ -1,6 +1,6 @@
 {
     "name": "quick",
-    "version": "1.0.0",
+    "version": "0.1.0",
     "author": "Eric Peterson",
     "homepage": "https://github.com/elpete/quick",
     "documentation": "https://github.com/elpete/quick",

diff --git a/models/Query/Builder.cfc b/models/Query/Builder.cfc
@@ -1,5 +1,7 @@
 component displayname='Builder' {
 
+    property name='grammar' inject='Grammar@Quick';
+
     property name='distinct' type='boolean' default='false';
     property name='columns' type='array';
     property name='from' type='string';
@@ -23,9 +25,7 @@ component displayname='Builder' {
         "where" = []
     };
 
-    public Builder function init(required Quick.Query.Grammars.Grammar grammar) {
-        variables.grammar = arguments.grammar;
-
+    public Builder function init() {
         setDefaultValues();
 
         return this;

diff --git a/models/Query/Grammars/Grammar.cfc b/models/Query/Grammars/Grammar.cfc
diff --git a/models/Query/Grammars/GrammarInterface.cfc b/models/Query/Grammars/GrammarInterface.cfc
@@ -0,0 +1,3 @@
+interface displayname='GrammarInterface' {
+    public string function compileSelect(required Quick.models.Query.Builder query);    
+}
diff --git a/models/Query/Grammars/OracleGrammar.cfc b/models/Query/Grammars/OracleGrammar.cfc
@@ -1,10 +1,10 @@
-component displayname='OracleGrammar' implements='Quick.Query.Grammars.Grammar' {
+component displayname='OracleGrammar' implements='Quick.models.Query.Grammars.GrammarInterface' {
 
     variables.selectComponents = [
         'columns', 'from', 'wheres', 'joins'
     ];
 
-    public string function compileSelect(required Quick.Query.Builder query) {
+    public string function compileSelect(required Quick.models.Query.Builder query) {
 
         var sql = [];
 
@@ -19,16 +19,16 @@ component displayname='OracleGrammar' implements='Quick.Query.Grammars.Grammar'
         return concatenate(sql);
     }
 
-    private string function compileColumns(required Quick.Query.Builder query, required array columns) {
+    private string function compileColumns(required Quick.models.Query.Builder query, required array columns) {
         var select = query.getDistinct() ? 'SELECT DISTINCT ' : 'SELECT ';
         return select & ArrayToList(columns);
     }
 
-    private string function compileFrom(required Quick.Query.Builder query, required string from) {
+    private string function compileFrom(required Quick.models.Query.Builder query, required string from) {
         return 'FROM ' & from;
     }
 
-    private string function compileJoins(required Quick.Query.Builder query, required array joins) {
+    private string function compileJoins(required Quick.models.Query.Builder query, required array joins) {
         return arrayToList(arrayMap(arguments.joins, function(join) {
             var clauses = arrayToList(arrayMap(join.getClauses(), function(clause, index) {
                 if (index == 1) {
@@ -41,7 +41,7 @@ component displayname='OracleGrammar' implements='Quick.Query.Grammars.Grammar'
         }), ' ');
     }
 
-    private string function compileWheres(required Quick.Query.Builder query, requierd array wheres) {
+    private string function compileWheres(required Quick.models.Query.Builder query, requierd array wheres) {
         var whereStatements = ArrayMap(wheres, function(where, index) {
             if (! isStruct(where)) {
                 return '';

diff --git a/tests/Application.cfc b/tests/Application.cfc
@@ -1,4 +1,4 @@
 component {
     this.mappings["/tests"] = getDirectoryFromPath(getCurrentTemplatePath());
-    this.mappings["/Quick"] = expandPath("/models");
+    this.mappings["/Quick"] = expandPath("/");
 }
diff --git a/tests/specs/Query/Builder/BuilderCollaboratorsSpec.cfc b/tests/specs/Query/Builder/BuilderCollaboratorsSpec.cfc
@@ -2,8 +2,8 @@ component extends='testbox.system.BaseSpec' {
     function run() {
         describe('interaction with collaborators', function() {
             beforeEach(function() {
-                variables.mockGrammar = getMockBox().createStub(implements = 'Quick.Query.Grammars.Grammar');
-                variables.query = new Quick.Query.Builder(variables.mockGrammar);
+                variables.mockGrammar = getMockBox().createStub(implements = 'Quick.models.Query.Grammars.GrammarInterface');
+                variables.query = new Quick.models.Query.Builder(variables.mockGrammar);
             });
 
             describe('interaction with grammar', function() {

diff --git a/tests/specs/Query/Builder/BuilderJoinSpec.cfc b/tests/specs/Query/Builder/BuilderJoinSpec.cfc
@@ -2,8 +2,8 @@ component extends='testbox.system.BaseSpec' {
     function run() {
         describe('join methods', function() {
             beforeEach(function() {
-                variables.mockGrammar = getMockBox().createStub(implements = 'Quick.Query.Grammars.Grammar');
-                variables.query = new Quick.Query.Builder(variables.mockGrammar);
+                variables.mockGrammar = getMockBox().createStub(implements = 'Quick.models.Query.Grammars.GrammarInterface');
+                variables.query = new Quick.models.Query.Builder(variables.mockGrammar);
             });
 
             it('does a simple inner join', function() {

diff --git a/tests/specs/Query/Builder/BuilderSelectSpec.cfc b/tests/specs/Query/Builder/BuilderSelectSpec.cfc
@@ -2,8 +2,8 @@ component extends='testbox.system.BaseSpec' {
     function run() {
         describe('select methods', function() {
             beforeEach(function() {
-                variables.mockGrammar = getMockBox().createStub(implements = 'Quick.Query.Grammars.Grammar');
-                variables.query = new Quick.Query.Builder(variables.mockGrammar);
+                variables.mockGrammar = getMockBox().createStub(implements = 'Quick.models.Query.Grammars.GrammarInterface');
+                variables.query = new Quick.models.Query.Builder(variables.mockGrammar);
             });
 
             describe('select()', function() {

diff --git a/tests/specs/Query/Builder/BuilderWhereSpec.cfc b/tests/specs/Query/Builder/BuilderWhereSpec.cfc
@@ -2,8 +2,8 @@ component extends='testbox.system.BaseSpec' {
     function run() {
         describe('where methods', function() {
             beforeEach(function() {
-                variables.mockGrammar = getMockBox().createStub(implements = 'Quick.Query.Grammars.Grammar');
-                variables.query = new Quick.Query.Builder(variables.mockGrammar);
+                variables.mockGrammar = getMockBox().createStub(implements = 'Quick.models.Query.Grammars.GrammarInterface');
+                variables.query = new Quick.models.Query.Builder(variables.mockGrammar);
             });
 
             it('defaults to empty', function() {

diff --git a/tests/specs/Query/Builder/JoinClauseSpec.cfc b/tests/specs/Query/Builder/JoinClauseSpec.cfc
@@ -2,22 +2,22 @@ component extends='testbox.system.BaseSpec' {
     function run() {
         describe('initialization', function() {
             it('requires a type and a table', function() {
-                expect(function() { new Quick.Query.JoinClause(); }).toThrow();
-                expect(function() { new Quick.Query.JoinClause('inner'); }).toThrow();
-                expect(function() { new Quick.Query.JoinClause('inner', 'sometable'); }).notToThrow();
+                expect(function() { new Quick.models.Query.JoinClause(); }).toThrow();
+                expect(function() { new Quick.models.Query.JoinClause('inner'); }).toThrow();
+                expect(function() { new Quick.models.Query.JoinClause('inner', 'sometable'); }).notToThrow();
             });
 
             it('validates the type is a valid sql join type', function() {
-                expect(function() { new Quick.Query.JoinClause('gibberish', 'sometable') }).toThrow();
-                expect(function() { new Quick.Query.JoinClause('left typo', 'sometable') }).toThrow();
-                expect(function() { new Quick.Query.JoinClause('left', 'sometable') }).notToThrow();
-                expect(function() { new Quick.Query.JoinClause('left outer', 'sometable') }).notToThrow();
+                expect(function() { new Quick.models.Query.JoinClause('gibberish', 'sometable') }).toThrow();
+                expect(function() { new Quick.models.Query.JoinClause('left typo', 'sometable') }).toThrow();
+                expect(function() { new Quick.models.Query.JoinClause('left', 'sometable') }).notToThrow();
+                expect(function() { new Quick.models.Query.JoinClause('left outer', 'sometable') }).notToThrow();
             });
         });
 
         describe('adding join conditions', function() {
             beforeEach(function() {
-                variables.join = new Quick.Query.JoinClause('inner', 'second');
+                variables.join = new Quick.models.Query.JoinClause('inner', 'second');
             });
 
             afterEach(function() {

diff --git a/tests/specs/Query/Grammar/GrammarCompileSQLSpec.cfc b/tests/specs/Query/Grammar/GrammarCompileSQLSpec.cfc
@@ -2,8 +2,8 @@ component extends='testbox.system.BaseSpec' {
     function run() {
         describe('compileSelect', function() {
             beforeEach(function() {
-                variables.grammar = new Quick.Query.Grammars.OracleGrammar();
-                variables.mockQuery = getMockBox().createMock('Quick.Query.Builder');
+                variables.grammar = new Quick.models.Query.Grammars.OracleGrammar();
+                variables.mockQuery = getMockBox().createMock('Quick.models.Query.Builder');
                 mockQuery.$('getDistinct', false);
                 mockQuery.$('getColumns', ['*']);
                 mockQuery.$('getFrom', 'sometable');
@@ -49,7 +49,7 @@ component extends='testbox.system.BaseSpec' {
 
             describe('compiling joins', function() {
                 it('adds a single join', function() {
-                    var mockJoin = getMockBox().createMock('Quick.Query.JoinClause');
+                    var mockJoin = getMockBox().createMock('Quick.models.Query.JoinClause');
                     mockJoin.$('getType', 'inner');
                     mockJoin.$('getTable', 'othertable');
                     mockJoin.$('getClauses', [{
@@ -66,7 +66,7 @@ component extends='testbox.system.BaseSpec' {
                 });
 
                 it('adds multiple joins', function() {
-                    var mockJoinOne = getMockBox().createMock('Quick.Query.JoinClause');
+                    var mockJoinOne = getMockBox().createMock('Quick.models.Query.JoinClause');
                     mockJoinOne.$('getType', 'inner');
                     mockJoinOne.$('getTable', 'othertable');
                     mockJoinOne.$('getClauses', [{
@@ -75,7 +75,7 @@ component extends='testbox.system.BaseSpec' {
                         second = 'othertable.sometable_id',
                         combinator = 'and'
                     }]);
-                    var mockJoinTwo = getMockBox().createMock('Quick.Query.JoinClause');
+                    var mockJoinTwo = getMockBox().createMock('Quick.models.Query.JoinClause');
                     mockJoinTwo.$('getType', 'left');
                     mockJoinTwo.$('getTable', 'anothertable');
                     mockJoinTwo.$('getClauses', [{
@@ -92,7 +92,7 @@ component extends='testbox.system.BaseSpec' {
                 });
 
                 it('adds all the clauses in a join', function() {
-                    var mockJoin = getMockBox().createMock('Quick.Query.JoinClause');
+                    var mockJoin = getMockBox().createMock('Quick.models.Query.JoinClause');
                     mockJoin.$('getType', 'inner');
                     mockJoin.$('getTable', 'othertable');
                     mockJoin.$('getClauses', [