morph 0.3.2 → 0.3.3

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.3.3. removed show_ruby() method; updated script_generate() to utilise new rails commands
+
 v0.3.2. from_hash() can now handle keys that are symbols
 
 v0.3.1. only show fastercsv install message if Morph.from_csv() called

data/Manifest

@@ -6,5 +6,5 @@ LICENSE
 README
 spec/lib/morph_spec.rb
 spec/morph_spec_helper.rb
-spec/spec.opts
+spec/spec_helper.rb
 Manifest

data/README

@@ -1,28 +1,21 @@
-Morph allows you to emerge class definitions via calling assignment methods; mix with Hpricot for screen scraping fun.
+Morph mixin allows you to emerge class definitions via calling assignment methods; mix with Nokogiri for screen scraping fun.
 
 
-== Morph creating classes +from_xml+
+== Morph creating classes +from_csv+
 
-Here's example code showing Morph playing with XML:
+Here's example code showing Morph playing with CSV (comma-separated values):
 
  require 'rubygems'; require 'morph'
 
- xml = %Q[<?xml version="1.0" encoding="UTF-8"?>
- <councils type="array">
-   <council code='1'>
-     <name>Aberdeen City Council</name>
-   </council>
-   <council code='2'>
-     <name>Allerdale Borough Council</name>
-   </council>
- </councils>]
+ csv = %Q[name,party\nTed Roe,red\nAli Davidson,blue\nSue Smith,green]
 
- councils = Morph.from_xml(xml)
- # => [#<Morph::Council @code="1", @name="Aberdeen City Council">,
-       #<Morph::Council @code="2", @name="Allerdale Borough Council">]
+ people = Morph.from_csv(csv, 'person')
+ # => [#<Morph::Person @name="Ted Roe", @party="red">,
+       #<Morph::Person @name="Ali Davidson", @party="blue">,
+       #<Morph::Person @name="Sue Smith", @party="green">]
 
- councils.first.name
- # => "Aberdeen City Council"
+ people.last.party
+ # => "green"
 
 == Morph creating classes +from_tsv+
 
@@ -40,42 +33,75 @@ Here's example code showing Morph playing with TSV (tab-separated values):
  people.last.party
  # => "green"
 
-== Morph playing with +Hpricot+
+== Morph creating classes +from_xml+
+
+Here's example code showing Morph playing with XML:
+
+ require 'rubygems'; require 'morph'
 
-Here's example code showing Morph playing with Hpricot:
+ xml = %Q[<?xml version="1.0" encoding="UTF-8"?>
+ <councils type="array">
+   <council code='1'>
+     <name>Aberdeen City Council</name>
+   </council>
+   <council code='2'>
+     <name>Allerdale Borough Council</name>
+   </council>
+ </councils>]
 
- require 'rubygems'; require 'hpricot'; require 'open-uri'
+ councils = Morph.from_xml(xml)
+ # => [#<Morph::Council @code="1", @name="Aberdeen City Council">,
+       #<Morph::Council @code="2", @name="Allerdale Borough Council">]
+
+ councils.first.name
+ # => "Aberdeen City Council"
+
+== Morph playing with +Nokogiri+
+
+Here's example code showing Morph playing with Nokogiri in Ruby 1.9.2:
+
+ require 'rubygems'; require 'nokogiri'; require 'open-uri'
  require 'morph'
 
  class Hubbit
    include Morph  # allows class to morph
 
    def initialize name
-     doc = Hpricot open("http://github.com/#{name}")
+     doc = Nokogiri::HTML open("https://github.com/#{name}")
 
-     (doc/'label').collect do |node|
+     profile_fields = doc.search('.vcard dt')
+
+     profile_fields.each do |node|
        label = node.inner_text
-       value = node.next_sibling.inner_text.strip
+       value = node.next_element.inner_text.strip
 
-       morph(label, value)  # morph magic happening here!
+       morph(label, value)  # morph magic adds accessor methods!
      end
    end
+
+   def member_since_date
+     Date.parse member_since
+   end
  end
 
  def Hubbit name; Hubbit.new name; end
 
-
 The model emerges from the data. Let's start by looking up 'why':
 
  why = Hubbit 'why'
 
 What new methods do we have?
 
- Hubbit.morph_methods # => ["email", "email=", "name", "name="]
+ Hubbit.morph_methods.map {|m| m.to_s}
+ #=> ["location", "location=", "member_since", "member_since=", "name", "name="]
 
 Ah-ha, so we have a name attribute now:
 
