morph 0.2.3 → 0.2.4

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.2.4. from_hash() creates classes in Morph namespace and handles arrays of hashes
+
 v0.2.3. added Morph.from_hash method
 
 v0.2.2. changed rubygem requirement to be >= 1.2 instead of = 1.2

data/lib/morph.rb

@@ -1,44 +1,15 @@
 require 'activesupport'
 
 module Morph
-  VERSION = "0.2.3"
-
-  def self.object_from_key key
-    begin
-      name = key.to_s
-      type = name.constantize
-    rescue NameError => e
-      Object.const_set name, Class.new
-      type = name.constantize
-      type.send(:include, Morph)
-    end
-    object = type.new
-  end
-
-  def self.add_to_object object, attributes
-    attributes.each do |key, value|
-      attribute = key.gsub(':',' ')
-      attribute = attribute.underscore
-
-      if value.is_a?(String)
-        object.morph(attribute, value)
-      elsif value.is_a?(Array)
-        object.morph(attribute.pluralize, value)
-      elsif value.is_a? Hash
-        child_object = object_from_key key
-        add_to_object child_object, value
-        object.morph(attribute, child_object)
-      end
-    end
-  end
+  VERSION = "0.2.4"
 
-  def self.from_hash hash
+  def self.from_hash hash, namespace=Morph
     if hash.keys.size == 1
       key = hash.keys.first
-      object = object_from_key key
+      object = object_from_key key, namespace
       if hash[key].is_a? Hash
         attributes = hash[key]
-        add_to_object object, attributes
+        add_to_object object, attributes, namespace
       end
       object
     else
@@ -52,6 +23,47 @@ module Morph
     base.send(:include, MethodMissing)
   end
 
+  private
+    def self.object_from_key key, namespace
+      begin
+        name = key.to_s
+        type = "#{namespace.name}::#{name}".constantize
+      rescue NameError => e
+        namespace.const_set name, Class.new
+        type = "#{namespace.name}::#{name}".constantize
+        type.send(:include, Morph)
+      end
+      object = type.new
+    end
+
+    def self.add_to_object object, attributes, namespace
+      attributes.each do |key, value|
+        attribute = key.gsub(':',' ')
+        attribute = attribute.underscore
+
+        if value.is_a?(String)
+          object.morph(attribute, value)
+        elsif value.is_a?(Array)
+          array = value
+          if array.size > 0 && array.collect(&:class).uniq == [Hash]
+            array = array.collect do |hash|
+              child = object_from_key key.singularize, namespace
+              add_to_object child, hash, namespace
+              child
+            end
+          end
+
+          object.morph(attribute.pluralize, array)
+        elsif value.is_a? Hash
+          child_object = object_from_key key, namespace
+          add_to_object child_object, value, namespace
+          object.morph(attribute, child_object)
+        end
+      end
+    end
+
+  public
+
   module ClassMethods
 
     @@adding_morph_method = Hash.new {|hash,klass| hash[klass] = false }

data/morph.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{morph}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rob McKinnon"]

data/spec/lib/morph_spec.rb

@@ -390,19 +390,39 @@ describe Morph do
               "AccountRefDate"=>"0000-30-04"},
           "IncorporationDate"=>"1996-03-25",
           "CompanyNumber"=>"03176906",
-          "xmlns"=>"http://xmlgw.companieshouse.gov.uk/v1-0"}
+          "xmlns"=>"http://xmlgw.companieshouse.gov.uk/v1-0",
+          "SearchItems"=> [
+            { "CompanyDate"=> '',
+              "CompanyIndexStatus"=> '',
+              "DataSet"=>"LIVE",
+              "CompanyName"=>"CANONGROVE LIMITED",
+              "CompanyNumber"=>"SC244777" },
+            { "CompanyDate"=>"",
+              "CompanyIndexStatus"=>"",
+              "DataSet"=>"LIVE",
+              "CompanyName"=>"CANONHALL ACCOUNTANCY LTD",
+              "CompanyNumber"=>"05110715" }
+          ]
+        }
       }
-      company_details = Morph.from_hash(h)
-      company_details.class.name.should == 'CompanyDetails'
+      Object.const_set 'Company', Module.new
+      Company.const_set 'House', Module.new
+
+      company_details = Morph.from_hash(h, Company::House)
+      company_details.class.name.should == 'Company::House::CompanyDetails'
       company_details.class.morph_methods.include?('last_full_mem_date').should be_true
       company_details.class.morph_methods.include?('accounts').should be_true
 
-      company_details.accounts.class.name.should == 'Accounts'
+      company_details.accounts.class.name.should == 'Company::House::Accounts'
       company_details.accounts.overdue.should == 'NO'
       company_details.last_full_mem_date.should == "2002-03-25"
       company_details.sic_codes.sic_text.should == 'stadiums'
       company_details.reg_address.address_lines.should == ["ST DAVID'S HOUSE", "WEST WING", "WOOD STREET", "CARDIFF CF10 1ES"]
-      puts company_details.to_yaml
+
+      company_details.search_items.first.class.name.should == 'Company::House::SearchItem'
+      company_details.search_items.first.data_set.should == 'LIVE'
+      company_details.search_items.first.company_name.should == 'CANONGROVE LIMITED'
+      # puts company_details.to_yaml
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: morph
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Rob McKinnon