to_factory 0.2.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b7199b7f56596066bd61469c11ed611c8559011
-  data.tar.gz: 9799646595d3bb9835d61cceffde7514334bfc9a
+  metadata.gz: 6906cfbba894ee5d9a25a7a8c30467c59c0c7c27
+  data.tar.gz: 5a27e0c0912602908f81bd19335c46b880adbe77
 SHA512:
-  metadata.gz: eb276d7e60f92af6de9fb7a6c6fa0883cdffbd43d585141d359bb64b6e4539936d7fe40545453026419ccfa513a72db5804eecbe80ffd75f42d886d2f7c61e1c
-  data.tar.gz: 9345ae024ec70089a05d6430e1039691bbfad6eb43833525e8bb1ed4d7ba9054560a5d15b780617f4ede28efb51bc88c3e770250a24883ecc435563f05efc804
+  metadata.gz: ac378d94509e96ea3417a714e6b4073033552fe675e43b263d020a577c9c2201f119ef23fe13563221a5a67d098bcca34f900f305117485980b3394faaa5c654
+  data.tar.gz: d19f74bdd1789ebf9d57c0fc267c39e5c9db3221828c9adec12d4dbc6002ea0ef11818e9c2009ee0d4943ebb142f332553a8c4c752d139ce4947e15fcb2c7df7

data/.travis.yml

@@ -1,16 +1,9 @@
 language: ruby
 rvm:
-  - 2.2.0
-  - 2.1.5
-  - 2.1.4
-  - 2.1.3
-  - 2.1.2
-  - 2.1.1
-  - 2.1.0
+  - 2.2.3
+  - 2.1.7
   - 2.0.0
   - 1.9.3
-  - 1.9.2
-  - 1.8.7
 
 script: "./bin/ci"
 

data/Gemfile

@@ -1,6 +1,5 @@
 source "https://rubygems.org"
 
-if RUBY_VERSION != "1.8.7"
-  gem "codeclimate-test-reporter", :group => :test, :require => nil
-end
+gem "codeclimate-test-reporter", :group => :test, :require => nil
+
 gemspec

data/lib/to_factory/file_writer.rb

@@ -23,14 +23,6 @@ module ToFactory
     end
 
     def wrap_factories(definitions)
-      if ToFactory.new_syntax?
-        modern_header(definitions)
-      else
-        definitions.join("\n\n")
-      end
-    end
-
-    def modern_header(definitions)
       out =  "FactoryGirl.define do\n"
       out << definitions.join("\n\n")
       out << "end"

data/lib/to_factory/generation/attribute.rb

@@ -8,12 +8,7 @@ module ToFactory
 
       def to_s
         setter = "#{@attribute}#{inspect_value(@value)}"
-
-        if ToFactory.new_syntax?
-          "    #{setter}"
-        else
-          "  o.#{setter}"
-        end
+        "    #{setter}"
       end
 
       def inspect_value(value, nested=false)
@@ -26,10 +21,12 @@ module ToFactory
         formatted
       end
 
-      def format(value, nested)
+      def format(value, nested=false)
         case value
         when Time, DateTime
           inspect_time(value)
+        when Date
+          value.to_s.inspect
         when BigDecimal
           value.to_f.inspect
         when Hash
@@ -60,8 +57,9 @@ module ToFactory
       end
 
       def inspect_time(value)
-        time = in_utc(value).strftime("%Y-%m-%dT%H:%M%Z").inspect
-        time.gsub(/UTC"$/, "Z\"").gsub(/GMT"$/, "Z\"")
+        value = value.strftime("%Y-%m-%dT%H:%M %Z").inspect
+        value.gsub! /GMT/, "UTC"
+        value
       end
 
       def inspect_hash(value, nested)
@@ -86,10 +84,6 @@ module ToFactory
         formatted_value = inspect_value(value.fetch(key), true)
         "#{formatted_key} => #{formatted_value}"
       end
-
-      def in_utc(time)
-        time.utc
-      end
     end
   end
 end

data/lib/to_factory/generation/factory.rb

@@ -18,25 +18,21 @@ module ToFactory
       end
 
       def header(&block)
-        if ToFactory.new_syntax?
-          generic_header("  factory", "", "  end", &block)
-        else
-          generic_header("Factory.define", " |o|", "end", &block)
-        end
+        generic_header("  factory", "", "  end", &block)
       end
 
       def factory_attribute(attr, value)
         Attribute.new(attr, value).to_s
       end
 
-      private
-
       def attributes
-        to_skip = [:id, :created_at, :updated_at]
+        to_skip = [:id, :created_at, :created_on, :updated_at, :updated_on]
 
-        @representation.attributes.delete_if{|key, _| to_skip.include? key.to_sym}
+        @representation.attributes.delete_if{|key, _| key.nil? || to_skip.include?(key.to_sym)}
       end
 
+      private
+
       def parent_name
         @representation.parent_name
       end

data/lib/to_factory/parsing/file.rb

@@ -1,8 +1,7 @@
 require 'ruby2ruby'
 require 'ruby_parser'
+require "to_factory/parsing/ruby_parsing_helpers"
 require 'to_factory/parsing/syntax'
-require 'to_factory/parsing/new_syntax'
-require 'to_factory/parsing/old_syntax'
 
 module ToFactory
   module Parsing
@@ -26,14 +25,9 @@ module ToFactory
       end
 
       def parser
-        @parser ||= parser_klass.new(@contents)
+        @parser ||= Syntax.new(@contents)
       end
 
-      private
-
-      def parser_klass
-        ToFactory.new_syntax? ? NewSyntax : OldSyntax
-      end
     end
   end
 end

data/lib/to_factory/parsing/ruby_parsing_helpers.rb

@@ -0,0 +1,17 @@
+module ToFactory
+  module Parsing
+    module RubyParsingHelpers
+      def to_ruby(sexp)
+        ruby2ruby.process sexp.deep_clone
+      end
+
+      def ruby2ruby
+        @ruby2ruby ||= Ruby2Ruby.new
+      end
+
+      def ruby_parser
+        @ruby_parseer ||= RubyParser.new
+      end
+    end
+  end
+end

data/lib/to_factory/parsing/syntax.rb

@@ -2,7 +2,16 @@ 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)
@@ -15,13 +24,22 @@ module ToFactory
 
       def parse
         factories.map do |x|
