logical_model 0.5.10 → 0.5.11

data/VERSION

@@ -1 +1 @@
-0.5.10
+0.5.11

data/lib/logical_model/associations/has_many_keys.rb

@@ -8,75 +8,93 @@ class LogicalModel
 
       module ClassMethods
 
-        def has_many(key)
+        # @param key [String] association name
+        # @param options [Hash]
+        # @option options [String/Constant] class
+        def has_many(key, options = {})
           @has_many_keys ||= []
           @has_many_keys << key
-          has_many_keys = @has_many_keys
+          define_association_methods(key,get_attr_class(key,options))
         end
 
+        # DEPRECATED!!!
+        # Use has_many instead
         def has_many_keys=(keys)
           @has_many_keys = keys
           attr_accessor *keys
 
           keys.each do |association|
+            define_association_methods(association,get_attr_class(association,{}))
+          end
+        end
 
-            # return empty array or @association variable for each association
-            define_method association do
-              if instance_variable_get("@#{association}").blank?
-                instance_variable_set("@#{association}", [])
-              end
+        def has_many_keys
+          @has_many_keys
+        end
+        
+        protected
 
-              instance_variable_get("@#{association}")
-            end
+        def get_attr_class(key, options)
+          if options[:class]
+            options[:class].is_a?(String) ? options[:class].constantize : options[:class]
+          else
+            key.to_s.singularize.camelize.constantize
+          end
+        end
 
-            # this method loads the contact attributes recieved by logical model from the service
-            define_method "#{association}=" do |params|
-              collection = []
-              params.each do |attr_params|
-                if attr_params["_type"].present?
-                  attr_class = attr_params.delete("_type").to_s.constantize
-                else
-                  attr_class = association.to_s.singularize.camelize.constantize
-                end
-                collection << attr_class.new(attr_params)
-              end
-              instance_variable_set("@#{association}", collection)
+        def define_association_methods(association,attr_class)
+
+          # Accessor
+          # return empty array or @association variable for each association
+          define_method association do
+            if instance_variable_get("@#{association}").blank?
+              instance_variable_set("@#{association}", [])
             end
 
-            define_method "new_#{association.to_s.singularize}" do |attr_params|
+            instance_variable_get("@#{association}")
+          end
+
+          # Setter
+          # this method loads the contact attributes recieved by logical model from the service
+          define_method "#{association}=" do |params|
+            collection = []
+            params.each do |attr_params|
               if attr_params["_type"].present?
-                clazz = attr_params.delete(:_type).constantize
-              else
-                clazz = association.to_s.singularize.camelize.constantize
+                attr_class = attr_params.delete("_type").to_s.constantize
               end
+              collection << attr_class.new(attr_params)
+            end
+            instance_variable_set("@#{association}", collection)
+          end
 
-              return unless clazz
-
-              temp_object = clazz.new(attr_params.merge({"#{self.json_root}_id" => self.id}))
-              eval(association.to_s) << temp_object
-              temp_object
+          # Initialize instance of associated object
+          define_method "new_#{association.to_s.singularize}" do |attr_params|
+            if attr_params["_type"].present?
+              clazz = attr_params.delete(:_type).constantize
+            else
+              clazz = attr_class
             end
 
-            # this method loads the contact attributes from the html form (using nested resources conventions)
-            define_method "#{association}_attributes=" do |key_attributes|
-              array = []
-              key_attributes.each do |attr_params|
-                attr_params.to_hash.symbolize_keys!
-                if attr_params["_type"].present?
-                  attr_class = attr_params.delete("_type").to_s.constantize
-                else
-                  attr_class = association.to_s.singularize.camelize.constantize
-                end
-                array << attr_class.new(attr_params)
+            return unless clazz
+
+            temp_object = clazz.new(attr_params.merge({"#{self.json_root}_id" => self.id}))
+            eval(association.to_s) << temp_object
+            temp_object
+          end
+
+          # this method loads the contact attributes from the html form (using nested resources conventions)
+          define_method "#{association}_attributes=" do |key_attributes|
+            array = []
+            key_attributes.each do |attr_params|
+              attr_params.to_hash.symbolize_keys!
+              if attr_params["_type"].present?
+                attr_class = attr_params.delete("_type").to_s.constantize
               end
-              instance_variable_set("@#{association}", array)
+              array << attr_class.new(attr_params)
             end
+            instance_variable_set("@#{association}", array)
           end
         end
-
-        def has_many_keys
-          @has_many_keys
-        end
       end
     end
   end

data/logical_model.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "logical_model"
-  s.version = "0.5.10"
+  s.version = "0.5.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dwayne Macgowan"]
-  s.date = "2013-11-08"
+  s.date = "2014-04-19"
   s.description = "LogicalModel allows to use a resource as a model. It is based on web presentation http://www.slideshare.net/ihower/serviceoriented-design-and-implement-with-rails3"
   s.email = "dwaynemac@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logical_model
 version: !ruby/object:Gem::Version
-  version: 0.5.10
+  version: 0.5.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2014-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -373,7 +373,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 449501073
+      hash: -888068301
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: