dm-metamapper 0.0.2 → 0.0.3

data/Gemfile

@@ -1,12 +1,15 @@
 source :rubygems
 
-gem "dm-core"
+dm_gems_version   = "~> 0.10"
+do_gems_version   = "~> 0.10"
+
+gem "dm-core", dm_gems_version
 
 group :test do
   gem "rspec"
   gem "data_objects"
-  gem "do_sqlite3"
-  gem "do_mysql"
+  gem "do_sqlite3", do_gems_version
+  gem "do_mysql", do_gems_version
 end
 
 group :deploy do

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/dm-metamapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-metamapper}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jonah Honeyman", "Omer Tamuz"]
-  s.date = %q{2010-06-08}
+  s.date = %q{2010-06-09}
   s.description = %q{C++ API for databases created with DM. Hard typing, compile time checked queries.}
   s.email = %q{jonah@honeyman.org}
   s.extra_rdoc_files = [

data/lib/dm-metamapper/generator.rb

@@ -82,13 +82,13 @@ class CPPGenerator < DataMapper::MetaMapper::Generator
     puts "Generating files for model " + self.name.to_s
     key_to_parent = {}
     relationships.select{|r,m| m.class.name == 'DataMapper::Associations::ManyToOne::Relationship'}.each do |r|
-      key_to_parent[r[1].child_key.first.name.to_s] = r[0].to_const_string
-      puts "#{r[1].child_key.first.name.to_s} -> #{r[0].to_const_string}"
+      key_to_parent[r[1].child_key.first.name.to_s] = r[1].parent_model_name.to_const_string.sub(/::/,'_')
+      puts "#{r[1].child_key.first.name.to_s} -> #{key_to_parent[r[1].child_key.first.name.to_s]}"
     end
 
     properties.each do |e| 
       cpp_name = if e.serial?
-        "Field<I_#{e.model.name}>"
+        "Field<I_#{e.model.name.sub(/::/,'_')}>"
       elsif !key_to_parent[e.name.to_s].nil?
         "Field<I_#{key_to_parent[e.name.to_s]}>"
       else           

data/lib/dm-metamapper/metamapper.rb

@@ -26,7 +26,7 @@ module DataMapper
             generated_file.template
           ].join('/')
 
