fixie 0.2.0 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 942d233e8db89efea3069363c9bc729f65b38fed
+  data.tar.gz: c8810c4a8e5f7b403394ede43137e0ff081d9917
+SHA512:
+  metadata.gz: 12895d4237d004b66be0ac8a4192f10be5fd80609a09ed616f35c3fdeece9d51e18319dbcfa47cd468eddc8da4391daa88c99a4478ca702d1ab12f2e53b92751
+  data.tar.gz: a8f886d191335f04b8b105cd305668d445e906f57d659b1656002b93513fb737031257b968f3a5b59b801b040e445eaae4d7a7fd20e9bfd811e6aa6fd536bc93

data/README.md

@@ -26,7 +26,7 @@ To use Fixie, you first create some fixture files in a directory called `fixture
             ├── cities.yml
             └── countries.yml
 
-You must put all your fixtures into a subdirectory of the `fixtures` directory.  The name of the directory should be a good logical name for the database that the fixtures.  If you have only one database, `default` is a reasonable name, but if you have an app with customers in one database and orders in another, you would name them `customers` and `orders`.
+You must put all your fixtures into a subdirectory of the `fixtures` directory.  The name of the directory should be a good logical name for the database that the fixtures.  If you have only one database, you should use `default` as the name, but if you have an app with customers in one database and orders in another, you would name them `customers` and `orders`.
 
 Fixie uses Sequel to load the data into the database.  Fixie will work even if you aren't using Sequel in your application.  You must configure the Fixie databases and then call `load_fixtures` to get the fixtures to actually be loaded.  Your test helper might look like this:
 
@@ -36,7 +36,23 @@ Fixie.dbs[:default] = Sequel.sqlite
 Fixie.load_fixtures
 ```
 
-Now all the fixtures will be loaded into the test database.  In order to access them from a test, you need to mix the `Fixie::Model` module into the base class of your models.  For example, say you have models defined like this:
+Now all the fixtures will be loaded into the default database.  In order to access them from a test, you can the fixture as a Hash like this:
+
+``` ruby
+Fixie::Fixtures.countries(:us)
+```
+
+You can also include the `Fixie::Fixtures` model in your tests and then just call the method directly:
+
+``` ruby
+include Fixie::Fixtures
+
+def test_something
+  assert_equal "US", countries(:us)
+end
+```
+
+If you have models in your application and you want to get instances of the model back instead of Hashes, you need to mix the `Fixie::Model` module into the base class of your models.  For example, say you have models defined like this:
 
 ``` ruby
 class Model
@@ -63,12 +79,6 @@ def test_something
 end
 ```
 
-You can also access the fixtures in any context once they have been loaded like this:
-
-``` ruby
-Fixie.fixture(:default, :countries, :us)
-```
-
 Fixtures are defined in YAML files like this:
 
 ``` yaml

data/fixie.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "fixie"
-  gem.version       = "0.2.0"
+  gem.version       = "0.3.0"
   gem.authors       = ["Paul Barry"]
   gem.email         = ["mail@paulbarry.com"]
   gem.description   = %q{A standalone library for managing test fixture data}

data/lib/fixie.rb

@@ -1,4 +1,5 @@
 require 'fixie/version'
+require 'active_support'
 require 'active_support/core_ext'
 require 'erb'
 require 'sequel'
@@ -35,8 +36,8 @@ module Fixie
 
   def self.all_fixtures
     @all_fixtures ||= begin
-      unless Dir.exists?(Fixie.dir)
-        raise "There is no directory in the $LOAD_PATH with a 'fixtures' directory in it"
+      unless Fixie.dir.present? && Dir.exists?(Fixie.dir)
+        raise "There is no directory in the load path with a 'fixtures' directory in it"
       end
 
       all_fixtures = {}
@@ -53,15 +54,19 @@ module Fixie
           fixtures = YAML.load(ERB.new(IO.read(file)).result(binding)).symbolize_keys
 
           fixtures.each do |name, data|
-            data["id"] ||= identify(name)
+            data[:id] ||= identify(name)
+            data.symbolize_keys!
           end
 
+          Fixie::Fixtures.define_fixture_accessor(db_name, table_name.to_sym)
+
           all_fixtures[db_name][table_name.to_sym] = fixtures
         end
 
         # Do a second pass to resolve associations and load data in DB
         all_fixtures[db_name].each do |table_name, fixtures|
           table = db[table_name]
+          table.delete
           table_has_created_at = table.columns.include?(:created_at)
           table_has_updated_at = table.columns.include?(:updated_at)
 
@@ -73,18 +78,18 @@ module Fixie
               if associated_fixtures && table.columns.include?("#{attr}_id".to_sym)
                 associated_fixture = associated_fixtures[data[attr].to_sym]
                 if associated_fixture
-                  data["#{attr}_id"] = associated_fixture['id']
+                  data["#{attr}_id".to_sym] = associated_fixture[:id]
                   data.delete(attr)
                 end
               end
 
-              data["created_at"] = now if table_has_created_at && !data.key?("created_at")
-              data["updated_at"] = now if table_has_updated_at && !data.key?("updated_at")
+              data[:created_at] = now if table_has_created_at && !data.key?(:created_at)
+              data[:updated_at] = now if table_has_updated_at && !data.key?(:updated_at)
             end
 
             # Set created_at/updated_at if they exist
 
-            # Finally, put the data in the DB
+            # Finally, replace the data in the DB
             table.insert(data)
           end
         end
@@ -117,6 +122,16 @@ module Fixie
     Fixie.all_fixtures
   end
 
+  module Fixtures
+    extend self
+
+    def define_fixture_accessor(db_name, table_name)
+      define_method(table_name) do |fixture_name|
+        Fixie.fixture(db_name, table_name, fixture_name)
+      end
+    end
+  end
+
   module Model
     # This will return an instance of this class loaded from
     # the fixtures matching the name
@@ -142,7 +157,7 @@ module Fixie
       new(fixture)
     end
 
-    # This method determine which database is used to load the fixture.
+    # This method determines which database is used to load the fixture.
     # The default implementation is to check the class to see if it has a
     # namespace, like 'Foo::Bar', and if it does, return :foo.
     # If it does not have a namespace, it will return :default.

data/lib/fixie/version.rb

@@ -1,3 +1,3 @@
 module Fixie
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/test/fixie_test.rb

@@ -1,7 +1,8 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'logger'
 require 'sequel'
 require 'sqlite3'
+require 'fileutils'
 
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
 $LOAD_PATH.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
@@ -26,6 +27,7 @@ class City < Model
   attr_accessor :name, :country, :country_id, :created_at
 end
 
+FileUtils.mkdir_p 'log'
 db = Sequel.sqlite(logger: Logger.new("log/test.log"))
 
 db.create_table :countries do
@@ -54,7 +56,7 @@ Fixie.extend FakeGetText
 Fixie.load_fixtures
 Model.extend Fixie::Model
 
-class FixieTest < MiniTest::Unit::TestCase
+class FixieTest < Minitest::Test
 
   def test_explicit_id
     assert_equal "United States", Country.fixture(:us).name
@@ -73,7 +75,7 @@ class FixieTest < MiniTest::Unit::TestCase
   end
 
   def test_get
-    assert_equal "US", Fixie.fixture(:default, :countries, :us)["code"]
+    assert_equal "US", Fixie.fixture(:default, :countries, :us)[:code]
   end
 
   def test_loaded_in_db

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: fixie
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Paul Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A standalone library for managing test fixture data
@@ -66,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -79,30 +72,28 @@ files:
 - test/fixtures/default/countries.yml
 homepage: http://github.com/pjb3/fixie
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A standalone library for managing test fixture data
 test_files:
 - test/fixie_test.rb
 - test/fixtures/default/cities.yml
 - test/fixtures/default/countries.yml
-has_rdoc: