morph 0.2.5 → 0.2.6

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.2.6. handle more types of value types in from_hash()
+
 v0.2.5. camelize names for classes in from_hash()
 
 v0.2.4. from_hash() creates classes in Morph namespace and handles arrays of hashes

data/lib/morph.rb

@@ -1,66 +1,112 @@
 require 'activesupport'
 
 module Morph
-  VERSION = "0.2.5"
-
-  def self.from_hash hash, namespace=Morph
-    if hash.keys.size == 1
-      key = hash.keys.first
-      object = object_from_key key, namespace
-      if hash[key].is_a? Hash
-        attributes = hash[key]
-        add_to_object object, attributes, namespace
-      end
-      object
-    else
-      raise 'hash must have single key'
+  VERSION = "0.2.6"
+
+  class << self
+    def generate_migrations object, options={}
+      options[:ignore] ||= []
+      options[:belongs_to_id] ||= ''
+      migrations = []
+      name = object.class.name.demodulize.underscore
+      add_migration name, object.morph_attributes, migrations, options
     end
-  end
-
-  def self.included(base)
-    base.extend ClassMethods
-    base.send(:include, InstanceMethods)
-    base.send(:include, MethodMissing)
-  end
 
-  private
-    def self.object_from_key key, namespace
-      begin
-        name = key.to_s.camelize
-        type = "#{namespace.name}::#{name}".constantize
-      rescue NameError => e
-        namespace.const_set name, Class.new
-        type = "#{namespace.name}::#{name}".constantize
-        type.send(:include, Morph)
+    def from_hash hash, namespace=Morph
+      if hash.keys.size == 1
+        key = hash.keys.first
+        object = object_from_name key, namespace
+        if hash[key].is_a? Hash
+          attributes = hash[key]
+          add_to_object object, attributes, namespace
+        end
+        object
+      else
+        raise 'hash must have single key'
       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
+    def included(base)
+      base.extend ClassMethods
+      base.send(:include, InstanceMethods)
+      base.send(:include, MethodMissing)
+    end
+
+    private
+      def add_migration name, attributes, migrations, options
+        migration = "./script/generate model #{name}#{options[:belongs_to_id]}"
+        options[:belongs_to_id] = ''
+        migrations << migration
+        attributes.to_a.sort{|a,b| a[0].to_s <=> b[0].to_s}.each do |attribute, value|
+          case value
+            when String
+              attribute_name = attribute.to_s
+              unless options[:ignore].include?(attribute_name)
+                type = attribute_name.ends_with?('date') ? 'date' : 'string'
+                attribute_def = "#{attribute}:#{type}"
+                migration.sub!(migration, "#{migration} #{attribute_def}")
+              end
+            when Array
+              options[:belongs_to_id] = " #{name}_id:integer"
+              migrations = add_migration(attribute, '', migrations, options)
+            when Hash
+              options[:belongs_to_id] = " #{name}_id:integer"
+              migrations = add_migration(attribute, value, migrations, options)
+            else
+              puts 'hi'
           end
+        end
+        migrations
+      end
+
+      def class_constant namespace, name
+        "#{namespace.name}::#{name}".constantize
+      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)
+      def object_from_name name, namespace
+        name = name.to_s.camelize
+        begin
+          type = class_constant namespace, name
+        rescue NameError => e
+          namespace.const_set name, Class.new
+          type = class_constant namespace, name
+          type.send(:include, Morph)
         end
+        type.new
       end
-    end
+
+      def object_from_hash hash, name, namespace
+        object = object_from_name(name, namespace)
+        add_to_object(object, hash, namespace)
+      end
+
+      def objects_from_array array, name, namespace
+        if array.size > 0 && array.collect(&:class).uniq == [Hash]
+          array.map! { |hash| object_from_hash(hash, name.singularize, namespace) }
+        else
+          array
+        end
+      end
+
+      def add_to_object object, attributes, namespace
+        attributes.each do |name, value|
+          attribute = name.gsub(':',' ').underscore
+          case value
+            when String, Date
+              object.morph(attribute, value)
+            when Array
+              object.morph(attribute.pluralize, objects_from_array(value, name, namespace))
+            when Hash
+              object.morph(attribute, object_from_hash(value, name, namespace))
+            when NilClass
+              object.morph(attribute, nil)
+            else
+              raise "cannot handle adding #{name} value of class: #{value.class.name}"
+          end
+        end
+        object
+      end
+  end
 
   public
 

data/morph.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{morph}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rob McKinnon"]
-  s.date = %q{2009-03-16}
+  s.date = %q{2009-03-30}
   s.description = %q{Morph allows you to emerge class definitions via calling assignment methods; mix with Hpricot for screen scrapping fun.}
   s.email = ["rob ~@nospam@~ rubyforge.org"]
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README"]

data/spec/lib/morph_spec.rb

@@ -352,6 +352,29 @@ describe Morph do
   end
 
   describe 'creating from hash' do
+    it 'should create classes and object instances with array of hashes' do
+      h = {
+        "CompanyDetails"=> {
+          "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.search_items.first.class.name.should == 'Morph::SearchItem'
+      company_details.search_items.first.data_set.should == 'LIVE'
+      company_details.search_items.first.company_name.should == 'CANONGROVE LIMITED'
+    end
+
     it 'should create classes and object instances' do
       h = {
         "CompanyDetails"=> {
@@ -390,19 +413,7 @@ describe Morph do
               "AccountRefDate"=>"0000-30-04"},
           "IncorporationDate"=>"1996-03-25",
           "CompanyNumber"=>"03176906",
-          "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" }
-          ]
+          "xmlns"=>"http://xmlgw.companieshouse.gov.uk/v1-0"
         }
       }
       Object.const_set 'Company', Module.new
@@ -419,10 +430,56 @@ describe Morph do
       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"]
 
-      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
+      list = Morph.generate_migrations company_details, :ignore=>['xmlns','xmlns_xsi','xsi_schema_location']
+      list.size.should == 7
+      list[0].should == "./script/generate model company_details company_category:string company_name:string company_number:string company_status:string country_of_origin:string has_appointments:string has_branch_info:string in_liquidation:string incorporation_date:date last_full_mem_date:date"
+      list[1].should == './script/generate model accounts company_details_id:integer account_category:string account_ref_date:date document_available:string last_made_up_date:date next_due_date:date overdue:string'
+      list[2].should == './script/generate model mortgages company_details_id:integer mortgage_ind:string num_mort_charges:string num_mort_outstanding:string num_mort_part_satisfied:string num_mort_satisfied:string'
+      list[3].should == './script/generate model reg_address company_details_id:integer'
+      list[4].should == './script/generate model address_lines reg_address_id:integer'
+      list[5].should == './script/generate model returns company_details_id:integer document_available:string last_made_up_date:date next_due_date:date overdue:string'
+      list[6].should == './script/generate model sic_codes company_details_id:integer sic_text:string'
+
+      yaml = %Q|--- !ruby/object:Company::House::CompanyDetails
+accounts: !ruby/object:Company::House::Accounts
+  account_category: FULL
+  account_ref_date: "0000-30-04"
+  document_available: "1"
+  last_made_up_date: "2001-04-30"
+  next_due_date: "2002-11-30"
+  overdue: "NO"
+company_category: Public Limited Company
+company_name: MILLENNIUM STADIUM PLC
+company_number: 03176906
+company_status: Active
+country_of_origin: United Kingdom
+has_appointments: "1"
+has_branch_info: "0"
+in_liquidation: "0"
+incorporation_date: "1996-03-25"
+last_full_mem_date: "2002-03-25"
+mortgages: !ruby/object:Company::House::Mortgages
+  mortgage_ind: LT300
+  num_mort_charges: "7"
+  num_mort_outstanding: "7"
+  num_mort_part_satisfied: "0"
+  num_mort_satisfied: "0"
+reg_address: !ruby/object:Company::House::RegAddress
+  address_lines:
+  - ST DAVID'S HOUSE
+  - WEST WING
+  - WOOD STREET
+  - CARDIFF CF10 1ES
+returns: !ruby/object:Company::House::Returns
+  document_available: "1"
+  last_made_up_date: "2002-03-25"
+  next_due_date: "2003-04-22"
+  overdue: "NO"
+sic_codes: !ruby/object:Company::House::SICCodes
+  sic_text: stadiums
+xmlns: http://xmlgw.companieshouse.gov.uk/v1-0
+xmlns_xsi: http://www.w3.org/2001/XMLSchema-instance
+xsi_schema_location: xmlgwdev.companieshouse.gov.uk/v1-0/schema/CompanyDetails.xsd|
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: morph
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Rob McKinnon
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-16 00:00:00 +00:00
+date: 2009-03-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency