sequel-fixture 0.0.3 → 2.0.0

data/.gitignore

@@ -1,17 +1,21 @@
 *.gem
 *.rbc
+Gemfile.lock
 .bundle
 .config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
 coverage
-doc/
+vendor/
+InstalledFiles
 lib/bundler/man
 pkg
 rdoc
 spec/reports
 test/tmp
 test/version_tmp
+.bin/
 tmp
+
+# YARD artifacts
+.yardoc
+_yardoc
+doc/

data/.travis.yml

@@ -8,4 +8,4 @@ rvm:
   - rbx-18mode
   - rbx-19mode
   - ree
-bundler_args: --without cucumber
+

data/Gemfile

@@ -3,13 +3,8 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in sequel-fixture.gemspec
 gemspec
 
-group :cucumber do
-  gem "cucumber"
-  gem "sqlite3"
-  gem "pry"
-end
-
 group :test do
+  gem "sqlite3"
   gem "rake"
 end
 

data/README.md

@@ -2,35 +2,57 @@ Sequel::Fixture
 ===============
 [![Build Status](https://secure.travis-ci.org/Fetcher/sequel-fixture.png)](http://travis-ci.org/Fetcher/sequel-fixture) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/Fetcher/sequel-fixture)
 
-Just like Rails 2 fixtures, but for Sequel.
+Just like Rails fixtures, but for Sequel.
 
-Show off
-========
+This  version includes support for defining the fixture schemas
+and uses sqlite3 adapter to inject data into memory.
+
+Usage
+=====
+Each fixture file defines the schema and data for a single table which
+is named after the file name.
+
+Schema definition is optional, but note that db inserts will fail if the tables do
+not exist.
 
 Assuming you have a fixture for the table users with:
 ```yaml
-# test/fixtures/simple/users.yaml
-john:
-  name: John
-  last_name: Doe
-  email: john@doe.com
-jane:
-  name: Jane
-  last_name: Doe
-  email: jane@doe.com
+# fixtures/simple/users.yaml
+schema:
+  - name: name
+    type: string
+    primary_key: true
+  - name: last_name
+    type: string
+  - name: empty
+    type: string
+data:
+  - name: John
+    last_name: Doe
+    email: john@doe.com
+  - name: Jane
+    last_name: Doe
+    email: jane@doe.com
 ```
 
 and for messages:
 ```yaml
-# test/fixtures/simple/messages.yaml
-greeting:
-  sender_id: 1
-  receiver_id: 2
-  text: Hi Jane! Long time no see.
-long_time:
-  sender_id: 2
-  receiver_id: 1
-  text: John! Long time indeed. How are you doing?
+# fixtures/simple/messages.yaml
+schema:
+  - name: sender_id
+    type: integer
+    primary_key: true
+  - name: receiver_id
+    type: integer
+  - name: text
+    type: string
+data:
+  - sender_id: 1
+    receiver_id: 2
+    text: Hi Jane! Long time no see.
+  - sender_id: 2
+    receiver_id: 1
+    text: John! Long time indeed. How are you doing?
 ```
 
 and the ruby script
@@ -41,6 +63,9 @@ require "sequel-fixture"
 
 DB = Sequel.sqlite # Just a simple example, needs sqlite3 gem
 
+## Set the path of the fixture yaml files to be [script.rb]/fixtures/
+Sequel::Fixture.path = File.join(File.dirname(__FILE__), "fixtures")
+
 fixture = Sequel::Fixture.new :simple, DB # Will load all the data in the fixture into the database
 
 fixture.users               # == fixture[:users]
@@ -65,7 +90,13 @@ fixture.rollback            # Don't forget to rollback
 
 ...naturally, `sequel-fixture` makes a lot more sense within some testing framework.
 
-> **Note**: As of version 0.0.1, the `test/fixtures` path for fixtures is not configurable. Will solve soon.
+
+Contributing
+------------
+
+```
+bundle install --binstubs .bin --path vendor/bundle
+```
 
 Installation
 ------------

data/lib/sequel-fixture/exceptions.rb

@@ -0,0 +1,17 @@
+class Sequel::Fixture
+  class IllegalFixtureFormat < StandardError; end
+  class TablesNotEmptyError < StandardError; end
+  class RollbackIllegalError < StandardError; end
+  class MissingFixtureError < StandardError; end
+  class MissingConnectionError < StandardError; end
+  class LoadingFixtureIllegal < StandardError; end
+  class ChangingConnectionIllegal < StandardError; end
+
+  class MissingProcessedValueError < StandardError
+    attr_accessor :field
+    def initialize message, field = nil
+      @field = field
+      super message
+    end
+  end
+end

data/lib/sequel-fixture/table.rb

@@ -0,0 +1,40 @@
+module Sequel; end
+
+class Sequel::Fixture
+  
+  # === Description
+  # Class which represents the actual fixture data in a table
+  #
+  class Table
+    def initialize(data)
+      @data = data
+    end
+
+    def [](row)
+      Sequel::Fixture::Row.new(@data[row])
+    end
+    
+    def rows
+      @data
+    end
+  end
+
+  
+  # === Description
+  # Class which represents a single row in a fixture table.
+  #
+  class Row
+    def initialize(row)
+      @data = row
+    end
+    
+    # === Description
+    # Method missing, for enabling discovery of columns within a row
+    #
+    def method_missing(s, *args)
+      key = s.to_s
+      return @data[key] if @data && @data.has_key?(key)
+      return super
+    end    
+  end
+end

data/lib/sequel-fixture/util.rb

@@ -0,0 +1,22 @@
+class Sequel::Fixture
+  
+  # === Description
+  # Simplifies the hash in order to insert it into the database
+  # (Note: I'm well aware that this functionality belongs in a dependency)
+  #
+  def simplify(the_hash)    
+    the_returned_hash = {}
+    
+    the_hash.each do |key, value|
+      if value.is_a? Hash
+        unless value.has_key?("processed") || value.has_key?(:processed)
+          raise MissingProcessedValueError.new "The processed value to insert into the db is missing from the field '#{key}', aborting", key 
+        end
+        the_returned_hash[key] = value["processed"] || value[:processed]
+      else
+        the_returned_hash[key] = value
+      end
+    end
+    return the_returned_hash
+  end  
+end

data/lib/sequel-fixture/version.rb

@@ -1,5 +1,5 @@
 module Sequel
   class Fixture
-    VERSION = "0.0.3"
+    VERSION = "2.0.0"
   end
 end

data/lib/sequel-fixture.rb

@@ -3,143 +3,195 @@ require "symbolmatrix"
 require "fast"
 
 require "sequel-fixture/version"
+require "sequel-fixture/exceptions"
+require "sequel-fixture/util"
+require "sequel-fixture/table"
 
-module Sequel
+module Sequel; end
 
-  # Fixture managing class for Sequel
-  class Fixture
-    ## Class methods
-    
-    # Returns the current path to the fixtures folder
-    def self.path
-      @@path ||= "test/fixtures"
-    end
-    
-    
-    ## Instance methods
-    
-    # Initializes the fixture handler
-    # Accepts optionally a symbol as a reference to the fixture
-    # and a Sequel::Database connection
-    def initialize fixture = nil, connection = nil, option_push = true
-      load fixture if fixture
-      
-      @connection = connection if connection
-      push if fixture && connection && option_push
+class Sequel::Fixture
+  
+  # === Description
+  # Returns the current path to the fixtures folder
+  #
+  def self.path
+    @@path ||= "test/fixtures"
+  end
+
+  
+  # === Description
+  # Set the current path of the fixtures folder
+  #
+  def self.path=(path)
+    @@path = path
+  end
+  
+  # === Description
+  # Initializes the fixture handler
+  # Accepts optionally a symbol as a reference to the fixture
+  # and a Sequel::Database connection
+  def initialize(fixture = nil, connection = nil, option_push = true)
+    @schema = {}
+    @data = {}
+    
+    load(fixture) if fixture
+    
+    @connection = connection if connection
+    push if fixture && connection && option_push
+  end
+
+  
+  # === Description
+  # Loads the fixture files into this instance
+  #
+  def load(fixture)
+    raise LoadingFixtureIllegal, "A check has already been made, loading a different fixture is illegal" if @checked
+    
+    Fast.dir("#{fixtures_path}/#{fixture}").files.to.symbols.each do |file|
+      @data ||= {}
+      @schema ||= {}
+
+      file_data = SymbolMatrix.new "#{fixtures_path}/#{fixture}/#{file}.yaml"
+
+      if file_data
+        @data[file] = Table.new(file_data[:data]) if file_data.key?(:data)
+        @schema[file] = file_data[:schema] if file_data.key?(:schema)
+      end
     end
+  end
+
+  
+  # === Description
+  # Returns the current fixtures path where Sequel::Fixture looks for fixture folders
+  #
+  def fixtures_path
+    Sequel::Fixture.path
+  end
+
+
+  # === Description
+  # For enabling discovery of tables
+  #
+  def method_missing(key, *args)
+    return @data[key] if @data && @data.has_key?(key)
+    return super
+  end    
+  
+  # === Description
+  # Returns the SymbolMatrix with the data referring to that table
+  #
+  def [](reference)
+    @data[reference]
+  end
+  
+  
+  # === Description
+  # Forces the check to pass. Dangerous!
+  #
+  def force_checked!
+    @checked = true
+  end
+
+  
+  # === Description
+  # Assures that the tables are empty before proceeding
+  #
+  def check
+    return @checked if @checked # If already checked, it's alright
+
+    raise MissingFixtureError, "No fixture has been loaded, nothing to check" unless @data.length > 0
+    raise MissingConnectionError, "No connection has been provided, impossible to check" unless @connection
     
-    # Loads the fixture files into this instance
-    def load fixture
-      raise LoadingFixtureIllegal, "A check has already been made, loading a different fixture is illegal" if @checked
-      
-      Fast.dir("#{fixtures_path}/#{fixture}").files.to.symbols.each do |file|
-        @data ||= {}
-        @data[file] = SymbolMatrix.new "#{fixtures_path}/#{fixture}/#{file}.yaml"
+    @data.each_key do |table|
+      if @connection[table].count != 0
+        raise TablesNotEmptyError, "Table '#{table}' is not empty, tables must be empty prior to testing"
       end
     end
-    
-    # Returns the current fixtures path where Sequel::Fixtures looks for fixture folders
-    def fixtures_path
-      Sequel::Fixture.path
+    return @checked = true
+  end
+
+  
+  # === Description
+  # Initializes fixture schema and Inserts the fixture data into the corresponding
+  # tables
+  #
+  def push
+    check
+
+    @schema.each do |table, matrix|
+      push_schema(table, matrix)
     end
     
-    # Returns the SymbolMatrix with the data referring to that table
-    def [] reference
-      @data[reference]
+    @data.each do |table_name, table_data|
+      table_data.rows.each do |values|
+        begin
+          @connection[table_name].insert(simplify(values.to_h))
+        rescue MissingProcessedValueError => m
+          rollback
+          raise MissingProcessedValueError, "In record '#{values.to_h}' to be inserted into '#{table_name}', the processed value of field '#{m.field}' is missing, aborting."
+        rescue NoMethodError => e
+          raise IllegalFixtureFormat, "In record '#{values}', data must be formatted as arrays of hashes. Check 'data' section in '#{table_name}.yaml'"
+        end
+      end
     end
-    
-    # Method missing, for enabling discovery of tables
-    def method_missing s, *args
-      return @data[s] if @data && @data.has_key?(s)
-      return super
+  end
+
+  
+  # === Description 
+  # Create the schema in our DB connection based on the schema values
+  #  
+  def push_schema(table, values)
+    ## Lets passively ignore the schema if the table already exists
+    return if @connection.table_exists?(table.to_sym)
+
+    ## Find the primary key
+    pkey_data = nil
+    values.each do |column_def|
+      pkey_data = column_def if column_def["primary_key"]
     end
     
-    # Forces the check to pass. Dangerous!
-    def force_checked!
-      @checked = true
+    ## Create the table with the primary key
+    @connection.create_table(table) do
+      column(pkey_data["name"].to_sym, pkey_data["type"].to_sym)
     end
-    
-    # Assures that the tables are empty before proceeding
-    def check
-      return @checked if @checked # If already checked, it's alright
 
-      raise MissingFixtureError, "No fixture has been loaded, nothing to check" unless @data
-      raise MissingConnectionError, "No connection has been provided, impossible to check" unless @connection
-      
-      @data.each_key do |table|
-        raise TablesNotEmptyError, "The table '#{table}' is not empty, all tables should be empty prior to testing" if @connection[table].count != 0
+    ## Add the rest of the columns
+    values.each do |column_def|
+      unless column_def["primary_key"]
+        @connection.alter_table(table) { add_column(column_def["name"].to_sym, column_def["type"].to_sym) }
       end
-      return @checked = true
     end
-    
-    # Inserts the fixture data into the corresponding tables
-    def push
+  end
+  
+  
+  # === Description
+  # Empties the tables, only if they were empty to begin with
+  #
+  def rollback
+    begin
       check
       
-      @data.each do |table, matrix|
-        matrix.each do |element, values|
-          begin
-            @connection[table].insert simplify values.to_hash
-          rescue MissingProcessedValueError => m
-            rollback
-            raise MissingProcessedValueError, "In record '#{element}' to be inserted into '#{table}', the processed value of field '#{m.field}' is missing, aborting"
-          end
-        end
-      end
-    end
-    
-    # Empties the tables, only if they were empty to begin with
-    def rollback
-      begin
-        check
-        
-        @data.each_key do |table|
-          @connection[table].truncate
-        end
-      rescue TablesNotEmptyError => e
-        raise RollbackIllegalError, "The tables weren't empty to begin with, rollback aborted."
-      end
-    end
-    
-    attr_reader :connection    
-    
-    # Sets the connection. Raises an ChangingConnectionIllegal exception if this fixture has already been checked
-    def connection= the_connection
-      raise ChangingConnectionIllegal, "A check has already been performed, changing the connection now is illegal" if @checked
-      @connection = the_connection
-    end
-    
-    attr_reader :data
-    
-    # Simplifies the hash in order to insert it into the database
-    # (Note: I'm well aware that this functionality belongs in a dependency)
-    def simplify the_hash
-      the_returned_hash = {}
-      the_hash.each do |key, value|
-        if value.is_a? Hash
-          unless value.has_key? :processed
-            raise MissingProcessedValueError.new "The processed value to insert into the db is missing from the field '#{key}', aborting", key 
-          end
-          the_returned_hash[key] = value[:processed]
-        else
-          the_returned_hash[key] = value
-        end
+      @data.each_key do |table|
+        @connection[table].truncate
       end
-      return the_returned_hash
+    rescue TablesNotEmptyError => e
+      raise RollbackIllegalError, "The tables weren't empty to begin with, rollback aborted."
     end
+  end
 
-    class TablesNotEmptyError < StandardError; end
-    class RollbackIllegalError < StandardError; end
-    class MissingFixtureError < StandardError; end
-    class MissingConnectionError < StandardError; end
-    class LoadingFixtureIllegal < StandardError; end
-    class ChangingConnectionIllegal < StandardError; end
-    class MissingProcessedValueError < StandardError
-      attr_accessor :field
-      def initialize message, field = nil
-        @field = field
-        super message
-      end
+  
+  # === Description
+  # Sets the connection. Raises an ChangingConnectionIllegal exception if this fixture has
+  # already been checked
+  #
+  def connection=(the_connection)
+    if @checked
+      raise ChangingConnectionIllegal, "Illegal to change connection after check has already been performed"
     end
+    @connection = the_connection
   end
+
+  attr_reader :connection
+  attr_reader :data
+  attr_reader :schema  
 end

data/spec/sequel/fixture_spec.rb

@@ -2,10 +2,15 @@ require "sequel-fixture"
 require "fast"
 
 describe Sequel::Fixture do
-  describe ".path" do
+  describe ".path" do    
     it "should return 'test/fixtures'" do
       Sequel::Fixture.path.should == "test/fixtures"
     end
+
+    it "should be configurable" do
+      Sequel::Fixture.path = File.join(File.dirname(__FILE__), "fixtures")
+      Sequel::Fixture.path.should == File.join(File.dirname(__FILE__), "fixtures")
+    end    
   end
 
   describe ".new" do
@@ -46,6 +51,7 @@ describe Sequel::Fixture do
   describe "#load" do
     context "there is a valid fixture folder setup" do
       before do
+        Sequel::Fixture.path = "test/fixtures"
         Fast.file! "test/fixtures/test/users.yaml"
         Fast.file! "test/fixtures/test/actions.yaml"
       end
@@ -65,8 +71,7 @@ describe Sequel::Fixture do
     
     context "the check has been performed and I attempt to load another fixture" do
       before do
-        Fast.file.write "test/fixtures/test/users.yaml", "john: { name: John Doe }"
-        Fast.file.write "test/fixtures/another/users.yaml", "john: { name: John Doe }"
+        Sequel::Fixture.path = File.join(File.dirname(__FILE__), "fixtures")
       end
 
       it "should fail" do
@@ -101,20 +106,19 @@ describe Sequel::Fixture do
   describe "#[]" do
     context "a valid fixture has been loaded" do
       before do
-        Fast.file.write "test/fixtures/test/users.yaml", "john: { name: John, last_name: Wayne }"
-        Fast.file.write "test/fixtures/test/actions.yaml", "walk: { user_id: 1, action: Walks }"
+        Sequel::Fixture.path = File.join(File.dirname(__FILE__), "fixtures")
+        
         @fix = Sequel::Fixture.new
         @fix.stub :check
         @fix.load :test
       end
       
       context "a table key is passed" do
-        it "should return the SymbolMatrix containing the same info as in the matching YAML file" do
-          @fix[:users].should be_a SymbolMatrix
-          @fix[:users].john.name.should == "John"
-          @fix[:users].john.last_name.should == "Wayne"
-          
-          @fix[:actions].walk.action.should == "Walks"
+        it "should return the Fixture::Table containing the same info as in the matching YAML file" do
+          @fix[:users].should be_a Sequel::Fixture::Table
+          @fix[:users][0].name.should == "John Doe"
+          @fix[:users][0].last_name.should == "Wayne"          
+          @fix[:actions][0].action.should == "Walks"
         end
       end
       
@@ -128,19 +132,17 @@ describe Sequel::Fixture do
     context "a valid fixture has been loaded" do
       context "a table key is passed" do
         before do
-          Fast.file.write "test/fixtures/test/users.yaml", "john: { name: John, last_name: Wayne }"
-          Fast.file.write "test/fixtures/test/actions.yaml", "walk: { user_id: 1, action: Walks }"
+          Sequel::Fixture.path = File.join(File.dirname(__FILE__), "fixtures")
           @fix = Sequel::Fixture.new
           @fix.stub :check
           @fix.load :test
         end
       
         it "should return the SymbolMatrix containing the same info as in the matching YAML file" do
-          @fix.users.should be_a SymbolMatrix
-          @fix.users.john.name.should == "John"
-          @fix.users.john.last_name.should == "Wayne"
-          
-          @fix.actions.walk.action.should == "Walks"          
+          @fix.users.should be_a Sequel::Fixture::Table
+          @fix.users[0].name.should == "John Doe"
+          @fix.users[0].last_name.should == "Wayne"
+          @fix.actions[0].action.should == "Walks"          
         end
 
         after do
@@ -197,9 +199,8 @@ describe Sequel::Fixture do
       end
       fix.stub_data
       
-      expect { fix.check
-      }.to raise_error Sequel::Fixture::TablesNotEmptyError, 
-        "The table 'users' is not empty, all tables should be empty prior to testing"
+      expect { fix.check }.to raise_error Sequel::Fixture::TablesNotEmptyError, 
+      "Table 'users' is not empty, tables must be empty prior to testing"
     end
     
     it "should return true if all tables count equals 0" do
@@ -312,7 +313,7 @@ describe Sequel::Fixture do
         fix.check
         expect { fix.connection = double 'database'
         }.to raise_error Sequel::Fixture::ChangingConnectionIllegal, 
-          "A check has already been performed, changing the connection now is illegal"
+          "Illegal to change connection after check has already been performed"
       end
       
       after do
@@ -323,14 +324,14 @@ describe Sequel::Fixture do
   
   describe "#data" do
     context "a fixture has been loaded" do
-      before do 
-        Fast.file.write "test/fixtures/test/users.yaml", "jane { name: Jessica Dore }"
+      before do
+        Sequel::Fixture.path = File.join(File.dirname(__FILE__), "fixtures")
       end
       
       it "should return the fixture data" do
         fix = Sequel::Fixture.new :test
         fix.data.should have_key :users
-        fix.data[:users].should be_a SymbolMatrix
+        fix.data[:users].should be_a Sequel::Fixture::Table
       end
       
       after do
@@ -341,7 +342,7 @@ describe Sequel::Fixture do
     context "no fixture has been loaded" do
       it "should return nil" do
         fix = Sequel::Fixture.new 
-        fix.data.should be_nil
+        fix.data.should be {}
       end
     end
   end
@@ -359,8 +360,8 @@ describe Sequel::Fixture do
 
     context "a valid fixture and a database connection are provided" do
       before do
-        Fast.file.write "test/fixtures/test/users.yaml", "john: { name: John, last_name: Wayne }"
-        Fast.file.write "test/fixtures/test/actions.yaml", "walk: { user_id: 1, action: Walks }"
+        Sequel::Fixture.path = File.join(File.dirname(__FILE__), "fixtures")
+        
         @table    = stub
         @database = stub :[] => @table
         @fix = Sequel::Fixture.new
@@ -370,8 +371,8 @@ describe Sequel::Fixture do
     
       it "should attempt to insert the data into the database" do
         @table.stub :count => 0
-        @table.should_receive(:insert).with :name => "John", :last_name => "Wayne"
-        @table.should_receive(:insert).with :user_id => 1, :action => "Walks"
+        @table.should_receive(:insert).with "name" => "John Doe", "last_name" => "Wayne"
+        @table.should_receive(:insert).with "user_id" => 1, "action" => "Walks"
         @fix.push
       end
       
@@ -382,16 +383,18 @@ describe Sequel::Fixture do
     
     context "a fixture with a field with a <raw> and a <processed> alternative" do
       before do
-        Fast.file.write "test/fixtures/test/users.yaml", "user: { password: { raw: secret, processed: 35ferwt352 } }"
+        Sequel::Fixture.path = File.join(File.dirname(__FILE__), "fixtures")        
       end
       
       it "should insert the <processed> alternative" do
         database = double 'database'
         insertable = double 'table'
         insertable.stub :count => 0
-        insertable.should_receive(:insert).with :password => '35ferwt352'
+        insertable.should_receive(:insert).with "password" => '35ferwt352'
         database.stub(:[]).and_return insertable
-        fix = Sequel::Fixture.new :test, database, false
+        
+        fix = Sequel::Fixture.new :processed, database, false
+        
         fix.push
       end
       
@@ -402,24 +405,22 @@ describe Sequel::Fixture do
     
     context "a fixture with a field with alternatives yet missing the <processed> one" do
       before do
-        Fast.file.write "test/fixtures/test/users.yaml", "hey: { pass: { raw: There } }"
+        Sequel::Fixture.path = File.join(File.dirname(__FILE__), "fixtures")
       end
       
       it "should fail" do
         database = double 'database', :[] => stub( 'table', :count => 0, :truncate => nil  )
-        fix = Sequel::Fixture.new :test, database, false
-        expect { fix.push
-        }.to raise_error Sequel::Fixture::MissingProcessedValueError, 
-          "In record 'hey' to be inserted into 'users', the processed value of field 'pass' is missing, aborting"
+        fix = Sequel::Fixture.new :invalid, database, false
+        
+        expect { fix.push }.to raise_error Sequel::Fixture::MissingProcessedValueError
       end
       
       
       it "should call the rollback" do
         database = double 'database', :[] => stub( 'table', :count => 0, :truncate => nil )
-        fix = Sequel::Fixture.new :test, database, false
+        fix = Sequel::Fixture.new :invalid, database, false
         fix.should_receive :rollback
-        expect { fix.push
-        }.to raise_error Sequel::Fixture::MissingProcessedValueError
+        expect { fix.push }.to raise_error Sequel::Fixture::MissingProcessedValueError
       end      
       
       after do
@@ -428,55 +429,6 @@ describe Sequel::Fixture do
     end
   end
   
-  # This should go in a dependency, pending refactoring TODO
-  describe "#simplify" do
-    context "when receiving a multidimensional hash containing a field with raw and processed" do
-      it "should convert it in a simple hash using the processed value as replacement" do
-        base_hash = {
-          :name => "Jane",
-          :band => "Witherspoons",
-          :pass => {
-            :raw => "secret",
-            :processed => "53oih7fhjdgj3f8="
-          },
-          :email => {
-            :raw => "Jane@gmail.com ",
-            :processed => "jane@gmail.com"
-          }
-        }
-        
-        fix = Sequel::Fixture.new
-        simplified = fix.simplify base_hash
-        simplified.should == {
-          :name => "Jane",
-          :band => "Witherspoons",
-          :pass => "53oih7fhjdgj3f8=",
-          :email => "jane@gmail.com"
-        }
-      end
-    end
-    
-    context "the multidimensional array is missing the processed part of the field" do
-      it "should raise an exception" do
-        base_hash = {
-          :name => "Jane",
-          :pass => {
-            :raw => "secret",
-            :not_processed => "53oih7fhjdgj3f8="
-          },
-          :email => {
-            :raw => "Jane@gmail.com ",
-            :processed => "jane@gmail.com"
-          }
-        }
-        
-        fix = Sequel::Fixture.new
-        expect { fix.simplify base_hash
-        }.to raise_error Sequel::Fixture::MissingProcessedValueError, 
-          "The processed value to insert into the db is missing from the field 'pass', aborting"
-      end
-    end
-  end
   
   describe "#rollback" do
     it "should check" do

data/spec/sequel/fixtures/another/users.yaml

@@ -0,0 +1,2 @@
+data:
+  - name: John Doe

data/spec/sequel/fixtures/invalid/users.yaml

@@ -0,0 +1,4 @@
+data:
+  - name: Hey
+    pass:
+      raw: secret

data/spec/sequel/fixtures/processed/users.yaml

@@ -0,0 +1,4 @@
+data:
+  - password:
+      raw: secret
+      processed: 35ferwt352 

data/spec/sequel/fixtures/test/actions.yaml

@@ -0,0 +1,4 @@
+data:
+  - user_id: 1
+    action: Walks
+  

data/spec/sequel/fixtures/test/users.yaml

@@ -0,0 +1,3 @@
+data:
+  - name: John Doe
+    last_name: Wayne

data/spec/sequel/util_spec.rb

@@ -0,0 +1,54 @@
+require "sequel-fixture"
+require "fast"
+
+describe Sequel::Fixture do
+  # This should go in a dependency, pending refactoring TODO
+  describe "#simplify" do
+    context "when receiving a multidimensional hash containing a field with raw and processed" do
+      it "should convert it in a simple hash using the processed value as replacement" do
+        base_hash = {
+          :name => "Jane",
+          :band => "Witherspoons",
+          :pass => {
+            :raw => "secret",
+            :processed => "53oih7fhjdgj3f8="
+          },
+          :email => {
+            :raw => "Jane@gmail.com ",
+            :processed => "jane@gmail.com"
+          }
+        }
+        
+        fix = Sequel::Fixture.new
+        simplified = fix.simplify(base_hash)
+        simplified.should == {
+          :name => "Jane",
+          :band => "Witherspoons",
+          :pass => "53oih7fhjdgj3f8=",
+          :email => "jane@gmail.com"
+        }
+      end
+    end
+    
+    context "the multidimensional array is missing the processed part of the field" do
+      it "should raise an exception" do
+        base_hash = {
+          :name => "Jane",
+          :pass => {
+            :raw => "secret",
+            :not_processed => "53oih7fhjdgj3f8="
+          },
+          :email => {
+            :raw => "Jane@gmail.com ",
+            :processed => "jane@gmail.com"
+          }
+        }
+        
+        fix = Sequel::Fixture.new
+        expect { fix.simplify(base_hash)
+        }.to raise_error Sequel::Fixture::MissingProcessedValueError, 
+          "The processed value to insert into the db is missing from the field 'pass', aborting"
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-fixture
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-07 00:00:00.000000000 Z
+date: 2013-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -88,17 +88,19 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- features/configurable_fixtures_folder.feature
-- features/play_around_with_fixtures.feature
-- features/stepdefs/play_around_with_fixtures/background.rb
-- features/stepdefs/play_around_with_fixtures/create_a_simple_fixture_push_it_and_rollback.rb
-- features/stepdefs/play_around_with_fixtures/misconfigured_password_field.rb
-- features/support/env.rb
-- features/support/hooks.rb
 - lib/sequel-fixture.rb
+- lib/sequel-fixture/exceptions.rb
+- lib/sequel-fixture/table.rb
+- lib/sequel-fixture/util.rb
 - lib/sequel-fixture/version.rb
 - sequel-fixture.gemspec
 - spec/sequel/fixture_spec.rb
+- spec/sequel/fixtures/another/users.yaml
+- spec/sequel/fixtures/invalid/users.yaml
+- spec/sequel/fixtures/processed/users.yaml
+- spec/sequel/fixtures/test/actions.yaml
+- spec/sequel/fixtures/test/users.yaml
+- spec/sequel/util_spec.rb
 homepage: http://github.com/Fetcher/sequel-fixture
 licenses: []
 post_install_message: 
@@ -111,24 +113,29 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2872414278293677799
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2872414278293677799
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Flexible fixtures for the Sequel Gem inspired in Rails 2 fixtures
 test_files:
-- features/configurable_fixtures_folder.feature
-- features/play_around_with_fixtures.feature
-- features/stepdefs/play_around_with_fixtures/background.rb
-- features/stepdefs/play_around_with_fixtures/create_a_simple_fixture_push_it_and_rollback.rb
-- features/stepdefs/play_around_with_fixtures/misconfigured_password_field.rb
-- features/support/env.rb
-- features/support/hooks.rb
 - spec/sequel/fixture_spec.rb
+- spec/sequel/fixtures/another/users.yaml
+- spec/sequel/fixtures/invalid/users.yaml
+- spec/sequel/fixtures/processed/users.yaml
+- spec/sequel/fixtures/test/actions.yaml
+- spec/sequel/fixtures/test/users.yaml
+- spec/sequel/util_spec.rb

data/features/configurable_fixtures_folder.feature

@@ -1,24 +0,0 @@
-Feature: Configurable fixtures folder
-  In order to load fixtures from arbitrary folders
-  I want to be able to configure the source of the fixtures
-
-Background: We have a database connection working
-  Given a sqlite database connection
-  
-Scenario: The folder is now just "fixtures"
-  Given a table users with String:name, String:email
-  And a file "fixtures/configurable/users.yaml" with:
-    """
-    xavi:
-      name: Xavier
-      email: xavier@via.com
-    john:
-      name: Johnny
-      email: john@doe.com
-    """
-  When I set the fixtures path as "fixtures"
-  And I load the configurable fixture
-  Then I should see 1 record in users with name "Xavier" and email "xavier@via.com"
-  And I should see 1 record in users with name "Johnny" and email "john@doe.com"
-  When I rollback
-  Then I should see 0 records in users

data/features/play_around_with_fixtures.feature

@@ -1,70 +0,0 @@
-Feature: Play around with Fixtures
-  In order to test if Sequel::Fixture is really practical
-  As the gem developer
-  I want to play around with it a little bit
-
-Background: We have a database connection working
-  Given a sqlite database connection
-
-Scenario: Create a simple fixture, push it into a sqlite and rollback
-  Given a table visitors with String:name, String:email
-  And a table aliens with String:race
-  And a table visits with Integer:alien_id, Integer:visitor_id
-  And a file "test/fixtures/simple/visitors.yaml" with:
-    """
-    anonymous:
-      name: V
-      email: v@for.vendetta
-    """
-  And a file "test/fixtures/simple/aliens.yaml" with:
-    """
-    yourfavouritemartian:
-      race: Zerg
-    """
-  And a file "test/fixtures/simple/visits.yaml" with:
-    """
-    v2yfm:
-      alien_id: 1
-      visitor_id: 1
-    """
-  When I load the simple fixture
-  Then I should see 1 record in visitors with name "V" and email "v@for.vendetta"
-  And I should see 1 record in aliens with race "Zerg"
-  And I should see 1 record in visits with alien_id 1 and visitor_id 1
-  When I rollback
-  Then I should see 0 records in visitors
-  And I should see 0 records in aliens
-  And I should see 0 records in visits
-
-Scenario: The users table has a password field
-  Given a table users with String:name, String:password
-  And a file "test/fixtures/password/users.yaml" with: 
-    """
-    john:
-      name: John Wayne
-      password:
-        raw: secret
-        processed: 5bfb52c459cdb07218c176b5ddec9b6215bd5b76
-    """
-  When I load the password fixture
-  Then I should see 1 record in users with name "John Wayne" and password "5bfb52c459cdb07218c176b5ddec9b6215bd5b76"    
-  When I rollback
-  Then I should see 0 records in users
-
-Scenario: Misconfigured password field
-  Given a table users with String:password
-  And a file "test/fixtures/misconfigured/users.yaml" with:
-    """
-    good_entry:
-      password:
-        raw: secret
-        processed: 96bdg756n5sgf9gfs==
-    wrong_entry:
-      password:
-        missing: The field
-    """
-  Then the loading of misconfigured fixture should fail
-  And I should see that the table was "users"
-  And I should see that the field was "password"
-  And I should see that the entry was "wrong_entry"
-  And I should see 0 records in users

data/features/stepdefs/play_around_with_fixtures/background.rb

@@ -1,5 +0,0 @@
-# Background: We have a database connection working
-#   Given a sqlite database connection
-Given /^a sqlite database connection$/ do
-  @DB = Sequel.sqlite
-end 

data/features/stepdefs/play_around_with_fixtures/create_a_simple_fixture_push_it_and_rollback.rb

@@ -1,66 +0,0 @@
-#Scenario: Create a simple fixture, push it into a sqlite and rollback
-#  Given a table visitors with String:name, String:email
-#  And a table aliens with String:race
-#  And a table visits with Integer:alien_id, Integer:visitor_id
-#  And a file "test/fixtures/simple/visitors.yaml" with:
-#    """
-#    anonymous:
-#      name: V
-#      email: v@for.vendetta
-#    """
-#  And a file "test/fixtures/simple/aliens.yaml" with:
-#    """
-#    yourfavouritemartian:
-#      race: Zerg
-#    """
-#  And a file "test/fixtures/simple/visits.yaml" with:
-#    """
-#    v2yfm:
-#      alien_id: 1
-#      visitor_id: 1
-#    """
-#  When I load the simple fixture
-#  Then I should see 1 record in visitors with name "V" and email "v@for.vendetta"
-#  And I should see 1 record in aliens with race "Zerg"
-#  And I should see 1 record in visits with alien_id 1 and visitor_id 1
-
-Given /^a table (\w+) with (\w+):(\w+), (\w+):(\w+)$/ do |table, type1, field1, type2, field2|
-  @DB.create_table table.to_sym do
-    send :"#{type1}", field1
-    send :"#{type2}", field2
-  end
-end
-
-Given /^a table (\w+) with (\w+):(\w+)$/ do |table, type, field|
-  @DB.create_table table.to_sym do
-    send :"#{type}", field
-  end
-end
-
-And /^a file "(.+?)" with:$/ do |path, content|
-  Fast.file.write path, content
-end
-
-When /^I load the (\w+) fixture$/ do |fixture|
-  @fixture = Sequel::Fixture.new fixture.to_sym, @DB
-end
-
-Then /^I should see (\d) record in (\w+) with (\w+) "(.+?)" and (\w+) "(.+?)"$/ do |amount, table, field1, data1, field2, data2|
-  @DB[table.to_sym].where(field1.to_sym => data1, field2.to_sym => data2).count.should == amount.to_i
-end
-
-And /^I should see (\d) record in (\w+) with (\w+) "([^"]+)"$/ do |amount, table, field1, data1|
-  @DB[table.to_sym].where(field1.to_sym => data1).count.should == amount.to_i
-end
-
-Then /^I should see (\d) record in (\w+) with (\w+) (\d+) and (\w+) (\d+)$/ do |amount, table, field1, data1, field2, data2|
-  @DB[table.to_sym].where(field1.to_sym => data1.to_i, field2.to_sym => data2.to_i).count.should == amount.to_i
-end
-
-When /^I rollback$/ do
-  @fixture.rollback
-end
-
-Then /^I should see (\d+) records? in (\w+)$/ do |amount, table|
-  @DB[table.to_sym].count.should == amount.to_i
-end

data/features/stepdefs/play_around_with_fixtures/misconfigured_password_field.rb

@@ -1,40 +0,0 @@
-#Scenario: Misconfigured password field
-#  Given a table users with String:password
-#  And a file "test/fixtures/misconfigured/users.yaml" with:
-#    """
-#    good_entry:
-#      password:
-#        raw: secret
-#        processed: 96bdg756n5sgf9gfs==
-#    wrong_entry:
-#      password:
-#        missing: The field
-#    """
-#  Then the loading of misconfigured fixture should fail
-#  And I should see that the table was "users"
-#  And I should see that the field was "password"
-#  And I should see that the entry was "wrong_entry"
-#  And I should see 0 records in users
-
-# NOTE: most steps have been defined in 
-# `create_a_simple_fixture_push_it_and_rollback.rb`
-
-Then /^the loading of (\w+) fixture should fail$/ do |fixture|
-  begin
-    Sequel::Fixture.new fixture.to_sym, @DB
-  rescue Sequel::Fixture::MissingProcessedValueError => e
-    @exception = e
-  end
-end
-
-And /^I should see that the table was "(\w+)"$/ do |table|
-  @exception.message.should include table
-end
-
-And /^I should see that the field was "(\w+)"$/ do |field|
-  @exception.message.should include field
-end
-
-And /^I should see that the entry was "(\w+)"$/ do |entry|
-  @exception.message.should include entry
-end

data/features/support/env.rb

@@ -1,6 +0,0 @@
-require "fast"
-require "pry"
-
-$LOAD_PATH << File.expand_path("../../../../lib", __FILE__)
-
-require "sequel-fixture"

data/features/support/hooks.rb

@@ -1,6 +0,0 @@
-After do
-  Fast.dir.remove! :test, :fixtures
-  @DB.tables do |table|
-    @DB.drop_table table
-  end
-end