naranya_ecm-sdk 0.0.52 → 0.0.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfe5894d0cf5db142b03d0a20548038fa721dc86
-  data.tar.gz: 6421ce63c3f6acecf3c23a7194ed1eaec1fe466f
+  metadata.gz: 1ca18ddb2dee136305ec964bd7a4e21e85aca031
+  data.tar.gz: cae662085784a09b9c704738d75440c7a70ab164
 SHA512:
-  metadata.gz: 10cc3f36754e215986dc6757d8d3e48456c1cdca0e9b06867c33f5952d29ad84da99bd9ce46e79dc06dc221b6251a542cc1d2e48a91d504826d0e7a41ee25b7e
-  data.tar.gz: 3331f2ddedc3f5844b2667c69abb18e4d7f3c556d1050c759548f7689fbfcb6b54ba3c389dd359df1625352124c23d17b0a512ed1a79f0c940625f3461d08e12
+  metadata.gz: 46ac57df6f1d22a4fa44f925235422aa2b4cd3c45522f395e4fb8618fee235df56846ec57323b32b6e85ff8fc75821fb36f363fd1f452073142fcdeab93642a1
+  data.tar.gz: 52458768d9951bad05c4d1aebf5ddeed03a1ec847c4521bc7f34f3a93381a4ff3d6079bd5e2da7bf3338afa449b98325c8f86de7f4b94dbe0af86fe8fd46c0b7

data/lib/naranya_ecm-sdk/version.rb

@@ -1,3 +1,3 @@
 module NaranyaEcm
-  VERSION = "0.0.52"
+  VERSION = "0.0.53"
 end

data/lib/naranya_ecm/models/content.rb

@@ -12,7 +12,7 @@ module NaranyaEcm
   #
   # In order to create a Content Unit, the Content Object should contain at least the following attributes:
   # * <tt>lifecycle_name:</tt> Indicates whether the Content object follows a <tt>simple</tt> lifecycle, a <tt>validatable</tt> lifecycle (can't publish without some sort of editorial validation first), or any other significant lifecycle.
-  # * <tt>title_translations:</tt> At least one localized title is required. This attribute is a Hash-like object, requiring the locale name as a key, and the localized string as value. 
+  # * <tt>title_translations:</tt> At least one localized title is required. This attribute is a Hash-like object, requiring the locale name as a key, and the localized string as value.
   # * <tt>author:</tt> This string represents the name of the author of the content.
   #
   # === Other significant attributes
@@ -97,7 +97,7 @@ module NaranyaEcm
     # :attr: description_translations
     #
     # Hash-like containing all the description translations.
-    
+
     ##
     # :attr: content_rating
     #
@@ -139,7 +139,7 @@ module NaranyaEcm
     #
     # A list of ContentVersion objects corresponding to changes in a versionable content.
     has_many :versions, class_name: :ContentVersion
-    
+
     ##
     # :attr: current_version
     # :category: Associations
@@ -160,7 +160,7 @@ module NaranyaEcm
     #
     # A list of MediaResource objects associated directly to the Content.
     has_many :media_resources, class_name: :MediaResource, inverse_of: :content
-    
+
     ###############################################################
     # StateMachine:
     include AASM
@@ -186,7 +186,7 @@ module NaranyaEcm
     #   accept => true or false
     #
     # Triggers the <tt>accept</tt> event.
-    
+
     ##
     # :method: accept!
     # :call-seq:
@@ -200,7 +200,7 @@ module NaranyaEcm
     #   reject => true or false
     #
     # Triggers the <tt>reject</tt> event, which starts the Content transition to an <tt>:rejected</tt> state.
-    
+
     ##
     # :method: reject!
     # :call-seq:
@@ -214,7 +214,7 @@ module NaranyaEcm
     #   publish => true or false
     #
     # Triggers the <tt>publish</tt> event, which starts the Content transition to a <tt>:published</tt> state.
-    
+
     ##
     # :method: publish!
     # :call-seq:
@@ -228,7 +228,7 @@ module NaranyaEcm
     #   deactivate => true or false
     #
     # Triggers the <tt>deactivate</tt> event, which starts the Content transition to a <tt>:deactivated</tt> state.
-    
+
     ##
     # :method: deactivate!
     # :call-seq:
@@ -285,7 +285,7 @@ module NaranyaEcm
     def simple_lifecycle?
       self.lifecycle_name == 'simple'
     end
-    
+
     ##
     # :method: validatable_lifecycle?
     # :call-seq:
@@ -300,8 +300,10 @@ module NaranyaEcm
 
       # Validates that at least one title translation exists.
       def at_least_one_title_translation_must_exist
-        errors.add :title_translations, "must have at least one translation" unless title_translations.keys.any?
+        unless title_translations.present? && title_translations.keys.any?
+          errors.add :title_translations, "must have at least one translation"
+        end
       end
-    
+
   end
 end

data/lib/naranya_ecm/rest/associations.rb

@@ -10,7 +10,7 @@ module NaranyaEcm::Rest
         given_class_name = "#{@klass.name.deconstantize}::#{given_class_name}" if given_class_name.is_a?(Symbol)
         given_class_name.constantize
       end
-      
+
       def initialize(klass, name, options = {})
         @klass, @name = klass, name
 
@@ -23,7 +23,7 @@ module NaranyaEcm::Rest
         @options = options.with_indifferent_access
 
         klass.send :attr_accessor, name
-        
+
       end
     end
 
@@ -60,7 +60,7 @@ module NaranyaEcm::Rest
           relation = AssociationRelation.new(reflection.associated_class, reflection.foreign_key, self.id)
 
           relation.load new_value unless new_value.nil?
-          
+
           instance_variable_set "@#{name}".to_sym, relation
         end
       end
@@ -98,8 +98,8 @@ module NaranyaEcm::Rest
         klass.send :define_method, "#{name}=".to_sym do |new_value|
           reflection = self.class.reflect_on_association(name)
           foreign_key_name = reflection.foreign_key
-
-          new_value = reflection.associated_class.load new_value if new_value.is_a? Hash
+          
+          new_value = reflection.associated_class.new new_value if new_value.is_a? Hash
           raise "Type Mismatch on #{self.class.name} ##{name}= #{new_value.inspect}" unless new_value.nil? || new_value.class == reflection.associated_class
 
           self.send "#{foreign_key_name}=".to_sym, new_value.nil? ? nil : new_value.id
@@ -152,4 +152,4 @@ module NaranyaEcm::Rest
     end
   end
 
-end
+end

data/lib/naranya_ecm/rest/finder_methods.rb

@@ -18,7 +18,7 @@ module NaranyaEcm::Rest
     protected
 
       def find_one(id)
-        found_resource = self.load fetch_one(id)
+        found_resource = self._load_from_fetched_attributes fetch_one(id)
         found_resource.instance_variable_set("@new_resource", false)
         found_resource
       end

data/lib/naranya_ecm/rest/model.rb

@@ -157,12 +157,6 @@ module NaranyaEcm::Rest
         .inject({}.with_indifferent_access) { |hash, accessor_name| hash[accessor_name] = self.send accessor_name; hash }
     end
 
-    def load(params={})
-      params.each do |attr, value|
-        self.public_send("#{attr}=", value)
-      end if params
-    end
-
     def path
       "#{self.class.path}/#{self.id}"
     end
@@ -187,13 +181,6 @@ module NaranyaEcm::Rest
         @_fields ||= {}.with_indifferent_access
       end
 
-      def load(*args)
-        loaded = self.new
-        loaded.load(*args)
-        loaded.changed_attributes.clear
-        loaded
-      end
-
       def primary_key(name, options = {})
         attr_accessor name
         define_attribute_method name
@@ -253,6 +240,14 @@ module NaranyaEcm::Rest
         where()
       end
 
+      protected
+
+        def _load_from_fetched_attributes(*args)
+          loaded = self.new
+          loaded.send :_load_from_fetched_attributes!, *args
+          loaded
+        end
+
     end
 
     # Returns +true+ if the resource is read only.
@@ -273,6 +268,42 @@ module NaranyaEcm::Rest
 
     private
 
+      def _load_from_fetched_attributes!(params={})
+        if params
+
+          association_dictionary = self.class.send(:associations).inject({}) do |hash, keyval|
+            key, val = keyval
+            hash[key] = val.associated_class
+            hash
+          end
+
+          nested_attributes = params.slice *association_dictionary.keys
+          self_attributes = params.reject { |k,v| nested_attributes.keys.include? k }
+
+          loaded_associations = nested_attributes.inject({}) do |hash, keyval|
+            association_name, association_attributes = keyval
+            association_class = association_dictionary[association_name]
+
+            hash[association_name] = if association_attributes.is_a?(Array)
+              association_attributes.map do |x|
+                association_class.send :_load_from_fetched_attributes, x
+              end
+            else
+              association_class.send :_load_from_fetched_attributes, association_attributes
+            end
+            hash
+          end
+
+          # Set the given params and the inflated association params:
+          self_attributes.merge(loaded_associations).each do |attr, value|
+            self.public_send("#{attr}=", value)
+          end
+
+          changed_attributes.clear
+        end
+        @new_resource = false
+      end
+
       def init_internals
         @readonly                 = false
         @destroyed                = false

data/lib/naranya_ecm/rest/persistence.rb

@@ -253,9 +253,7 @@ module NaranyaEcm::Rest
 
       def reload
         response = NContent::SDK::RESTClient.get "#{path}.json"
-
-        load(response.body)
-        @new_resource = false
+        send :_load_from_fetched_attributes!, response.body
         true
       end
 
@@ -292,8 +290,7 @@ module NaranyaEcm::Rest
               )
             end
 
-            self.load(response.body)
-            @new_resource = false
+            send :_load_from_fetched_attributes!, response.body
             true
           rescue UnprocessableEntity => e
             self.load_server_errors(e.response.body)

data/lib/naranya_ecm/rest/relation.rb

@@ -42,8 +42,7 @@ module NaranyaEcm::Rest
 
       @elements = given_list.map do |element|
         if element.is_a?(Hash)
-          loaded_element = @klass.load(element)
-          loaded_element.instance_variable_set("@new_resource", false)
+          loaded_element = @klass.send :_load_from_fetched_attributes, element
           loaded_element
         else
           element
@@ -58,7 +57,7 @@ module NaranyaEcm::Rest
 
       def materialize!
         @elements = fetch_from_server.map do |s|
-          resource = klass.load s
+          resource = klass.send :_load_from_fetched_attributes, s
           resource.instance_variable_set("@new_resource", false)
           resource
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: naranya_ecm-sdk
 version: !ruby/object:Gem::Version
-  version: 0.0.52
+  version: 0.0.53
 platform: ruby
 authors:
 - Roberto Quintanilla
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport