dm-metamapper 0.2.9 → 0.3

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

@@ -40,15 +40,15 @@ module DataMapper
         
         def key_to_parent
           many_to_one.inject({}) do |hash, (r,m)|
-            hash[m.child_key.first.name] = decolonize(m.parent_model_name)
+            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.find {|k,m|
+          child_model.relationships.select {|m|
             m.class.name == 'DataMapper::Associations::ManyToOne::Relationship' && m.parent_model_name == model.name
-          }[1].child_key.first.name.to_s
+          }.first.child_key.first.name.to_s
         end
 
         def output_path(model, template)
@@ -64,30 +64,29 @@ module DataMapper
 
         def many_to_one
           return unless model
-          @many_to_one ||= model.relationships.select {|k,m|
+          @many_to_one ||= model.relationships.select {|m|
             m.class.name == 'DataMapper::Associations::ManyToOne::Relationship'
           }
-          
           #in case of ruby < 1.9
-#          if Array === @many_to_one
-#            temp = @many_to_one
-#            @many_to_one = {}
-#            temp.each{|t| @many_to_one[t.name] = t}
-#          end
+          if Array === @many_to_one
+            temp = @many_to_one
+            @many_to_one = {}
+            temp.each{|t| @many_to_one[t.name] = t}
+          end
 
           @many_to_one
         end
         def one_to_many
           return unless model
-          @one_to_many ||= model.relationships.select {|k,m|
+          @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
+          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

data/lib/dm-metamapper/version.rb

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

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

@@ -162,6 +162,38 @@ public:
 					  fields, rows);
     }
 
+    bool insertDirtyFields(std::vector<O_<%= class_name %>>::const_iterator begin,
+                           std::vector<O_<%= class_name %>>::const_iterator end)
+    {
+        if (begin == end)
+            return true;
+        FieldsToRows fields2Rows;
+	for (std::vector<O_<%= class_name %>>::const_iterator it = begin; 
+             it != end; ++it)
+        {
+            std::vector<std::string> fields;
+            std::vector<std::string> row;
+	    <%- model.generated_properties.each do |property| -%>
+            <% if property.name != model.serial.name %>
+            if (it->_f_<%= property.name %>._dirty){
+                fields.push_back(std::string("<%= property.name %>"));
+                row.push_back(toSQLString(it->_<%= property.name %>()));
+            }
+            <%- end -%>
+            <%- end -%>
+            fields2Rows[fields].push_back(row);
+	}
+        bool ret = true;
+        for (FieldsToRows::const_iterator it = fields2Rows.begin();
+             it != fields2Rows.end(); ++it)
+        {
+            ret = DBFace::instance()->insert("<%= model.storage_name %>",
+                                             it->first, it->second) && ret;
+        }
+        return ret;
+    }
+
+
     Condition                 _constraint;    
     std::vector<std::string>  _tables;
 };

data/lib/templates/cpp/dmmm_dbface.cpp.erb

@@ -1,3 +1,4 @@
+#include <boost/date_time/posix_time/posix_time.hpp>
 #include "dmmm_dbface.h"
 #include "dmmm_utils.hpp"
 using namespace mysqlpp;
@@ -41,11 +42,21 @@ DBFace::connect()
     }
 }
 
+string 
+currentDateTime()
+{
+    using namespace boost::posix_time;
+    ptime now = second_clock::local_time();
+
+    return to_iso_extended_string(now);
+}
+
+
 void
 DBFace::log(const string& message)
 {
     if (_os)
-	(*_os) << "DMMM: " << message << endl;
+	(*_os) << currentDateTime() << " DMMM " << message << endl;
 }
 
 void

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

@@ -7,6 +7,29 @@
 #include "dmmm_id.hpp"
 
 namespace DMMM {
+
+typedef std::vector<std::string> FieldVector;
+struct FieldVectorComp{
+    bool operator() (const FieldVector& f1, const FieldVector& f2) const
+    {
+        if (f1.size() < f2.size())
+            return true;
+        if (f1.size() > f2.size())
+            return false;
+        for (size_t i = 0; i < f1.size(); ++i){
+            if (f1[i] < f2[i])
+                return true;
+            if (f1[i] > f2[i])
+                return false;
+        }
+        return false;
+    }
+};
+
+typedef std::map<FieldVector, 
+                 std::vector<std::vector<std::string> >,
+                 FieldVectorComp> FieldsToRows;
+
 namespace UTILS {
 
 template<class T>

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dm-metamapper
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 13
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 9
-  version: 0.2.9
+  - 3
+  version: "0.3"
 platform: ruby
 authors: 
 - Jonah Honeyman
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-23 00:00:00 Z
+date: 2012-09-06 00:00:00 Z
 dependencies: []
 
 description: C++ API for databases created with DM. Hard typing, compile time checked queries.