morph 0.2.9 → 0.3.0

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.3.0. modifications for ruby 1.9.2 compatibility
+
 v0.2.9. added from_csv(); require fastercsv; added morph_attributes() class method
 
 v0.2.8. added from_xml() and from_tsv(); updated for active_support; fixed from_hash() when hash root is an array

data/Rakefile

@@ -18,7 +18,6 @@ begin
     m.rubyforge_name = "morph"
     m.rdoc_options << '--inline-source'
     m.dependencies = ["activesupport >=2.0.2"]
-    m.dependencies = ["fastercsv >=1.5.0"]
     m.rdoc_pattern = ["README", "CHANGELOG", "LICENSE"]
   end
 

data/lib/morph.rb

@@ -1,20 +1,31 @@
-require 'fastercsv'
+if RUBY_VERSION >= "1.9"
+  require 'csv'
+else
+  begin
+    require 'fastercsv'
+  rescue LoadError
+    puts "\nYou need to install the fastercsv gem to use Morph.from_csv with Ruby 1.8"
+    puts "  sudo gem install fastercsv\n"
+  end
+end
 begin
+  # require 'active_support'
   require 'active_support/core_ext/object/blank'
   require 'active_support/inflector'
   require 'active_support/core_ext/string/inflections'
-  require 'active_support/core_ext/xml_mini'
   require 'active_support/core_ext/hash/conversions'
 rescue Exception => e
   begin
+    puts e.to_s
     require 'active_support'
   rescue Exception => e
+    puts e.to_s
     require 'activesupport'
   end
 end
 
 module Morph
-  VERSION = "0.2.9"
+  VERSION = "0.3.0"
 
   class << self
     def generate_migrations object, options={}
@@ -27,13 +38,14 @@ module Morph
 
     def from_csv csv, class_name, namespace=Morph
       objects = []
-      FasterCSV.parse(csv, { :headers => true }) do |row|
-        object = object_from_name class_name, namespace
-        row.each do |key, value|
-          object.morph(key, value)
+      csv_utility = (RUBY_VERSION >= "1.9") ? CSV : FasterCSV
+      csv_utility.parse(csv, { :headers => true }) do |row|
+          object = object_from_name class_name, namespace
+          row.each do |key, value|
+            object.morph(key, value)
+          end
+          objects << object
         end
-        objects << object
-      end
       objects
     end
 
@@ -90,6 +102,7 @@ module Morph
         migration = "./script/generate model #{name}#{options[:belongs_to_id]}"
         options[:belongs_to_id] = ''
         migrations << migration
+        attributes = [attributes] if attributes.is_a?(String)
         attributes.to_a.sort{|a,b| a[0].to_s <=> b[0].to_s}.each do |attribute, value|
           case value
             when String
@@ -174,7 +187,11 @@ module Morph
     end
 
     def morph_methods
-      @@morph_methods[self].keys.sort
+      if RUBY_VERSION >= "1.9"
+        @@morph_methods[self].keys.sort.map(&:to_sym)
+      else
+        @@morph_methods[self].keys.sort
+      end
     end
 
     def adding_morph_method= true_or_false
@@ -217,7 +234,7 @@ module Morph
         if @@morph_methods[self].has_key? symbol.to_s
           @@morph_methods[self].delete symbol.to_s
           is_writer = symbol.to_s =~ /=$/
-          @@morph_attributes[self].delete(symbol) unless is_writer 
+          @@morph_attributes[self].delete(symbol) unless is_writer
         end
       end
 
@@ -282,6 +299,9 @@ module Morph
 
     def morph_method_missing symbol, *args
       attribute = symbol.to_s.chomp '='
+      if RUBY_VERSION >= "1.9"
+        attribute = attribute.to_sym
+      end
 
       if Object.instance_methods.include?(attribute)
         raise "'#{attribute}' is an instance_method on Object, cannot create accessor methods for '#{attribute}'"

data/morph.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{morph}
-  s.version = "0.2.9"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rob McKinnon"]
-  s.date = %q{2010-04-04}
+  s.date = %q{2010-10-18}
   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"]
@@ -16,19 +16,19 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Morph", "--main", "README", "--inline-source"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{morph}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Morph allows you to emerge class definitions via calling assignment methods; mix with Hpricot for screen scrapping fun.}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<fastercsv>, [">= 1.5.0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, [">= 2.0.2"])
     else
-      s.add_dependency(%q<fastercsv>, [">= 1.5.0"])
+      s.add_dependency(%q<activesupport>, [">= 2.0.2"])
     end
   else
-    s.add_dependency(%q<fastercsv>, [">= 1.5.0"])
+    s.add_dependency(%q<activesupport>, [">= 2.0.2"])
   end
 end

data/spec/lib/morph_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require File.dirname(__FILE__) + '/../../lib/morph'
 require File.dirname(__FILE__) + '/../morph_spec_helper'
 
@@ -59,8 +60,13 @@ describe Morph do
       @morphed_class.morph_methods.size.should == 2
       @another_morphed_class.morph_methods.size.should == 2
 
-      @morphed_class.morph_methods.should == ['every','every=']
-      @another_morphed_class.morph_methods.should == ['no','no=']
+      if RUBY_VERSION >= "1.9"
+        @morphed_class.morph_methods.should == [:every,:every=]
+        @another_morphed_class.morph_methods.should == [:no,:no=]
+      else
+        @morphed_class.morph_methods.should == ['every','every=']
+        @another_morphed_class.morph_methods.should == ['no','no=']
+      end
     end
 
     it 'should call morph_attributes on both objects, when one object has a reference to another' do
@@ -94,7 +100,7 @@ describe Morph do
       attributes.delete(:every)
       attributes = @morph.morph_attributes
       attributes[:every].should == 'which'
-      
+
       attributes = @morph.class.morph_attributes
       attributes.should == [:every, :loose]
       attributes.delete(:every)
@@ -176,7 +182,7 @@ describe Morph do
 
   describe "when morph method used to set unicode attribute name with a value" do
     before :each do
-      $KCODE = "u"
+      $KCODE = "u" unless RUBY_VERSION >= "1.9"
       remove_morph_methods
       @age = 19
       @attribute = "年龄"
@@ -185,7 +191,7 @@ describe Morph do
     end
 
     after :all do
-      $KCODE = "NONE"
+      $KCODE = "NONE" unless RUBY_VERSION >= "1.9"
     end
 
     it_should_behave_like "class with generated accessor methods added"
@@ -197,7 +203,7 @@ describe Morph do
 
   describe "when morph method used to set japanese and latin unicode attribute name with a value" do
     before :each do
-      $KCODE = "u"
+      $KCODE = "u" unless RUBY_VERSION >= "1.9"
       remove_morph_methods
       @age = 19
       @attribute = "ページビュー_graph"
@@ -206,7 +212,7 @@ describe Morph do
     end
 
     after :all do
-      $KCODE = "NONE"
+      $KCODE = "NONE" unless RUBY_VERSION >= "1.9"
     end
 
     it_should_behave_like "class with generated accessor methods added"
@@ -434,14 +440,22 @@ describe Morph do
       company_details = Morph.from_hash(h, Company::House)
       company_details.class.name.should == 'Company::House::CompanyDetails'
       morph_methods = company_details.class.morph_methods
-      morph_methods.include?('last_full_mem_date').should be_true
-      morph_methods.include?('accounts').should be_true
+      if RUBY_VERSION >= "1.9"
+        morph_methods.include?(:last_full_mem_date).should be_true
+        morph_methods.include?(:accounts).should be_true
+        morph_methods.delete(:accounts)
+        morph_methods.include?(:accounts).should be_false
+        morph_methods = company_details.class.morph_methods
+        morph_methods.include?(:accounts).should be_true
+      else
+        morph_methods.include?('last_full_mem_date').should be_true
+        morph_methods.include?('accounts').should be_true
+        morph_methods.delete('accounts')
+        morph_methods.include?('accounts').should be_false
+        morph_methods = company_details.class.morph_methods
+        morph_methods.include?('accounts').should be_true
+      end
 
-      morph_methods.delete('accounts')
-      morph_methods.include?('accounts').should be_false
-      morph_methods = company_details.class.morph_methods
-      morph_methods.include?('accounts').should be_true
-      
       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"
@@ -500,9 +514,9 @@ xmlns_xsi: http://www.w3.org/2001/XMLSchema-instance
 xsi_schema_location: xmlgwdev.companieshouse.gov.uk/v1-0/schema/CompanyDetails.xsd|
     end
   end
-  
+
   describe 'creating from xml' do
-    
+
     def check_councils councils, class_name
       councils.class.should == Array
       councils.size.should == 2
@@ -515,7 +529,7 @@ xsi_schema_location: xmlgwdev.companieshouse.gov.uk/v1-0/schema/CompanyDetails.x
       councils = Morph.from_xml(xml)
       check_councils councils, 'Morph::Council'
     end
-    
+
     describe 'when module name is supplied' do
       it 'should create classes and object instances' do
         Object.const_set 'Ppc', Module.new
@@ -537,8 +551,8 @@ xsi_schema_location: xmlgwdev.companieshouse.gov.uk/v1-0/schema/CompanyDetails.x
     end
   end
 
-  describe 'creating from' do 
-    
+  describe 'creating from' do
+
     def check_councillors councillors, class_name, nil_value=''
       councillors.class.should == Array
       councillors.size.should == 2
@@ -565,7 +579,7 @@ xsi_schema_location: xmlgwdev.companieshouse.gov.uk/v1-0/schema/CompanyDetails.x
           check_councillors councillors, 'Morph::Councillor'
         end
       end
-      
+
       describe 'when class name and module name is supplied' do
         it 'should create classes and object instances' do
           Object.const_set 'Ppc', Module.new
@@ -576,20 +590,20 @@ xsi_schema_location: xmlgwdev.companieshouse.gov.uk/v1-0/schema/CompanyDetails.x
 
       def tsv
   %Q[name	party	councillors	councils	council_experience
-Ted Roe	labour	Councillor for Stretford Ward	Trafford Council	
-Ali Davidson	labour		Basildon District Council	
+Ted Roe	labour	Councillor for Stretford Ward	Trafford Council
+Ali Davidson	labour		Basildon District Council
 ]
       end
     end
 
-    describe 'csv (comma separated value)' do  
+    describe 'csv (comma separated value)' do
       describe 'when class name is supplied' do
         it 'should create classes and object instances' do
           councillors = Morph.from_csv(csv, 'Councillor')
           check_councillors councillors, 'Morph::Councillor', nil
         end
       end
-      
+
       describe 'when class name and module name is supplied' do
         it 'should create classes and object instances' do
           Object.const_set 'Ppc', Module.new
@@ -597,7 +611,7 @@ Ali Davidson	labour		Basildon District Council
           check_councillors councillors, 'Ppc::Councillor', nil
         end
       end
-  
+
       def csv
   %Q[name,party,councillors,councils,council_experience
 Ted Roe,labour,Councillor for Stretford Ward,Trafford Council,

data/spec/morph_spec_helper.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require File.dirname(__FILE__) + '/../lib/morph'
 
 module MorphSpecHelperMethods
@@ -68,19 +69,35 @@ describe "class with generated accessor methods added", :shared => true do
   after  :all do remove_morph_methods; end
 
   it 'should add reader method to class instance_methods list' do
-    each_attribute { |a| instance_methods.should include(a.to_s) }
+    if RUBY_VERSION >= "1.9"
+      each_attribute { |a| instance_methods.should include(a.to_s.to_sym) }
+    else
+      each_attribute { |a| instance_methods.should include(a.to_s) }
+    end
   end
 
   it 'should add writer method to class instance_methods list' do
-    each_attribute { |a| instance_methods.should include("#{a}=") }
+    if RUBY_VERSION >= "1.9"
+      each_attribute { |a| instance_methods.should include("#{a}=".to_sym) }
+    else
+      each_attribute { |a| instance_methods.should include("#{a}=") }
+    end
   end
 
   it 'should add reader method to class morph_methods list' do
-    each_attribute { |a| morph_methods.should include(a.to_s) }
+    if RUBY_VERSION >= "1.9"
+      each_attribute { |a| morph_methods.should include(a.to_s.to_sym) }
+    else
+      each_attribute { |a| morph_methods.should include(a.to_s) }
+    end
   end
 
   it 'should add writer method to class morph_methods list' do
-    each_attribute { |a| morph_methods.should include("#{a}=") }
+    if RUBY_VERSION >= "1.9"
+      each_attribute { |a| morph_methods.should include("#{a}=".to_sym) }
+    else
+      each_attribute { |a| morph_methods.should include("#{a}=") }
+    end
   end
 
   it 'should only have generated accessor methods in morph_methods list' do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: morph
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 9
-  version: 0.2.9
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Rob McKinnon
@@ -14,21 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-04 00:00:00 +01:00
+date: 2010-10-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: fastercsv
+  name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
-        - 1
-        - 5
+        - 2
         - 0
-        version: 1.5.0
+        - 2
+        version: 2.0.2
   type: :runtime
   version_requirements: *id001
 description: |
@@ -73,16 +76,20 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 11
       segments: 
       - 1
       - 2
@@ -90,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: morph
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Morph allows you to emerge class definitions via calling assignment methods; mix with Hpricot for screen scrapping fun.