rseed 1.0.3 → 1.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjBlZDc3ZThmOGFlZTZlYjE1YmNiZjk2ZGFhOTc4YjkzYWM0YmY3Yw==
+    NmM0NmU2ZmY1OWMwZDcwOWMyYjQzMGQxOTViM2I5ZGQ5NGU2M2I5MQ==
   data.tar.gz: !binary |-
-    MGIzNmY3MGUxODI1MWVkYzgwNTQzOTNkMzAxYjQ1OWMzMDdhODE0Yg==
+    NTdiYWIzZTRmMDdiNGYyZmRkNzNkNzgyMzc4NjhiYjQ4ZWU3OTExYQ==
 SHA512:
   metadata.gz: !binary |-
-    YzYxOGE5YTI2YTY5ZDBlMDA5OThiNzIxZWIwMTU4NzU1ZDMwNmM2MGM5NTc1
-    MDJkZDhmZGRmODBjOWI0NmRiNmM0YmEwZjcwMzM1NTE2MzU2NWEwNDU4ODA4
-    NTQ5YTQ1ZTczNDgxNzJkNGQzMWI3NTNkMDVhM2JiNGJhZDE3MzI=
+    MjNlN2E4Mjc5OTYzMzg4NzM1NWQ0NTMxNGM0Y2MxZmFjOTgyODczMmI2ODI5
+    YjI1NTJmNzkwZTI1ZThiNGZkNjA0MDkxNWQ3MDAzNjRiZGE0MzZiMWY0YjY1
+    OGFmZjMyM2Y1ZTI5NTdlZmJiZjdlZDViM2RjOGMzNzQwZWJmMTk=
   data.tar.gz: !binary |-
-    ZDkxNjJlNTVlOTZmNzVlNTllZTE5ODVmNzYxODBiNmY3ODkzNGRjODU1ZmEx
-    NTMyNzZiMmVmM2M4NzJhZjI0NDhkMTEwMWU5M2E1MzFmZDg0OGJkM2M4Yzgx
-    ODJhMDc2YWI1MmE4MDI0Mjk2ZjM4NTg5MDUxN2RhODEzYTI3NjQ=
+    ZDQxN2YwMzk3ZGYzYTU5YTkxZDRmNWQ2MDFlYzFiZGQ1NTA0ZWI0NzgxYjMz
+    ZWQ3ZTVmODE1ZDBmNWJkYjJjOTcyZTRhNjNkYzc1YjY2Y2JmNjRlYThmZWQ2
+    ZDBlMzkzOWQwYWYwNTk5MDY4MGMzNTQ1NTFhZjYxZTFiMmZmZmY=

data/lib/generators/rseed/templates/converter.rb.erb

@@ -11,7 +11,7 @@ class <%= @converter_name.camelize %>Converter < Rseed::Converter
     def <%= @model_name %>_attributes values
         attributes = {}
 
-        [<%= [].tap { |list| @columns.each_pair{|attribute, meta| list << ":#{attribute}"}}.join(", ") %>].each do |attribute|
+        [<%= [].tap { |list| (@columns.keys + @relationships.keys).each {|attribute| list << ":#{attribute}"}}.join(", ") %>].each do |attribute|
             attributes[attribute] = values[attribute]
         end
 

data/lib/generators/rseed/templates/data.csv.erb

@@ -1 +1 @@
-<%= CSV.generate { |csv| csv << ( @columns.keys + @relationships.keys) } %>
+<%= CSV.generate { |csv| csv << (@columns.keys + @relationships.keys) } %>

data/lib/rseed/attribute.rb

@@ -25,13 +25,14 @@ module Rseed
       return nil if values[self.name].nil?
       value = values[self.name]
 
-      if options[:model_attribute]
+      if options[:model_attribute] || options[:model]
         model = options[:model] || true
+        model_attribute = options[:model_attribute] || :id
         # The attribute is a model, we look up the model via the specified attribute
         model_name = model == true ? self.name : model
         klass = model_name.is_a?(Class) ? model_name : model_name.to_s.classify.constantize
         model_match = options[:model_match] || :first
-        value = klass.where(options[:model_attribute] => value).send(model_match.to_s)
+        value = klass.where(model_attribute => value).send(model_match.to_s)
       elsif options[:type]
         # Check for a deserialize function for the type
         dsf = "deserialize_#{options[:type].to_s}"

data/lib/rseed/version.rb

@@ -1,3 +1,3 @@
 module Rseed
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rseed
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - David Monagle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2013-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize