rails3-generators 0.17.3 → 0.17.4

data/CHANGELOG.rdoc

@@ -2,6 +2,10 @@
 * Write some documentation. (In both the github wiki and the source code)
 * Remove generators that exist in other libraries
 
+== 0.17.4
+* optimize
+  * Allow use of both FactoryGirl 1 and 2. (Louis T.)
+
 == 0.17.3
 * optimize
   * Update FactoryGirl generator to use version 2.0.0 syntax (Kevin Faustino)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails3-generators (0.17.0.beta.1)
+    rails3-generators (0.17.3)
       railties (>= 3.0.0)
 
 GEM
@@ -34,18 +34,19 @@ GEM
       activemodel (= 3.0.3)
       activesupport (= 3.0.3)
     activesupport (3.0.3)
-    arel (2.0.6)
+    arel (2.0.7)
     builder (2.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    haml (3.0.24)
+    factory_girl (1.3.3)
+    haml (3.0.25)
     haml-rails (0.3.4)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       haml (~> 3.0)
       railties (~> 3.0)
     i18n (0.5.0)
-    mail (2.2.12)
+    mail (2.2.15)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -55,7 +56,7 @@ GEM
     rack (1.2.1)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
-    rack-test (0.5.6)
+    rack-test (0.5.7)
       rack (>= 1.0)
     rails (3.0.3)
       actionmailer (= 3.0.3)
@@ -75,15 +76,15 @@ GEM
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
+    tzinfo (0.3.24)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (>= 1.0.0)
+  factory_girl
   haml-rails
   rails (>= 3.0.0)
   rails3-generators!
-  railties (>= 3.0.0)
   test-unit

data/README.rdoc

@@ -2,7 +2,7 @@
 
 Rails 3 compatible generators for gems that don't have them yet 
 
-== install
+== Install
 
   gem install rails3-generators
 
@@ -10,6 +10,8 @@ and add the following to your project's Gemfile
 
   gem 'rails3-generators'
 
+== Notes/Use
+
 Activate individual generators in your *config/application.rb* file, like so:
 
   config.generators do |g|
@@ -18,8 +20,6 @@ Activate individual generators in your *config/application.rb* file, like so:
 
 Now a factory_girl fixture will be generated by default whenever a model is generated.
 
-== notes
-
 The Haml generators have moved to {the haml-rails gem}[http://github.com/indirect/haml-rails].
 
 The jQuery generators have moved to {the jquery-rails gem}[http://github.com/indirect/jquery-rails].
@@ -43,19 +43,11 @@ To avoid overriding the rails built-in Erb template generators this project uses
 == Contributors
 
 DataMapper: José Valim
-
 Factory Girl: Paul Barry
-
 Authlogic: Jeff Tucker
-
 Mongomapper: Jai-Gouk Kim
-
 MongoMapper: Kristian Mandrup (for 0.8) - needs testing
-
-Mongoid: Kristian Mandrup (for 2.0.beta) - needs testing
-
 Shoulda: Peter Haza
-
 SimpleForm: Peter Gumeson
 
 and more[http://github.com/indirect/rails3-generators/contributors]

data/lib/generators/factory_girl/model/model_generator.rb

@@ -7,7 +7,18 @@ module FactoryGirl
       class_option :dir, :type => :string, :default => "test/factories", :desc => "The directory where the factories should go"
       
       def create_fixture_file
-        template 'fixtures.rb', File.join(options[:dir], "#{table_name}.rb")
+        version = nil
+        begin
+          require 'factory_girl/version'
+          version = FactoryGirl::VERSION.to_i
+        rescue LoadError
+          require 'factory_girl'
+          version = Factory::VERSION.to_i
+        rescue Object => e
+          raise "Please install Factory_girl or add it to your Gemfile"
+        end
+        
+        template "fixtures.#{version}.rb", File.join(options[:dir], "#{table_name}.rb")
       end
     end
   end

data/lib/generators/factory_girl/model/templates/fixtures.1.rb

@@ -0,0 +1,7 @@
+# Read about factories at http://github.com/thoughtbot/factory_girl
+
+Factory.define :<%= singular_name %> do |f|
+<% for attribute in attributes -%>
+  f.<%= attribute.name %> <%= attribute.default.inspect %>
+<% end -%>
+end

data/lib/rails3-generators/version.rb

@@ -1,5 +1,5 @@
 module Rails3
   module Generators
-    VERSION = "0.17.3"
+    VERSION = "0.17.4"
   end
 end

data/rails3-generators.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "test-unit"
   s.add_development_dependency "haml-rails"
   s.add_development_dependency "rails", ">= 3.0.0"
+  s.add_development_dependency "factory_girl"
   
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").select{|f| f =~ /^bin/}

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 17
-  - 3
-  version: 0.17.3
+  - 4
+  version: 0.17.4
 platform: ruby
 authors: 
 - Jose Valim
@@ -24,7 +24,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-28 00:00:00 -05:00
+date: 2011-02-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -98,6 +98,19 @@ dependencies:
         version: 3.0.0
   type: :development
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: factory_girl
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: "Rails 3 compatible generators for gems that don't have them yet "
 email: andre@arko.net
 executables: []
@@ -139,7 +152,8 @@ files:
 - lib/generators/erubis/scaffold/templates/show.html.erb
 - lib/generators/factory_girl.rb
 - lib/generators/factory_girl/model/model_generator.rb
-- lib/generators/factory_girl/model/templates/fixtures.rb
+- lib/generators/factory_girl/model/templates/fixtures.1.rb
+- lib/generators/factory_girl/model/templates/fixtures.2.rb
 - lib/generators/formtastic.rb
 - lib/generators/formtastic/scaffold/scaffold_generator.rb
 - lib/generators/formtastic/scaffold/templates/_form.html.erb.erb
@@ -216,7 +230,7 @@ homepage: https://github.com/indirect/rails3-generators
 licenses: []
 
 post_install_message: "\n\
-  rails3-generators-0.17.3\n\n\
+  rails3-generators-0.17.4\n\n\
   Be sure to check out the wiki, https://wiki.github.com/indirect/rails3-generators/,\n\
   for information about recent changes to this project.\n\n\
   Machinist generators have been removed. Please update your project to use Machinist 2 (https://github.com/notahat/machinist) which contains its own generators.\n\n\