@@ -105,7 +105,6 @@ lib/imw/utils/extensions/uri.rb lib/imw/utils/log.rb lib/imw/utils/misc.rb lib/imw/utils/paths.rb -lib/imw/utils/random.rb lib/imw/utils/uri.rb lib/imw/utils/uuid.rb lib/imw/utils/validate.rb @@ -139,185 +138,14 @@ meta/notes/about-rdoc.txt old/spec/imw/rip_test.rb old/spec/imw/utils/validate_test.rb old/spec/rspec_autotest.rb -pkg/imw-0.1.0.gem -pkg/imw-0.1.0.tar.gz -pkg/imw-0.1.0/CHANGELOG -pkg/imw-0.1.0/Manifest -pkg/imw-0.1.0/README-commands -pkg/imw-0.1.0/README-license -pkg/imw-0.1.0/README-organization.txt -pkg/imw-0.1.0/README-overview -pkg/imw-0.1.0/README.rdoc -pkg/imw-0.1.0/Rakefile -pkg/imw-0.1.0/TAGS -pkg/imw-0.1.0/TODO -pkg/imw-0.1.0/TODO-scraper.TODO -pkg/imw-0.1.0/etc/directories.yaml -pkg/imw-0.1.0/etc/icss/metadata-rights.icss.yaml -pkg/imw-0.1.0/etc/icss/skel.icss.yaml -pkg/imw-0.1.0/etc/imwrc.rb -pkg/imw-0.1.0/etc/taxonomy.yaml -pkg/imw-0.1.0/imw.gemspec -pkg/imw-0.1.0/imw.org -pkg/imw-0.1.0/lib/imw.rb -pkg/imw-0.1.0/lib/imw/boot.rb -pkg/imw-0.1.0/lib/imw/chunk_store/cached_uri.rb -pkg/imw-0.1.0/lib/imw/chunk_store/chunk.rb -pkg/imw-0.1.0/lib/imw/chunk_store/scrape.rb -pkg/imw-0.1.0/lib/imw/chunk_store/scrape_request.rb -pkg/imw-0.1.0/lib/imw/chunk_store/tracker.rb -pkg/imw-0.1.0/lib/imw/chunk_store/uri_file_store.rb -pkg/imw-0.1.0/lib/imw/chunk_store/uri_file_store_junk.rb -pkg/imw-0.1.0/lib/imw/dataset.rb -pkg/imw-0.1.0/lib/imw/dataset/datamapper.rb -pkg/imw-0.1.0/lib/imw/dataset/datamapper/time_and_user_stamps.rb -pkg/imw-0.1.0/lib/imw/dataset/loaddump.rb -pkg/imw-0.1.0/lib/imw/dataset/old/file_collection.rb -pkg/imw-0.1.0/lib/imw/dataset/old/file_collection_utils.rb -pkg/imw-0.1.0/lib/imw/dataset/scaffold.rb -pkg/imw-0.1.0/lib/imw/dataset/scraped_uri.rb -pkg/imw-0.1.0/lib/imw/dataset/scrub/old_working_scrubber.rb -pkg/imw-0.1.0/lib/imw/dataset/scrub/scrub.rb -pkg/imw-0.1.0/lib/imw/dataset/scrub/scrub_simple_url.rb -pkg/imw-0.1.0/lib/imw/dataset/scrub/scrub_test.rb -pkg/imw-0.1.0/lib/imw/dataset/scrub/slug.rb -pkg/imw-0.1.0/lib/imw/dataset/stats.rb -pkg/imw-0.1.0/lib/imw/dataset/stats/counter.rb -pkg/imw-0.1.0/lib/imw/dataset/task.rb -pkg/imw-0.1.0/lib/imw/dataset/workflow.rb -pkg/imw-0.1.0/lib/imw/extract/flat_file_parser.rb -pkg/imw-0.1.0/lib/imw/extract/hpricot.rb -pkg/imw-0.1.0/lib/imw/extract/html_parser/match_tree.rb -pkg/imw-0.1.0/lib/imw/extract/html_parser/matcher.rb -pkg/imw-0.1.0/lib/imw/extract/loaddump.rb -pkg/imw-0.1.0/lib/imw/files.rb -pkg/imw-0.1.0/lib/imw/files/archive.rb -pkg/imw-0.1.0/lib/imw/files/basicfile.rb -pkg/imw-0.1.0/lib/imw/files/binary.rb -pkg/imw-0.1.0/lib/imw/files/compressed_file.rb -pkg/imw-0.1.0/lib/imw/files/compressed_files_and_archives.rb -pkg/imw-0.1.0/lib/imw/files/compressible.rb -pkg/imw-0.1.0/lib/imw/files/csv.rb -pkg/imw-0.1.0/lib/imw/files/json.rb -pkg/imw-0.1.0/lib/imw/files/sgml.rb -pkg/imw-0.1.0/lib/imw/files/text.rb -pkg/imw-0.1.0/lib/imw/files/yaml.rb -pkg/imw-0.1.0/lib/imw/infochimps/ics-rails-datamapper-migration-maker.rb -pkg/imw-0.1.0/lib/imw/infochimps/ics-wreck_and_migrate.rb -pkg/imw-0.1.0/lib/imw/infochimps/ics_models_more.rb -pkg/imw-0.1.0/lib/imw/infochimps/icss.rb -pkg/imw-0.1.0/lib/imw/infochimps/infochimps_models.rb -pkg/imw-0.1.0/lib/imw/infochimps/infochimps_resource.rb -pkg/imw-0.1.0/lib/imw/infochimps/link.rb -pkg/imw-0.1.0/lib/imw/infochimps/metadataset.rb -pkg/imw-0.1.0/lib/imw/model/source.rb -pkg/imw-0.1.0/lib/imw/package.rb -pkg/imw-0.1.0/lib/imw/package/to_archive.rb -pkg/imw-0.1.0/lib/imw/parsers.rb -pkg/imw-0.1.0/lib/imw/parsers/flat_file_parser.rb -pkg/imw-0.1.0/lib/imw/parsers/html_parser.rb -pkg/imw-0.1.0/lib/imw/parsers/html_parser/matchers.rb -pkg/imw-0.1.0/lib/imw/parsers/line_parser.rb -pkg/imw-0.1.0/lib/imw/pool.rb -pkg/imw-0.1.0/lib/imw/reconcile.rb -pkg/imw-0.1.0/lib/imw/reconcile/canonicalize_by_mapping.rb -pkg/imw-0.1.0/lib/imw/rip.rb -pkg/imw-0.1.0/lib/imw/rip/database.rb -pkg/imw-0.1.0/lib/imw/rip/feed.rb -pkg/imw-0.1.0/lib/imw/rip/http.rb -pkg/imw-0.1.0/lib/imw/rip/local.rb -pkg/imw-0.1.0/lib/imw/transform.rb -pkg/imw-0.1.0/lib/imw/utils.rb -pkg/imw-0.1.0/lib/imw/utils/archive.rb -pkg/imw-0.1.0/lib/imw/utils/components.rb -pkg/imw-0.1.0/lib/imw/utils/config.rb -pkg/imw-0.1.0/lib/imw/utils/error.rb -pkg/imw-0.1.0/lib/imw/utils/extensions/array.rb -pkg/imw-0.1.0/lib/imw/utils/extensions/class/attribute_accessors.rb -pkg/imw-0.1.0/lib/imw/utils/extensions/core.rb -pkg/imw-0.1.0/lib/imw/utils/extensions/dir.rb -pkg/imw-0.1.0/lib/imw/utils/extensions/file_core.rb -pkg/imw-0.1.0/lib/imw/utils/extensions/fileutils.rb -pkg/imw-0.1.0/lib/imw/utils/extensions/find.rb -pkg/imw-0.1.0/lib/imw/utils/extensions/hash.rb -pkg/imw-0.1.0/lib/imw/utils/extensions/hpricot.rb -pkg/imw-0.1.0/lib/imw/utils/extensions/string.rb -pkg/imw-0.1.0/lib/imw/utils/extensions/struct.rb -pkg/imw-0.1.0/lib/imw/utils/extensions/symbol.rb -pkg/imw-0.1.0/lib/imw/utils/extensions/typed_struct.rb -pkg/imw-0.1.0/lib/imw/utils/extensions/uri.rb -pkg/imw-0.1.0/lib/imw/utils/log.rb -pkg/imw-0.1.0/lib/imw/utils/misc.rb -pkg/imw-0.1.0/lib/imw/utils/paths.rb -pkg/imw-0.1.0/lib/imw/utils/random.rb -pkg/imw-0.1.0/lib/imw/utils/uri.rb -pkg/imw-0.1.0/lib/imw/utils/uuid.rb -pkg/imw-0.1.0/lib/imw/utils/validate.rb -pkg/imw-0.1.0/lib/imw/utils/version.rb -pkg/imw-0.1.0/lib/imw/utils/view.rb -pkg/imw-0.1.0/lib/imw/utils/view/dump_csv.rb -pkg/imw-0.1.0/lib/imw/utils/view/dump_csv_older.rb -pkg/imw-0.1.0/lib/tasks/boot.rb -pkg/imw-0.1.0/lib/tasks/db.rake -pkg/imw-0.1.0/lib/tasks/dev/devutils.rake -pkg/imw-0.1.0/lib/tasks/dev/makegem.rake -pkg/imw-0.1.0/lib/tasks/dump.rake -pkg/imw-0.1.0/lib/tasks/load.rake -pkg/imw-0.1.0/lib/tasks/main.rake -pkg/imw-0.1.0/lib/tasks/munge.rake -pkg/imw-0.1.0/lib/tasks/munge/lint.rake -pkg/imw-0.1.0/lib/tasks/paths.rake -pkg/imw-0.1.0/lib/tasks/pkg.rake -pkg/imw-0.1.0/lib/tasks/pool.rake -pkg/imw-0.1.0/lib/tasks/prep.rake -pkg/imw-0.1.0/lib/tasks/rip.rake -pkg/imw-0.1.0/meta/design/bs/principles.txt -pkg/imw-0.1.0/meta/design/notes/about_textile.txt -pkg/imw-0.1.0/meta/design/notes/about_w3schema_dublincore.txt -pkg/imw-0.1.0/meta/design/notes/about_w3schema_fiddle.txt -pkg/imw-0.1.0/meta/design/schema_format.txt -pkg/imw-0.1.0/meta/model/imw_struct.rb -pkg/imw-0.1.0/meta/model/schemadb_schema.rb -pkg/imw-0.1.0/meta/model/tag_list.rb -pkg/imw-0.1.0/meta/notes/about-rdoc.txt -pkg/imw-0.1.0/old/spec/imw/rip_test.rb -pkg/imw-0.1.0/old/spec/imw/utils/validate_test.rb -pkg/imw-0.1.0/old/spec/rspec_autotest.rb -pkg/imw-0.1.0/spec/imw/dataset/datamapper/uri_spec.rb -pkg/imw-0.1.0/spec/imw/dataset/datamapper_spec_helper.rb -pkg/imw-0.1.0/spec/imw/files/samples/sample.csv -pkg/imw-0.1.0/spec/imw/files/samples/sample.tsv -pkg/imw-0.1.0/spec/imw/files/samples/sample.xml -pkg/imw-0.1.0/spec/imw/files/samples/sample.yaml -pkg/imw-0.1.0/spec/imw/matchers/archive_contents_matcher.rb -pkg/imw-0.1.0/spec/imw/matchers/directory_contents_matcher.rb -pkg/imw-0.1.0/spec/imw/matchers/file_contents_matcher.rb -pkg/imw-0.1.0/spec/imw/matchers/without_regard_to_order_matcher.rb -pkg/imw-0.1.0/spec/imw/model/directory_spec.rb -pkg/imw-0.1.0/spec/imw/model/files/archive_spec.rb -pkg/imw-0.1.0/spec/imw/model/files/bz2_spec.rb -pkg/imw-0.1.0/spec/imw/model/files/compressed_file_spec.rb -pkg/imw-0.1.0/spec/imw/model/files/compressible_spec.rb -pkg/imw-0.1.0/spec/imw/model/files/file_spec.rb -pkg/imw-0.1.0/spec/imw/model/files/gz_spec.rb -pkg/imw-0.1.0/spec/imw/model/files/rar_spec.rb -pkg/imw-0.1.0/spec/imw/model/files/tar_spec.rb -pkg/imw-0.1.0/spec/imw/model/files/text_spec.rb -pkg/imw-0.1.0/spec/imw/model/files/zip_spec.rb -pkg/imw-0.1.0/spec/imw/utils/extensions/file_core_spec.rb -pkg/imw-0.1.0/spec/imw/utils/extensions/find_spec.rb -pkg/imw-0.1.0/spec/imw/utils/paths_spec.rb -pkg/imw-0.1.0/spec/imw/workflow/rip/local_spec.rb -pkg/imw-0.1.0/spec/imw/workflow/rip_spec.rb -pkg/imw-0.1.0/spec/rcov.opts -pkg/imw-0.1.0/spec/spec.opts -pkg/imw-0.1.0/spec/spec_helper.rb +spec/imw/#files_spec.rb# spec/imw/dataset/datamapper/uri_spec.rb spec/imw/dataset/datamapper_spec_helper.rb spec/imw/files/samples/sample.csv spec/imw/files/samples/sample.tsv spec/imw/files/samples/sample.xml spec/imw/files/samples/sample.yaml +spec/imw/files_spec.rb spec/imw/matchers/archive_contents_matcher.rb spec/imw/matchers/directory_contents_matcher.rb spec/imw/matchers/file_contents_matcher.rb @@ -341,3 +169,4 @@ spec/imw/workflow/rip_spec.rb spec/rcov.opts spec/spec.opts spec/spec_helper.rb +spec/support/random.rb Manifest @@ -19,7 +19,7 @@ module IMW module Files module BasicFile - attr_reader :uri, :path, :dirname, :basename, :extname, :name + attr_reader :uri, :host, :path, :dirname, :basename, :extname, :name protected @@ -28,11 +28,12 @@ module IMW when uri.is_a?(String); URI.parse(uri) when uri.is_a?(URI::Generic) || uri.superclass.is_a?(URI::Generic); uri end - @path = self.uri.path - @dirname = ::File.dirname path + @host = self.uri.host + @path = local? ? ::File.expand_path(self.uri.path) : self.uri.path + @dirname = ::File.dirname path @basename = ::File.basename path - @extname = find_extname - @name = @basename[0,@basename.length - @extname.length] + @extname = find_extname + @name = @basename[0,@basename.length - @extname.length] end # Some files (like <tt>.tar.gz</tt>) have an "extra" extension. @@ -47,7 +48,7 @@ module IMW # Is this file on the local machine (the scheme of the file's URI is nil or def local? - uri.host == 'file' || uri.host.nil? + host == 'file' || host.nil? end # Is this file on a remote machine? lib/imw/files/basicfile.rb de9981947c40f2d940360272389cfac4aea527e5 Dhruv Bansal dhruv@ph.utexas.edu http://github.com/infochimps/imw/commit/737e3d1e7530d5d867f0e4be7f6855c89ee6ab0c 737e3d1e7530d5d867f0e4be7f6855c89ee6ab0c 2009-10-07T22:51:48-07:00 2009-10-07T22:51:48-07:00 Couple of bugs with expanding paths were fixed. 5b578dff2ded3f6c6cf6689a4726692ff066d692 Dhruv Bansal dhruv@ph.utexas.edu