to_factory 0.1.0 → 0.1.1

data/.travis.yml

@@ -7,13 +7,10 @@ rvm:
   - 2.1.2
   - 2.1.1
   - 2.1.0
-
   - 2.0.0
-
   - 1.9.3
-  - 1.9.2
-
   - 1.8.7
+
 script: "./bin/ci"
 
 branches:

data/README.md

@@ -11,12 +11,13 @@ ToFactory
 
 Easily add factories with valid data for an existing project.
 
-If you find yourself working on a project without tests/factories or only using fixtures,
-then use this gem to quickly generate a factory from an existing object.
+* auto-generate all factories
+* adhoc generate from existing records
+* unintrusively update factory files in place
+* Parses and writes both new `FactoryGirl`, syntax or older `Factory.define` syntax
 
-Tested against Ruby 1.8.7, 1.9.2, 1.9.3, 2.0.0,  2.1.x
+Tested against Ruby 1.8.7, 1.9.3, 2.0.0,  2.1.x, 2.2.0
 
-Reads and writes both new `FactoryGirl`, syntax or older `Factory.define` syntax
 
 #Installation
 ___________
@@ -30,12 +31,24 @@ group :test, :development do
 end
 ```
 
-#Usage
+
+#Warning
+`ToFactory` writes into the `spec/factories` folder. Whilst it
+is tested and avoids overwriting existing factories,
+it is recommended that you execute after committing or when in a known
+safe state.
+
+#Example
+```bash
+git add spec/factories
+git commit -m "I know what I am doing"
+rails c
+>ToFactory()
+```
 
 ```ruby
 #Generate all factories
 ToFactory()
-
 #outputs the first record of each ActiveRecord::Base subclass in the models folder
 #to spec/factories
 
@@ -50,6 +63,11 @@ ToFactory(exclude: [User, Project])
 #Use Adhoc instances from the console
 ToFactory User.last
 
+#List defined factory names
+ToFactory.definitions
+#=> [:user, :admin, :project]
+
+
 #writes to spec/factories/user.rb
 FactoryGirl.define
   factory(:user) do |u|