-          result_base_name = context ? context.name.to_s : generated_file.template.sub(/\.erb$/,'')
+          result_base_name = context ? context.name.to_s.sub(/::/,'_') : generated_file.template.sub(/\.erb$/,'')
 
           result_filename = File.join(
             File.dirname(__FILE__), "../../output", [

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

@@ -1,4 +1,4 @@
-<% class_name = self.name %>
+<% class_name = self.name.sub(/::/,'_') %>
 <% all_caps_name = class_name.upcase %>
 #ifndef T_<%= all_caps_name %>
 #define T_<%= all_caps_name %>
@@ -23,7 +23,7 @@ public:
         _tables.push_back("<%= storage_name %>");
     }
     <% self.relationships.select{|r,m| m.class.name == 'DataMapper::Associations::ManyToOne::Relationship'}.each do |r| %> 
-    <% parent = r[0].to_const_string %>
+    <% parent = r[1].parent_model_name.sub(/::/,'_') %>
     T_<%= class_name %>(const T_<%= parent %>& parent)
     {
         _tables.push_back("<%= storage_name %>");
@@ -76,7 +76,7 @@ public:
         for(size_t i = 0; i < res.size(); ++i){
             <% generated_properties.each do |property| %>
             r[i]._f_<%= property.name %>._base = 
-                fromString<<%= property.instance_variable_get(:@cpp_name) %>::Base>(res[i]["<%= property.name %>"]);
+                UTILS::fromString<<%= property.instance_variable_get(:@cpp_name) %>::Base>(res[i]["<%= property.name %>"]);
             <% end %>
         }
     }

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

@@ -8,49 +8,49 @@ namespace DMMM {
 template<class E>
 typename E::ConditionType operator== (E e, const typename E::ComparerType& x){
     typename E::ConditionType c;
-    c._cond = e._field + " = '" + toString(x) + "'";
+    c._cond = e._field + " = '" + UTILS::toString(x) + "'";
     return c;
 }
 
 template<class E>
 typename E::ConditionType operator< (E e, const typename E::ComparerType& x){
     typename E::ConditionType c;
-    c._cond = e._field + " < '" + toString(x) + "'";
+    c._cond = e._field + " < '" + UTILS::toString(x) + "'";
     return c;
 }
 
 template<class E>
 typename E::ConditionType operator<= (E e, const typename E::ComparerType& x){
     typename E::ConditionType c;
-    c._cond = e._field + " <= '" + toString(x) + "'";
+    c._cond = e._field + " <= '" + UTILS::toString(x) + "'";
     return c;
 }
 
 template<class E>
 typename E::ConditionType operator> (E e, const typename E::ComparerType& x){
     typename E::ConditionType c;
-    c._cond = e._field + " > '" + toString(x) + "'";
+    c._cond = e._field + " > '" + UTILS::toString(x) + "'";
     return c;
 }
 
 template<class E>
 typename E::ConditionType operator>= (E e, const typename E::ComparerType& x){
     typename E::ConditionType c;
-    c._cond = e._field + " >= '" + toString(x) + "'";
+    c._cond = e._field + " >= '" + UTILS::toString(x) + "'";
     return c;
 }
 
 template<class E>
 typename E::ConditionType operator!= (E e, const typename E::ComparerType& x){
     typename E::ConditionType c;
-    c._cond = e._field + " != '" + toString(x) + "'";
+    c._cond = e._field + " != '" + UTILS::toString(x) + "'";
     return c;
 }
 
 template<class E>
 typename E::ConditionType operator%= (E e, const typename E::ComparerType& x){
     typename E::ConditionType c;
-    c._cond = e._field + " LIKE '" + toString(x) + "'";
+    c._cond = e._field + " LIKE '" + UTILS::toString(x) + "'";
     return c;
 }
 

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

@@ -54,7 +54,7 @@ DBFace::select(const std::vector<std::string>& tables,
     for (size_t i = 0; i < mysqlRes.num_rows(); ++i){
 	rRes.resize(rRes.size() + 1);
 	for (size_t j = 0; j < columns.size(); ++j)
-	    rRes.back()[columns[j]] = toString(mysqlRes[i][columns[j].c_str()]);
+	    rRes.back()[columns[j]] = UTILS::toString(mysqlRes[i][columns[j].c_str()]);
     }
     return true;
 }
@@ -172,5 +172,5 @@ DBFace::now()
         cerr << "Query failed: " << q << endl << er.what();
         return string();
     }
-    return toString(mysqlRes[0]["now()"]);
+    return UTILS::toString(mysqlRes[0]["now()"]);
 }

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

@@ -6,6 +6,8 @@
 #include <sstream>
 
 namespace DMMM{
+namespace UTILS{
+
 template<class T>
 class Id {
 
@@ -57,11 +59,12 @@ private:
 };
 
 
+} //namespace UTILS
 } //namespace DMMM
 
 template<class T>
 std::ostream& 