- why.name # => "why the lucky stiff"
+ why.name # => "Squatting until _why gets home."
+
+We wrote a +member_since_date+ method in our class, let's call that now:
+
+ why.member_since_date # => Wed, 19 Aug 2009
 
 
 Let's add some of why's projects:
@@ -85,8 +111,9 @@ Let's add some of why's projects:
 
 That why's a productive fellow! Note new accessor methods have been added:
 
- Hubbit.morph_methods
- # => ["email", "email=", "name", "name=", "projects", "projects="]
+ Hubbit.morph_methods.map {|m| m.to_s}
+ #=> ["location", "location=", "member_since", "member_since=", "name", "name=",
+ #    "projects", "projects="]
 
 
 Let's do some more morphing:
@@ -95,9 +122,10 @@ Let's do some more morphing:
 
 Do we have more methods now?
 
- Hubbit.morph_methods
- # => ["blog", "blog=", "company", "company=", "email", "email=",
- #    "location", "location=" "name", "name=", "projects", "projects="]
+ Hubbit.morph_methods.map {|m| m.to_s}
+ #=> ["company", "company=", "email", "email=", "location", "location=",
+ #    "member_since", "member_since=", "name", "name=", "projects", "projects=",
+ #    "website_blog", "website_blog="]
 
 So, a new company method has appeared:
 
@@ -109,16 +137,17 @@ So, a new company method has appeared:
 Time to generate an Active Record model? Get a sample script line like this:
 
  Hubbit.script_generate
- # => "ruby script/destroy rspec_model Hubbit;
- #    ruby script/generate rspec_model Hubbit blog:string company:string
- #        email:string location:string name:string projects:string"
+ #=> "rails destroy model Hubbit;
+ #    rails generate model Hubbit company:string email:string location:string
+ #          member_since:string name:string projects:string website_blog:string"
 
 or specify the generator:
 
- Hubbit.script_generate :generator => 'model'
- # => "ruby script/destroy model Hubbit;
- #     ruby script/generate model Hubbit blog:string company:string
- #         email:string location:string name:string projects:string"
+ Hubbit.script_generate :generator => 'rspec_model'
+ #=> "rails destroy rspec_model Hubbit;
+ #    rails generate rspec_model Hubbit company:string email:string
+ #          location:string member_since:string name:string projects:string
+ #          website_blog:string"
 
 You'll have to edit this as it currently sets all data types to be string, and
 doesn't understand associations.

data/Rakefile

@@ -1,29 +1,34 @@
 require 'rubygems'
-require 'lib/morph'
+require './lib/morph'
 
 begin
-  require 'spec'
+  require 'rspec'
 rescue LoadError
   puts "\nYou need to install the rspec gem to perform meta operations on this gem"
-  puts "  sudo gem install rspec\n"
+  puts "  gem install rspec\n"
 end
 
 begin
   require 'echoe'
 
-  Echoe.new("morph", Morph::VERSION) do |m|
+  Echoe.new("morph") do |m|
     m.author = ["Rob McKinnon"]
     m.email = ["rob ~@nospam@~ rubyforge.org"]
+    m.summary = 'Morph mixin allows you to emerge class definitions via calling assignment methods.'
     m.description = File.readlines("README").first
-    m.rubyforge_name = "morph"
+    m.url = 'https://github.com/robmckinnon/morph'
+    m.install_message = 'Read usage examples at: https://github.com/robmckinnon/morph#readme'
+    m.version = Morph::VERSION
+    m.project = "morph"
     m.rdoc_options << '--inline-source'
     m.rdoc_pattern = ["README", "CHANGELOG", "LICENSE"]
-    m.dependencies = ["activesupport >=2.0.2"]
+    m.runtime_dependencies = ["activesupport >=2.0.2"]
+    m.development_dependencies = ['rspec','echoe']
   end
 
 rescue LoadError
   puts "\nYou need to install the echoe gem to perform meta operations on this gem"
-  puts "  sudo gem install echoe\n\n"
+  puts "  gem install echoe\n\n"
 end
 
 desc "Open an irb session preloaded with this library"

data/examples/forger.rb

@@ -28,4 +28,4 @@ def Forger name
 end
 
 #> why = Forger 'why'
-#> dhh = Forger 'webster123'
+

data/examples/hubbit.rb

@@ -1,26 +1,27 @@
 require 'morph'
 
-require 'rubygems'; require 'hpricot'; require 'open-uri'
+require 'rubygems'; require 'nokogiri'; require 'open-uri'
 
-# An example of Morph playing with Hpricot
+# An example of Morph playing with Nokogiri
 class Hubbit
-
-  include Morph
+  include Morph  # allows class to morph
 
   def initialize name
-    begin
-      doc = Hpricot open("http://github.com/#{name}")
+    doc = Nokogiri::HTML open("https://github.com/#{name}")
+
+    profile_fields = doc.search('.vcard dt')
 
-      (doc/'label').collect do |node|
-        label = node.inner_text
-        value = node.next_sibling.inner_text.strip
+    profile_fields.each do |node|
+      label = node.inner_text
+      value = node.next_element.inner_text.strip
 
-        morph(label, value) # magic morphing happening here!
-      end
-    rescue
-      raise "Couldn't find hubbit with name: #{name}"
+      morph(label, value)  # morph magic adds accessor methods!
     end
   end
+
+  def member_since_date
+    Date.parse member_since
+  end
 end
 
 def Hubbit name

data/lib/morph.rb

@@ -18,7 +18,7 @@ rescue Exception => e
 end
 
 module Morph
-  VERSION = "0.3.2" unless defined? Morph::VERSION
+  VERSION = "0.3.3" unless defined? Morph::VERSION
 
   class << self
     def generate_migrations object, options={}
@@ -119,8 +119,10 @@ module Morph
             when Hash
               options[:belongs_to_id] = " #{name}_id:integer"
               migrations = add_migration(attribute, value, migrations, options)
+            when nil
+              # ignore
             else
-              puts 'hi'
+              puts 'not supported ' + value.inspect
           end
         end
         migrations
@@ -205,20 +207,11 @@ module Morph
       class_eval { define_method name, &block }
     end
 
-    def show_ruby
-      begin
-        require 'ruby2ruby'
-        puts Ruby2Ruby.translate(self)
-      rescue LoadError
-        puts "You need to install the ruby2ruby gem before calling show_ruby"
-      end
-    end
-
     def script_generate options={}
       name = self.name.to_s.split('::').last
       name = yield name if block_given?
-      generator = options[:generator] || 'rspec_model'
-      line = ["ruby script/destroy #{generator} #{name}; ruby script/generate #{generator} #{name}"]
+      generator = options[:generator] || 'model'
+      line = ["rails destroy #{generator} #{name}; rails generate #{generator} #{name}"]
       morph_methods.select{|m| not(m =~ /=$/) }.each {|attribute| line << " #{attribute}:string"}
       line.join('')
     end

data/morph.gemspec

@@ -1,34 +1,39 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{morph}
-  s.version = "0.3.2"
+  s.name = "morph"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rob McKinnon"]
-  s.date = %q{2010-10-20}
-  s.description = %q{Morph allows you to emerge class definitions via calling assignment methods; mix with Hpricot for screen scraping fun.
-}
+  s.date = "2011-09-21"
+  s.description = "Morph mixin allows you to emerge class definitions via calling assignment methods; mix with Nokogiri for screen scraping fun.\n"
   s.email = ["rob ~@nospam@~ rubyforge.org"]
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README"]
-  s.files = ["CHANGELOG", "examples/forger.rb", "examples/hubbit.rb", "lib/morph.rb", "LICENSE", "README", "spec/lib/morph_spec.rb", "spec/morph_spec_helper.rb", "spec/spec.opts", "Manifest", "morph.gemspec", "Rakefile"]
-  s.homepage = %q{}
+  s.files = ["CHANGELOG", "examples/forger.rb", "examples/hubbit.rb", "lib/morph.rb", "LICENSE", "README", "spec/lib/morph_spec.rb", "spec/morph_spec_helper.rb", "spec/spec_helper.rb", "Manifest", "morph.gemspec", "Rakefile"]
+  s.homepage = "https://github.com/robmckinnon/morph"
+  s.post_install_message = "Read usage examples at: https://github.com/robmckinnon/morph#readme"
   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.7}
-  s.summary = %q{Morph allows you to emerge class definitions via calling assignment methods; mix with Hpricot for screen scraping fun.}
+  s.rubyforge_project = "morph"
+  s.rubygems_version = "1.8.10"
+  s.summary = "Morph mixin allows you to emerge class definitions via calling assignment methods."
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.0.2"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<echoe>, [">= 0"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.0.2"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<echoe>, [">= 0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.0.2"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<echoe>, [">= 0"])
   end
 end

data/spec/lib/morph_spec.rb

@@ -1,9 +1,13 @@
 # encoding: utf-8
-require File.dirname(__FILE__) + '/../../lib/morph'
 require File.dirname(__FILE__) + '/../morph_spec_helper'
 
 describe Morph do
+  include MorphSpecHelperMethods
+
   describe "when writer method that didn't exist before is called with non-nil value" do
+    before :all do initialize_morph; end
+    after  :all do remove_morph_methods; end
+
     before :each do
       remove_morph_methods
       @quack = 'quack'
@@ -23,15 +27,15 @@ describe Morph do
     end
 
     it 'should generate rails model generator script line, with given model name' do
-      @morphed_class.script_generate {|model_name| 'SomethingDifferent'}.should == "ruby script/destroy rspec_model SomethingDifferent; ruby script/generate rspec_model SomethingDifferent noise:string"
+      @morphed_class.script_generate {|model_name| 'SomethingDifferent'}.should == "rails destroy model SomethingDifferent; rails generate model SomethingDifferent noise:string"
     end
 
     it 'should generate rails model generator script line' do
-      @morphed_class.script_generate.should == "ruby script/destroy rspec_model ExampleMorph; ruby script/generate rspec_model ExampleMorph noise:string"
+      @morphed_class.script_generate.should == "rails destroy model ExampleMorph; rails generate model ExampleMorph noise:string"
     end
 
     it 'should generate rails model generator script line' do
-      @morphed_class.script_generate(:generator=>'model').should == "ruby script/destroy model ExampleMorph; ruby script/generate model ExampleMorph noise:string"
+      @morphed_class.script_generate(:generator=>'model').should == "rails destroy model ExampleMorph; rails generate model ExampleMorph noise:string"
     end
   end
 
@@ -119,7 +123,7 @@ describe Morph do
 
     after :all do
       remove_morph_methods
-      @morphed_class.class_eval "remove_method :happy"
+      @morphed_class.class_eval "remove_method :happy" if @morphed_class
     end
 
     it 'should not return methods defined in class in morph_methods list' do
@@ -139,6 +143,8 @@ describe Morph do
   end
 
   describe 'when morph method used to set attribute value' do
+    before :all do initialize_morph; end
+    after  :all do remove_morph_methods; end
 
     before :each do
       remove_morph_methods
@@ -156,6 +162,9 @@ describe Morph do
   end
 
   describe 'when morph method used to set an attribute value hash' do
+    before :all do initialize_morph; end
+    after  :all do remove_morph_methods; end
+
     before :each do
       remove_morph_methods
       @attributes = [:drink,:sugars,:milk]
@@ -172,15 +181,19 @@ describe Morph do
     end
 
     it 'should generate rails model generator script line' do
-      @morphed_class.script_generate.should == "ruby script/destroy rspec_model ExampleMorph; ruby script/generate rspec_model ExampleMorph drink:string milk:string sugars:string"
+      @morphed_class.script_generate.should == "rails destroy model ExampleMorph; rails generate model ExampleMorph drink:string milk:string sugars:string"
     end
 
     it 'should generate rails model generator script line' do
-      @morphed_class.script_generate(:generator=>'model').should == "ruby script/destroy model ExampleMorph; ruby script/generate model ExampleMorph drink:string milk:string sugars:string"
+      @morphed_class.script_generate(:generator=>'model').should == "rails destroy model ExampleMorph; rails generate model ExampleMorph drink:string milk:string sugars:string"
     end
   end
 
+=begin
   describe "when morph method used to set unicode attribute name with a value" do
+    before :all do initialize_morph; end
+    after  :all do remove_morph_methods; end
+
     before :each do
       $KCODE = "u" unless RUBY_VERSION >= "1.9"
       remove_morph_methods
@@ -200,8 +213,10 @@ describe Morph do
       @morph.send(@attribute.to_sym) == @age
     end
   end
-
   describe "when morph method used to set japanese and latin unicode attribute name with a value" do
+    before :all do initialize_morph; end
+    after  :all do remove_morph_methods; end
+
     before :each do
       $KCODE = "u" unless RUBY_VERSION >= "1.9"
       remove_morph_methods
@@ -221,7 +236,7 @@ describe Morph do
       @morph.send(@attribute.to_sym) == @age
     end
   end
-
+=end
   describe 'when morph method used to set blank space attribute value' do
     before :each do
       remove_morph_methods
@@ -265,6 +280,9 @@ describe Morph do
 
   describe "when writer method called matches a class reader method" do
 
+    before :all do initialize_morph; end
+    after  :all do remove_morph_methods; end
+
     before :each do
       remove_morph_methods
       @value = 'Morph'
@@ -582,7 +600,7 @@ xsi_schema_location: xmlgwdev.companieshouse.gov.uk/v1-0/schema/CompanyDetails.x
 
       describe 'when class name and module name is supplied' do
         it 'should create classes and object instances' do
-          Object.const_set 'Ppc', Module.new
+          Object.const_set 'Ppc', Module.new unless defined? Ppc
           councillors = Morph.from_tsv(tsv, 'Councillor', Ppc)
           check_councillors councillors, 'Ppc::Councillor'
         end
@@ -606,7 +624,7 @@ Ali Davidson	labour		Basildon District Council
 
       describe 'when class name and module name is supplied' do
         it 'should create classes and object instances' do
-          Object.const_set 'Ppc', Module.new
+          Object.const_set 'Ppc', Module.new unless defined? Ppc
           councillors = Morph.from_csv(csv, 'Councillor', Ppc)
           check_councillors councillors, 'Ppc::Councillor', nil
         end

data/spec/morph_spec_helper.rb

@@ -29,8 +29,16 @@ module MorphSpecHelperMethods
 
   def remove_morph_methods
     @morphed_class.instance_methods.each do |method|
-      @morphed_class.class_eval "remove_method :#{method}" unless @original_instance_methods.include?(method)
-    end
+      begin
+        unless method.to_s[/received_message\?|should_not_receive|rspec_verify|unstub|rspec_reset|should_receive|as_null_object|stub_chain|stub\!|null_object?|stub/]
+          remove_cmd = "remove_method :#{method}"
+          @morphed_class.class_eval remove_cmd unless @original_instance_methods.include?(method)
+        end
+      rescue Exception => e
+        raise e.to_s + '------' + @original_instance_methods.sort.inspect
+      end
+
+    end if @morphed_class
   end
 
   def remove_another_morph_methods
@@ -62,7 +70,7 @@ module MorphSpecHelperMethods
   end
 end
 
-describe "class with generated accessor methods added", :shared => true do
+shared_examples_for "class with generated accessor methods added" do
 
   include MorphSpecHelperMethods
   before :all do initialize_morph; end
@@ -106,7 +114,7 @@ describe "class with generated accessor methods added", :shared => true do
 
 end
 
-describe "class without generated accessor methods added", :shared => true do
+shared_examples_for "class without generated accessor methods added" do
   include MorphSpecHelperMethods
 
   before :all do

data/spec/spec_helper.rb

@@ -0,0 +1,3 @@
+RSpec.configure do |config|
+  config.mock_with :rspec
+end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: morph
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 2
-  version: 0.3.2
+  prerelease: 
+  version: 0.3.3
 platform: ruby
 authors: 
 - Rob McKinnon
@@ -15,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-20 00:00:00 +01:00
-default_executable: 
+date: 2011-09-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -26,16 +20,33 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 0
-        - 2
         version: 2.0.2
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: echoe
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: |
-  Morph allows you to emerge class definitions via calling assignment methods; mix with Hpricot for screen scraping fun.
+  Morph mixin allows you to emerge class definitions via calling assignment methods; mix with Nokogiri for screen scraping fun.
 
 email: 
 - rob ~@nospam@~ rubyforge.org
@@ -56,15 +67,14 @@ files:
 - README
 - spec/lib/morph_spec.rb
 - spec/morph_spec_helper.rb
-- spec/spec.opts
+- spec/spec_helper.rb
 - Manifest
 - morph.gemspec
 - Rakefile
-has_rdoc: true
-homepage: ""
+homepage: https://github.com/robmckinnon/morph
 licenses: []
 
-post_install_message: 
+post_install_message: "Read usage examples at: https://github.com/robmckinnon/morph#readme"
 rdoc_options: 
 - --line-numbers
 - --inline-source
@@ -80,26 +90,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   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
       version: "1.2"
 requirements: []
 
 rubyforge_project: morph
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Morph allows you to emerge class definitions via calling assignment methods; mix with Hpricot for screen scraping fun.
+summary: Morph mixin allows you to emerge class definitions via calling assignment methods.
 test_files: []
 

data/spec/spec.opts

@@ -1,7 +0,0 @@
---colour
---format
-progress
---loadby
-mtime
---reverse
---backtrace