iain-fill 0.0.1 → 0.0.2

data/Manifest

@@ -1,7 +1,12 @@
 Manifest
 README.rdoc
 Rakefile
+VERSION
+fill.gemspec
 lib/fill.rb
 lib/fill/configure.rb
 lib/fill/presenter.rb
 lib/fill/procedure.rb
+spec/fill_spec.rb
+spec/spec.opts
+spec/spec_helper.rb

data/README.rdoc

@@ -27,6 +27,10 @@ long it took, resulting in this output:
   | 10    | 0      | Project | 0.018627 |
   +-------+--------+---------+----------+
 
+You'll need to install hirb for this pretty output. Otherwise it won't print
+out this pretty table. I recommend using Hirb anyway. Find it at
+http://github.com/cldwalker/hirb
+
 == Why?
 
 At my company, we taught testers, customers and developers to use
@@ -40,17 +44,28 @@ database when they fucked it up.
 
 By specifying a block, do whatever you need to fill a model.
 
-Usage: db.produce :model1, :model2 do ... end
+Example:
+
+  db.produce :users, :memberships do
+    10.times do
+      user = Factory(:user)
+      membership = Factory(:membership, :user => user)
+    end
+  end
 
 Specify the models that you want. The models that you specified will be
 emptied, which is handy if you're building relational models, like users
 and their memberships.
 
+The models are named *plural*.
+
 === db.fill
 
-A simple list of values.
+Provide a simple list of values.
+
+Example
 
-Usage: db.fill :model, :attribute, "value 1", "value 2", "value 3"
+  db.fill :projects, :name, "Foo", "Bar", "Baz", "etc"
 
 For simple models with only one distinct attribute, you can just specify
 the model, attribute and the values.
@@ -61,14 +76,47 @@ See also the iain/root_table plugin if you have many of these.
 
 Invoke a rake task.
 
-Usage: db.invoke "some:task", :model
+  db.invoke "some:task", :projects
+
+I use a seperate rake task whenever I need to import files. Of course you
+can do that in the +db.produce+, but that clutters your seeds.rb.
 
 === Global options
 
-* :needs    specify one or many dependencies, tables to be filled before
-            filling the ones you're specifying now.
-* :delete   set to false if you don't want to delete all records before
-            continuing
+These options work on all above mentioned methods.
+
+==== :needs
+
+Specify one or many dependencies, tables to be filled before filling the ones
+you're specifying now.
+
+Example
+
+  db.produce :memberships, :needs => :users do
+    User.all.each { |user| Factory(:membership, :user => user) }
+  end
+
+==== :delete
+
+Set to false if you don't want to delete all records before filling it.
+
+Example:
+
+  db.invoke "import:zipcodes", :zips, :delete => false
+
+In this example, the zipcodes import takes a long time to complete, so it
+doesn't insert them when the database is already filled.
+
+==== :name
+
+The output uses Rails i18n methods to determine how the output calls the
+models filled, but if you want to specify your own name, use this option.
+
+Example:
+
+  db.produce :users, :name => "Accounts" do
+    ....
+  end
 
 == Installation
 
@@ -76,8 +124,8 @@ Add this to config/environment.rb:
 
   config.gem "iain-fill", :lib => "fill", :source => "http://gems.github.com"
 
-And run "rake gems:install" and you're done.
+And run "+rake gems:install+" and you're done.
 
 ---
 
-Made by Iain, Released under the MIT License
+Made by Iain, http://iain.nl/, Released under the MIT License

data/Rakefile

@@ -1,13 +1,24 @@
 require 'rake'
 require 'rake/rdoctask'
 
-require 'echoe'
-Echoe.new('fill', '0.0.1') do |p|
-  p.description = "Fill your database"
-  p.url = "http://iain.nl"
-  p.author = "iain"
-  p.email = "iain@iain.nl"
-  p.ignore_pattern = []
-  p.development_dependencies = []
-  p.runtime_dependencies = []
+require 'spec/rake/spectask'
+desc "Run all specs in spec directory"
+Spec::Rake::SpecTask.new(:spec) do |t|
+  t.spec_opts = ['--options spec/spec.opts']
+  t.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+
+begin
+  require 'echoe'
+  Echoe.new('fill', File.read('VERSION').chomp) do |p|
+    p.description = "Fill your database"
+    p.url = "http://iain.nl"
+    p.author = "iain"
+    p.email = "iain@iain.nl"
+    p.ignore_pattern = []
+    p.development_dependencies = []
+    p.runtime_dependencies = []
+  end
+rescue LoadError
 end

data/fill.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fill}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["iain"]
-  s.date = %q{2009-09-21}
+  s.date = %q{2009-09-25}
   s.description = %q{Fill your database}
   s.email = %q{iain@iain.nl}
   s.extra_rdoc_files = ["README.rdoc", "lib/fill.rb", "lib/fill/configure.rb", "lib/fill/presenter.rb", "lib/fill/procedure.rb"]
-  s.files = ["README.rdoc", "Rakefile", "lib/fill.rb", "lib/fill/configure.rb", "lib/fill/presenter.rb", "lib/fill/procedure.rb", "Manifest", "fill.gemspec"]
+  s.files = ["Manifest", "README.rdoc", "Rakefile", "lib/fill.rb", "lib/fill/configure.rb", "lib/fill/presenter.rb", "lib/fill/procedure.rb", "fill.gemspec"]
   s.homepage = %q{http://iain.nl}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Fill", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/lib/fill.rb

@@ -1,18 +1,31 @@
 require 'activesupport'
-require 'fill/configure'
-require 'fill/presenter'
-require 'fill/procedure'
+require File.dirname(__FILE__) + '/fill/configure'
+require File.dirname(__FILE__) + '/fill/presenter'
+require File.dirname(__FILE__) + '/fill/procedure'
 
 module Fill
 
+  VERSION = File.read(File.dirname(__FILE__) + '/../VERSION').chomp
+
   class << self
 
+
+    attr_writer :out
+    def out
+      @out ||= STDOUT
+    end
+
     def database
       db = Configure.new
       yield db
-      bm = time { db.perform! }
-      puts Presenter
-      puts "Database filled in %.2f seconds" % bm
+      perform!(db)
+    end
+
+    def perform!(configuration)
+      bm = time { configuration.perform! }
+      out.puts Presenter
+      out.puts "Database filled in %.2f seconds" % bm
+      Presenter.clear!
     end
 
     def time

data/lib/fill/presenter.rb

@@ -14,15 +14,23 @@ module Fill
       presenter.to_s
     end
 
+    def self.hirb?
+      require 'hirb'
+      true
+    rescue LoadError
+      false
+    end
+
+    def self.clear!
+      @presenter = nil
+    end
+
     def add(data)
       presented.push(data) if data && !presented.include?(data)
     end
 
     def hirb?
-      require 'hirb'
-      true
-    rescue LoadError
-      false
+      self.class.hirb?
     end
 
     def presented
@@ -42,8 +50,15 @@ module Fill
     end
 
     def present_hash
-      hash.map do |row|
-        row.map { |key, value| "#{key}: #{value}" }.join(" - ")
+      presentable.map do |row|
+        format_row(row).join(" - ")
+      end
+    end
+
+    def format_row(row)
+      row.map do |key, value|
+        value = "%.2f" % value if key == "Time"
+        "#{key}: #{value}"
       end
     end
 

data/lib/fill/procedure.rb

@@ -2,7 +2,7 @@ module Fill
 
   class Procedure
 
-    attr_accessor :block
+    attr_accessor :block, :options
 
     def initialize(models, options = {}, &block)
       @block   = block
@@ -19,12 +19,19 @@ module Fill
     end
 
     def human_models
-      @options[:name] ||
-      models.map { |model| model.respond_to?(:human_name) ? model.human_name : model.to_s }.join(', ')
+      @human_models ||= (options[:name] || humanize_models)
+    end
+
+    def humanize_models
+      models.map { |model| i18n_name(model) }.join(', ')
+    end
+
+    def i18n_name(model)
+      model.respond_to?(:human_name) ? model.human_name : model.to_s
     end
 
     def delete_all
-      models.each { |model| model.delete_all } if @options[:delete]
+      models.map { |model| model.delete_all }
     end
 
     def models
@@ -36,8 +43,8 @@ module Fill
     end
 
     def perform
-      @before = count
-      @time   = Fill.time { self.delete_all; block.call }
+      @before = options[:delete] ? delete_all : count
+      @time   = Fill.time { block.call }
       @after  = count
       Presenter.present self
       true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: iain-fill
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - iain
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-21 00:00:00 -07:00
+date: 2009-09-25 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -26,13 +26,13 @@ extra_rdoc_files:
 - lib/fill/presenter.rb
 - lib/fill/procedure.rb
 files: 
+- Manifest
 - README.rdoc
 - Rakefile
 - lib/fill.rb
 - lib/fill/configure.rb
 - lib/fill/presenter.rb
 - lib/fill/procedure.rb
-- Manifest
 - fill.gemspec
 has_rdoc: false
 homepage: http://iain.nl