cutest-cj 1.7.1 → 1.8.0

data/bin/cutest

@@ -34,9 +34,11 @@ if files.any?
     env      = '.env'
     rack_env = "#{env}.#{ENV['RACK_ENV']}"
 
-    File.foreach env do |line|
-      key, value = line.split "=", 2
-      ENV[key] = value.gsub('\n', '').strip
+    if File.file? env
+      File.foreach env do |line|
+        key, value = line.split "=", 2
+        ENV[key] = value.gsub('\n', '').strip
+      end
     end
 
     if File.file? rack_env

data/lib/cutest.rb

@@ -7,7 +7,7 @@ class Cutest
   autoload :Database, 'cutest/database'
 
   unless defined?(VERSION)
-    VERSION = "1.7.1"
+    VERSION = "1.8.0"
     FILTER = %r[/(ruby|jruby|rbx)[-/]([0-9\.])+]
     CACHE = Hash.new { |h, k| h[k] = File.readlines(k) }
   end

data/lib/cutest/database.rb

@@ -1,79 +1,6 @@
-class Cutest
-  module Database
-    extend self
-
-    module Helper
-      require 'active_record'
-
-      extend ActiveSupport::Concern
-
-      private
-
-      def factory *attrs
-        attrs.each do |key, value|
-          if key.is_a? Hash
-            key.each do |k, v|
-              send("#{k}=", v) unless send("#{k}").present?
-            end
-          else
-            send("#{key}=", value) unless send("#{key}").present?
-          end
-        end
-
-        if respond_to?(:creator_id) and not creator_id
-          self.creator_id = Cutest.config.creator_id
-        end
-
-        if respond_to?(:updater_id) and not updater_id
-          self.updater_id = Cutest.config.updater_id
-        end
-      end
-    end
-
-    def reset database = false, options = {}
-      connect database
-
-      c = config.merge options
-
-      ignore_tables = %w(schema_migrations)
-
-      if c.key? :ignore_tables
-        ignore_tables.concat c[:ignore_tables]
-      end
-
-      conn   = ActiveRecord::Base.connection
-      tables = conn.execute("show tables").map { |r| r[0]  }
-
-      tables.each do |t|
-        unless ignore_tables.include? t
-          conn.execute("SET FOREIGN_KEY_CHECKS = 0")
-          conn.execute("TRUNCATE #{t}")
-          conn.execute("SET FOREIGN_KEY_CHECKS = 1")
-        end
-      end
-    end
-
-    def connect database = false
-      ActiveRecord::Base.default_timezone = Time.zone
-
-      db = URI.parse database || config[:url]
-
-      ActiveRecord::Base.establish_connection(
-          adapter:      db.scheme == 'postgres' ? 'postgresql' : db.scheme,
-          encoding:     'utf8',
-          reconnect:    true,
-          database:     db.path[1..-1],
-          host:         db.host,
-          port:         db.port,
-          username:     db.user,
-          password:     db.password,
-      )
-    end
-
-    def config
-      Cutest.config.database.clone
-    end
-  end
+if defined? Sequel
+  require_relative 'database/sequel_driver'
+  require_relative 'database/sequel_factories'
+elsif defined? ActiveRecord
+  require_relative 'database/activerecord_driver'
 end
-
-ActiveRecord::Base.send :include, Cutest::Database::Helper

data/lib/cutest/database/activerecord_driver.rb

@@ -0,0 +1,79 @@
+class Cutest
+  module Database
+    extend self
+
+    module Helper
+      require 'active_record'
+
+      extend ActiveSupport::Concern
+
+      private
+
+      def factory *attrs
+        attrs.each do |key, value|
+          if key.is_a? Hash
+            key.each do |k, v|
+              send("#{k}=", v) unless send("#{k}").present?
+            end
+          else
+            send("#{key}=", value) unless send("#{key}").present?
+          end
+        end
+
+        if respond_to?(:creator_id) and not creator_id
+          self.creator_id = Cutest.config.creator_id
+        end
+
+        if respond_to?(:updater_id) and not updater_id
+          self.updater_id = Cutest.config.updater_id
+        end
+      end
+    end
+
+    def reset database = false, options = {}
+      connect database
+
+      c = config.merge options
+
+      ignore_tables = %w(schema_migrations)
+
+      if c.key? :ignore_tables
+        ignore_tables.concat c[:ignore_tables]
+      end
+
+      conn   = ActiveRecord::Base.connection
+      tables = conn.execute("show tables").map { |r| r[0]  }
+
+      tables.each do |t|
+        unless ignore_tables.include? t
+          conn.execute("SET FOREIGN_KEY_CHECKS = 0")
+          conn.execute("TRUNCATE #{t}")
+          conn.execute("SET FOREIGN_KEY_CHECKS = 1")
+        end
+      end
+    end
+
+    def connect database = false
+      ActiveRecord::Base.default_timezone = Time.zone
+
+      db = URI.parse database || config[:url]
+
+      ActiveRecord::Base.establish_connection(
+          adapter:      db.scheme == 'postgres' ? 'postgresql' : db.scheme,
+          encoding:     'utf8',
+          reconnect:    true,
+          database:     db.path[1..-1],
+          host:         db.host,
+          port:         db.port,
+          username:     db.user,
+          password:     db.password,
+      )
+    end
+
+    def config
+      Cutest.config.database.clone
+    end
+  end
+end
+
+ActiveRecord::Base.send :include, Cutest::Database::Helper

data/lib/cutest/database/sequel_driver.rb

@@ -0,0 +1,33 @@
+class Cutest
+  module Database
+    extend self
+
+    def reset database = false, options = {}
+      db = connect database
+
+      c = config.merge options
+
+      ignore_tables = %w(schema_migrations)
+
+      if c.key? :ignore_tables
+        ignore_tables.concat c[:ignore_tables]
+      end
+
+      db.tables.each do |t|
+        unless ignore_tables.include? t
+          db.run("SET FOREIGN_KEY_CHECKS = 0")
+          db.run("TRUNCATE #{t}")
+          db.run("SET FOREIGN_KEY_CHECKS = 1")
+        end
+      end
+    end
+
+    def connect database = false
+      @db ||= Sequel.connect database || config[:url]
+    end
+
+    def config
+      Cutest.config.database.clone
+    end
+  end
+end

data/lib/cutest/database/sequel_factories.rb

@@ -0,0 +1,128 @@
+require 'sequel'
+
+module Sequel
+  class Factory
+    def initialize(values_proc)
+      @values_proc = values_proc
+    end
+
+    # The Proc this factory uses to generate a new set of values.
+    attr_reader :values_proc
+
+    # Merges all key/value pairs generated by this factory into the
+    # given +values+ hash.
+    def apply_values(values={})
+      @values = values
+      instance_eval(&values_proc)
+      @values
+    end
+
+    # Merges all key/value pairs that are generated by the given +factory+ into
+    # the values currently being generated by this factory. Should be called
+    # inside a values Proc to include values from some higher-level factory.
+    #
+    #   User.factory do
+    #     name Randgen.name
+    #   end
+    #
+    #   User.factory(:with_url) do
+    #     include_factory User.factory
+    #     url "http://www.example.com"
+    #   end
+    #
+    #   User.make               # Has only a name property
+    #   User.make(:with_url)    # Has both name *and* url properties
+    def include_factory(factory)
+      factory.apply_values(@values)
+    end
+
+    alias_method :include, :include_factory
+
+    # Gets/sets the value of the given +key+. If any +args+ are provided, the
+    # value is set to the first one. Otherwise, if a block is given it will be
+    # called with a number unique to the given +key+ (like a sequence) and the
+    # return value of the block is used as the value.
+    def method_missing(key, *args)
+      if args.any?
+        @values[key] = args.first
+      elsif block_given?
+        @counts ||= {}
+        @counts[key] ||= 0
+        @counts[key] += 1
+        @values[key] = yield(@counts[key])
+      end
+
+      @values[key]
+    end
+  end
+
+  class Model
+    class << self
+      attr_writer :factory_method
+    end
+
+    # Returns the name of the Sequel::Model class method that this factory uses
+    # to make new instances. Defaults to +:create+. Other useful methods are
+    # +:new+ (to prevent saving to the database) and +:find_or_create+ (to avoid
+    # uniqueness constraints in the database).
+    def self.factory_method
+      return @factory_method unless @factory_method.nil?
+      return superclass.factory_method if superclass.respond_to?(:factory_method)
+      :create
+    end
+
+    # A Hash of factories for this model, keyed by factory name.
+    def self.factories
+      @factories ||= {}
+    end
+
+    # Gets/sets the factory with the given +name+. If a block is given, uses that
+    # block to create a new factory.
+    def self.factory(name=:default)
+      factories[name] = Factory.new(Proc.new) if block_given?
+      factories[name]
+    end
+
+    def self.has_factory?(name)
+      not factory(name).nil?
+    end
+
+    # Makes an instance of this model using the factories with the given
+    # +factory_names+. Any +values+ given to this method will override
+    # factory-produced values with the same name after all factory values have
+    # been generated. The default factory is used if no factory names are given.
+    #
+    # Note: If +values+ is not a Hash, it will be used as a factory name.
+    def self.make(values={}, *factory_names)
+      unless Hash === values
+        factory_names.unshift(values)
+        values = {}
+      end
+
+      factory_names << :default if factory_names.empty?
+
+      factory_values = factory_names.inject({}) do |memo, name|
+        fac = factory(name) or raise "Unknown #{self} factory: #{name}"
+        fac.apply_values(memo)
+      end
+
+      send factory_method, factory_values.merge(values)
+    end
+
+    # Forces the #factory_method to be the given +method+ temporarily while an
+    # instance is made, then reverts to the old factory method.
+    def self.make_with(method, *args)
+      tmp = @factory_method
+      @factory_method = method
+      obj = make(*args)
+      @factory_method = tmp
+      obj
+    end
+
+    # Sugar for +make_with(:new, *args)+. Useful when the #factory_method is
+    # something other than +:new+ but you still want to use it.
+    def self.build(*args)
+      make_with(:new, *args)
+    end
+  end
+end

data/test/run.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 test "output of successful run" do
   expected = "•"
 

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cutest-cj
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
+  prerelease: 
 platform: ruby
 authors:
 - Damian Janowski
@@ -10,62 +11,70 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   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: awesome_print
   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: clap
   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: mocoso
   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'
 description: Run tests in separate processes to avoid shared state.
@@ -87,6 +96,9 @@ files:
 - cutest.gemspec
 - lib/cutest.rb
 - lib/cutest/database.rb
+- lib/cutest/database/activerecord_driver.rb
+- lib/cutest/database/sequel_driver.rb
+- lib/cutest/database/sequel_factories.rb
 - test/assert.rb
 - test/assert_equal.rb
 - test/assert_raise.rb
@@ -104,26 +116,26 @@ files:
 homepage: https://github.com/djanowski/cutest
 licenses:
 - MIT
-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: 2.0.14
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Forking tests.
 test_files: []
-has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 224cb7bb171191f5c0e9ceeea0299171871c0d8f
-  data.tar.gz: f8d25e5a5ca28c3fa07d00c3562da48ecb233193
-SHA512:
-  metadata.gz: 09b987489d3e419b21a31d386bfe7fd6a06b67970d8168d6d0914a69816bb83c48fdc14dac566db619c0b552bd0793f618f5abc8e6824d8d4cab14f16ba6ed81
-  data.tar.gz: 3a439c1113fde62e73b28e297a3d9e2562237dbcc87ec6b4126f53efc267735be90f2a6d4772c8b73ec38e38e7e1812be41ccbf1d41ab50dbb3b46fddb6e173a