dm-metamapper 0.2.0 → 0.2.1

data/lib/dm-metamapper/version.rb

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

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

@@ -60,28 +60,30 @@ public:
     }
     <%- end -%>    
 
-    void getFields(std::vector<std::string>& rFields)
+    std::vector<std::string> getFields()
     {
-        rFields.clear();
+        std::vector<std::string> ret;
+        ret.clear();
         <%- model.generated_properties.each do |property| -%>
-        rFields.push_back("<%= property.name %>");
+        ret.push_back("<%= property.name %>");
         <%- end -%>
+        return ret;
     }
 
-    void select(const Condition& c, 
-                const std::string& additional,
-                std::vector<O_<%= class_name %>>& r)
+    std::vector<O_<%= class_name %>> 
+    select(const Condition& c, 
+    const std::string& additional)
     {
+        std::vector<O_<%= class_name %>> ret;
         Condition c1 = _constraint.nil() ? c : _constraint && c;
-        std::vector<std::string> fields;
-        getFields(fields);
+        std::vector<std::string> fields = getFields();
         QueryRes res;
         DBFace::instance()->select(_tables, fields, c1._cond, 
                                    additional, res);
-        r.resize(res.size());
+        ret.resize(res.size());
         for(size_t i = 0; i < res.size(); ++i){
             <%- model.generated_properties.each do |property| -%>
-            r[i]._f_<%= property.name %>._base = 
+            ret[i]._f_<%= property.name %>._base = 
             <%- if DataMapper::Property::Enum === property -%>
                 (<%= property.cpp_name %>::Base)UTILS::fromString<size_t>(res[i]["<%= property.name %>"]);
             <%- else -%>
@@ -89,6 +91,7 @@ public:
             <%- end -%>
             <%- end -%>
         }
+        return ret;
     }
 
     size_t count(const Condition& c)
@@ -109,16 +112,15 @@ public:
     }
 
 
-    void select(const Condition& c, 
-                std::vector<O_<%= class_name %>>& r)
+    std::vector<O_<%= class_name %>> select(const Condition& c)
     {
         Condition c1 = _constraint.nil() ? c : _constraint && c;
-        select(c1, "", r);
+        return select(c1, "");
     }
 
-    void select(std::vector<O_<%= class_name %>>& r)
+    std::vector<O_<%= class_name %>> select()
     {
-        select(_constraint, "", r);
+        return select(_constraint, "");
     }
 
     std::pair<O_<%= class_name %>, bool> select(const I_<%= class_name %>& id){
@@ -128,8 +130,7 @@ public:
     std::pair<O_<%= class_name %>, bool> first(const Condition& c)
     {
         Condition c1 = _constraint.nil() ? c : _constraint && c;
-        std::vector<O_<%= class_name %>> r;
-        select(c, "limit 1", r);
+        std::vector<O_<%= class_name %>> r = select(c, "limit 1");
         if(r.size() > 0)
             return std::make_pair(r[0], true);
         else

metadata

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