-operator<< (std::ostream& os, const DMMM::Id<T>& id)
+operator<< (std::ostream& os, const DMMM::UTILS::Id<T>& id)
 { 
     os << id.to_s(); 
     return os;
@@ -69,7 +72,7 @@ operator<< (std::ostream& os, const DMMM::Id<T>& id)
 
 template<class T>
 std::istream& 
-operator>> (std::istream& is, DMMM::Id<T>& id)
+operator>> (std::istream& is, DMMM::UTILS::Id<T>& id)
 { 
     is >> id.serialization(); 
     return is;

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

@@ -6,8 +6,9 @@
 namespace DMMM {
 
 <% models.each do |model| %>
-class DummyO_<%= model.name %>;
-typedef Id<DummyO_<%= model.name %>> I_<%= model.name %>;
+<% model_name = model.name.sub(/::/,'_') %>
+class DummyO_<%= model_name %>;
+typedef UTILS::Id<DummyO_<%= model_name %>> I_<%= model_name %>;
 <% end %>
 
 

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

@@ -1,6 +1,8 @@
 #include "dmmm_utils.hpp"
 
 namespace DMMM {
+namespace UTILS {
+
 template<>
 std::string
 fromString<std::string>(const std::string& s)
@@ -8,4 +10,5 @@ fromString<std::string>(const std::string& s)
     return s;
 }
 
+} //namespace UTILS
 } //namespace DMMM

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

@@ -7,6 +7,7 @@
 #include <dmmm_id.hpp>
 
 namespace DMMM {
+namespace UTILS {
 
 template<class T>
 std::string
@@ -35,6 +36,7 @@ template<>
 std::string
 fromString<std::string>(const std::string& s);
 
+} //namespace UTILS
 } //namespace DMMM
 
 #endif //DMMM_UTILS_HPP

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

@@ -1,4 +1,4 @@
-<% class_name = self.name %>
+<% class_name = self.name.sub(/::/,'_') %>
 <% all_caps_name = class_name.upcase %>
 #ifndef O_<%= all_caps_name %>
 #define O_<%= all_caps_name %>
@@ -11,7 +11,7 @@
 #include "dmmm_fields.hpp"
 #include "dmmm_comparators.hpp"
 <% self.relationships.select{|r,m| m.class.name == 'DataMapper::Associations::ManyToOne::Relationship'}.each do |relative| %>
-#include "T_<%= relative[1].parent_model.to_s %>.hpp"
+#include "T_<%= relative[1].parent_model.to_s.sub(/::/,'_') %>.hpp"
 <% end %>
 
 <%# self.relationships.select{|r,m| m.class.name == 'DataMapper::Associations::OneToMany::Relationship'}.each do |relative| %>
@@ -23,7 +23,7 @@ public:
 
     O_<%= class_name %>() {}
     <% self.relationships.select{|r,m| m.class.name == 'DataMapper::Associations::ManyToOne::Relationship'}.each do |r| %> 
-    <% parent = r[0].to_const_string %>
+    <% parent = r[1].parent_model_name.sub(/::/,'_') %>
     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 %>())
         {}
@@ -49,10 +49,10 @@ public:
         <% generated_properties.each do |property| %>
         if (_f_<%= property.name %>._dirty)
             field2Val["<%= property.name %>"] = 
-                toString(_f_<%= property.name %>._base);
+                UTILS::toString(_f_<%= property.name %>._base);
         <% end %>
         std::string where =
-	    "<%= serial.name %>=" + toString(_f_<%= serial.name %>._base);
+	    "<%= serial.name %>=" + UTILS::toString(_f_<%= serial.name %>._base);
         return DBFace::instance()->update("<%= storage_name %>", 
                                           field2Val, where);
     }
@@ -65,23 +65,31 @@ public:
         <% generated_properties.each do |property| %>
         if (_f_<%= property.name %>._dirty)
             field2Val["<%= property.name %>"] = 
-                toString(_f_<%= property.name %>._base);
+                UTILS::toString(_f_<%= property.name %>._base);
         <% end %>
         <% if serial %>
-        return DBFace::instance()->
-            insert("<%= storage_name %>", field2Val,
-                   _f_<%= serial.name %>._base.serialization());
+        if (DBFace::instance()->
+                insert("<%= storage_name %>", field2Val,
+                       _f_<%= serial.name %>._base.serialization()))
 	<% else %>
         size_t id;
-        return DBFace::instance()->
-            insert("<%= storage_name %>", field2Val,
-                   id);
+        if (DBFace::instance()->
+                insert("<%= storage_name %>", field2Val,
+                       id))
         <% end %>
+        {
+            <% generated_properties.each do |property| %>
+            _f_<%= property.name %>._dirty = false;
+            <% end %>
+            return true;
+        }
+ 	else
+	    return false;
  				   
     }
 
     <% self.relationships.select{|r,m| m.class.name == 'DataMapper::Associations::ManyToOne::Relationship'}.each do |r| %> 
-    <% parent = r[0].to_const_string %>
+    <% parent = r[1].parent_model_name.sub(/::/,'_') %>
     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();

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Jonah Honeyman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 +03:00
+date: 2010-06-09 00:00:00 +03:00
 default_executable: 
 dependencies: []