dynamic_models 0.4.4 → 0.4.7

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.7

data/dynamic_models.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dynamic_models"
-  s.version = "0.4.4"
+  s.version = "0.4.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Craig Ulliott"]
-  s.date = "2012-09-28"
+  s.date = "2012-10-18"
   s.description = "Methods to get and build models directly from parameters.  Useful for DRYing up code, specifically very dynamic code for things like admin tools."
   s.email = "craigulliott@gmail.com"
   s.extra_rdoc_files = [

data/lib/dynamic_models.rb

@@ -19,12 +19,16 @@ module DynamicModels
 
   # model name from the controller or type parameter (for a model which is using STI)
   def model_name
-    sti_model? ? params[:type].underscore : params[:controller].split('/').last.singularize
+    sti_model? ? params[:type].underscore : base_model_class_name
   end
 
   # the model class, inferred from the controller
+  def base_model_class_name
+    params[:controller].split('/').last.singularize
+  end
+
   def base_model_class
-    params[:controller].split('/').last.singularize.camelize.constantize
+    base_model_class_name.camelize.constantize
   end
 
   # the class we are working with, if an STI model then it will fail loudly on a type which inst descendant from the class which corresponds to this controller
@@ -43,20 +47,13 @@ module DynamicModels
   
   # returns a new model, it can be set with an optional hash
   def new_model(defaults = {})
+    new_model = model_class.new(defaults)
+    # if there is a parent then associate it with the model
     if parent_model
-      # is it a has_many
-      if parent_model.respond_to?(plural_model_name)
-        new_model = parent_model.send(plural_model_name).build(defaults)
-      # is is a has_one
-      elsif parent_model.respond_to?(model_name)
-        new_model = parent_model.send("build_#{model_name}", defaults)
-      else
-        raise "can't find association #{model_name} or #{plural_model_name} for #{parent_model.class.name}"
-      end
-    else
-      new_model = model_class.new(defaults)
+      new_model.send("#{parent_model.class.name.downcase}=", parent_model)
     end
-    return new_model
+    # return the new model
+    new_model
   end
 
   # returns a model using the id from the params

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_models
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-28 00:00:00.000000000 Z
+date: 2012-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -111,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2210442058104043262
+      hash: 4067818536583822020
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: