dm-sweatshop 0.9.7 → 0.9.8

data/History.txt

@@ -1,6 +1,16 @@
-=== 0.9.7
+=== 0.9.8 / 2008-12-07
 
-* 2 major enhancements
+* 1 minor enhancement:
+
+  * callable values now automatically expanded
+
+* 1 bug fix:
+
+  * Now requiring with gem() calls and tested versions
+
+=== 0.9.7 / 2008-11-18
+
+* 2 major enhancements:
 
   * Reworked unique model generator.
   * Improved documentation.

data/Manifest.txt

@@ -2,7 +2,6 @@ History.txt
 LICENSE
 Manifest.txt
 README.textile
-README.txt
 Rakefile
 TODO
 lib/dm-sweatshop.rb
@@ -15,3 +14,5 @@ spec/dm-sweatshop/sweatshop_spec.rb
 spec/dm-sweatshop/unique_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
+tasks/install.rb
+tasks/spec.rb

data/README.textile

@@ -288,6 +288,7 @@ The suggested way to use dm-sweatshop with test specs is to create a @spec/spec_
 <code>
   Merb.start_environment(:testing => true, :adapter => 'runner', :environment => ENV['MERB_ENV'] || 'test')
 
+  require 'dm-sweatshop'
   require File.join(File.dirname(__FILE__), 'spec_fixtures')
 </code>
 </pre>

data/Rakefile

@@ -1,63 +1,25 @@
-require 'rubygems'
-require 'spec'
-require 'spec/rake/spectask'
 require 'pathname'
+require 'rubygems'
+
+ROOT    = Pathname(__FILE__).dirname.expand_path
+JRUBY   = RUBY_PLATFORM =~ /java/
+WINDOWS = Gem.win_platform?
+SUDO    = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS'])
 
-ROOT = Pathname(__FILE__).dirname.expand_path
 require ROOT + 'lib/dm-sweatshop/version'
 
-AUTHOR = "Ben Burkert"
-EMAIL  = "ben@benburkert.com"
-GEM_NAME = "dm-sweatshop"
+AUTHOR = 'Ben Burkert'
+EMAIL  = 'ben [a] benburkert [d] com'
+GEM_NAME = 'dm-sweatshop'
 GEM_VERSION = DataMapper::Sweatshop::VERSION
-GEM_DEPENDENCIES = [["dm-core", GEM_VERSION], "randexp"]
-GEM_CLEAN = ["log", "pkg"]
-GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.textile LICENSE TODO ] }
-
-PROJECT_NAME = "datamapper"
-PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/dm-Sweatshop"
-PROJECT_DESCRIPTION = PROJECT_SUMMARY = "DataMapper plugin for building pseudo random models"
-
-require ROOT.parent + 'tasks/hoe'
-
-task :default => [ :spec ]
-
-WIN32 = (RUBY_PLATFORM =~ /win32|mingw|cygwin/) rescue nil
-SUDO  = WIN32 ? '' : ('sudo' unless ENV['SUDOLESS'])
-
-desc "Install #{GEM_NAME} #{GEM_VERSION} (default ruby)"
-task :install => [ :package, :install_randexp ] do
-  sh "#{SUDO} gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources", :verbose => false
-end
-
-desc "Install the randexp gem from rubyforge"
-task :install_randexp do
-  sh "#{SUDO} gem install randexp --no-update-sources", :verbose => false
-end
-
-desc "Uninstall #{GEM_NAME} #{GEM_VERSION} (default ruby)"
-task :uninstall => [ :clobber ] do
-  sh "#{SUDO} gem uninstall #{GEM_NAME} -v#{GEM_VERSION} -I -x", :verbose => false
-end
-
-namespace :jruby do
-  desc "Install #{GEM_NAME} #{GEM_VERSION} with JRuby"
-  task :install => [ :package ] do
-    sh %{#{SUDO} jruby -S gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources}, :verbose => false
-  end
-end
+GEM_DEPENDENCIES = [['dm-core', "~>#{GEM_VERSION}"], ['randexp', '~>0.1.4']]
+GEM_CLEAN = %w[ log pkg coverage ]
+GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.textile LICENSE TODO History.txt ] }
 
-desc 'Run specifications'
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-  t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+PROJECT_NAME = 'datamapper'
+PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/#{GEM_NAME}"
+PROJECT_DESCRIPTION = PROJECT_SUMMARY = 'DataMapper plugin for building pseudo random models'
 
-  begin
-    t.rcov = ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true
-    t.rcov_opts << '--exclude' << 'spec'
-    t.rcov_opts << '--text-summary'
-    t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
-  rescue Exception
-    # rcov not installed
-  end
+[ ROOT, ROOT.parent ].each do |dir|
+  Pathname.glob(dir.join('tasks/**/*.rb').to_s).each { |f| require f }
 end

data/lib/dm-sweatshop/sweatshop.rb

@@ -101,12 +101,31 @@ module DataMapper
       proc = model_map[klass][name.to_sym].pick
 
       if proc
-        proc.call
+        expand_callable_values(proc.call)
       elsif klass.superclass.is_a?(DataMapper::Model)
         attributes(klass.superclass, name)
       else
         raise NoFixtureExist, "#{name} fixture was not found for class #{klass}"
       end
     end
+
+    # Returns a Hash with callable values evaluated.
+    #
+    # @param     hash     [Hash]
+    #
+    # @returns   [Hash]          existing instance of a model from the model map
+    #
+    # @api       private
+    def self.expand_callable_values(hash)
+      expanded = {}
+      hash.each do |key, value|
+        if value.respond_to?(:call)
+          expanded[key] = value.call
+        else
+          expanded[key] = value
+        end
+      end
+      expanded
+    end
   end
 end

data/lib/dm-sweatshop/unique.rb

@@ -57,6 +57,7 @@ module DataMapper
       MAX_TRIES = 10
 
       begin
+        gem 'ParseTree', '~>3.0.2'
         require 'parse_tree'
       rescue LoadError
         puts "DataMapper::Sweatshop::Unique - ParseTree could not be loaded, anonymous uniques will not be allowed"

data/lib/dm-sweatshop/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   class Sweatshop
-    VERSION = "0.9.7"
+    VERSION = '0.9.8'
   end
 end

data/lib/dm-sweatshop.rb

@@ -1,12 +1,14 @@
 require 'rubygems'
 
-gem 'dm-core', '~>0.9.7'
+gem 'dm-core', '~>0.9.8'
 require 'dm-core'
+
+gem 'randexp', '~>0.1.4'
 require 'randexp'
 
 dir = Pathname(__FILE__).dirname.expand_path / 'dm-sweatshop'
 
-require dir / "version"
-require dir / "sweatshop"
-require dir / "model"
-require dir / "unique"
+require dir / 'version'
+require dir / 'sweatshop'
+require dir / 'model'
+require dir / 'unique'

data/spec/dm-sweatshop/model_spec.rb

@@ -142,8 +142,14 @@ describe DataMapper::Model do
         :price => 30
       }}
 
+      Widget.fix(:blue) {{
+        :name  => Proc.new { "b" + "lu" },
+        :price => 40
+      }}
+
       @red    = Widget.gen(:red)
       @yellow = Widget.gen(:yellow)
+      @blue   = Widget.gen(:blue)
     end
 
     it "returns a pre existing object with named attributes hash" do
@@ -153,6 +159,10 @@ describe DataMapper::Model do
       @yellow.name.should == "giallo"
       @yellow.price.should == 30
     end
+
+    it "expands callable values of attributes hash" do
+      @blue.name.should == "blu"
+    end
   end
 
 

data/spec/dm-sweatshop/sweatshop_spec.rb

@@ -51,6 +51,14 @@ describe DataMapper::Sweatshop do
     end
   end
 
+  describe ".expand_callable_values" do
+    it 'evalues values that respond to call' do
+      DataMapper::Sweatshop.
+        expand_callable_values({ :value => Proc.new { "a" + "b" } }).
+        should == { :value => "ab" }
+    end
+  end
+
   describe ".attributes" do
     it "should return an attributes hash" do
       DataMapper::Sweatshop.add(Parent, :default) {{
@@ -70,6 +78,15 @@ describe DataMapper::Sweatshop do
       DataMapper::Sweatshop.attributes(Parent, :default).should == {:calls => 2}
     end
 
+    it "expands callable values" do
+      DataMapper::Sweatshop.add(Parent, :default) do
+        { :value => Proc.new { "a" + "b" } }
+      end
+      DataMapper::Sweatshop.attributes(Parent, :default).should == {
+        :value => "ab"
+      }
+    end
+
     it "should call attributes with the superclass if the class is not mapped" do
       DataMapper::Sweatshop.add(Parent, :default) {{:first_name => 'Bob'}}
       DataMapper::Sweatshop.attributes(Child, :default).should == {:first_name => 'Bob'}

data/spec/dm-sweatshop/unique_spec.rb

@@ -1,73 +1,83 @@
 require(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
+begin
+  require 'parse_tree'
+rescue LoadError
+  skip_tests = true
+end
+
 describe DataMapper::Sweatshop::Unique do
-  describe '#unique' do
-    before(:each) do
-      @ss = DataMapper::Sweatshop
-      DataMapper::Sweatshop::UniqueWorker.class_eval do
-        self.count_map = Hash.new() { 0 }
+  unless skip_tests
+    describe '#unique' do
+      before(:each) do
+        @ss = DataMapper::Sweatshop
+        DataMapper::Sweatshop::UniqueWorker.class_eval do
+          self.count_map = Hash.new() { 0 }
+        end
       end
-    end
-
-    it 'for the same block, yields an incrementing value' do
-      (1..3).to_a.collect { @ss.unique {|x| "a#{x}"} }.should ==
-        %w(a0 a1 a2)
-    end
-
-    it 'for the different blocks, yields separately incrementing values' do
-      (1..3).to_a.collect { @ss.unique {|x| "a#{x}"} }.should ==
-        %w(a0 a1 a2)
-      (1..3).to_a.collect { @ss.unique {|x| "b#{x}"} }.should ==
-        %w(b0 b1 b2)
-      (1..3).to_a.collect { @ss.unique {|x| "a#{x}"} }.should ==
-        %w(a3 a4 a5)
-    end
 
-    it 'allows an optional key to be specified' do
-      (1..3).to_a.collect { @ss.unique {|x| "a#{x}"} }.should ==
-        %w(a0 a1 a2)
-      (1..3).to_a.collect { @ss.unique(:a) {|x| "a#{x}"} }.should ==
-        %w(a0 a1 a2)
-    end
+      it 'for the same block, yields an incrementing value' do
+        (1..3).to_a.collect { @ss.unique {|x| "a#{x}"} }.should ==
+          %w(a0 a1 a2)
+      end
 
-    describe 'when the block has an arity less than 1' do
-      it 'keeps yielding until a unique value is generated' do
-        a = [1,1,1,2]
-        (1..2).collect { @ss.unique { a.shift }}.should ==
-          [1, 2]
+      it 'for the different blocks, yields separately incrementing values' do
+        (1..3).to_a.collect { @ss.unique {|x| "a#{x}"} }.should ==
+          %w(a0 a1 a2)
+        (1..3).to_a.collect { @ss.unique {|x| "b#{x}"} }.should ==
+          %w(b0 b1 b2)
+        (1..3).to_a.collect { @ss.unique {|x| "a#{x}"} }.should ==
+          %w(a3 a4 a5)
       end
 
-      it 'raises when a unique value cannot be generated' do
-        a = [1,1,1, nil]
-        lambda {
-          (1..3).collect { @ss.unique { a.shift }}
-        }.should raise_error(DataMapper::Sweatshop::Unique::TooManyTriesException)
+      it 'allows an optional key to be specified' do
+        (1..3).to_a.collect { @ss.unique {|x| "a#{x}"} }.should ==
+          %w(a0 a1 a2)
+        (1..3).to_a.collect { @ss.unique(:a) {|x| "a#{x}"} }.should ==
+          %w(a0 a1 a2)
       end
-    end
 
-    describe 'when ParseTree is unavilable' do
-      it 'raises when no key is provided' do
-        Object.stub!(:const_defined?).with("ParseTree").and_return(false)
-        lambda {
-          @ss.unique {}
-        }.should raise_error
+      describe 'when the block has an arity less than 1' do
+        it 'keeps yielding until a unique value is generated' do
+          a = [1,1,1,2]
+          (1..2).collect { @ss.unique { a.shift }}.should ==
+            [1, 2]
+        end
+
+        it 'raises when a unique value cannot be generated' do
+          a = [1,1,1, nil]
+          lambda {
+            (1..3).collect { @ss.unique { a.shift }}
+          }.should raise_error(DataMapper::Sweatshop::Unique::TooManyTriesException)
+        end
       end
 
-      it 'does not raise when a key is provided' do
-        lambda {
-          @ss.unique(:a) {}
-        }.should_not raise_error
+      describe 'when ParseTree is unavilable' do
+        it 'raises when no key is provided' do
+          Object.stub!(:const_defined?).with("ParseTree").and_return(false)
+          lambda {
+            @ss.unique {}
+          }.should raise_error
+        end
+
+        it 'does not raise when a key is provided' do
+          lambda {
+            @ss.unique(:a) {}
+          }.should_not raise_error
+        end
       end
     end
-  end
 
-  describe 'when mixing into an object' do
-    it 'only the unique method is added to the public interface' do
-      obj = Object.new
-      old = obj.public_methods
-      obj.extend(DataMapper::Sweatshop::Unique)
-      new = obj.public_methods
-      (new - old).should == ["unique"]
+    describe 'when mixing into an object' do
+      it 'only the unique method is added to the public interface' do
+        obj = Object.new
+        old = obj.public_methods
+        obj.extend(DataMapper::Sweatshop::Unique)
+        new = obj.public_methods
+        (new - old).should == ["unique"]
+      end
     end
+  else
+    it 'requires the ParseTree gem to test'
   end
 end

data/spec/spec.opts

@@ -1,2 +1 @@
---format specdoc
 --colour

data/tasks/install.rb

@@ -0,0 +1,13 @@
+def sudo_gem(cmd)
+  sh "#{SUDO} #{RUBY} -S gem #{cmd}", :verbose => false
+end
+
+desc "Install #{GEM_NAME} #{GEM_VERSION}"
+task :install => [ :package ] do
+  sudo_gem "install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
+end
+
+desc "Uninstall #{GEM_NAME} #{GEM_VERSION}"
+task :uninstall => [ :clobber ] do
+  sudo_gem "uninstall #{GEM_NAME} -v#{GEM_VERSION} -Ix"
+end

data/tasks/spec.rb

@@ -0,0 +1,25 @@
+begin
+  gem 'rspec', '~>1.1.11'
+  require 'spec'
+  require 'spec/rake/spectask'
+
+  task :default => [ :spec ]
+
+  desc 'Run specifications'
+  Spec::Rake::SpecTask.new(:spec) do |t|
+    t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+
+    begin
+      gem 'rcov', '~>0.8'
+      t.rcov = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
+      t.rcov_opts << '--exclude' << 'spec'
+      t.rcov_opts << '--text-summary'
+      t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
+    rescue LoadError
+      # rcov not installed
+    end
+  end
+rescue LoadError
+  # rspec not installed
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-sweatshop
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Ben Burkert
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-18 00:00:00 -08:00
+date: 2008-12-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,9 +18,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.7
+        version: 0.9.8
     version: 
 - !ruby/object:Gem::Dependency 
   name: randexp
@@ -28,23 +28,13 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.8.2
+        version: 0.1.4
     version: 
 description: DataMapper plugin for building pseudo random models
 email: 
-- ben@benburkert.com
+- ben [a] benburkert [d] com
 executables: []
 
 extensions: []
@@ -53,12 +43,12 @@ extra_rdoc_files:
 - README.textile
 - LICENSE
 - TODO
+- History.txt
 files: 
 - History.txt
 - LICENSE
 - Manifest.txt
 - README.textile
-- README.txt
 - Rakefile
 - TODO
 - lib/dm-sweatshop.rb
@@ -71,8 +61,10 @@ files:
 - spec/dm-sweatshop/unique_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- tasks/install.rb
+- tasks/spec.rb
 has_rdoc: true
-homepage: http://github.com/sam/dm-more/tree/master/dm-Sweatshop
+homepage: http://github.com/sam/dm-more/tree/master/dm-sweatshop
 post_install_message: 
 rdoc_options: 
 - --main

data/README.txt

@@ -1,45 +0,0 @@
-= DM sweatshop
-
-Part of dm-more gems collection.
-
-== DESCRIPTION:
-
-* DM Sweatshop is a YAML fixture alternative that uses pure Ruby.
-
-== SYNOPSIS:
-
-See README.textile
-
-== REQUIREMENTS:
-
-* randexp
-* ParseTree (if you want to use uniq records generator)
-
-== INSTALL:
-
-* FIX (sudo gem install, anything else)
-
-== LICENSE:
-
-(The MIT License)
-
-Copyright (c) 2008 Ben Burkert & contributors
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.