@@ -69,6 +87,9 @@ ToFactory :admin => User.last
 
 ```
 
+#Known bugs/limitations
+* Factory generation does not follow a hierarchical order, so factory files may require manual editing for now.
+
 #Other useful projects
 
 If you are adding specs to an existing project you may want to look at:

data/Rakefile

@@ -1,14 +1,24 @@
 require "bundler/gem_tasks"
 
 namespace :spec do
-  desc "Migrate the database through scripts in db/migrate. Target specific version with VERSION=x"
-  task :migrate_db do
+  def setup_db
     require 'logger'
     require 'active_record'
     ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => "spec/db/test.sqlite3")
     ActiveRecord::Base.logger = Logger.new(File.open('tmp/database.log', 'a'))
+  end
+
+  desc "Migrate the database through scripts in db/migrate. Target specific version with VERSION=x"
+  task :migrate_db do
+    setup_db
     ActiveRecord::Migrator.migrate('spec/db/migrate')
   end
+
+  desc "Migrate down"
+  task :migrate_down do
+    setup_db
+    ActiveRecord::Migrator.down('spec/db/migrate')
+  end
 end
 
 begin

data/lib/to_factory/generation/attribute.rb

@@ -7,39 +7,45 @@ module ToFactory
       end
 
       def to_s
-        attribute = "#{@attribute} #{inspect_value(@value)}"
+        setter = "#{@attribute}#{inspect_value(@value)}"
 
         if ToFactory.new_syntax?
-          "    #{attribute}"
+          "    #{setter}"
         else
-          "  o.#{attribute}"
+          "  o.#{setter}"
         end
       end
 
-      def <=>(other)
-        @attribute <=> other
-      end
-
-      def ==(other)
-        to_s == other.to_s
-      end
-
-      private
-
-      def inspect_value(value)
-        case value
+      def inspect_value(value, nested=false)
+        formatted = case value
         when Time, DateTime
           time = in_utc(value).strftime("%Y-%m-%dT%H:%M%Z").inspect
           time.gsub(/UTC"$/, "Z\"").gsub(/GMT"$/, "Z\"")
         when BigDecimal
           value.to_f.inspect
         when Hash
-          hash = value.inject({}){|result, (k, v)| result[k] = inspect_value(v); result}
+          formatted = value.keys.inject([]) do |a, key|
+            formatted_key = inspect_value(key, true)
+            formatted_value = inspect_value(value.fetch(key), true)
+            a << "#{formatted_key} => #{formatted_value}"
+          end.join(', ')
+
+          if nested
+            "{#{formatted}}"
+          else
+            "({#{formatted}})"
+          end
         when Array
           value.map{|v| inspect_value(v)}
         else
           value.inspect
         end
+
+        if !value.is_a?(Hash) && !nested
+          formatted = " #{formatted}"
+        end
+
+        formatted
       end
 
       def in_utc(time)

data/lib/to_factory/generation/factory.rb

@@ -1,6 +1,5 @@
 module ToFactory
   module Generation
-
     class Factory
       def initialize(object, name)
         unless object.is_a? ActiveRecord::Base

data/lib/to_factory/parsing/klass_inference.rb

@@ -0,0 +1,34 @@
+module ToFactory
+  module Parsing
+    CannotInferClass = Class.new ArgumentError
+
+    class KlassInference
+      def initialize
+        @mapping = {}
+      end
+
+      def setup(factory_names_and_parents)
+        factory_names_and_parents.each do |factory_name, parent|
+          @mapping[factory_name.to_s] = to_const(parent || factory_name)
+        end
+      end
+
+      def infer(factory_name)
+        result = @mapping[factory_name.to_s]
+        return result if result.is_a? Class
+
+        raise CannotInferClass.new(factory_name) if result.nil?
+
+        infer(result)
+      end
+
+      private
+
+      def to_const(factory_name)
+        factory_name.to_s.camelize.constantize
+      rescue NameError
+        factory_name
+      end
+    end
+  end
+end

data/lib/to_factory/parsing/new_syntax.rb

@@ -4,6 +4,16 @@ module ToFactory
       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
     end
   end
 end

data/lib/to_factory/parsing/old_syntax.rb

@@ -4,6 +4,10 @@ module ToFactory
       def header?
         false
       end
+
+      def parent_from(x)
+        x[1][-1][-1][-1] rescue name_from(x)
+      end
     end
   end
 end

data/lib/to_factory/parsing/syntax.rb

@@ -1,3 +1,5 @@
+require "to_factory/parsing/klass_inference"
+
 module ToFactory
   module Parsing
     class Syntax
@@ -14,9 +16,10 @@ module ToFactory
       def parse
         result = {}
         @klass_inference = KlassInference.new
+        @klass_inference.setup(all_factories)
 
-        parse_multiple do |factory_name, parent_name, ruby|
-          klass = @klass_inference.infer(factory_name, parent_name)
+        all_factories.each do |factory_name, parent_name, ruby|
+          klass = @klass_inference.infer(factory_name)
           result[klass] ||= {}
           result[klass][factory_name] = ruby
         end
@@ -36,16 +39,12 @@ module ToFactory
         header? ?  sexp[3] : sexp
       end
 
-      def parse_multiple(&block)
-        factories.each do |x|
-          yield name_from(x), parent_from(x), to_ruby(x)
+      def all_factories
+        factories.map do |x|
+          [name_from(x), parent_from(x), to_ruby(x)]
         end
       end
 
-      def parent_from(x)
-        x[1][-1][-1][-1] rescue name_from(x)
-      end
-
       def name_from(sexp)
         sexp[1][3][1]
       end
@@ -67,20 +66,6 @@ module ToFactory
       def ruby_parser
         @ruby_parseer ||= RubyParser.new
       end
-
-      class KlassInference
-        def initialize
-          @mapping = {}
-        end
-
-        def infer(klass, parent_klass=nil)
-          @mapping[klass] ||= klass.to_s.camelize.constantize
-        rescue
-          infer(parent_klass)
-        end
-      end
-
-
     end
   end
 end

data/lib/to_factory/version.rb

@@ -1,3 +1,3 @@
 module ToFactory
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/to_factory.rb

@@ -26,6 +26,11 @@ module ToFactory
     rescue NameError, ArgumentError
       false
     end
+
+    def definitions
+      results = Finders::Factory.new.call
+      results.map{|_, r| r.keys}.flatten
+    end
   end
 end
 

data/spec/db/migrate/5_add_serialized_attributes_to_users.rb

@@ -0,0 +1,9 @@
+class AddSerializedAttributesToUsers < ActiveRecord::Migration
+  def self.up
+    add_column :users, :some_attributes, :text
+  end
+
+  def self.down
+    remove_column :users, :some_attributes
+  end
+end

data/spec/example_factories/new_syntax/admin.rb

@@ -2,5 +2,6 @@ factory(:admin, :parent => :"to_factory/user") do
   birthday "2014-07-08T15:30Z"
   email "admin@example.com"
   name "Admin"
+  some_attributes({:a => 1})
   some_id 9
 end

data/spec/example_factories/new_syntax/admin_with_header.rb

@@ -3,6 +3,7 @@ FactoryGirl.define do
     birthday "2014-07-08T15:30Z"
     email "admin@example.com"
     name "Admin"
+    some_attributes({:a => 1})
     some_id 9
   end
 end

data/spec/example_factories/new_syntax/user.rb

@@ -2,5 +2,6 @@ factory(:"to_factory/user") do
   birthday "2014-07-08T15:30Z"
   email "test@example.com"
   name "Jeff"
+  some_attributes({:a => 1})
   some_id 8
 end

data/spec/example_factories/new_syntax/user_admin.rb

@@ -2,6 +2,7 @@ factory(:"to_factory/user") do
   birthday "2014-07-08T15:30Z"
   email "test@example.com"
   name "Jeff"
+  some_attributes({:a => 1})
   some_id 8
 end
 
@@ -9,5 +10,6 @@ factory(:admin, :parent => :"to_factory/user") do
   birthday "2014-07-08T15:30Z"
   email "admin@example.com"
   name "Admin"
+  some_attributes({:a => 1})
   some_id 9
 end

data/spec/example_factories/new_syntax/user_admin_super_admin.rb

@@ -0,0 +1,13 @@
+FactoryGirl.define do
+  factory(:admin, :parent => :"to_factory/user") do
+    name "Admin"
+  end
+
+  factory(:super_admin, :parent => :admin) do
+    name "Super Admin"
+  end
+
+  factory(:"to_factory/user") do
+    name "User"
+  end
+end

data/spec/example_factories/new_syntax/user_admin_with_header.rb

@@ -3,6 +3,7 @@ FactoryGirl.define do
     birthday "2014-07-08T15:30Z"
     email "test@example.com"
     name "Jeff"
+    some_attributes({:a => 1})
     some_id 8
   end
 
@@ -10,6 +11,7 @@ FactoryGirl.define do
     birthday "2014-07-08T15:30Z"
     email "admin@example.com"
     name "Admin"
+    some_attributes({:a => 1})
     some_id 9
   end
 end

data/spec/example_factories/new_syntax/user_with_header.rb

@@ -3,6 +3,7 @@ FactoryGirl.define do
     birthday "2014-07-08T15:30Z"
     email "test@example.com"
     name "Jeff"
+    some_attributes({:a => 1})
     some_id 8
   end
 end

data/spec/example_factories/old_syntax/admin.rb

@@ -2,5 +2,6 @@ Factory.define(:admin, :parent => :"to_factory/user") do |o|
   o.birthday "2014-07-08T15:30Z"
   o.email "admin@example.com"
   o.name "Admin"
+  o.some_attributes({:a => 1})
   o.some_id 9
 end

data/spec/example_factories/old_syntax/user.rb

@@ -2,5 +2,6 @@ Factory.define(:"to_factory/user") do |o|
   o.birthday "2014-07-08T15:30Z"
   o.email "test@example.com"
   o.name "Jeff"
+  o.some_attributes({:a => 1})
   o.some_id 8
 end

data/spec/example_factories/old_syntax/user_admin.rb

@@ -2,6 +2,7 @@ Factory.define(:"to_factory/user") do |o|
   o.birthday "2014-07-08T15:30Z"
   o.email "test@example.com"
   o.name "Jeff"
+  o.some_attributes({:a => 1})
   o.some_id 8
 end
 
@@ -9,5 +10,6 @@ Factory.define(:admin, :parent => :"to_factory/user") do |o|
   o.birthday "2014-07-08T15:30Z"
   o.email "admin@example.com"
   o.name "Admin"
+  o.some_attributes({:a => 1})
   o.some_id 9
 end

data/spec/example_factories/old_syntax/user_admin_super_admin.rb

@@ -0,0 +1,11 @@
+Factory.define(:admin, :parent => :"to_factory/user") do |o|
+  o.name "Admin"
+end
+
+Factory.define(:super_admin, :parent => :admin) do |o|
+  o.name "Super Admin"
+end
+
+Factory.define(:"to_factory/user") do |o|
+  o.name "User"
+end

data/spec/example_factories/old_syntax/user_admin_with_header.rb

@@ -2,6 +2,7 @@ Factory.define(:"to_factory/user") do |o|
   o.birthday "2014-07-08T15:30Z"
   o.email "test@example.com"
   o.name "Jeff"
+  o.some_attributes({:a => 1})
   o.some_id 8
 end
 
@@ -9,5 +10,6 @@ Factory.define(:admin, :parent => :"to_factory/user") do |o|
   o.birthday "2014-07-08T15:30Z"
   o.email "admin@example.com"
   o.name "Admin"
+  o.some_attributes({:a => 1})
   o.some_id 9
 end

data/spec/example_factories/old_syntax/user_with_header.rb

@@ -2,5 +2,6 @@ Factory.define(:"to_factory/user") do |o|
   o.birthday "2014-07-08T15:30Z"
   o.email "test@example.com"
   o.name "Jeff"
+  o.some_attributes({:a => 1})
   o.some_id 8
 end

data/spec/integration/config_spec.rb

@@ -1,4 +1,4 @@
-describe "ToFactory  Configuration" do
+describe "ToFactory Configuration" do
   before do
     ToFactory.reset_config!
   end

data/spec/integration/{generate_class_method_spec.rb → to_factory_method_spec.rb}

@@ -15,6 +15,14 @@ describe ToFactory do
   let(:expected_user_file) { File.read "./spec/example_factories/#{version}_syntax/user_with_header.rb"}
   let(:expected_project_file) { File.read "./spec/example_factories/#{version}_syntax/project_with_header.rb"}
 
+  describe "ToFactory.definitions" do
+    it do
+      ToFactory()
+      expect(ToFactory.definitions).to match_array ["to_factory/user", "to_factory/project"]
+    end
+
+  end
+
   describe "Object#ToFactory" do
     it "generates all factories" do
       ToFactory()

data/spec/spec_helper.rb

@@ -26,31 +26,8 @@ require "to_factory"
 
 require "./spec/support/models/user"
 require "./spec/support/models/project"
-require "./spec/support/terse_expect_syntax"
 require "./spec/support/match_sexp"
-
-module ToFactory::DataCreation
-  def create_all!
-    create_user!
-    create_admin!
-  end
-
-  def create_project!
-    ToFactory::Project.create({:name => "My Project", :objective => "easy testing", :some_id => 9 })
-  end
-
-  def birthday
-    Time.find_zone("UTC").parse("2014-07-08T15:30Z")
-  end
-
-  def create_user!
-    ToFactory::User.create :name => "Jeff", :email => "test@example.com", :some_id => 8, :birthday => birthday
-  end
-
-  def create_admin!
-    ToFactory::User.create :name => "Admin", :email => "admin@example.com", :some_id => 9, :birthday => birthday
-  end
-end
+require "./spec/support/data_creation"
 
 module ToFactory::SpecSyntaxHelpers
   def version
@@ -59,7 +36,6 @@ module ToFactory::SpecSyntaxHelpers
 end
 
 RSpec.configure do |config|
-  config.include TerseExpectSyntax
   config.include ToFactory::DataCreation
   config.include ToFactory::SpecSyntaxHelpers
 

data/spec/support/data_creation.rb

@@ -0,0 +1,36 @@
+module ToFactory::DataCreation
+  def create_all!
+    create_user!
+    create_admin!
+  end
+
+  def create_project!
+    ToFactory::Project.create({:name => "My Project", :objective => "easy testing", :some_id => 9 })
+  end
+
+  def birthday
+    Time.find_zone("UTC").parse("2014-07-08T15:30Z")
+  end
+
+  def create_user!
+    ToFactory::User.create(
+      :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
+    )
+  end
+end
+
+

data/spec/support/models/user.rb

@@ -1,3 +1,4 @@
 class ToFactory::User < ActiveRecord::Base
   self.table_name = "users"
+  serialize :some_attributes, Hash
 end

data/spec/unit/generation/attribute_spec.rb

@@ -0,0 +1,27 @@
+describe ToFactory::Generation::Attribute do
+  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})"
+    end
+  end
+
+  describe "#inspect_value" do
+    it do
+      expect(attribute.inspect_value({:a => 1})).to eq "({:a => 1})"
+    end
+
+    it do
+      hash = ActiveSupport::OrderedHash.new
+      hash[{"with" => :hash}] = "keys"
+      hash[2] = "integers"
+      hash[:a] = {:nested => "hash"}
+
+      expected = '({{"with" => :hash} => "keys", 2 => "integers", :a => {:nested => "hash"}})'
+
+      expect(attribute.inspect_value(hash)).to eq expected
+    end
+  end
+
+end

data/spec/unit/parsing/file_spec.rb

@@ -36,6 +36,16 @@ describe ToFactory::Parsing::File do
   end
 
   describe "#parse" do
+    context "with multiple levels of parent classes" do
+      let(:filename) { "spec/example_factories/#{version}_syntax/#{'user_admin_super_admin'}.rb"}
+
+      it do
+        result = parser.parse
+
+        expect(result[ToFactory::User].keys).to match_array [:super_admin, :admin, :"to_factory/user"]
+      end
+    end
+
     context "file: user" do
       let(:filename) { "spec/example_factories/#{version}_syntax/#{'user'}.rb"}
 

data/spec/unit/parsing/klass_inference_spec.rb

@@ -0,0 +1,29 @@
+describe ToFactory::Parsing::KlassInference do
+  let(:inference) { ToFactory::Parsing::KlassInference.new }
+
+  mappings = #klass, parent, result
+    [:admin,        :"to_factory/user",    ToFactory::User],
+    [:some_project, :"to_factory/project", ToFactory::Project],
+    [:sub_project,  :"some_project",       ToFactory::Project],
+    [:super_admin,  :admin,                ToFactory::User],
+    [:"to_factory/user", nil,              ToFactory::User]
+
+
+  to_infer = mappings.map{|a| a[0..1]}
+
+  before do
+    inference.setup to_infer
+  end
+
+  mappings.each do |klass, parent, expected|
+    it "having #{klass} and #{parent.inspect} implies #{expected} "do
+      result = inference.infer(klass)
+      expect(result).to eq expected
+    end
+  end
+
+  it do
+
+    expect(lambda{inference.infer("unknown")}).to raise_error
+  end
+end

data/to_factory.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Mark Burns"]
   spec.email         = ["markthedeveloper@gmail.com"]
   spec.summary     = %q{Turn ActiveRecord instances into factories}
-  spec.description = %q{ActiveRecord::Base#to_factory method to create factory_girl definitions from real data}
+  spec.description = %q{Autogenerate and append/create factory_girl definitions from the console}
   spec.homepage      = ""
   spec.license       = "MIT"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: to_factory
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Mark Burns
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-01-05 00:00:00 +00:00
+date: 2015-01-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -173,7 +173,7 @@ dependencies:
         version: "10.0"
   type: :development
   version_requirements: *id010
-description: ActiveRecord::Base#to_factory method to create factory_girl definitions from real data
+description: Autogenerate and append/create factory_girl definitions from the console
 email: 
 - markthedeveloper@gmail.com
 executables: []
@@ -202,6 +202,7 @@ files:
 - lib/to_factory/generation/attribute.rb
 - lib/to_factory/generation/factory.rb
 - lib/to_factory/parsing/file.rb
+- lib/to_factory/parsing/klass_inference.rb
 - lib/to_factory/parsing/new_syntax.rb
 - lib/to_factory/parsing/old_syntax.rb
 - lib/to_factory/parsing/syntax.rb
@@ -210,37 +211,42 @@ files:
 - spec/db/migrate/2_create_projects.rb
 - spec/db/migrate/3_create_not_namespaced.rb
 - spec/db/migrate/4_add_birthday_to_users.rb
+- spec/db/migrate/5_add_serialized_attributes_to_users.rb
 - spec/example_factories/new_syntax/admin.rb
 - spec/example_factories/new_syntax/admin_with_header.rb
 - spec/example_factories/new_syntax/project_with_header.rb
 - spec/example_factories/new_syntax/user.rb
 - spec/example_factories/new_syntax/user_admin.rb
+- spec/example_factories/new_syntax/user_admin_super_admin.rb
 - spec/example_factories/new_syntax/user_admin_with_header.rb
 - spec/example_factories/new_syntax/user_with_header.rb
 - spec/example_factories/old_syntax/admin.rb
 - spec/example_factories/old_syntax/project_with_header.rb
 - spec/example_factories/old_syntax/user.rb
 - spec/example_factories/old_syntax/user_admin.rb
+- spec/example_factories/old_syntax/user_admin_super_admin.rb
 - spec/example_factories/old_syntax/user_admin_with_header.rb
 - spec/example_factories/old_syntax/user_with_header.rb
 - spec/integration/config_spec.rb
 - spec/integration/file_sync_spec.rb
 - spec/integration/file_writer_spec.rb
-- spec/integration/generate_class_method_spec.rb
 - spec/integration/lint_spec.rb
+- spec/integration/to_factory_method_spec.rb
 - spec/spec_helper.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/terse_expect_syntax.rb
 - spec/unit/collation_spec.rb
 - spec/unit/definition_group_spec.rb
 - spec/unit/file_writer_spec.rb
 - spec/unit/finders/factory_spec.rb
 - spec/unit/finders/model_spec.rb
+- spec/unit/generation/attribute_spec.rb
 - spec/unit/generator_spec.rb
 - spec/unit/parsing/file_spec.rb
+- spec/unit/parsing/klass_inference_spec.rb
 - tmp/.keep
 - to_factory.gemspec
 has_rdoc: true
@@ -282,34 +288,39 @@ test_files:
 - spec/db/migrate/2_create_projects.rb
 - spec/db/migrate/3_create_not_namespaced.rb
 - spec/db/migrate/4_add_birthday_to_users.rb
+- spec/db/migrate/5_add_serialized_attributes_to_users.rb
 - spec/example_factories/new_syntax/admin.rb
 - spec/example_factories/new_syntax/admin_with_header.rb
 - spec/example_factories/new_syntax/project_with_header.rb
 - spec/example_factories/new_syntax/user.rb
 - spec/example_factories/new_syntax/user_admin.rb
+- spec/example_factories/new_syntax/user_admin_super_admin.rb
 - spec/example_factories/new_syntax/user_admin_with_header.rb
 - spec/example_factories/new_syntax/user_with_header.rb
 - spec/example_factories/old_syntax/admin.rb
 - spec/example_factories/old_syntax/project_with_header.rb
 - spec/example_factories/old_syntax/user.rb
 - spec/example_factories/old_syntax/user_admin.rb
+- spec/example_factories/old_syntax/user_admin_super_admin.rb
 - spec/example_factories/old_syntax/user_admin_with_header.rb
 - spec/example_factories/old_syntax/user_with_header.rb
 - spec/integration/config_spec.rb
 - spec/integration/file_sync_spec.rb
 - spec/integration/file_writer_spec.rb
-- spec/integration/generate_class_method_spec.rb
 - spec/integration/lint_spec.rb
+- spec/integration/to_factory_method_spec.rb
 - spec/spec_helper.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/terse_expect_syntax.rb
 - spec/unit/collation_spec.rb
 - spec/unit/definition_group_spec.rb
 - spec/unit/file_writer_spec.rb
 - spec/unit/finders/factory_spec.rb
 - spec/unit/finders/model_spec.rb
+- spec/unit/generation/attribute_spec.rb
 - spec/unit/generator_spec.rb
 - spec/unit/parsing/file_spec.rb
+- spec/unit/parsing/klass_inference_spec.rb

data/spec/support/terse_expect_syntax.rb

@@ -1,23 +0,0 @@
-module TerseExpectSyntax
-  class Returner
-    def initialize(to_call)
-      @to_call=to_call
-    end
-    def r(*args)
-      @to_call.call(*args)
-    end
-  end
-
-  #x(     @a,            :b,      "c").r          d
-  #becomes
-  #expect(@a).to_receive(:b).with("c").and_return d
-  def x(target, expected_method, *received_args)
-    receiver = expect(target).to receive(expected_method)
-    if received_args.any?
-      receiver = receiver.with(*received_args)
-    end
-
-
-    Returner.new(lambda {|*return_args| receiver.and_return(*return_args) })
-  end
-end