dm-metamapper 0.0.4 → 0.0.5

data/.gitignore

@@ -3,5 +3,4 @@
 .bundle/*
 .rvmrc
 *.gem
-*.gemspec
 output

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/dm-metamapper.gemspec

@@ -0,0 +1,74 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{dm-metamapper}
+  s.version = "0.0.5"
+
+  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-22}
+  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 = [
+    "README.md"
+  ]
+  s.files = [
+    ".autospec",
+     ".gitignore",
+     "Gemfile",
+     "README.md",
+     "Rakefile",
+     "VERSION",
+     "dm-metamapper.gemspec",
+     "example/.gitignore",
+     "example/Makefile",
+     "example/example.cpp",
+     "example/example.rb",
+     "lib/dm-metamapper.rb",
+     "lib/dm-metamapper/config.rb",
+     "lib/dm-metamapper/extension.rb",
+     "lib/dm-metamapper/generator.rb",
+     "lib/dm-metamapper/generators/cpp.rb",
+     "lib/dm-metamapper/metamapper.rb",
+     "lib/dm-metamapper/property.rb",
+     "lib/dm-metamapper/template.rb",
+     "lib/templates/cpp/class.hpp.erb",
+     "lib/templates/cpp/dmmm_comparators.hpp.erb",
+     "lib/templates/cpp/dmmm_dbface.cpp.erb",
+     "lib/templates/cpp/dmmm_dbface.h.erb",
+     "lib/templates/cpp/dmmm_fields.hpp.erb",
+     "lib/templates/cpp/dmmm_id.hpp.erb",
+     "lib/templates/cpp/dmmm_identifiers.hpp.erb",
+     "lib/templates/cpp/dmmm_utils.cpp.erb",
+     "lib/templates/cpp/dmmm_utils.hpp.erb",
+     "lib/templates/cpp/instance.hpp.erb",
+     "spec/dm-metamapper/generator_spec.rb",
+     "spec/dm-metamapper/template_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/jonuts/dm-metamapper}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Code generating C++ ORM}
+  s.test_files = [
+    "spec/spec_helper.rb",
+     "spec/dm-metamapper/generator_spec.rb",
+     "spec/dm-metamapper/template_spec.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end
+

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

@@ -8,10 +8,28 @@ DBFace* DBFace::_this = NULL;
 
 DBFace::DBFace(const string& database, const string& host, 
 	       const string& user, const string& password)
+    : _os(cout)
 {
     _this = this;
     if (!_connection.connect(database.c_str(), host.c_str(), 
-			     user.c_str(), password.c_str())){
+			     user.c_str(), password.c_str()))
+    {
+        _os << "Could not connect to DB";        
+        cerr << "Could not connect to DB";
+        exit(-1);
+    }     
+}
+
+DBFace::DBFace(const string& database, const string& host, 
+               const string& user, const string& password,
+               ostream& os)
+    : _os(os)
+{
+    _this = this;
+    if (!_connection.connect(database.c_str(), host.c_str(), 
+			     user.c_str(), password.c_str()))
+    {
+        _os << "Could not connect to DB";
         cerr << "Could not connect to DB";
         exit(-1);
     }     
@@ -41,7 +59,7 @@ DBFace::select(const std::vector<std::string>& tables,
 	q << " WHERE " << where;
     if (additional.size())
 	q << " " << additional;
-    cout << q << endl;
+    _os << q << endl;
     StoreQueryResult mysqlRes;
     try{
 	mysqlRes = q.store();
@@ -72,7 +90,7 @@ DBFace::erase(const std::vector<std::string>& tables,
         q << " INNER JOIN " + tables[i];
     if (where.size())
 	q << " WHERE " << where;
-    cout << q << endl;
+    _os << q << endl;
     return executeQuery(q);
     
 }
@@ -97,7 +115,7 @@ DBFace::getLastInsertId(Query& rQuery, size_t& rId)
 {
     try{
         rId = rQuery.insert_id();
-        cout << "got last insert ID: " << rId << endl;
+        _os << "got last insert ID: " << rId << endl;
     }
     catch (const mysqlpp::Exception& er) {
         return false;
@@ -131,7 +149,7 @@ DBFace::insert(const string& table,
 	q << quote << it->second;
     }
     q << ")";
-    cout << q << endl;
+    _os << q << endl;
     bool ok = executeQuery(q);
     ok = ok && getLastInsertId(q, rInsertId);
     return ok;
@@ -154,7 +172,7 @@ DBFace::update(const string& table,
     }
     if (where.size())
 	q << " WHERE " << where;
-    cout << q << endl;
+    _os << q << endl;
     return executeQuery(q);
 }
 

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

@@ -2,6 +2,7 @@
 #define DMMM_DBFACE_H
 
 #include <map>
+#include <iosfwd>
 #include <mysql++.h>
 #include <boost/thread/mutex.hpp>
 
@@ -15,6 +16,9 @@ public:
     
     DBFace(const std::string& database, const std::string& host, 
 	   const std::string& user, const std::string& password);
+    DBFace(const std::string& database, const std::string& host, 
+	   const std::string& user, const std::string& password,
+	   std::ostream& os);
     
     bool insert(const std::string& table, 
 		const std::map<std::string, std::string>& field2Val,
@@ -40,6 +44,7 @@ private:
     mysqlpp::Connection                 _connection;
     mutable boost::mutex                _mutex;
     static DBFace*                      _this;		
+    std::ostream&                       _os;
 };
 
 } //namespace DMMM

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

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

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

@@ -8,7 +8,7 @@ namespace DMMM {
 <% models.each do |model| %>
 <% model_name = decolonize(model.name) %>
 class DummyO_<%= model_name %>;
-typedef UTILS::Id<DummyO_<%= model_name %>> I_<%= model_name %>;
+typedef ID::Id<DummyO_<%= model_name %>> I_<%= model_name %>;
 <% end %>
 
 

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

@@ -52,8 +52,16 @@ public:
         <% end %>
         std::string where =
 	    "<%= model.serial.name %>=" + UTILS::toString(_f_<%= model.serial.name %>._base);
-        return DBFace::instance()->update("<%= model.storage_name %>", 
-                                          field2Val, where);
+        if (DBFace::instance()->update("<%= model.storage_name %>", 
+                                       field2Val, where))
+        {
+            <% model.generated_properties.each do |property| %>
+            _f_<%= property.name %>._dirty = false;
+            <% end %>
+	    return true;
+	}
+	else
+	    return false;
     }
     <% end %>
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Jonah Honeyman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-15 00:00:00 +03:00
+date: 2010-06-22 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -34,6 +34,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- dm-metamapper.gemspec
 - example/.gitignore
 - example/Makefile
 - example/example.cpp