@@ -1,5 +1,4 @@ $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib')) -require 'rubygems' require 'date' require 'doodle' require "yaml" @@ -27,7 +26,7 @@ class Event end end has :locations, :collect => {:place => :Location} -end +end event = Event "Festival" do date '2018-04-01' @@ -89,16 +88,16 @@ e = Event(hash_data) pp e __END__ ---- !ruby/object:Event +--- !ruby/object:Event date: 2000-04-01 -locations: -- !ruby/object:Location +locations: +- !ruby/object:Location events: [] name: The muddy field -- !ruby/object:Location - events: - - !ruby/object:Event +- !ruby/object:Location + events: + - !ruby/object:Event locations: [] name: Drinking examples/event-location.rb @@ -1,4 +1,3 @@ -require 'rubygems' require 'doodle/app' class Filter < Doodle::App examples/filter.rb @@ -48,7 +48,7 @@ class Mail < Doodle end end end - + def send_message if true puts msg @@ -60,7 +60,6 @@ class Mail < Doodle end end -require 'rubygems' require 'highline/import' def prompt_for_password ask("Enter your password: ") { |q| q.echo = '*' } @@ -78,15 +77,15 @@ class GMail < Mail # end has :host, :default => 'localhost.localdomain' has :message_format, :default => 'plain' - + def send_message puts msg return - ::Net::SMTP.start(mail_server, + ::Net::SMTP.start(mail_server, port, - host, - username, - password, + host, + username, + password, message_format) do |smtp| smtp.send_message(msg, from, to) end examples/mail-datatypes.rb @@ -1,6 +1,5 @@ # RUBYLIB=lib xmpfilter #: requires -require 'rubygems' require 'doodle' require 'doodle/xml' examples/xml1.rb @@ -1,7 +1,6 @@ $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib')) $:.unshift(File.join(File.dirname(__FILE__), '.')) -require 'rubygems' require 'yaml' require 'doodle' require 'pp' @@ -17,7 +16,7 @@ end yaml = %[ --- -:address: +:address: - Henry Wood House - London :name: Sean @@ -29,11 +28,11 @@ yaml = person.to_yaml puts yaml yaml = %[ ---- !ruby/object:Person -address: -- !ruby/object:AddressLine +--- !ruby/object:Person +address: +- !ruby/object:AddressLine text: Henry Wood House -- !ruby/object:AddressLine +- !ruby/object:AddressLine text: London name: Sean ] examples/yaml-example2.rb @@ -18,9 +18,9 @@ module ModNormalizedHash #p [:block, h, k] res = normalize_value(original_block[h, normalize_key(k)]) #p [:block_self, self, res] - each do |k, v| + each do |k2, v2| #p [:init_block, k, v] - self[k] = normalize_value(v) + self[k2] = normalize_value(v2) end #p [:block_res, self, res] res lib/doodle/normalized_hash.rb @@ -1,4 +1,3 @@ -require 'rubygems' # some prob with different versions of libxml on different platforms # begin # require 'nokogiri' lib/doodle/xml.rb @@ -1,10 +1,4 @@ -begin - require 'spec' -rescue LoadError - require 'rubygems' - gem 'rspec' - require 'spec' -end +require 'spec' $:.unshift(File.dirname(__FILE__) + '/../lib') require 'doodle' spec/spec_helper.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/spec_helper.rb' require 'yaml' -describe 'Doodle', 'block initialization of scalar attributes' do +describe 'Doodle', 'to_hash' do temporary_constant :Foo, :Bar, :Farm, :Barn, :Animal do before :each do class ::Animal < Doodle @@ -31,8 +31,8 @@ describe 'Doodle', 'block initialization of scalar attributes' do farm.to_string_hash.should_be( {"barn"=>{"animals"=>[{"species"=>"pig"}]}} ) end - it 'should do something sensible with Proc-valued attributes' do - pending + it 'should not nuke Proc-valued attributes' do + pending "rewrite of to_hash" source_block = proc { puts "hello" } b = Bar do block(&source_block) spec/to_hash_spec.rb @@ -1,4 +1,4 @@ -require 'rubygems' + require 'doodle' require 'pp' www/content/examples/animal-house.rb @@ -1,4 +1,4 @@ -require 'rubygems' + require 'doodle' class Life < Doodle www/content/examples/answer-const.rb @@ -1,4 +1,4 @@ -require 'rubygems' + require 'doodle' class Life < Doodle www/content/examples/answer.rb @@ -1,6 +1,6 @@ #: requires # $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib')) -require 'rubygems' + require 'doodle' #: require_other require 'pp' www/content/examples/castor-xml-example.rb @@ -1,6 +1,6 @@ #: requires # $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib')) -require 'rubygems' + require 'doodle' #: require_xml require 'doodle/xml' www/content/examples/castor-xml-example2.rb @@ -1,5 +1,5 @@ # from http://configtoolkit.rubyforge.org/ -require 'rubygems' + require 'configtoolkit' require 'uri' www/content/examples/config-toolkit-machine-config.rb @@ -1,5 +1,5 @@ #:requires -require 'rubygems' + require 'configtoolkit' require 'configtoolkit/hashreader' require 'config-toolkit-machine-config' www/content/examples/config-toolkit-run-machine-config.rb @@ -1,4 +1,4 @@ -require 'rubygems' + require 'configtoolkit' require 'configtoolkit/hashreader' require 'yaml' www/content/examples/config-toolkit.rb @@ -1,5 +1,5 @@ #: requires -require 'rubygems' + require 'doodle' #: definition class Event < Doodle www/content/examples/conversions1.rb @@ -1,5 +1,5 @@ #: requires -require 'rubygems' + require 'doodle' #: d1 class Event < Doodle www/content/examples/conversions2.rb @@ -1,5 +1,3 @@ -#: rubygems -require 'rubygems' #: requires require 'doodle' require 'doodle/datatypes' www/content/examples/doodle-machine-config.rb @@ -1,5 +1,5 @@ #: requires -require 'rubygems' + require 'doodle' require 'event' #: use www/content/examples/eg-defer-validation-1.rb @@ -1,5 +1,5 @@ #: requires -require 'rubygems' + require 'doodle' require 'event' #: use www/content/examples/eg-defer-validation-2.rb @@ -1,5 +1,5 @@ #: requires -require 'rubygems' + require 'doodle' require 'event' #: use www/content/examples/eg-defer-validation-3.rb @@ -1,5 +1,5 @@ #: requires -require 'rubygems' + require 'date' require 'pp' require 'doodle' www/content/examples/eg-event.rb @@ -1,4 +1,4 @@ -require 'rubygems' + #:requires require 'doodle' require 'doodle/json' www/content/examples/eg-json-person.rb @@ -1,5 +1,5 @@ #: requires -require 'rubygems' + require 'doodle' #: definition www/content/examples/eg-string-collector.rb @@ -1,5 +1,5 @@ #: requires -require 'rubygems' + require 'doodle' #: definitions class Event < Doodle www/content/examples/eg-validation-date.rb @@ -1,5 +1,5 @@ #: requires -require 'rubygems' + require 'doodle' #: all class Event < Doodle www/content/examples/eg-validation3.rb @@ -1,5 +1,5 @@ #: requires -require 'rubygems' + require 'doodle' #: definitions class Event < Doodle www/content/examples/eg-validations1.rb @@ -1,5 +1,5 @@ #: requires -require 'rubygems' + require 'doodle' #: all class Event < Doodle www/content/examples/eg-validations2.rb @@ -1,5 +1,5 @@ #: requires -require 'rubygems' + require 'doodle' #: all class Event < Doodle www/content/examples/eg-validations3.rb @@ -1,5 +1,4 @@ #: requires -require "rubygems" require "doodle" require "yaml" #: all www/content/examples/eg-validations4.rb @@ -1,4 +1,4 @@ -require 'rubygems' + require 'doodle' class Life < Doodle www/content/examples/eg1.rb @@ -1,5 +1,3 @@ -#: rubygems -require 'rubygems' #: requires require 'doodle' require 'doodle/datatypes' www/content/examples/machine-config.rb @@ -1,4 +1,4 @@ -require 'rubygems' + require 'wiki_creole' require File.expand_path(File.join(File.dirname(__FILE__), 'creole_coderay_plugin')) www/lib/webby/filters/creole.rb @@ -1,7 +1,7 @@ # provide the means to import source code into webby site # running through xmpfilter and selecting sections # with pre and post filters -require 'rubygems' + require 'wiki_creole' require 'coderay' require 'shellwords' www/lib/webby/filters/creole_coderay_plugin.rb @@ -1,5 +1,5 @@ #!/usr/bin/env ruby -require 'rubygems' + require 'sinatra' get '/' do www/sin.rb @@ -1,5 +1,5 @@ #!/usr/bin/env ruby -require 'rubygems' + require 'directory_watcher' dw = DirectoryWatcher.new(".", :glob => "**/*", :pre_load => true) www/watcher.rb fe4f02e73cbaf7195b51ed3ea71877160e82340f Sean O'Halpin sean.ohalpin@gmail.com http://github.com/seanohalpin/doodle/commit/8dcc0441189cfc59c32bcd8f1435b4688ec70bab 8dcc0441189cfc59c32bcd8f1435b4688ec70bab 2009-03-15T16:45:21-07:00 2009-03-15T16:45:21-07:00 removed all references to rubygems b48e20a9d701c14b83df5f92dc3074781892efeb Sean O'Halpin sean.ohalpin@gmail.com