fixation 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b9a44ee63cacf43c742f6e4292f031aa718aa47
-  data.tar.gz: 62924349c40e85c753bdefb14bfc3371a72739eb
+  metadata.gz: ebf779f055287d6af43f1dc2fc1625a06186d9cb
+  data.tar.gz: 8b77c04e6bfa3682a5662cc9833e5b34224b7c3e
 SHA512:
-  metadata.gz: ebb9d086bd7296eda9f5e54de1475e875cb08f822d5a7d9776986a86f88dae9460c6dfb1fd70d4c231a33b29b282b8346e8b9e6e6b1bbc010807fa41ebe5a37b
-  data.tar.gz: f4d907e2b7a1a7fddc5235534265dc562776cfb58d6ad9ffed13382f398e78f6c760de1b2fa88c6e8b0309eb51aab00aef1443dd34b9f3f832a88048a55d21dc
+  metadata.gz: 664900554e247b44d0029f426128df2909e5dd10cfcdbe254e088c92f88584480acb63976fec453f8e9bf70d1c3177feb8c6ac75d43290fe5377d0f93b281338
+  data.tar.gz: bc34ed6961ca5966c561b8d7faf70cc57fd93900acfd52acfdc301b002014f5bf7e90bdea8a32bf4a1612ab4fedb81f86c6d9613068928ad38a0124e96ba6bc9

data/README.md

@@ -22,7 +22,7 @@ Or install it yourself as:
 
     $ gem install fixation
 
-Then, make an initializer:
+Then, make an initializer file in config/initializers:
 
 ```ruby
 if Rails.env.test? && Fixation.running_under_spring?
@@ -32,9 +32,7 @@ if Rails.env.test? && Fixation.running_under_spring?
 end
 ```
 
-And run `spring stop` so this gets picked up.
-
-Finally, open up your spec_helper.rb, and find the current `global_fixtures` setting:
+Open up your spec_helper.rb, and find the current `global_fixtures` setting:
 
 ```ruby
 config.global_fixtures = :all
@@ -47,6 +45,8 @@ config.global_fixtures = []
 config.include Fixation.fixture_methods
 ```
 
+Finally run `spring stop` so these changes get picked up.
+
 ## Usage
 
 Simply run your tests under spring.
