to_factory 2.1.0 → 3.0.0.pre.pre

data/spec/support/data_creation.rb

@@ -5,7 +5,7 @@ module ToFactory::DataCreation
   end
 
   def create_project!
-    ToFactory::Project.create({:name => "My Project", :objective => "easy testing", :some_id => 9 })
+    ToFactory::Project.create(name: "My Project", objective: "easy testing", some_id: 9)
   end
 
   def birthday
@@ -14,23 +14,21 @@ module ToFactory::DataCreation
 
   def create_user!
     ToFactory::User.create(
-      :name            => "Jeff",
-      :email           => "test@example.com",
-      :some_attributes => {:a => 1},
-      :some_id         => 8,
-      :birthday        => birthday
+      name: "Jeff",
+      email: "test@example.com",
+      some_attributes: { a: 1 },
+      some_id: 8,
+      birthday: birthday
     )
   end
 
   def create_admin!
     ToFactory::User.create(
-      :name            => "Admin",
-      :email           => "admin@example.com",
-      :some_attributes => {:a => 1},
-      :some_id         => 9,
-      :birthday        => birthday
+      name: "Admin",
+      email: "admin@example.com",
+      some_attributes: { a: 1 },
+      some_id: 9,
+      birthday: birthday
     )
   end
 end
-
-

data/spec/support/match_sexp.rb

@@ -8,7 +8,6 @@ RSpec::Matchers.define :match_sexp do |expected|
       @raised = e
       false
     end
-
   end
 
   failure_message do |actual|

data/spec/support/non_active_record/inherited_project.rb

@@ -0,0 +1,3 @@
+class ToFactory::InheritedProject < ToFactory::Project
+  self.table_name = "projects"
+end

data/spec/support/non_active_record/project.rb

@@ -0,0 +1,3 @@
+class ToFactory::Project < ActiveRecord::Base
+  self.table_name = "projects"
+end

data/spec/support/non_active_record/some_other_service_inheriting_from_something_else.rb

@@ -0,0 +1,4 @@
+require_relative "something_else"
+
+class SomeOtherService < SomethingElse
+end

data/spec/support/non_active_record/some_service.rb

@@ -0,0 +1,2 @@
+class SomeService
+end

data/spec/support/non_active_record/something_else.rb

@@ -0,0 +1,2 @@
+class SomethingElse
+end

data/spec/support/ruby_parser_exception_causing_string.rb

@@ -1,31 +1,31 @@
-"               
-                                      \ \ \                 -           \ \   
-                                                                             
-                                                                               
-                                                                    ,      
-                                                                           
-                                                                   
-                                                                             
-                                                                   
-                                                                         \    
-                                                                       
-                                                                      
-                                              \                              
-                                                                              
-                                                                               
-                                                                             
-                                                                             
-                                                                       
-                                                                        
-                                                                             
-                                                                          
-                                                                         
-                                                    ,                  
-                                                                        
-                                                               \ \    
-                                                                               
-                                                                          
-                                                                           
-                                                                         
+"
+                                      \ \ \                 -           \ \
+
+
+                                                                    ,
+
+
+
+
+                                                                         \
+
+
+                                              \
+
+
+
+
+
+
+
+
+
+                                                    ,
+
+                                                               \ \
+
+
+
+
 
                                                                  \ "

data/spec/unit/collation_spec.rb

@@ -1,20 +1,20 @@
 describe ToFactory::Collation do
   describe "detect_collisions!" do
-    let(:collation) { ToFactory::Collation.new(a,b) }
-    let(:a) { [double(:name => "a")]}
-    let(:b) { [double(:name => "a")]}
+    let(:collation) { ToFactory::Collation.new(a, b) }
+    let(:a) { [double(name: "a")] }
+    let(:b) { [double(name: "a")] }
 
     def perform
       collation.detect_collisions!(a, b)
     end
 
     it do
-      expect(lambda{perform}).to raise_error ToFactory::AlreadyExists
+      expect { perform }.to raise_error ToFactory::AlreadyExists
     end
 
     context "non matching keys" do
-      let(:a) { [double(:name => "a")]}
-      let(:b) { [double(:name => "b")]}
+      let(:a) { [double(name: "a")] }
+      let(:b) { [double(name: "b")] }
 
       it do
         expect(perform).to eq nil
@@ -29,14 +29,13 @@ describe ToFactory::Collation do
     let(:super_admin) { ToFactory::Representation.new("super_admin", "admin", "Factory.define(:super_admin, :parent => :admin) { |o| o.name(\"Super Admin\") }") }
 
     it do
-      new_definitions = [ root ]
-      pre_existing    = [ admin, user, super_admin ]
+      new_definitions = [root]
+      pre_existing    = [admin, user, super_admin]
 
       result = ToFactory::Collation.organize(new_definitions, pre_existing)
       result = result["to_factory/user"]
-      expect(result.map &:hierarchy_order).to eq [1,2,3,4]
+      expect(result.map &:hierarchy_order).to eq [1, 2, 3, 4]
       expect(result).to eq [user, admin, super_admin, root]
     end
   end
 end
-

data/spec/unit/file_writer_spec.rb

@@ -12,17 +12,13 @@ describe ToFactory::FileWriter do
 
     it "adds factories for all models" do
       user_representation = double :name => :user, "definition" => "factory a"
-      project_representation = double :name => "project", :definition =>"factory b"
-      fw.write({"to_factory/user" =>[user_representation],
-                "to_factory/project" => [project_representation]
-      })
+      project_representation = double name: "project", definition: "factory b"
+      fw.write("to_factory/user" => [user_representation],
+               "to_factory/project" => [project_representation])
 
-      expect(user_file).to match /FactoryGirl.define do/
+      expect(user_file).to match /FactoryBot.define do/
       expect(user_file).to include "factory a"
       expect(project_file).to include "factory b"
     end
   end
-
-
-
 end

data/spec/unit/finders/factory_spec.rb

@@ -3,24 +3,22 @@ describe ToFactory::Finders::Factory do
     before do
       FileUtils.mkdir_p "./tmp/factories/to_factory"
       FileUtils.cp "./spec/example_factories/user_admin_with_header.rb",
-        "./tmp/factories/to_factory/user.rb"
+                   "./tmp/factories/to_factory/user.rb"
     end
 
-    let(:user_file_contents) { File.read "./spec/example_factories/user.rb"}
-    let(:admin_file_contents){ File.read "./spec/example_factories/admin.rb" }
+    let(:user_file_contents) { File.read "./spec/example_factories/user.rb" }
+    let(:admin_file_contents) { File.read "./spec/example_factories/admin.rb" }
 
     it "reads all the factories" do
       finder = ToFactory::Finders::Factory.new
 
       result = finder.call
 
-      expect(result[0].definition).
-        to match_sexp user_file_contents
+      expect(result[0].definition)
+        .to match_sexp user_file_contents
 
-      expect(result[1].definition).
-        to match_sexp admin_file_contents
+      expect(result[1].definition)
+        .to match_sexp admin_file_contents
     end
   end
-
 end
-

data/spec/unit/finders/model_spec.rb

@@ -7,8 +7,8 @@ describe ToFactory::Finders::Model do
   let(:path) { "./spec/support/models" }
 
   describe "#call" do
-    let!(:user) { ToFactory::User.create! :name => "a user"}
-    let!(:project) { ToFactory::Project.create! :name => "a project"}
+    let!(:user) { ToFactory::User.create! name: "a user" }
+    let!(:project) { ToFactory::Project.create! name: "a project" }
 
     context "with a match" do
       it do
@@ -32,8 +32,8 @@ describe ToFactory::Finders::Model do
       it "displays a warning" do
         expect(finder.call).to eq [project]
 
-        expect(finder).to have_received(:warn).
-          with( "Failed to eval ./spec/support/broken_models/invalid_ruby_file.rb")
+        expect(finder).to have_received(:warn)
+          .with("Failed to eval ./spec/support/broken_models/invalid_ruby_file.rb")
       end
     end
 
@@ -47,12 +47,9 @@ describe ToFactory::Finders::Model do
         expect(klass).to receive(:ancestors).and_raise("Some error")
         finder.call(klasses: [klass])
 
-        expect(finder).to have_received(:warn).
-          with( "Failed to get record from BrokenClass \"Some error\"")
+        expect(finder).to have_received(:warn)
+          .with("Failed to get record from BrokenClass \"Some error\"")
       end
     end
   end
-
 end
-
-

data/spec/unit/generation/attribute_spec.rb

@@ -1,16 +1,16 @@
 describe ToFactory::Generation::Attribute do
-  let(:attribute) { ToFactory::Generation::Attribute.new(:some_attributes, {:a => 1}) }
+  let(:attribute) { ToFactory::Generation::Attribute.new(:some_attributes, a: 1) }
 
   describe "#to_s" do
     it do
-      expect(attribute.to_s).to include "some_attributes({:a => 1})"
+      expect(attribute.to_s).to include "some_attributes { {:a => 1} }"
     end
   end
 
   describe "#format" do
     it "formats Date, Time, DateTime" do
-      Time.zone= "UTC"
-      time_string ="2011-12-13T14:15 UTC"
+      Time.zone = "UTC"
+      time_string = "2011-12-13T14:15 UTC"
 
       expect(attribute.format(Time    .parse(time_string))).to eq "2011-12-13T14:15 UTC".inspect
       expect(attribute.format(Date    .parse(time_string))).to eq "2011-12-13".inspect
@@ -23,12 +23,12 @@ describe ToFactory::Generation::Attribute do
     end
 
     it "formats BigDecimal"do
-      expect(attribute.format(BigDecimal.new "123456789012345678900.0")).to eq "BigDecimal.new(\"123456789012345678900.0\")"
+      expect(attribute.format(BigDecimal "123456789012345678900.0")).to eq "BigDecimal.new(\"123456789012345678900.0\")"
     end
 
     it "handles unparseable strings" do
-      #NB this spec may only have been relevant for ruby 1.8 i.e. older RubyParser versions
-      #see https://github.com/markburns/to_factory/issues/4
+      # NB this spec may only have been relevant for ruby 1.8 i.e. older RubyParser versions
+      # see https://github.com/markburns/to_factory/issues/4
       parser = double "RubyParser"
       expect(parser).to receive(:parse).and_raise "some error"
       attribute.parser = parser
@@ -37,18 +37,17 @@ describe ToFactory::Generation::Attribute do
     end
   end
 
-
   describe "#inspect_value" do
     it do
-      expect(attribute.inspect_value({:a => 1})).to eq "({:a => 1})"
+      expect(attribute.inspect_value(a: 1)).to eq " { {:a => 1} }"
     end
     it "formats hashes correctly" do
       hash = ActiveSupport::OrderedHash.new
-      hash[{"with" => :hash}] = "keys"
+      hash[{ "with" => :hash }] = "keys"
       hash[2] = "integers"
-      hash[:a] = {:nested => "hash"}
+      hash[:a] = { nested: "hash" }
 
-      expected = '({{"with" => :hash} => "keys", 2 => "integers", :a => {:nested => "hash"}})'
+      expected = ' { {{"with" => :hash} => "keys", 2 => "integers", :a => {:nested => "hash"}} }'
 
       expect(attribute.inspect_value(hash)).to eq expected
     end

data/spec/unit/generation/factory_spec.rb

@@ -11,7 +11,7 @@ describe ToFactory::Generation::Factory do
   let!(:user) { create_user! }
 
   let(:representation) { ToFactory::Representation.from(user) }
-  let(:generator) { ToFactory::Generation::Factory.new representation  }
+  let(:generator) { ToFactory::Generation::Factory.new representation }
 
   describe "#name" do
     context "with a simple name" do
@@ -39,11 +39,9 @@ describe ToFactory::Generation::Factory do
     end
   end
 
-
-
   describe "#header" do
     it do
-      expect(generator.header{}).to match_sexp  <<-eof.strip_heredoc
+      expect(generator.header {}).to match_sexp <<-eof.strip_heredoc
         factory(:"to_factory/user") do
         end
       eof
