dm-metamapper 0.2.8 → 0.2.9

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

@@ -40,15 +40,15 @@ module DataMapper
         
         def key_to_parent
           many_to_one.inject({}) do |hash, (r,m)|
-            hash[m.child_key.first.name] = decolonize(m.parent_model_name.to_const_string)
+            hash[m.child_key.first.name] = decolonize(m.parent_model_name)
             hash
           end
         end
 
         def child_key(child_model)
-          child_model.relationships.select {|m|
+          child_model.relationships.find {|k,m|
             m.class.name == 'DataMapper::Associations::ManyToOne::Relationship' && m.parent_model_name == model.name
-          }.first.child_key.first.name.to_s
+          }[1].child_key.first.name.to_s
         end
 
         def output_path(model, template)
@@ -64,29 +64,30 @@ module DataMapper
 
         def many_to_one
           return unless model
-          @many_to_one ||= model.relationships.select {|m|
+          @many_to_one ||= model.relationships.select {|k,m|
             m.class.name == 'DataMapper::Associations::ManyToOne::Relationship'
           }
+          
           #in case of ruby < 1.9
-          if Array === @many_to_one
-            temp = @many_to_one
-            @many_to_one = {}
-            temp.each{|t| @many_to_one[t.name] = t}
-          end
+#          if Array === @many_to_one
+#            temp = @many_to_one
+#            @many_to_one = {}
+#            temp.each{|t| @many_to_one[t.name] = t}
+#          end
 
           @many_to_one
         end
         def one_to_many
           return unless model
-          @one_to_many ||= model.relationships.select {|m|
+          @one_to_many ||= model.relationships.select {|k,m|
             m.class.name == 'DataMapper::Associations::OneToMany::Relationship'
           }
           #in case of ruby < 1.9
-          if Array === @one_to_many
-            temp = @one_to_many
-            @one_to_many = {}
-            temp.each{|t| @one_to_many[t.name] = t}
-          end
+#          if Array === @one_to_many
+#            temp = @one_to_many
+#            @one_to_many = {}
+#            temp.each{|t| @one_to_many[t.name] = t}
+#          end
 
           @one_to_many
         end

data/lib/dm-metamapper/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-metamapper
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 2
-  - 8
-  version: 0.2.8
+  - 9
+  version: 0.2.9
 platform: ruby
 authors: 
 - Jonah Honeyman
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-14 00:00:00 Z
+date: 2012-07-23 00:00:00 Z
 dependencies: []
 
 description: C++ API for databases created with DM. Hard typing, compile time checked queries.