-          Representation.new(name_from(x), parent_from(x), to_ruby(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]
@@ -36,25 +54,30 @@ module ToFactory
 
       def name_from(sexp)
         sexp[1][3][1]
+      rescue NoMethodError
+        raise CouldNotInferClassException.new(sexp)
       end
 
-      private
+      def header?
+        sexp[1][1][1] == :FactoryGirl rescue false
+      end
 
-      def to_ruby(sexp)
-        ruby2ruby.process sexp.deep_clone
+      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
 
-      def ruby2ruby
-        @ruby2ruby ||= Ruby2Ruby.new
-      end
-
-      def ruby_parser
-        @ruby_parseer ||= RubyParser.new
-      end
     end
   end
 end

data/lib/to_factory/representation.rb

@@ -1,4 +1,25 @@
 module ToFactory
+  class NullRepresentation
+    include ToFactory::Parsing::RubyParsingHelpers
+
+    def initialize(sexp)
+      @sexp = sexp
+    end
+
+    def name
+      nil
+    end
+
+    def parent
+      nil
+    end
+
+    def definition
+      to_ruby(@sexp)
+    end
+  end
+
+
   class Representation
     delegate :attributes, :to => :record
     attr_accessor :klass, :name, :parent_name, :definition, :hierarchy_order, :record

data/lib/to_factory/version.rb

@@ -1,3 +1,3 @@
 module ToFactory
-  VERSION = "0.2.1"
+  VERSION = "2.0.0"
 end

data/lib/to_factory.rb

@@ -8,27 +8,18 @@ require "to_factory/collation"
 require "to_factory/file_writer"
 require "to_factory/finders/model"
 require "to_factory/finders/factory"
-require "to_factory/representation"
 require "to_factory/file_sync"
 require "to_factory/parsing/file"
+require "to_factory/representation"
 require "to_factory/klass_inference"
 require "to_factory/options_parser"
+require "factory_girl"
 
 module ToFactory
   class MissingActiveRecordInstanceException < Exception;end
   class NotFoundError < Exception;end
 
   class << self
-    def new_syntax?
-      require "factory_girl"
-      if FactoryGirl::VERSION.to_s[0..0].to_i > 1
-        true
-      else
-        false
-      end
-    rescue NameError, ArgumentError
-      false
-    end
 
     def definition_for(item)
       if item.is_a? ActiveRecord::Base

data/spec/example_factories/{new_syntax/admin.rb → admin.rb}

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

data/spec/example_factories/{new_syntax/admin_with_header.rb → admin_with_header.rb}

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

data/spec/example_factories/{new_syntax/user.rb → user.rb}

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

data/spec/example_factories/{new_syntax/user_admin.rb → user_admin.rb}

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

data/spec/example_factories/{new_syntax/user_admin_root.rb → user_admin_root.rb}

@@ -4,7 +4,7 @@ FactoryGirl.define do
   end
 
   factory(:root, :parent => :"to_factory/user") do
-    birthday "2014-07-08T15:30Z"
+    birthday "2014-07-08T15:30 UTC"
     email "test@example.com"
     name "Jeff"
     some_attributes({:a => 1})

data/spec/example_factories/{new_syntax/user_admin_with_header.rb → user_admin_with_header.rb}

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

data/spec/example_factories/{new_syntax/user_with_header.rb → user_with_header.rb}

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

data/spec/integration/file_sync_spec.rb

@@ -2,12 +2,12 @@ describe "FileSync" do
   let(:user) { create_user!  }
   let(:admin) { create_admin!  }
   let(:project) { create_project!  }
-  let(:version) { ToFactory.new_syntax? ? "new" : "old"}
-  let(:expected_user_file)             { File.read("./spec/example_factories/#{version}_syntax/user.rb") }
-  let(:expected_user_with_header_file) { File.read("./spec/example_factories/#{version}_syntax/user_with_header.rb") }
-  let(:expected_admin_file)            { File.read("./spec/example_factories/#{version}_syntax/admin.rb") }
-  let(:user_with_header)               { File.read("./spec/example_factories/#{version}_syntax/user_with_header.rb") }
-  let(:user_admin_with_header)         { File.read("./spec/example_factories/#{version}_syntax/user_admin_with_header.rb") }
+  let(:version) { "new" }
+  let(:expected_user_file)             { File.read("./spec/example_factories/user.rb") }
+  let(:expected_user_with_header_file) { File.read("./spec/example_factories/user_with_header.rb") }
+  let(:expected_admin_file)            { File.read("./spec/example_factories/admin.rb") }
+  let(:user_with_header)               { File.read("./spec/example_factories/user_with_header.rb") }
+  let(:user_admin_with_header)         { File.read("./spec/example_factories/user_admin_with_header.rb") }
 
 
   before do

data/spec/integration/file_writer_spec.rb

@@ -1,6 +1,6 @@
 describe ToFactory::FileWriter do
   let(:fw) { ToFactory::FileWriter.new }
-  let(:expected)    { File.read "./spec/example_factories/#{version}_syntax/user_with_header.rb"}
+  let(:expected)    { File.read "./spec/example_factories/user_with_header.rb"}
   let(:user_file_contents)    { File.read "./tmp/factories/to_factory/user.rb"}
   let!(:user) { create_user!  }
   let!(:admin) { create_admin!  }

data/spec/integration/lint_spec.rb

@@ -4,13 +4,9 @@ context "full integration" do
   end
 
   it "#to_factory linting the output" do
-    if ToFactory.new_syntax?
-      ToFactory(user)
-
-      load "./tmp/factories/to_factory/user.rb"
-
-      FactoryGirl.lint
-    end
+    ToFactory(user)
+    load "./tmp/factories/to_factory/user.rb"
+    FactoryGirl.lint
   end
 end
 

data/spec/integration/to_factory_method_spec.rb

@@ -12,8 +12,8 @@ describe ToFactory do
     File.read("./tmp/factories/to_factory/project.rb") rescue nil
   end
 
-  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"}
+  let(:expected_user_file) { File.read "./spec/example_factories/user_with_header.rb"}
+  let(:expected_project_file) { File.read "./spec/example_factories/project_with_header.rb"}
 
   describe "ToFactory.definitions" do
     it do
@@ -24,7 +24,7 @@ describe ToFactory do
   end
 
   describe "ToFactory.definition_for" do
-  let(:expected_user_file) { File.read "./spec/example_factories/#{version}_syntax/user.rb"}
+  let(:expected_user_file) { File.read "./spec/example_factories/user.rb"}
     it do
       expect(ToFactory.definition_for user).to match_sexp expected_user_file
     end
@@ -41,7 +41,7 @@ describe ToFactory do
 
   describe "Object#ToFactory" do
     context "with multiple levels of parent classes" do
-      let(:filename) { "spec/example_factories/#{version}_syntax/#{'user_admin_super_admin'}.rb"}
+      let(:filename) { "spec/example_factories/#{'user_admin_super_admin'}.rb"}
 
       it "gets the output order correct" do
         output = "./tmp/factories/to_factory/user.rb"
@@ -50,7 +50,7 @@ describe ToFactory do
 
         ToFactory(:root => user)
 
-        expected = File.read "spec/example_factories/#{version}_syntax/#{'user_admin_root'}.rb"
+        expected = File.read "spec/example_factories/#{'user_admin_root'}.rb"
 
         #user, admin, super_admin, root
         expect(File.read(output)).to match_sexp expected
@@ -116,20 +116,9 @@ describe ToFactory do
 
       context "with a name for the factory" do
         it "appends to the file" do
-          if ToFactory.new_syntax?
-            user_file_includes('factory(:"to_factory/user"')
-          else
-            user_file_includes('Factory.define(:"to_factory/user"')
-          end
-
+          user_file_includes('factory(:"to_factory/user"')
           ToFactory(:specific_user => user)
-          if ToFactory.new_syntax?
-            user_file_includes('factory(:specific_user, :parent => :"to_factory/user"')
-          else
-            user_file_includes('Factory.define(:specific_user, :parent => :"to_factory/user"')
-          end
-
-
+          user_file_includes('factory(:specific_user, :parent => :"to_factory/user"')
         end
       end
 

data/spec/spec_helper.rb

@@ -28,15 +28,8 @@ require "./spec/support/models/project"
 require "./spec/support/match_sexp"
 require "./spec/support/data_creation"
 
-module ToFactory::SpecSyntaxHelpers
-  def version
-    ToFactory.new_syntax? ? "new" : "old"
-  end
-end
-
 RSpec.configure do |config|
   config.include ToFactory::DataCreation
-  config.include ToFactory::SpecSyntaxHelpers
 
   config.before :suite do
     ActiveRecord::Base.tap do |base|

data/spec/unit/file_writer_spec.rb

@@ -17,9 +17,7 @@ describe ToFactory::FileWriter do
                 "to_factory/project" => [project_representation]
       })
 
-      if ToFactory.new_syntax?
-        expect(user_file).to match /FactoryGirl.define do/
-      end
+      expect(user_file).to match /FactoryGirl.define do/
       expect(user_file).to include "factory a"
       expect(project_file).to include "factory b"
     end

data/spec/unit/finders/factory_spec.rb

@@ -2,12 +2,12 @@ describe ToFactory::Finders::Factory do
   describe "#call" do
     before do
       FileUtils.mkdir_p "./tmp/factories/to_factory"
-      FileUtils.cp "./spec/example_factories/#{version}_syntax/user_admin_with_header.rb",
+      FileUtils.cp "./spec/example_factories/user_admin_with_header.rb",
         "./tmp/factories/to_factory/user.rb"
     end
 
-    let(:user_file_contents) { File.read "./spec/example_factories/#{version}_syntax/user.rb"}
-    let(:admin_file_contents){ File.read "./spec/example_factories/#{version}_syntax/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

data/spec/unit/generation/attribute_spec.rb

@@ -7,12 +7,28 @@ describe ToFactory::Generation::Attribute do
     end
   end
 
+  describe "#format" do
+    it "formats Date, Time, DateTime" do
+      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
+      expect(attribute.format(DateTime.parse(time_string))).to eq "2011-12-13T14:15 +00:00".inspect
+    end
+
+    it "formats Integer, Float"do
+      expect(attribute.format(123))  .to eq "123"
+      expect(attribute.format(123.0)).to eq "123.0"
+    end
+  end
+
+
   describe "#inspect_value" do
     it do
       expect(attribute.inspect_value({:a => 1})).to eq "({:a => 1})"
     end
-
-    it do
+    it "formats hashes correctly" do
       hash = ActiveSupport::OrderedHash.new
       hash[{"with" => :hash}] = "keys"
       hash[2] = "integers"

data/spec/unit/generation/factory_spec.rb

@@ -0,0 +1,64 @@
+describe ToFactory::Generation::Factory do
+  before(:each) do
+    ToFactory::User.destroy_all
+    ActiveRecord::Base.connection.execute "delete from sqlite_sequence where name = 'users'"
+  end
+
+  let(:birthday) do
+    Time.find_zone("UTC").parse("2014-07-08T15:30 UTC")
+  end
+
+  let!(:user) { create_user! }
+
+  let(:representation) { ToFactory::Representation.from(user) }
+  let(:generator) { ToFactory::Generation::Factory.new representation  }
+
+
+
+  describe "#header" do
+    it do
+      expect(generator.header{}).to match_sexp  <<-eof.strip_heredoc
+        factory(:"to_factory/user") do
+        end
+      eof
+    end
+  end
+
+  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})
+    end
+    it "ignores blank keys, :id, :created_at, :updated_at, :created_on, :updated_on" do
+      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'
+    end
+    it "generates usable datetime strings" do
+      output = generator.factory_attribute(:birthday, birthday)
+      expect(output).to eq '    birthday "2014-07-08T15:30 UTC"'
+    end
+  end
+
+  describe "#ToFactory" do
+    let(:expected) do
+      File.read "./spec/example_factories/user.rb"
+    end
+
+    it do
+      expect(generator.to_factory).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

