dm-metamapper 0.0.7 → 0.0.9

data/Gemfile

@@ -4,6 +4,8 @@ dm_gems_version   = "~> 0.10"
 do_gems_version   = "~> 0.10"
 
 gem "dm-core", dm_gems_version
+gem "dm-types", dm_gems_version
+
 
 group :test do
   gem "rspec"

data/Rakefile

@@ -16,8 +16,9 @@ end
 
 desc "local gem build and install"
 task :local do
+  sh "rvm ree@drive"
   sh "gem uninstall -a dm-metamapper"
   sh "gem build dm-metamapper.gemspec"
   version = File.read("VERSION").chomp
   sh "gem install -l ./dm-metamapper-#{version}.gem"
-end
+end

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.9

data/example/example.cpp

@@ -30,6 +30,7 @@ int main(int argc, char* argv[])
     d1._user_id() = u1._id();
     d1._name() = "spot";
     d1._stinks() = true;
+    d1._color() = DOG_COLOR_WHITE;
     d1.insert();
 
     d1 = d.select(d1._id()).first;

data/example/example.rb

@@ -3,12 +3,18 @@ require "rubygems"
 require "bundler"
 Bundler.setup(:default, :test)
 require "dm-core"
+require "dm-types"
 require File.expand_path("../../lib/dm-metamapper.rb", __FILE__)
 require "dm-metamapper/generators/cpp"
 
 #DataMapper.setup(:default, "sqlite3::memory:")
 DataMapper.setup(:default, "mysql://root@localhost/dmmm")
 
+COLORS = [
+  :blue,
+  :white
+]
+
 class User
   include DataMapper::Resource
 
@@ -29,6 +35,7 @@ class Dog
   property :id,       Serial
   property :user_id,  Integer
   property :name,     String
+  property :color,    Enum[*COLORS]
   property :stinks,   Boolean
 end
 

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

@@ -21,11 +21,16 @@ module DataMapper
             hash[m.child_key.first.name] = decolonize(m.parent_model_name.to_const_string)
             hash
           end
+          enums = {}
           model.properties.each do |prop|
             cpp_name = if prop.serial?
               "Field<I_#{decolonize(model.name)}>"
             elsif key_to_parent[prop.name]
               "Field<I_#{key_to_parent[prop.name]}>"
+            elsif prop.type.ancestors.include?(DataMapper::Types::Enum)
+              name = prop.name.to_s.upcase
+              enums[name] = prop
+              "Field<Enum#{decolonize(model.name)}#{name}>"
             else           
               "F_#{decolonize(prop.primitive.to_s)}"
             end
@@ -33,6 +38,8 @@ module DataMapper
             (class << prop; self; end).instance_eval{ attr_accessor :cpp_name }
             prop.cpp_name = cpp_name
           end
+          (class << model; self; end).instance_eval{ attr_accessor :enums }
+          model.enums = enums
         end
 
         def output_path(model, template)

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

@@ -74,8 +74,12 @@ public:
         for(size_t i = 0; i < res.size(); ++i){
             <% model.generated_properties.each do |property| %>
             r[i]._f_<%= property.name %>._base = 
+            <% if property.type.ancestors.include?(DataMapper::Types::Enum) %>
+                (<%= property.cpp_name %>::Base)UTILS::fromString<char>(res[i]["<%= property.name %>"]);
+            <% else %>
                 UTILS::fromString<<%= property.cpp_name %>::Base>(res[i]["<%= property.name %>"]);
             <% end %>
+            <% end %>
         }
     }
 

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

@@ -16,6 +16,11 @@
 
 <%# self.relationships.select{|r,m| m.class.name == 'DataMapper::Associations::OneToMany::Relationship'}.each do |relative| %>
 <%# end %>
+
+<% model.enums.each do |name, property| %>
+enum Enum<%= class_name %><%= name %> { <%= property.type.flag_map.map{|v, k| class_name.upcase + "_" + property.name.to_s.upcase + "_" + k.to_s.upcase + " = " + v.to_s}.join(", ") %> };
+<% end %>
+
 namespace DMMM {
 
 class O_<%= class_name %>{
@@ -38,6 +43,7 @@ public:
         {}
     <% 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
-  - 7
-  version: 0.0.7
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Jonah Honeyman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-08 00:00:00 +03:00
+date: 2010-07-21 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -34,7 +34,6 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- dm-metamapper.gemspec
 - example/.gitignore
 - example/Makefile
 - example/example.cpp

data/dm-metamapper.gemspec

@@ -1,74 +0,0 @@
-# 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.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-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 = [
-    "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/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",
-     "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
-