to_factory 2.0.0 → 3.0.0.pre.pre

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,34 +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_development_dependency "sqlite3" , "~> 1.3.6"
-  spec.add_development_dependency "database_cleaner", "~> 1.4.0"
+  spec.add_dependency "factory_bot"
+  spec.add_dependency "ruby2ruby"
 
-  if RUBY_VERSION =~ /^2\.\d/
-    spec.add_development_dependency "pry-byebug"
-  end
+  spec.add_development_dependency "activerecord"
+  spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "database_cleaner"
 
-  spec.add_development_dependency "factory_girl", "~> 4.5"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "byebug"
+  spec.add_development_dependency "pry"
 
-  spec.add_dependency "ruby2ruby"
-  spec.add_dependency "activerecord", "> 4.0"
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'rspec-github'
+
+  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
 end

metadata

@@ -1,45 +1,73 @@
 --- !ruby/object:Gem::Specification
 name: to_factory
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0.pre.pre
 platform: ruby
 authors:
 - Mark Burns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-22 00:00:00.000000000 Z
+date: 2022-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby2ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,55 +81,55 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby2ruby
+  name: rspec-github
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -109,29 +137,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
-description: Autogenerate and append/create factory_girl definitions from the console
+        version: 12.3.3
+description: Autogenerate and append/create factory_bot definitions from the console
 email:
 - markthedeveloper@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- ".rubocop-disabled.yml"
+- ".rubocop-enabled.yml"
+- ".rubocop.yml"
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
@@ -150,7 +196,6 @@ files:
 - lib/to_factory/options_parser.rb
 - lib/to_factory/parsing/file.rb
 - lib/to_factory/parsing/ruby_parsing_helpers.rb
-- lib/to_factory/parsing/syntax.rb
 - lib/to_factory/representation.rb
 - lib/to_factory/version.rb
 - spec/db/migrate/1_create_users.rb
@@ -160,6 +205,7 @@ files:
 - spec/db/migrate/5_add_serialized_attributes_to_users.rb
 - spec/example_factories/admin.rb
 - spec/example_factories/admin_with_header.rb
+- spec/example_factories/inherited_project_with_header.rb
 - spec/example_factories/project_with_header.rb
 - spec/example_factories/user.rb
 - spec/example_factories/user_admin.rb
@@ -168,16 +214,26 @@ files:
 - spec/example_factories/user_admin_with_header.rb
 - spec/example_factories/user_with_header.rb
 - spec/integration/config_spec.rb
+- spec/integration/empty_factory_file_spec.rb
 - spec/integration/file_sync_spec.rb
 - spec/integration/file_writer_spec.rb
 - spec/integration/lint_spec.rb
+- spec/integration/multiple_to_factory_calls_spec.rb
+- spec/integration/non_active_record_classes_spec.rb
 - spec/integration/to_factory_method_spec.rb
 - spec/spec_helper.rb
+- spec/support/broken_models/invalid_ruby_file.rb
+- spec/support/broken_models/project.rb
 - spec/support/data_creation.rb
 - spec/support/match_sexp.rb
 - spec/support/models/not_active_record.rb
 - spec/support/models/project.rb
 - spec/support/models/user.rb
+- spec/support/non_active_record/inherited_project.rb
+- spec/support/non_active_record/project.rb
+- spec/support/non_active_record/some_other_service_inheriting_from_something_else.rb
+- spec/support/non_active_record/some_service.rb
+- spec/support/non_active_record/something_else.rb
 - spec/support/ruby_parser_exception_causing_string.rb
 - spec/unit/collation_spec.rb
 - spec/unit/file_writer_spec.rb
@@ -204,12 +260,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Turn ActiveRecord instances into factories
@@ -221,6 +276,7 @@ test_files:
 - spec/db/migrate/5_add_serialized_attributes_to_users.rb
 - spec/example_factories/admin.rb
 - spec/example_factories/admin_with_header.rb
+- spec/example_factories/inherited_project_with_header.rb
 - spec/example_factories/project_with_header.rb
 - spec/example_factories/user.rb
 - spec/example_factories/user_admin.rb
@@ -229,16 +285,26 @@ test_files:
 - spec/example_factories/user_admin_with_header.rb
 - spec/example_factories/user_with_header.rb
 - spec/integration/config_spec.rb
+- spec/integration/empty_factory_file_spec.rb
 - spec/integration/file_sync_spec.rb
 - spec/integration/file_writer_spec.rb
 - spec/integration/lint_spec.rb
+- spec/integration/multiple_to_factory_calls_spec.rb
+- spec/integration/non_active_record_classes_spec.rb
 - spec/integration/to_factory_method_spec.rb
 - spec/spec_helper.rb
+- spec/support/broken_models/invalid_ruby_file.rb
+- spec/support/broken_models/project.rb
 - spec/support/data_creation.rb
 - spec/support/match_sexp.rb
 - spec/support/models/not_active_record.rb
 - spec/support/models/project.rb
 - spec/support/models/user.rb
+- spec/support/non_active_record/inherited_project.rb
+- spec/support/non_active_record/project.rb
+- spec/support/non_active_record/some_other_service_inheriting_from_something_else.rb
+- spec/support/non_active_record/some_service.rb
+- spec/support/non_active_record/something_else.rb
 - spec/support/ruby_parser_exception_causing_string.rb
 - spec/unit/collation_spec.rb
 - spec/unit/file_writer_spec.rb
@@ -248,4 +314,3 @@ test_files:
 - spec/unit/generation/factory_spec.rb
 - spec/unit/parsing/file_spec.rb
 - spec/unit/parsing/klass_inference_spec.rb
-has_rdoc: 

data/.travis.yml

@@ -1,14 +0,0 @@
-language: ruby
-rvm:
-  - 2.2.3
-  - 2.1.7
-  - 2.0.0
-  - 1.9.3
-
-script: "./bin/ci"
-
-branches:
-  only:
-    - master
-    - stable
-

data/lib/to_factory/parsing/syntax.rb

@@ -1,83 +0,0 @@
-module ToFactory
-  module Parsing
-    ParseException = Class.new ::Exception
-
-    class CouldNotInferClassException < ::Exception
-      attr_reader :sexp
-
-      def initialize(sexp)
-        @sexp = sexp
-      end
-    end
-
-    class Syntax
-      include Parsing::RubyParsingHelpers
-      attr_accessor :contents
-
-      def initialize(contents)
-        @contents = contents
-      end
-
-      def multiple_factories?
-        factories_sexp[0] == :block
-      end
-
-      def parse
-        factories.map do |x|
-          representation_from(x)
-        end
-
-      rescue Racc::ParseError, StringScanner::Error => e
-        raise ParseException.new("Original exception: #{e.message}\n #{e.backtrace}\nToFactory Error parsing \n#{@contents}\n o")
-      end
-
-
-      def representation_from(x)
-        Representation.new(name_from(x), parent_from(x), to_ruby(x))
-      rescue CouldNotInferClassException => e
-        ruby = to_ruby(e.sexp)
-        Kernel.warn "ToFactory could not parse\n#{ruby}"
-        NullRepresentation.new(e.sexp)
-      end
-
-      def factories
-        if multiple_factories?
-          factories_sexp[1..-1]
-        else
-          [factories_sexp]
-        end
-      end
-
-      def factories_sexp
-        header? ?  sexp[3] : sexp
-      end
-
-      def name_from(sexp)
-        sexp[1][3][1]
-      rescue NoMethodError
-        raise CouldNotInferClassException.new(sexp)
-      end
-
-      def header?
-        sexp[1][1][1] == :FactoryGirl rescue false
-      end
-
-      def parent_from(x)
-        # e.g.
-        #s(:call, nil, :factory, s(:lit, :admin), s(:hash, s(:lit, :parent), s(:lit, :"to_factory/user")))
-        x[1][4][2][1]
-      rescue  NoMethodError
-        # e.g.
-        #s(:call, nil, :factory, s(:lit, :"to_factory/user"))
-        x[1][3][1]
-      end
-
-      private
-
-      def sexp
-        @sexp ||= ruby_parser.process(@contents)
-      end
-
-    end
-  end
-end