@@ -52,27 +50,27 @@ describe ToFactory::Generation::Factory do
 
   describe "#attributes" do
     let(:representation) do
-      double(:attributes => {"something" => "something",
-                             :id         => 123,
-                             :created_at => anything,
-                             :created_on => anything,
-                             :updated_at => anything,
-                             :updated_on => anything,
-                             nil => nil})
+      double(attributes: { "something" => "something",
+                           :id         => 123,
+                           :created_at => anything,
+                           :created_on => anything,
+                           :updated_at => anything,
+                           :updated_on => anything,
+                           nil => nil })
     end
     it "ignores blank keys, :id, :created_at, :updated_at, :created_on, :updated_on" do
-      expect(generator.attributes).to eq({"something" => "something"})
+      expect(generator.attributes).to eq("something" => "something")
     end
   end
   describe "#factory_attribute" do
     it do
-      expect(generator.factory_attribute(:name, nil))   .to eq '    name nil'
-      expect(generator.factory_attribute(:name, "Jeff")).to eq '    name "Jeff"'
-      expect(generator.factory_attribute(:id, 8))       .to eq '    id 8'
+      expect(generator.factory_attribute(:name, nil))   .to eq "    name { nil }"
+      expect(generator.factory_attribute(:name, "Jeff")).to eq '    name { "Jeff" }'
+      expect(generator.factory_attribute(:id, 8))       .to eq "    id { 8 }"
     end
     it "generates usable datetime strings" do
       output = generator.factory_attribute(:birthday, birthday)
-      expect(output).to eq '    birthday "2014-07-08T15:30 UTC"'
+      expect(output).to eq '    birthday { "2014-07-08T15:30 UTC" }'
     end
   end
 

data/spec/unit/parsing/file_spec.rb

@@ -1,6 +1,6 @@
 describe ToFactory::Parsing::File do
   let(:user_contents) { File.read "spec/example_factories/user.rb" }
-  let(:admin_contents) { File.read "spec/example_factories/admin.rb"}
+  let(:admin_contents) { File.read "spec/example_factories/admin.rb" }
 
   let(:parser) { ToFactory::Parsing::File.from_file(filename) }
 