@@ -86,11 +86,27 @@ if Rails.env.test?
 end
 ```
 
+## Ruby fixtures
+
+As well as traditional .yml fixture files, Fixation allows you to drop .rb files into your fixture directory.  You can then call the `add_fixture` method, passing the name of the table, the name of the fixture, and the attributes:
+
+```ruby
+10.times do |n|
+  Fixation.add_fixture(:customers, "active_customer_#{n}", active: true, name: "Sue #{n}")
+end
+```
+
+(You should avoid accessing your actual model classes here, since that will cause them to be auto-loaded.)
 
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/willbryant/fixation.
 
+## Thanks
+
+* Andy Newport (@newportandy)
+* Andrew Clemons (@aclemons)
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/lib/fixation.rb

@@ -25,6 +25,7 @@ module Fixation
 
   def self.build_fixtures
     @fixtures = Fixtures.new
+    @fixtures.compile_fixture_files
   end
 
   def self.apply_fixtures
@@ -37,6 +38,10 @@ module Fixation
     @fixtures.fixture_methods
   end
 
+  def self.add_fixture(fixture_for, name, attributes)
+    @fixtures.add_fixture(fixture_for, name, attributes)
+  end
+
   # Returns a consistent, platform-independent identifier for +label+.
   # Integer identifiers are values less than 2^30. UUIDs are RFC 4122 version 5 SHA-1 hashes.
   #

data/lib/fixation/fixture_table.rb

@@ -1,11 +1,13 @@
 module Fixation
   class FixtureTable
-    attr_reader :filename, :class_name, :table_name, :connection, :now
+    attr_reader :filename, :fixture_name, :class_name, :table_name, :connection, :loaded_at
 
-    def initialize(filename, basename, connection, now)
+    def initialize(filename, basename, connection, loaded_at)
       @filename = filename
       @connection = connection
-      @now = now
+      @loaded_at = loaded_at
+
+      @fixture_name = basename.gsub('/', '_')
 
       @class_name = basename.classify
       begin
@@ -52,11 +54,11 @@ module Fixation
 
     def embellished_rows
       @embellished_rows ||= parsed_rows.each do |name, attributes|
-        embellish_fixture(name, attributes, columns_hash)
+        embellish_fixture(name, attributes)
       end
     end
 
-    def embellish_fixture(name, attributes, columns_hash)
+    def embellish_fixture(name, attributes)
       # populate the primary key column, if not already set
       if @primary_key && columns_hash[@primary_key] && !attributes.has_key?(@primary_key)
         attributes[@primary_key] = Fixation.identify(name, columns_hash[@primary_key].type)
@@ -70,10 +72,10 @@ module Fixation
       # populate any timestamp columns, if not already set
       if @record_timestamps
         %w(created_at updated_at).each do |column_name|
-          attributes[column_name] = now if columns_hash[column_name] && !attributes.has_key?(column_name)
+          attributes[column_name] = loaded_at if columns_hash[column_name] && !attributes.has_key?(column_name)
         end
         %w(created_at updated_at).each do |column_name|
-          attributes[column_name] = now.to_date if columns_hash[column_name] && !attributes.has_key?(column_name)
+          attributes[column_name] = loaded_at.to_date if columns_hash[column_name] && !attributes.has_key?(column_name)
         end
       end
 
@@ -116,6 +118,11 @@ module Fixation
       end
     end
 
+    def add_row(name, attributes)
+      embellish_fixture(name, attributes)
+      embellished_rows[name] = attributes
+    end
+
     def fixture_ids
       embellished_rows.each_with_object({}) do |(name, attributes), ids|
         ids[name] = attributes['id'] || attributes['uuid']

data/lib/fixation/fixtures.rb

@@ -1,33 +1,62 @@
 module Fixation
+  class FixtureContent
+  end
+
   class Fixtures
     def initialize
-      @class_names = {}
-      @fixture_ids = {}
-      @statements = {}
-
-      compile_fixture_files
+      @fixture_tables = {}
     end
 
     def compile_fixture_files(connection = ActiveRecord::Base.connection)
       puts "#{Time.now} building fixtures" if Fixation.trace
 
-      now = ActiveRecord::Base.default_timezone == :utc ? Time.now.utc : Time.now
+      @class_names = {}
+
+      @loaded_at = ActiveRecord::Base.default_timezone == :utc ? Time.now.utc : Time.now
+
       Fixation.paths.each do |path|
         Dir["#{path}/{**,*}/*.yml"].each do |pathname|
           basename = pathname[path.size + 1..-5]
-          compile_fixture_file(pathname, basename, connection, now) if ::File.file?(pathname)
+          load_fixture_file(pathname, basename, connection) if ::File.file?(pathname)
+        end
+      end
+
+      Fixation.paths.each do |path|
+        Dir["#{path}/{**,*}/*.rb"].each do |pathname|
+          FixtureContent.instance_eval(File.read(pathname)) if ::File.file?(pathname)
         end
       end
 
+      bake_fixtures
+
       puts "#{Time.now} built fixtures for #{@fixture_ids.size} tables" if Fixation.trace
     end
 
-    def compile_fixture_file(filename, basename, connection, now)
-      fixture_table = FixtureTable.new(filename, basename, connection, now)
-      fixture_name = basename.gsub('/', '_')
-      @fixture_ids[fixture_name] = fixture_table.fixture_ids
-      @class_names[fixture_name] = fixture_table.class_name
-      @statements[fixture_table.table_name] = fixture_table.statements
+    def load_fixture_file(filename, basename, connection)
+      fixture_table = FixtureTable.new(filename, basename, connection, @loaded_at)
+      @fixture_tables[fixture_table.fixture_name] = fixture_table
+      @class_names[fixture_table.fixture_name] = fixture_table.class_name
+    end
+
+    def add_fixture(fixture_for, name, attributes)
+      raise "Fixtures have already been compiled!  You can only call add_fixture from a file in one of the fixture directories, which is loaded on boot." if baked_fixtures?
+      fixture_table = @fixture_tables[fixture_for.to_s] or raise(ArgumentError, "No fixture file for #{fixture_for}") # TODO: consider allowing this
+      fixture_table.add_row(name.to_s, attributes.stringify_keys)
+      name
+    end
+
+    def bake_fixtures
+      @fixture_ids = {}
+      @statements = {}
+
+      @fixture_tables.each do |fixture_name, fixture_table|
+        @fixture_ids[fixture_table.fixture_name] = fixture_table.fixture_ids
+        @statements[fixture_table.table_name] = fixture_table.statements
+      end
+    end
+
+    def baked_fixtures?
+      !@fixture_ids.nil? || !@statements.nil?
     end
 
     def apply_fixtures(connection = ActiveRecord::Base.connection)
@@ -48,7 +77,8 @@ module Fixation
     end
 
     def clear_other_tables(connection)
-      (connection.tables - Fixation.tables_not_to_clear - @statements.keys).each do |table_name|
+      data_sources = connection.respond_to?(:data_sources) ? connection.data_sources : connection.tables
+      (data_sources - Fixation.tables_not_to_clear - @statements.keys).each do |table_name|
         connection.execute("DELETE FROM #{connection.quote_table_name table_name}")
       end
     end

data/lib/fixation/version.rb

@@ -1,3 +1,3 @@
 module Fixation
-  VERSION = "2.0.1"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fixation
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Will Bryant
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2017-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,8 +80,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: 10x faster fixture startup under spring.
 test_files: []
+has_rdoc: