to_factory 0.1.1 → 0.2.0

data/spec/example_factories/new_syntax/user_admin_super_admin.rb

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

data/spec/example_factories/old_syntax/user_admin_root.rb

@@ -0,0 +1,21 @@
+Factory.define(:"to_factory/user") do |o| 
+  o.name("User") 
+end
+
+Factory.define(:root, :parent => :"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
+
+
+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
+

data/spec/example_factories/old_syntax/user_admin_super_admin.rb

@@ -1,3 +1,7 @@
+Factory.define(:"to_factory/user") do |o|
+  o.name "User"
+end
+
 Factory.define(:admin, :parent => :"to_factory/user") do |o|
   o.name "Admin"
 end
@@ -6,6 +10,3 @@ 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/integration/file_sync_spec.rb

@@ -47,6 +47,8 @@ describe "FileSync" do
     end
   end
 
+
+
   context "with a pre-existing file" do
     let(:sync) { ToFactory::FileSync.new(user) }
     before do
@@ -64,9 +66,13 @@ describe "FileSync" do
         sync.perform
 
         parser = ToFactory::Parsing::File.new(user_file)
-        result = parser.parse[ToFactory::User]
-        expect(result[:admin]).to match_sexp expected_admin_file
-        expect(result[:"to_factory/user"]).to match_sexp expected_user_file
+        result = parser.parse
+        admin= result.find{|r| r.name == "admin"}
+        user= result.find{|r| r.name == "to_factory/user"}
+
+
+        expect(admin.definition).to match_sexp expected_admin_file
+        expect(user.definition).to match_sexp expected_user_file
 
         expect(lambda{
           sync.perform

data/spec/integration/file_writer_spec.rb

@@ -4,13 +4,15 @@ describe ToFactory::FileWriter do
   let(:user_file_contents)    { File.read "./tmp/factories/to_factory/user.rb"}
   let!(:user) { create_user!  }
   let!(:admin) { create_admin!  }
+
   it do
     fs = ToFactory::FileSync.new
-    definitions = fs.new_definitions
+    representations = fs.all_representations
     #sanity check generation isn't broken
-    expect(definitions.keys).to eq [ToFactory::User]
+    expect(representations.keys).to eq [ToFactory::User]
+    expect(representations.values[0][0]).to be_a ToFactory::Representation
 
-    fw.write definitions
+    fw.write representations
     expect(user_file_contents).to match_sexp expected
   end
 end

data/spec/integration/to_factory_method_spec.rb

@@ -24,6 +24,23 @@ describe ToFactory do
   end
 
   describe "Object#ToFactory" do
+    context "with multiple levels of parent classes" do
+      let(:filename) { "spec/example_factories/#{version}_syntax/#{'user_admin_super_admin'}.rb"}
+
+      it "gets the output order correct" do
+        output = "./tmp/factories/to_factory/user.rb"
+        `mkdir -p ./tmp/factories/to_factory`
+        `cp #{filename} #{output}`
+
+        ToFactory(:root => user)
+
+        expected = File.read "spec/example_factories/#{version}_syntax/#{'user_admin_root'}.rb"
+
+        #user, admin, super_admin, root
+        expect(File.read(output)).to match_sexp expected
+      end
+    end
+
     it "generates all factories" do
       ToFactory()
       expect(user_file)   .to match_sexp expected_user_file
@@ -51,17 +68,6 @@ describe ToFactory do
         expect(user_file).to be_present
         expect(project_file).to be_nil
       end
-
-      it "doesn't auto generate any if :all is specified" do
-        ToFactory(:exclude => :all)
-        expect(user_file).to be_nil
-        expect(project_file).to be_nil
-
-        #sanity check
-        ToFactory()
-        expect(user_file).to be_present
-        expect(project_file).to be_present
-      end
     end
 
     context "with no existing file" do

data/spec/unit/collation_spec.rb

@@ -1,34 +1,41 @@
 describe ToFactory::Collation do
-  def perform
-    ToFactory::Collation.merge(a, b)
-  end
+  describe "detect_collisions!" do
+    let(:collation) { ToFactory::Collation.new(a,b) }
+    let(:a) { [double(:name => "a")]}
+    let(:b) { [double(:name => "a")]}
 
-  context "matching keys" do
-    let(:a) { {:A => {:a => 1}} }
-    let(:b) { {:B => {:a => 2}} }
+    def perform
+      collation.detect_collisions!(a, b)
+    end
 
     it do
       expect(lambda{perform}).to raise_error ToFactory::AlreadyExists
     end
-  end
 
-  context "non matching keys" do
-    let(:a) { {:A => {:a => 1}} }
-    let(:b) { {:B => {:b => 2}} }
+    context "non matching keys" do
+      let(:a) { [double(:name => "a")]}
+      let(:b) { [double(:name => "b")]}
 
-    it do
-      result = {:A => {:a  => 1}, :B => {:b => 2}}.with_indifferent_access
-      expect(perform).to eq result
+      it do
+        expect(perform).to eq nil
+      end
     end
   end
 
-  context "merging" do
-    let(:a) { {:A => {:a => 1}} }
-    let(:b) { {:A => {:b => 2}} }
+  context "organizing" do
+    let(:root) { ToFactory::Representation.new(:root, "super_admin", "  Factory.define(:root, :parent => :\"to_factory/user\") do|o|\n  o.birthday \"2014-07-08T15:30Z\"\n  o.email \"test@example.com\"\n  o.name \"Jeff\"\n  o.some_id 8\n  end\n") }
+    let(:user) { ToFactory::Representation.new("to_factory/user", nil, "Factory.define(:\"to_factory/user\") { |o| o.name(\"User\") }") }
+    let(:admin) { ToFactory::Representation.new("admin", "to_factory/user", "Factory.define(:admin, :parent => :\"to_factory/user\") { |o| o.name(\"Admin\") }") }
+    let(:super_admin) { ToFactory::Representation.new("super_admin", "admin", "Factory.define(:super_admin, :parent => :admin) { |o| o.name(\"Super Admin\") }") }
 
     it do
-      result = {:A => {:a  => 1, :b => 2}}.with_indifferent_access
-      expect(perform).to eq result
+      new_definitions = [ root ]
+      pre_existing    = [ admin, user, super_admin ]
+
+      result = ToFactory::Collation.organize(new_definitions, pre_existing)
+      result = result[ToFactory::User]
+      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

@@ -11,8 +11,10 @@ describe ToFactory::FileWriter do
     end
 
     it "adds factories for all models" do
-      fw.write({ToFactory::User =>{:user => "factory a"},
-                ToFactory::Project => {:project =>"factory b"}
+      user_representation = double :name => :user, "definition" => "factory a"
+      project_representation = double :name => "project", :definition =>"factory b"
+      fw.write({ToFactory::User =>[user_representation],
+                ToFactory::Project => [project_representation]
       })
 
       if ToFactory.new_syntax?

data/spec/unit/finders/factory_spec.rb

@@ -13,12 +13,11 @@ describe ToFactory::Finders::Factory do
       finder = ToFactory::Finders::Factory.new
 
       result = finder.call
-      result = result[ToFactory::User]
 
-      expect(result[:"to_factory/user"]).
+      expect(result[0].definition).
         to match_sexp user_file_contents
 
-      expect(result[:admin]).
+      expect(result[1].definition).
         to match_sexp admin_file_contents
     end
   end

data/spec/unit/generator_spec.rb

@@ -10,26 +10,23 @@ describe ToFactory::Generation::Factory do
 
   let!(:user) { create_user! }
 
-  let(:generator) { ToFactory::Generation::Factory.new user, :"to_factory/user"  }
+  let(:representation) { ToFactory::Representation.from(user) }
+  let(:generator) { ToFactory::Generation::Factory.new representation  }
+
 
-  describe ".new" do
-    it "requires an activerecord instance" do
-      expect(lambda{ToFactory::Generation::Factory.new "", ""}).to raise_error ToFactory::MissingActiveRecordInstanceException
-    end
-  end
 
   describe "#header" do
     it do
       if ToFactory.new_syntax?
-      expect(generator.header{}).to match_sexp  <<-eof.strip_heredoc
-        factory(:"to_factory/user") do
-        end
-      eof
+        expect(generator.header{}).to match_sexp  <<-eof.strip_heredoc
+          factory(:"to_factory/user") do
+          end
+        eof
       else
-      expect(generator.header{}).to match_sexp  <<-eof.strip_heredoc
-        Factory.define(:"to_factory/user") do |o|
-        end
-      eof
+        expect(generator.header{}).to match_sexp  <<-eof.strip_heredoc
+          Factory.define(:"to_factory/user") do |o|
+          end
+        eof
       end
     end
   end
@@ -64,8 +61,8 @@ describe ToFactory::Generation::Factory do
 
     it do
       expect(generator.to_factory).to match_sexp expected
-      result = ToFactory(user).values.first.values.first
-      expect(result).to match_sexp expected
+      result = ToFactory(user).values.first.first
+      expect(result.definition).to match_sexp expected
     end
   end
 end

data/spec/unit/parsing/file_spec.rb

@@ -42,7 +42,7 @@ describe ToFactory::Parsing::File do
       it do
         result = parser.parse
 
-        expect(result[ToFactory::User].keys).to match_array [:super_admin, :admin, :"to_factory/user"]
+        expect(result.map(&:name)).to match_array ["super_admin", "admin", "to_factory/user"]
       end
     end
 
@@ -50,9 +50,9 @@ describe ToFactory::Parsing::File do
       let(:filename) { "spec/example_factories/#{version}_syntax/#{'user'}.rb"}
 
       it do
-        result = parser.parse[ToFactory::User]
+        result = parser.parse
 
-        expect(result[:"to_factory/user" ]).to match_sexp user_contents
+        expect(result.first.definition).to match_sexp user_contents
       end
     end
 
@@ -60,9 +60,9 @@ describe ToFactory::Parsing::File do
       let(:filename) { "spec/example_factories/#{version}_syntax/#{'user_with_header'}.rb"}
 
       it do
-        result = parser.parse[ToFactory::User]
+        result = parser.parse
 
-        expect(result[:"to_factory/user" ]).to match_sexp user_contents
+        expect(result.first.definition).to match_sexp user_contents
       end
     end
 
@@ -72,11 +72,10 @@ describe ToFactory::Parsing::File do
       it do
         result = parser.parse
 
-        expect(result.keys).to match_array [ToFactory::User]
-        users = result[ToFactory::User]
+        user, admin = result
 
-        expect(users[:"to_factory/user" ]).to match_sexp user_contents
-        expect(users[:admin]).to match_sexp admin_contents
+        expect(user.definition).to match_sexp user_contents
+        expect(admin.definition).to match_sexp admin_contents
       end
     end
 
@@ -84,9 +83,9 @@ describe ToFactory::Parsing::File do
       let(:filename) { "spec/example_factories/#{version}_syntax/#{'user_admin_with_header'}.rb"}
 
       it do
-        result = parser.parse[ToFactory::User]
+        result = parser.parse
 
-        expect(result[:"to_factory/user" ]).to match_sexp user_contents
+        expect(result.first.definition).to match_sexp user_contents
       end
     end
   end

data/spec/unit/parsing/klass_inference_spec.rb

@@ -1,24 +1,23 @@
-describe ToFactory::Parsing::KlassInference do
-  let(:inference) { ToFactory::Parsing::KlassInference.new }
+describe ToFactory::KlassInference do
+  let(:inference) { ToFactory::KlassInference.new representations }
 
-  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]
+  mappings = [
+    [: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],
+  ]
 
 
-  to_infer = mappings.map{|a| a[0..1]}
+  let(:representations) { mappings.map{|name, parent, _| ToFactory::Representation.new(name,parent) }}
 
-  before do
-    inference.setup to_infer
-  end
+  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)
 
-  mappings.each do |klass, parent, expected|
-    it "having #{klass} and #{parent.inspect} implies #{expected} "do
-      result = inference.infer(klass)
-      expect(result).to eq expected
+      expect(result_klass).to eq expected_klass
+      expect(order       ).to eq expected_order
     end
   end
 

data/to_factory.gemspec

@@ -34,7 +34,6 @@ Gem::Specification.new do |spec|
   old_active_record = RUBY_VERSION =~ /^1\.8|^1.9\.[1|2]/
 
   spec.add_dependency "ruby2ruby"
-  spec.add_dependency "deep_merge"
 
   if old_active_record
     spec.add_dependency  'activerecord', ">2.0", "< 4.0"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: to_factory
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Mark Burns
@@ -77,24 +77,10 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: deep_merge
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">"
@@ -112,11 +98,11 @@ dependencies:
         - 0
         version: "4.0"
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: i18n
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - <
@@ -127,11 +113,11 @@ dependencies:
         - 7
         version: "0.7"
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: factory_girl
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - <
@@ -142,11 +128,11 @@ dependencies:
         - 0
         version: "2.0"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -157,11 +143,11 @@ dependencies:
         - 0
         version: "3.0"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -172,7 +158,7 @@ dependencies:
         - 0
         version: "10.0"
   type: :development
-  version_requirements: *id010
+  version_requirements: *id009
 description: Autogenerate and append/create factory_girl definitions from the console
 email: 
 - markthedeveloper@gmail.com
@@ -194,18 +180,19 @@ files:
 - lib/to_factory.rb
 - lib/to_factory/collation.rb
 - lib/to_factory/config.rb
-- lib/to_factory/definition_group.rb
 - lib/to_factory/file_sync.rb
 - lib/to_factory/file_writer.rb
 - lib/to_factory/finders/factory.rb
 - lib/to_factory/finders/model.rb
 - lib/to_factory/generation/attribute.rb
 - lib/to_factory/generation/factory.rb
+- lib/to_factory/klass_inference.rb
+- lib/to_factory/options_parser.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
+- lib/to_factory/representation.rb
 - lib/to_factory/version.rb
 - spec/db/migrate/1_create_users.rb
 - spec/db/migrate/2_create_projects.rb
@@ -217,6 +204,7 @@ files:
 - 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_root.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
@@ -224,6 +212,7 @@ files:
 - 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_root.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
@@ -239,7 +228,6 @@ files:
 - spec/support/models/project.rb
 - spec/support/models/user.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
@@ -294,6 +282,7 @@ test_files:
 - 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_root.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
@@ -301,6 +290,7 @@ test_files:
 - 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_root.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
@@ -316,7 +306,6 @@ test_files:
 - spec/support/models/project.rb
 - spec/support/models/user.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

data/lib/to_factory/definition_group.rb

@@ -1,47 +0,0 @@
-module ToFactory
-  class DefinitionGroup
-    def self.perform(instances)
-      new.perform(instances)
-    end
-
-    def perform(instances)
-      instances.inject({}) do |result, record|
-        klass, name, definition = define_factory(record)
-        result[klass] ||= {}
-        result[klass][name] = definition
-        result
-      end
-    end
-
-    def define_factory(record)
-      name, item, parent_klass = extract_details(record)
-
-      definition = ToFactory::Generation::Factory.new(item, name).to_factory(parent_klass)
-
-      [item.class, name, definition]
-    end
-
-    def calculate_name(klass)
-      klass.name.to_s.underscore
-    end
-
-    private
-
-    def extract_details(record)
-      if record.is_a?(ActiveRecord::Base)
-        name = calculate_name record.class
-
-        [name, record, nil]
-      elsif record.is_a?(Array)
-        name, item = record
-        parent_klass_name = calculate_name(item.class)
-        parent_klass_name = nil if parent_klass_name.to_s == name.to_s
-        [name, item, parent_klass_name]
-      else
-        raise NotImplemented
-      end
-    end
-  end
-end
-
-

data/lib/to_factory/parsing/klass_inference.rb

@@ -1,34 +0,0 @@
-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/spec/unit/definition_group_spec.rb

@@ -1,19 +0,0 @@
-describe ToFactory::DefinitionGroup do
-  let(:user) { create_user! }
-  let(:admin) { create_admin! }
-  let(:user_definition) { File.read "./spec/example_factories/#{version}_syntax/user.rb"}
-  let(:admin_definition) { File.read "./spec/example_factories/#{version}_syntax/admin.rb"}
-  let(:group) { ToFactory::DefinitionGroup.new }
-
-  it do
-    result = group.perform([[:"to_factory/user", user], [:admin, admin]])
-
-    expect(result.keys[0]).to eq ToFactory::User
-    expect(result.values[0][:"to_factory/user"]).to match_sexp user_definition
-    expect(result.values[0][:admin]).to match_sexp admin_definition
-  end
-
-  it "#calculate_name" do
-    expect(group.calculate_name(ToFactory::Project)).to eq "to_factory/project"
-  end
-end