@@ -18,7 +18,7 @@ describe ToFactory::Parsing::File do
 
     it do
       expect(Kernel).to receive(:warn).with(/#{dynamic_content}/).at_least :once
-      expect(lambda{instance.parse}).not_to raise_error
+      expect { instance.parse }.not_to raise_error
       result = instance.parse
       expect(result).to be_a Array
       expect(result[0]).to be_a ToFactory::NullRepresentation
@@ -28,7 +28,7 @@ describe ToFactory::Parsing::File do
 
   describe "#multiple_factories? and #header?" do
     context "new syntax" do
-      tests =   #file,                      multiple, header
+      tests = # file,                      multiple, header
                 [
                   ["user",                   false,   false],
                   ["user_with_header",       false,   true],
@@ -39,7 +39,7 @@ describe ToFactory::Parsing::File do
       tests.each do |file, multiple, header|
         context "with #{header ? 'header' : 'no header'} and #{multiple ? 'multiple factories' : 'one factory'}" do
           context "file: #{file}" do
-            let(:filename) { "spec/example_factories/#{file}.rb"}
+            let(:filename) { "spec/example_factories/#{file}.rb" }
 
             it { expect(parser.multiple_factories?).to eq multiple }
             it { expect(parser.header?).to eq header }
@@ -51,7 +51,7 @@ describe ToFactory::Parsing::File do
 
   describe "#parse" do
     context "with multiple levels of parent classes" do
-      let(:filename) { "spec/example_factories/#{'user_admin_super_admin'}.rb"}
+      let(:filename) { "spec/example_factories/#{'user_admin_super_admin'}.rb" }
 
       it do
         result = parser.parse
@@ -61,7 +61,7 @@ describe ToFactory::Parsing::File do
     end
 
     context "file: user" do
-      let(:filename) { "spec/example_factories/#{'user'}.rb"}
+      let(:filename) { "spec/example_factories/#{'user'}.rb" }
 
       it do
         result = parser.parse
@@ -71,7 +71,7 @@ describe ToFactory::Parsing::File do
     end
 
     context "file: user_with_header" do
-      let(:filename) { "spec/example_factories/#{'user_with_header'}.rb"}
+      let(:filename) { "spec/example_factories/#{'user_with_header'}.rb" }
 
       it do
         result = parser.parse
@@ -81,7 +81,7 @@ describe ToFactory::Parsing::File do
     end
 
     context "file: user_admin" do
-      let(:filename) { "spec/example_factories/#{'user_admin'}.rb"}
+      let(:filename) { "spec/example_factories/#{'user_admin'}.rb" }
 
       it do
         result = parser.parse
@@ -94,7 +94,7 @@ describe ToFactory::Parsing::File do
     end
 
     context "file: user_admin_with_header" do
-      let(:filename) { "spec/example_factories/#{'user_admin_with_header'}.rb"}
+      let(:filename) { "spec/example_factories/#{'user_admin_with_header'}.rb" }
 
       it do
         result = parser.parse

data/spec/unit/parsing/klass_inference_spec.rb

@@ -2,27 +2,25 @@ describe ToFactory::KlassInference do
   let(:inference) { ToFactory::KlassInference.new representations }
 
   mappings = [
-    [:super_admin,  :admin,                ToFactory::User,    3],
+    [:super_admin, :admin, ToFactory::User, 3],
     [:"to_factory/user", nil,              ToFactory::User,    1],
     [:admin,        :"to_factory/user",    ToFactory::User,    2],
     [:some_project, :"to_factory/project", ToFactory::Project, 2],
-    [:sub_project,  :"some_project",       ToFactory::Project, 3],
+    [:sub_project,  :some_project, ToFactory::Project, 3]
   ]
 
-
-  let(:representations) { mappings.map{|name, parent, _| ToFactory::Representation.new(name,parent) }}
+  let(:representations) { mappings.map { |name, parent, _| ToFactory::Representation.new(name, parent) } }
 
   mappings.each do |name, parent_name, expected_klass, expected_order|
     it "having #{name} and #{parent_name.inspect} implies #{expected_klass} #{expected_order} "do
       result_klass, order = inference.infer(name.to_s)
 
       expect(result_klass).to eq expected_klass
-      expect(order       ).to eq expected_order
+      expect(order).to eq expected_order
     end
   end
 
   it do
-
-    expect(lambda{inference.infer("unknown")}).to raise_error
+    expect { inference.infer("unknown") }.to raise_error ToFactory::CannotInferClass
   end
 end

data/to_factory.gemspec

@@ -1,32 +1,36 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'to_factory/version'
+require "to_factory/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "to_factory"
   spec.version       = ToFactory::VERSION
   spec.authors       = ["Mark Burns"]
   spec.email         = ["markthedeveloper@gmail.com"]
-  spec.summary     = %q{Turn ActiveRecord instances into factories}
-  spec.description = %q{Autogenerate and append/create factory_girl definitions from the console}
+  spec.summary     = "Turn ActiveRecord instances into factories"
+  spec.description = "Autogenerate and append/create factory_bot definitions from the console"
   spec.homepage      = ""
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}){ |f| File.basename(f) }.reject{|f| f== "spec" || f =="ci" }
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }.reject { |f| f == "spec" || f == "ci" }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "factory_girl", "~> 4.5"
+  spec.add_dependency "factory_bot"
   spec.add_dependency "ruby2ruby"
-  spec.add_dependency "activerecord", "> 4.0"
 
-  spec.add_development_dependency "sqlite3" , "~> 1.3.6"
-  spec.add_development_dependency "database_cleaner", "~> 1.5.1"
+  spec.add_development_dependency "activerecord"
+  spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "database_cleaner"
 
   spec.add_development_dependency "byebug"
+  spec.add_development_dependency "pry"
+
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'rspec-github'
 
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
 end