smilodon 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/smilodon/fakes.rb

@@ -27,3 +27,13 @@ module FakePopulatorWithOverriddenDirectory
   # Populate the test file.
   populates 'TestFile', :directory => 'db/populate/files'
 end
+
+# A fake populator module with overridden directory for testing.
+module FakePopulatorWithMultipleFiles
+
+  # Extend it with the Populator module.
+  extend Smilodon::Populator
+
+  # Populate the test file.
+  populates 'TestFile1', 'TestFile2', 'TestFile3', :directory => 'db/populate/files'
+end

data/lib/smilodon.rb

@@ -1,5 +1,6 @@
 require 'smilodon/errors'
 require 'smilodon/logger'
+require 'csv'
 
 # Smilodon includes helper methods to ease parsing data files.
 # Assigning a header and iterating over rows is handled by the
@@ -30,22 +31,24 @@ module Smilodon
     # Default data file type is CSV.
     TYPE = 'csv'
 
-    # Attribute accessors for the directory, file name, header, count, rows and before hook.
-    attr_accessor :logger, :directory, :file, :type, :header, :count, :rows, :before
+    # Attribute accessors for the directory, file name, header, rows and before hook.
+    attr_accessor :logger, :directory, :files, :type, :header, :rows, :before
 
     # Configuration helper.
     #
-    # @param [String] file The data file name.
+    # @param [Array] args an array of strings with an optional options hash
     # @option options [String] :directory ('db/populate/data_files') The location of the data file.
     # @option options [String] :type ('csv') The data file type.
     # @option options [Boolean] :header Set true if the file has a header.
     # @option options [String] :before The method to call before the run.
-    def populates(file, options = {})
+    def populates(*args)
       # Setup the logger to log populator warnings and messages.
       self.logger = PopulateLogger.setup
 
+      options = args.last.is_a?(Hash) ? args.pop : {}
+
+      self.files = args
       self.directory = options[:directory] || DIRECTORY
-      self.file = file
       self.type = options[:type] || TYPE
       self.header = options[:header]
       self.before = options[:before]
@@ -56,19 +59,20 @@ module Smilodon
     # @return [Boolean] Returns true if all rows are processed successfully.
     def run
 
-      # Call the before hook if defined.
-      #
-      # @usage
-      #   populates 'TestFile', :before => :inactivate
-      send(before) if before
+      files.each do |f|
+        # Call the before hook if defined.
+        #
+        # @usage
+        #   populates 'TestFile', :before => :inactivate
+        send(before) if before
 
-      rows = parser.parse(read)
-      self.count = header ? rows.count - 1 : rows.count
-      self.header = rows.shift if header
-      count.times { process(rows.shift) }
+        rows = parser.parse(read(f))
+        rows.shift if header
+        rows.count.times { process(rows.shift) }
+      end
 
       # Return true when all rows are processed.
-      return true
+      true
     end
 
     # Stub method to be defined in the extended module.
@@ -82,6 +86,7 @@ module Smilodon
     
     # The parser to use based on the type of data file.
     #
+    # @param [String] Name of file to be read
     # @return [Parser, #parse] Returns the parser class to use.
     def parser
       if type == 'csv'
@@ -93,19 +98,24 @@ module Smilodon
     # Absolute path for the data file.
     # 
     # @return [String] The absolute path.
-    def path
-      "#{Rails.root}/#{directory}/#{file}.#{type}"
+    def path(file)
+      if defined?(Rails) 
+        "#{Rails.root}/#{directory}/#{file}.#{type}"
+      else
+        "#{directory}/#{file}.#{type}"
+      end
     end
 
     # Reads the data file.
     #
+    # @param [String] Name of file to be read
     # @return [File] The data file contents.
     # @raise [DataFileNotConfigured] Raises an exception when the file is not configured.
     # @raise [MissingDataFile] Raises an exception when the configured file is missing.
-    def read
+    def read(file)
       raise DataFileNotConfigured unless file
-      raise MissingDataFile unless File.exist?(path)
-      File.read path
+      raise MissingDataFile unless File.exist?(path(file))
+      File.read path(file)
     end
   end
 end

data/smilodon.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{smilodon}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Umang Chouhan"]
-  s.date = %q{2011-07-11}
+  s.date = %q{2012-02-08}
   s.description = %q{Smilodon is a utility to parse data files.}
   s.email = %q{uchouhan@optimiscorp.com}
   s.extra_rdoc_files = [
@@ -32,7 +32,6 @@ Gem::Specification.new do |s|
     "lib/smilodon/tasks.rb",
     "lib/tasks/populate.rake",
     "lib/tasks/populate.yml",
-    "populator.gemspec",
     "smilodon.gemspec",
     "spec/lib/smilodon_spec.rb",
     "spec/lib/tasks/populate_spec.rb",
@@ -41,7 +40,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/optimis/smilodon}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.3}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Smilodon is a utility to parse data files.}
 
   if s.respond_to? :specification_version then

data/spec/lib/smilodon_spec.rb

@@ -23,7 +23,7 @@ end
 
 describe FakePopulator, '.file' do
   it 'should return the configured file name' do
-    FakePopulator.file.should == 'TestFile'
+    FakePopulator.files.should == ['TestFile']
   end
 end
 
@@ -48,3 +48,18 @@ describe FakePopulator, '.process(row)' do
     }.should raise_exception(MethodNotOverridden)
   end
 end
+
+describe FakePopulator, '.files' do
+  it 'should return the configured file names' do
+    FakePopulatorWithMultipleFiles.files.should == ['TestFile1', 'TestFile2', 'TestFile3']
+  end
+
+  it 'should handle an options hash' do
+    FakePopulatorWithMultipleFiles.directory.should == 'db/populate/files'
+  end
+
+  it 'calls read for each file passed to populate' do
+    FakePopulatorWithMultipleFiles.files.each { |f| FakePopulatorWithMultipleFiles.should_receive(:read).with(f).and_return('') }
+    FakePopulatorWithMultipleFiles.run
+  end
+end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: smilodon
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: 
-  version: 0.2.2
+  segments: 
+  - 0
+  - 2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Umang Chouhan
@@ -10,75 +15,101 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-11 00:00:00 -07:00
+date: 2012-02-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: logging
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  prerelease: false
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  prerelease: false
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 6
+        - 0
         version: 1.6.0
-  type: :development
-  prerelease: false
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  prerelease: false
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  prerelease: false
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
         version: 2.3.0
-  type: :development
-  prerelease: false
-  version_requirements: *id004
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  prerelease: false
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-  type: :development
-  prerelease: false
-  version_requirements: *id005
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+  prerelease: false
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
         version: 0.6.0
-  type: :development
-  prerelease: false
-  version_requirements: *id006
+  requirement: *id006
 description: Smilodon is a utility to parse data files.
 email: uchouhan@optimiscorp.com
 executables: []
@@ -104,7 +135,6 @@ files:
 - lib/smilodon/tasks.rb
 - lib/tasks/populate.rake
 - lib/tasks/populate.yml
-- populator.gemspec
 - smilodon.gemspec
 - spec/lib/smilodon_spec.rb
 - spec/lib/tasks/populate_spec.rb
@@ -123,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 571169230994044764
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -132,11 +162,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Smilodon is a utility to parse data files.

data/populator.gemspec

@@ -1,70 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{populator}
-  s.version = "0.1.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Umang Chouhan"]
-  s.date = %q{2011-05-12}
-  s.description = %q{Populator is a utility to parse data files.}
-  s.email = %q{uchouhan@optimiscorp.com}
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lib/populator.rb",
-    "lib/populator/errors.rb",
-    "lib/populator/fakes.rb",
-    "lib/populator/logger.rb",
-    "populator.gemspec",
-    "spec/populator_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/optimis/populator}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Populator is a utility to parse data files.}
-
-  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<logging>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
-    else
-      s.add_dependency(%q<logging>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<yard>, ["~> 0.6.0"])
-    end
-  else
-    s.add_dependency(%q<logging>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<yard>, ["~> 0.6.0"])
-  end
-end
-