@@ -1,31 +1,45 @@
 describe ToFactory::Parsing::File do
-  let(:user_contents) { File.read "spec/example_factories/#{version}_syntax/user.rb" }
-  let(:admin_contents) { File.read "spec/example_factories/#{version}_syntax/admin.rb"}
+  let(:user_contents) { File.read "spec/example_factories/user.rb" }
+  let(:admin_contents) { File.read "spec/example_factories/admin.rb"}
 
   let(:parser) { ToFactory::Parsing::File.from_file(filename) }
 
+  context "with non-parseable factories" do
+    let(:dynamic_content) do
+      <<-RUBY
+        [ 0, 1, 2, 3, 4].each do |i|
+          Factory.define(:"user_\#{i}", :parent => :"to_factory/user") do |o|
+            p.project_statuses = statuses
+          end
+        end
+      RUBY
+    end
+    let(:instance) { ToFactory::Parsing::File.new(dynamic_content) }
+
+    it do
+      expect(Kernel).to receive(:warn).with(/#{dynamic_content}/).at_least :once
+      expect(lambda{instance.parse}).not_to raise_error
+      result = instance.parse
+      expect(result).to be_a Array
+      expect(result[0]).to be_a ToFactory::NullRepresentation
+      expect(result[0].definition).to match_sexp dynamic_content
+    end
+  end
+
   describe "#multiple_factories? and #header?" do
     context "new syntax" do
-      tests = if ToFactory.new_syntax?
-
-                #file,                      multiple, header
+      tests =   #file,                      multiple, header
                 [
                   ["user",                   false,   false],
                   ["user_with_header",       false,   true],
                   ["user_admin",             true,    false],
                   ["user_admin_with_header", true,    true]
                 ]
-              else
-                [
-                  ["user",                   false,   false],
-                  ["user_admin",             true,    false],
-                ]
-              end
 
       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/#{version}_syntax/#{file}.rb"}
+            let(:filename) { "spec/example_factories/#{file}.rb"}
 
             it { expect(parser.multiple_factories?).to eq multiple }
             it { expect(parser.header?).to eq header }
@@ -37,7 +51,7 @@ describe ToFactory::Parsing::File do
 
   describe "#parse" do
     context "with multiple levels of parent classes" do
-      let(:filename) { "spec/example_factories/#{version}_syntax/#{'user_admin_super_admin'}.rb"}
+      let(:filename) { "spec/example_factories/#{'user_admin_super_admin'}.rb"}
 
       it do
         result = parser.parse
@@ -47,7 +61,7 @@ describe ToFactory::Parsing::File do
     end
 
     context "file: user" do
-      let(:filename) { "spec/example_factories/#{version}_syntax/#{'user'}.rb"}
+      let(:filename) { "spec/example_factories/#{'user'}.rb"}
 
       it do
         result = parser.parse
@@ -57,7 +71,7 @@ describe ToFactory::Parsing::File do
     end
 
     context "file: user_with_header" do
-      let(:filename) { "spec/example_factories/#{version}_syntax/#{'user_with_header'}.rb"}
+      let(:filename) { "spec/example_factories/#{'user_with_header'}.rb"}
 
       it do
         result = parser.parse
@@ -67,7 +81,7 @@ describe ToFactory::Parsing::File do
     end
 
     context "file: user_admin" do
-      let(:filename) { "spec/example_factories/#{version}_syntax/#{'user_admin'}.rb"}
+      let(:filename) { "spec/example_factories/#{'user_admin'}.rb"}
 
       it do
         result = parser.parse
@@ -80,7 +94,7 @@ describe ToFactory::Parsing::File do
     end
 
     context "file: user_admin_with_header" do
-      let(:filename) { "spec/example_factories/#{version}_syntax/#{'user_admin_with_header'}.rb"}
+      let(:filename) { "spec/example_factories/#{'user_admin_with_header'}.rb"}
 
       it do
         result = parser.parse

data/to_factory.gemspec

@@ -19,31 +19,16 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "sqlite3" , "~> 1.3.6"
-
-  if RUBY_VERSION =~ /^1\.8/
-    spec.add_development_dependency "ruby-debug"
-    spec.add_development_dependency "database_cleaner", "~> 0.3"
-  else
-    spec.add_development_dependency "database_cleaner", "~> 1.4.0"
-  end
+  spec.add_development_dependency "database_cleaner", "~> 1.4.0"
 
   if RUBY_VERSION =~ /^2\.\d/
     spec.add_development_dependency "pry-byebug"
   end
 
-  old_active_record = RUBY_VERSION =~ /^1\.8|^1.9\.[1|2]/
-
-  spec.add_dependency "ruby2ruby"
-
-  if old_active_record
-    spec.add_dependency  'activerecord', ">2.0", "< 4.0"
-    spec.add_dependency  'i18n', "< 0.7"
-    spec.add_development_dependency "factory_girl", "< 2.0"
-  else
-    spec.add_dependency  'activerecord', ">3.0"
-    spec.add_development_dependency "factory_girl", "~> 4.5"
-  end
-
+  spec.add_development_dependency "factory_girl", "~> 4.5"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rake", "~> 10.0"
+
+  spec.add_dependency "ruby2ruby"
+  spec.add_dependency "activerecord", "> 4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: to_factory
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Mark Burns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -53,75 +53,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby2ruby
+  name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '4.5'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.5'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: ruby2ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
+        version: '0'
+  type: :runtime
   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: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
+        version: '4.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '4.0'
 description: Autogenerate and append/create factory_girl definitions from the console
 email:
 - markthedeveloper@gmail.com
@@ -149,8 +149,7 @@ files:
 - lib/to_factory/klass_inference.rb
 - lib/to_factory/options_parser.rb
 - lib/to_factory/parsing/file.rb
-- lib/to_factory/parsing/new_syntax.rb
-- lib/to_factory/parsing/old_syntax.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
@@ -159,23 +158,15 @@ files:
 - 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_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
-- 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_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
+- spec/example_factories/admin.rb
+- spec/example_factories/admin_with_header.rb
+- spec/example_factories/project_with_header.rb
+- spec/example_factories/user.rb
+- spec/example_factories/user_admin.rb
+- spec/example_factories/user_admin_root.rb
+- spec/example_factories/user_admin_super_admin.rb
+- spec/example_factories/user_admin_with_header.rb
+- spec/example_factories/user_with_header.rb
 - spec/integration/config_spec.rb
 - spec/integration/file_sync_spec.rb
 - spec/integration/file_writer_spec.rb
@@ -193,7 +184,7 @@ files:
 - 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/generation/factory_spec.rb
 - spec/unit/parsing/file_spec.rb
 - spec/unit/parsing/klass_inference_spec.rb
 - tmp/.keep
@@ -228,23 +219,15 @@ test_files:
 - 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_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
-- 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_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
+- spec/example_factories/admin.rb
+- spec/example_factories/admin_with_header.rb
+- spec/example_factories/project_with_header.rb
+- spec/example_factories/user.rb
+- spec/example_factories/user_admin.rb
+- spec/example_factories/user_admin_root.rb
+- spec/example_factories/user_admin_super_admin.rb
+- spec/example_factories/user_admin_with_header.rb
+- spec/example_factories/user_with_header.rb
 - spec/integration/config_spec.rb
 - spec/integration/file_sync_spec.rb
 - spec/integration/file_writer_spec.rb
@@ -262,6 +245,7 @@ test_files:
 - 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/generation/factory_spec.rb
 - spec/unit/parsing/file_spec.rb
 - spec/unit/parsing/klass_inference_spec.rb
+has_rdoc: 

data/lib/to_factory/parsing/new_syntax.rb

@@ -1,19 +0,0 @@
-module ToFactory
-  module Parsing
-    class NewSyntax < Syntax
-      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

@@ -1,13 +0,0 @@
-module ToFactory
-  module Parsing
-    class OldSyntax < Syntax
-      def header?
-        false
-      end
-
-      def parent_from(x)
-        x[1][-1][-1][-1] rescue name_from(x)
-      end
-    end
-  end
-end

data/spec/example_factories/old_syntax/admin.rb

@@ -1,7 +0,0 @@
-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/project_with_header.rb

@@ -1,5 +0,0 @@
-Factory.define(:"to_factory/project") do |o|
-  o.name "My Project"
-  o.objective "easy testing"
-  o.some_id 9
-end

data/spec/example_factories/old_syntax/user.rb

@@ -1,7 +0,0 @@
-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

@@ -1,15 +0,0 @@
-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
-
-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_root.rb

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

@@ -1,15 +0,0 @@
-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
-
-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

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

@@ -1,68 +0,0 @@
-describe ToFactory::Generation::Factory do
-  before(:each) do
-    ToFactory::User.destroy_all
-    ActiveRecord::Base.connection.execute "delete from sqlite_sequence where name = 'users'"
-  end
-
-  let(:birthday) do
-    Time.find_zone("UTC").parse("2014-07-08T15:30Z") 
-  end
-
-  let!(:user) { create_user! }
-
-  let(:representation) { ToFactory::Representation.from(user) }
-  let(:generator) { ToFactory::Generation::Factory.new representation  }
-
-
-
-  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
-      else
-        expect(generator.header{}).to match_sexp  <<-eof.strip_heredoc
-          Factory.define(:"to_factory/user") do |o|
-          end
-        eof
-      end
-    end
-  end
-
-  describe "#factory_attribute" do
-    it do
-      if ToFactory.new_syntax?
-        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'
-
-      else
-        expect(generator.factory_attribute(:name, nil))   .to eq '  o.name nil'
-        expect(generator.factory_attribute(:name, "Jeff")).to eq '  o.name "Jeff"'
-        expect(generator.factory_attribute(:id, 8))       .to eq '  o.id 8'
-      end
-    end
-    it "generates usable datetime strings" do
-      output = generator.factory_attribute(:birthday, birthday)
-      if ToFactory.new_syntax?
-        expect(output).to eq '    birthday "2014-07-08T15:30Z"'
-      else
-        expect(output).to eq '  o.birthday "2014-07-08T15:30Z"'
-      end
-    end
-  end
-
-  describe "#ToFactory" do
-    let(:expected) do
-      File.read "./spec/example_factories/#{version}_syntax/user.rb"
-    end
-
-    it do
-      expect(generator.to_factory).to match_sexp expected
-      result = ToFactory(user).values.first.first
-      expect(result.definition).to match_sexp expected
-    end
-  end
-end