dm-metamapper 0.0.5 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.7

data/dm-metamapper.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-metamapper}
-  s.version = "0.0.5"
+  s.version = "0.0.7"
 
   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.date = %q{2010-07-08}
   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 = [
@@ -29,10 +29,10 @@ Gem::Specification.new do |s|
      "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/model.rb",
      "lib/dm-metamapper/property.rb",
      "lib/dm-metamapper/template.rb",
      "lib/templates/cpp/class.hpp.erb",

data/example/example.cpp

@@ -13,7 +13,7 @@ int main(int argc, char* argv[])
     string user("root");
     string database("dmmm");
     string password("");
-    DBFace dbFace(database, host, user, password);
+    DBFace dbFace(database, host, user, password, &cout);
 
     T_Dog d;
     T_User u;
@@ -65,7 +65,10 @@ int main(int argc, char* argv[])
     T_Dog dconst(T_User(u._name() == "omer"));
     dogs.clear();
     dconst.select(d._stinks() == true, dogs);
-    cout << dogs.size() << " dogs meet criterion" << endl;
+    cout << dogs.size() 
+	 << " dogs meet criterion" << endl;
+    cout << dconst.count(d._stinks() == true) 
+	 << " dogs meet criterion" << endl;
     dconst.erase();
 
     d.erase(d._user_id() == u2._id());

data/example/example.rb

@@ -3,7 +3,7 @@ require "rubygems"
 require "bundler"
 Bundler.setup(:default, :test)
 require "dm-core"
-require "lib/dm-metamapper.rb"
+require File.expand_path("../../lib/dm-metamapper.rb", __FILE__)
 require "dm-metamapper/generators/cpp"
 
 #DataMapper.setup(:default, "sqlite3::memory:")
@@ -11,7 +11,6 @@ DataMapper.setup(:default, "mysql://root@localhost/dmmm")
 
 class User
   include DataMapper::Resource
-  extend DataMapper::MetaMapper::Extension
 
   has n,    :dogs
 
@@ -23,7 +22,6 @@ end
 
 class Dog
   include DataMapper::Resource
-  extend DataMapper::MetaMapper::Extension
 
   belongs_to :user
   has n,     :little_fleas
@@ -36,7 +34,6 @@ end
 
 class LittleFlea
   include DataMapper::Resource
-  extend DataMapper::MetaMapper::Extension
 
   belongs_to :dog
 

data/lib/dm-metamapper.rb

@@ -2,9 +2,9 @@ $:.push File.dirname(__FILE__)
 
 require 'dm-core'
 require 'dm-metamapper/property'
+require 'dm-metamapper/model'
 require 'dm-metamapper/config'
 require 'dm-metamapper/metamapper'
-require 'dm-metamapper/extension'
 require 'dm-metamapper/template'
 require 'dm-metamapper/generator'
 

data/lib/dm-metamapper/model.rb

@@ -0,0 +1,36 @@
+module DataMapper
+  module Model
+    class << self
+      alias_method :_extended, :extended
+
+      def extended(model)
+        _extended(model)
+        DataMapper::MetaMapper.register(model)
+        model.instance_variable_set(:@_skipped_generation_formats, [])
+        class <<model; attr_reader :_skipped_generation_formats end
+      end
+    end
+
+    def doesnt_generate(*layouts)
+      @_skipped_generation_formats = Array(layouts)
+    end
+    alias_method :dont_generate, :doesnt_generate
+    alias_method :skip_generation, :doesnt_generate
+
+    def generates?(format)
+      !@_skipped_generation_formats.include?(format)
+    end
+
+    def generate(format)
+      DataMapper::MetaMapper.generate(format, self)
+    end
+
+    def generated_properties
+      @_generated_properties ||= properties.select {|prop|
+        !prop.options[:skip_generation]
+      }
+    end
+
+  end
+end
+

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

@@ -79,6 +79,12 @@ public:
         }
     }
 
+    size_t count(const Condition& c)
+    {
+        Condition c1 = _constraint.nil() ? c : _constraint && c;
+	return DBFace::instance()->count(_tables, c1._cond);
+    }
+
     void erase(const Condition& c)
     {
         Condition c1 = _constraint.nil() ? c : _constraint && c;

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

@@ -8,13 +8,14 @@ DBFace* DBFace::_this = NULL;
 
 DBFace::DBFace(const string& database, const string& host, 
 	       const string& user, const string& password)
-    : _os(cout)
+    : _os(NULL)
 {
     _this = this;
     if (!_connection.connect(database.c_str(), host.c_str(), 
 			     user.c_str(), password.c_str()))
     {
-        _os << "Could not connect to DB";        
+	if (_os)
+	    (*_os) << "Could not connect to DB";        
         cerr << "Could not connect to DB";
         exit(-1);
     }     
@@ -22,24 +23,38 @@ DBFace::DBFace(const string& database, const string& host,
 
 DBFace::DBFace(const string& database, const string& host, 
                const string& user, const string& password,
-               ostream& os)
+               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";
+	if (_os)
+	    (*_os) << "Could not connect to DB";
         cerr << "Could not connect to DB";
         exit(-1);
     }     
 }
 
+void
+DBFace::log(const string& message)
+{
+    if (_os)
+	(*_os) << "DMMM: " << message << endl;
+}
+
+void
+DBFace::logError(const string& message)
+{
+    log(string("ERROR: ") + message);
+}
+
 bool
-DBFace::select(const std::vector<std::string>& tables, 
-	       const std::vector<string>& columns,
-	       const std::string& where, 
-	       const std::string& additional, 
+DBFace::select(const vector<string>& tables, 
+	       const vector<string>& columns,
+	       const string& where, 
+	       const string& additional, 
 	       QueryRes& rRes)
 {
     boost::mutex::scoped_lock lock(_mutex);
@@ -59,13 +74,13 @@ DBFace::select(const std::vector<std::string>& tables,
 	q << " WHERE " << where;
     if (additional.size())
 	q << " " << additional;
-    _os << q << endl;
+    log(q.str());
     StoreQueryResult mysqlRes;
     try{
 	mysqlRes = q.store();
     }
     catch (const mysqlpp::Exception& er) {
-        cerr << "Query failed: " << q << endl << er.what();
+	logError(er.what());
         return false;
     }
     
@@ -77,10 +92,39 @@ DBFace::select(const std::vector<std::string>& tables,
     return true;
 }
 
+size_t
+DBFace::count(const vector<string>& tables, 
+	      const string& where)
+{
+    boost::mutex::scoped_lock lock(_mutex);
+
+    Query q = _connection.query();
+    
+    q << "SELECT count(*) as count FROM " << tables[0];
+    for (size_t i = 1; i < tables.size(); ++i)
+        q << ", " + tables[i];
+    if (where.size())
+	q << " WHERE " << where;
+    log(q.str());
+    StoreQueryResult mysqlRes;
+    try{
+	mysqlRes = q.store();
+    }
+    catch (const mysqlpp::Exception& er) {
+	logError(er.what());
+        return false;
+    }
+
+    if (mysqlRes.num_rows() == 1)
+	return UTILS::fromString<size_t>(UTILS::toString(mysqlRes[0]["count"]));
+    else
+        return 0;    
+}
+
 
 bool 
-DBFace::erase(const std::vector<std::string>& tables, 
-   	      const std::string& where)
+DBFace::erase(const vector<string>& tables, 
+   	      const string& where)
 {
     Query q = _connection.query();
     q << "DELETE FROM " << tables[0];
@@ -90,7 +134,7 @@ DBFace::erase(const std::vector<std::string>& tables,
         q << " INNER JOIN " + tables[i];
     if (where.size())
 	q << " WHERE " << where;
-    _os << q << endl;
+    log(q.str());
     return executeQuery(q);
     
 }
@@ -104,7 +148,7 @@ DBFace::executeQuery(Query& q)
         q.execute();
     }
     catch (const mysqlpp::Exception& er) {
-        cerr << "Query failed: " << q << endl << er.what();
+	logError(er.what());
         return false;
     }
     return true;
@@ -115,9 +159,9 @@ DBFace::getLastInsertId(Query& rQuery, size_t& rId)
 {
     try{
         rId = rQuery.insert_id();
-        _os << "got last insert ID: " << rId << endl;
     }
     catch (const mysqlpp::Exception& er) {
+	logError(er.what());
         return false;
     }
     return true;
@@ -149,7 +193,7 @@ DBFace::insert(const string& table,
 	q << quote << it->second;
     }
     q << ")";
-    _os << q << endl;
+    log(q.str());
     bool ok = executeQuery(q);
     ok = ok && getLastInsertId(q, rInsertId);
     return ok;
@@ -172,13 +216,14 @@ DBFace::update(const string& table,
     }
     if (where.size())
 	q << " WHERE " << where;
-    _os << q << endl;
+    log(q.str());
     return executeQuery(q);
 }
 
 string 
 DBFace::now()
 {
+    boost::mutex::scoped_lock lock(_mutex);
     Query q = _connection.query();
     
     q << "SELECT NOW()";

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

@@ -18,7 +18,7 @@ public:
 	   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);
+	   std::ostream* os);
     
     bool insert(const std::string& table, 
 		const std::map<std::string, std::string>& field2Val,
@@ -33,10 +33,14 @@ public:
 		QueryRes& rRes);
     bool erase(const std::vector<std::string>& table, 
 	       const std::string& where);
-    
+    size_t count(const std::vector<std::string>& tables, 
+                 const std::string& where);
+
     std::string now(); 
     
 private:
+    void log(const std::string& message);
+    void logError(const std::string& message);
     bool getLastInsertId(mysqlpp::Query& rQuery, size_t& rId);
     bool executeQuery(mysqlpp::Query& rQuery);
     
@@ -44,7 +48,7 @@ private:
     mysqlpp::Connection                 _connection;
     mutable boost::mutex                _mutex;
     static DBFace*                      _this;		
-    std::ostream&                       _os;
+    std::ostream*                       _os;
 };
 
 } //namespace DMMM

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

@@ -52,6 +52,7 @@ public:
 
 
     inline size_t& serialization() { return _id; }
+    inline const size_t& serialization() const { return _id; }
 
 private:
     size_t _id;

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

@@ -32,6 +32,12 @@ public:
         {}
     <% end %>
 
+    <% if model.serial %>
+    O_<%= class_name %>(const I_<%= class_name %>& id) 
+        : _f_<%= model.serial.name %>(id)
+        {}
+    <% end %>
+
     <% model.generated_properties.each do |property| %>
     const <%= property.cpp_name %>::Base& _<%= property.name %>() const { 
         return _f_<%= property.name %>._base; 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Jonah Honeyman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-22 00:00:00 +03:00
+date: 2010-07-08 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -41,10 +41,10 @@ files:
 - 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/model.rb
 - lib/dm-metamapper/property.rb
 - lib/dm-metamapper/template.rb
 - lib/templates/cpp/class.hpp.erb

data/lib/dm-metamapper/extension.rb

@@ -1,32 +0,0 @@
-module DataMapper
-  module MetaMapper
-    module Extension
-      def doesnt_generate(*layouts)
-        @_skipped_generation_formats = Array(layouts)
-      end
-      alias_method :dont_generate, :doesnt_generate
-      alias_method :skip_generation, :doesnt_generate
-
-      def generates?(format)
-        !@_skipped_generation_formats.include?(format)
-      end
-
-      def generate(format)
-        DataMapper::MetaMapper.generate(format, self)
-      end
-
-      def generated_properties
-        @_generated_properties ||= properties.select {|prop|
-          !prop.options[:skip_generation]
-        }
-      end
-
-      def self.extended(base)
-        DataMapper::MetaMapper.register(base)
-        base.instance_variable_set(:@_skipped_generation_formats, [])
-        class <<base; attr_reader :_skipped_generation_formats end
-      end
-    end
-  end
-end
-