dm-metamapper 0.2.1 → 0.2.2

data/lib/dm-metamapper/generators/cpp.rb

@@ -17,10 +17,6 @@ module DataMapper
         generates_file :model, "T_%model%.hpp", :template => "class.hpp"
 
         setup_model do
-          key_to_parent = many_to_one.inject({}) do |hash, (r,m)|
-            hash[m.child_key.first.name] = decolonize(m.parent_model_name.to_const_string)
-            hash
-          end
           enums = {}
           model.properties.each do |prop|
             cpp_name = if prop.serial?
@@ -41,6 +37,19 @@ module DataMapper
           (class << model; self; end).instance_eval{ attr_accessor :enums }
           model.enums = enums
         end
+        
+        def key_to_parent
+          many_to_one.inject({}) do |hash, (r,m)|
+            hash[m.child_key.first.name] = decolonize(m.parent_model_name.to_const_string)
+            hash
+          end
+        end
+
+        def child_key(child_model)
+          child_model.relationships.select {|m|
+            m.class.name == 'DataMapper::Associations::ManyToOne::Relationship' && m.parent_model_name == model.name
+          }.first.child_key.first.name.to_s
+        end
 
         def output_path(model, template)
           name = model ? template.name.sub("%model%", decolonize(model.name)) : template.name
@@ -67,6 +76,20 @@ module DataMapper
 
           @many_to_one
         end
+        def one_to_many
+          return unless model
+          @one_to_many ||= model.relationships.select {|m|
+            m.class.name == 'DataMapper::Associations::OneToMany::Relationship'
+          }
+          #in case of ruby < 1.9
+          if Array === @one_to_many
+            temp = @one_to_many
+            @one_to_many = {}
+            temp.each{|t| @one_to_many[t.name] = t}
+          end
+
+          @one_to_many
+        end
       end
     end
   end

data/lib/dm-metamapper/version.rb

@@ -1,6 +1,6 @@
 module DataMapper 
   module MetaMapper
-    VERSION = "0.2.1" unless defined?(::DataMapper::MetaMapper::VERSION)
+    VERSION = "0.2.2" unless defined?(::DataMapper::MetaMapper::VERSION)
   end
   
 end

data/lib/templates/cpp/class.hpp.erb

@@ -3,6 +3,8 @@
 #ifndef T_<%= all_caps_name %>
 #define T_<%= all_caps_name %>
 #include "O_<%= class_name %>.hpp"
+
+
 namespace DMMM {
 
 class T_<%= class_name %>{
@@ -25,16 +27,6 @@ public:
 
     <%- many_to_one.each do |r| -%> 
     <%- parent = decolonize(r[1].parent_model_name) -%>
-    T_<%= class_name %>(const T_<%= parent %>& parent)
-    {
-        _tables.push_back("<%= model.storage_name %>");
-        _tables.insert(_tables.end(), 
-                       parent._tables.begin(), parent._tables.end());
-        
-        _constraint._cond = "(<%= model.storage_name + "." + r[1].child_key.first.name.to_s %> = " + parent._tables[0] + ".<%= r[1].parent_key.first.name.to_s %>)";
-        if (!parent._constraint.nil())
-        _constraint._cond += " AND " + parent._constraint._cond;
-    } 
 
     T_<%= class_name %>(const I_<%= parent %>& parentId)
     {
@@ -71,8 +63,7 @@ public:
     }
 
     std::vector<O_<%= class_name %>> 
-    select(const Condition& c, 
-    const std::string& additional)
+    select(const Condition& c, const std::string& additional)
     {
         std::vector<O_<%= class_name %>> ret;
         Condition c1 = _constraint.nil() ? c : _constraint && c;

data/lib/templates/cpp/instance.hpp.erb

@@ -10,8 +10,8 @@
 #include "dmmm_identifiers.hpp"
 #include "dmmm_fields.hpp"
 #include "dmmm_comparators.hpp"
-<%- many_to_one.each do |relative| -%>
-#include "T_<%= decolonize(relative[1].parent_model.to_s) %>.hpp"
+<%- one_to_many.each do |relative| -%>
+#include "T_<%= decolonize(relative[1].child_model.to_s) %>.hpp"
 <%- end -%>
 
 <%- model.enums.each do |name, property| -%>
@@ -26,9 +26,6 @@ public:
     O_<%= class_name %>() {}
     <%- many_to_one.each do |r| -%> 
     <%- parent = decolonize(r[1].parent_model_name) -%>
-    O_<%= class_name %>(const O_<%= parent %>& parent) 
-        : _f_<%= r[1].child_key.first.name.to_s %>(parent._<%= r[1].parent_key.first.name.to_s %>())
-        {}
     O_<%= class_name %>(const I_<%= parent %>& parent_id) 
         : _f_<%= r[1].child_key.first.name.to_s %>(parent_id)
         {}
@@ -40,6 +37,19 @@ public:
         {}
     <%- end -%>
 
+    <%- one_to_many.each do |relative| -%> 
+    std::vector<O_<%= decolonize(relative[1].child_model.to_s) %>> _<%= decolonize(relative[1].child_model.storage_name) %>() const
+    {
+        T_<%= decolonize(relative[1].child_model.to_s) %> table;
+        return table.select(table._<%= child_key(relative[1].child_model) %>() == _id());   
+    }
+    std::vector<O_<%= decolonize(relative[1].child_model.to_s) %>> 
+    _<%= decolonize(relative[1].child_model.storage_name) %>(const T_<%= decolonize(relative[1].child_model.to_s) %>::Condition& c) const
+    {
+        T_<%= decolonize(relative[1].child_model.to_s) %> table(c);
+        return table.select(table._<%= child_key(relative[1].child_model) %>() == _id());   
+    }
+    <%- end -%>
 
     <%- model.generated_properties.each do |property| -%>
     const <%= property.cpp_name %>::Base& _<%= property.name %>() const { 
@@ -101,15 +111,6 @@ public:
             return false;
                                    
     }
-
-    <%- many_to_one.each do |r| -%> 
-    <%- parent = decolonize(r[1].parent_model_name) -%>
-    std::pair<O_<%= parent %>, bool> <%= r[0] %>(){
-        T_<%= parent %> T(T_<%= parent %>::E_<%= r[1].parent_key.first.name.to_s %>() == _<%= r[1].child_key.first.name.to_s %>());
-        return T.first();
-    }
-    <%- end -%>
-
 private:
     <%- model.generated_properties.each do |property| -%>
     <%= property.cpp_name %> _f_<%= property.name %>;

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-metamapper
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Jonah Honeyman
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-02 00:00:00 Z
+date: 2012-01-31 00:00:00 Z
 dependencies: []
 
 description: C++ API for databases created with DM. Hard typing, compile time checked queries.