rails3_artifactor 0.3.0 → 0.3.1

data/Rakefile

@@ -7,7 +7,8 @@ begin
     gem.email = "kmandrup@gmail.com"
     gem.homepage = "http://github.com/kristianmandrup/rails3_artifact_helper"
     gem.authors = ["Kristian Mandrup"]
-    gem.add_development_dependency "rspec", ">= 2.0"
+    gem.add_development_dependency "rspec",           ">= 2.0.0"
+    gem.add_development_dependency "generator-spec",  '>= 0.7.0'
 
     gem.add_dependency "rspec",             ">= 2.0.0"
     gem.add_dependency "require_all",       "~> 1.2.0"

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/rails3_artifactor/artifact/file_name/view.rb

@@ -34,7 +34,12 @@ module Rails3::Assist::Artifact
 
       def view_file_name *args
         folder, action, type = get_view_args(args)
-        File.expand_path File.join(DIR.view_dir, folder.to_s, "#{action}.#{type}")
+        options = last_option args
+        root_path = options[:root_path]
+        views_path = options[:views_path]
+        views_path ||= File.join(root_path, 'app/views') if root_path
+        puts "views: #{views_path}"
+        File.expand_path File.join(views_path || DIR.view_dir, folder.to_s, "#{action}.#{type}")
       end 
       
       def get_view_args *args

data/rails3_artifactor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails3_artifactor}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-10-21}
+  s.date = %q{2010-11-20}
   s.description = %q{Helpers for handling Rails 3 artifacts in general, such as CRUD operations etc.}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -131,14 +131,16 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 2.0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
+      s.add_development_dependency(%q<generator-spec>, [">= 0.7.0"])
       s.add_runtime_dependency(%q<rspec>, [">= 2.0.0"])
       s.add_runtime_dependency(%q<require_all>, ["~> 1.2.0"])
       s.add_runtime_dependency(%q<sugar-high>, ["~> 0.3.0"])
       s.add_runtime_dependency(%q<rails3_assist>, ["~> 0.3.0"])
       s.add_runtime_dependency(%q<migration_assist>, ["~> 0.1.4"])
     else
-      s.add_dependency(%q<rspec>, [">= 2.0"])
+      s.add_dependency(%q<rspec>, [">= 2.0.0"])
+      s.add_dependency(%q<generator-spec>, [">= 0.7.0"])
       s.add_dependency(%q<rspec>, [">= 2.0.0"])
       s.add_dependency(%q<require_all>, ["~> 1.2.0"])
       s.add_dependency(%q<sugar-high>, ["~> 0.3.0"])
@@ -146,7 +148,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<migration_assist>, ["~> 0.1.4"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 2.0"])
+    s.add_dependency(%q<rspec>, [">= 2.0.0"])
+    s.add_dependency(%q<generator-spec>, [">= 0.7.0"])
     s.add_dependency(%q<rspec>, [">= 2.0.0"])
     s.add_dependency(%q<require_all>, ["~> 1.2.0"])
     s.add_dependency(%q<sugar-high>, ["~> 0.3.0"])

data/spec/rails3_artifactor/artifact/crud/migration_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'generator-spec'
 
 Rails3::Migration::Assist.orm = :active_record
 
@@ -26,7 +27,7 @@ describe 'migration' do
     remove_migration :create_account
   end
 
-  context "Non-existant migration(s)" do
+  context "Migration not there" do
     it "should not fail trying to remove non-existant migrations" do
       remove_migrations :person, :user
       remove_artifacts :migration, :person, :user
@@ -54,27 +55,32 @@ describe 'migration' do
       end.should_not be_true
     end   
   end
-    
-  it "should have an create_account_migration file that contains an index method and two inserted comments" do
-    insert_into_migration :create_account, :content => '# hello'
-    insert_into_migration :create_account do
-      '# goodbye'
-    end
-    read_migration(:create_account).should have_comment 'hello'
-    puts read_migration(:create_account)
-
-    # puts migration_file_name :create_account
 
-    # puts existing_file_name :create_account, :migration
+  context "When migration does exist" do
+    before do
+      insert_into_migration :create_account, :content => '# hello'
+      insert_into_migration :create_account do
+        '# goodbye'
+      end
+    end
+    
+    it "should have an :create_account migration file that contains an index method and two inserted comments" do
+      nil.should have_migration :create_account
 
-    # @root_dir.should have_migration :create_account
-    # 
-    # lambda {existing_migration_file :blip}.should raise_error
-    # 
-    # @root_dir.should have_migration :create_account do |migration_file|
-    #   migration_file.should have_class_method :up
-    #   migration_file.should have_comment 'hello'
-    #   migration_file.should have_comment 'goodbye'
-    # end
+      read_migration(:create_account).should have_comment 'hello'
+      read_migration(:create_account).should match /ActiveRecord::Migration/
+    end
+    
+    it "should not have migration blip" do
+      lambda {existing_migration_file :blip}.should raise_error
+    end
+        
+    it "shoud have migraion a :create_account migration with basic setup" do
+      nil.should have_migration :create_account do |migration_file|
+        migration_file.should have_class_method :up
+        migration_file.should have_comment 'hello'
+        migration_file.should have_comment 'goodbye'
+      end
+    end
   end
 end

data/spec/rails3_artifactor/artifact/file_name/view_spec.rb

@@ -16,23 +16,23 @@ describe Rails3::Assist::Artifact::View::FileName do
 
   describe '#view_file_name' do
     it "should return the file name for the persons/show view with default action" do      
-      CLASS.view_file_name(:person).should match 'views/person/show'.to_regexp
-    end
-
-    it "should return the file name for the persons/show view with default type" do      
       CLASS.view_file_name(:person, :show).should match 'views/person/show'.to_regexp
     end
 
     it "should return the file name for the persons/show view with template type" do      
-      CLASS.view_file_name(:person, :show, 'erb.hml').should match 'views/person/show'.to_regexp
+      CLASS.view_file_name(:person, :show, :type => :erb).should match 'views/person/show'.to_regexp
     end
-
+    
     it "should return the file name for the persons/show view using hash" do      
-      CLASS.view_file_name(:person, :action => :show, :type => 'erb.hml').should match 'views/person/show'.to_regexp
+      CLASS.view_file_name(:folder => :person, :action => :show, :type => 'erb.hml').should match 'views/person/show'.to_regexp
     end
+    
+    it "should return the file name for the persons/show view with root path" do      
+      CLASS.view_file_name(:folder => :person, :action => :show, :type => :erb, :root_path => Rails3::Assist::Directory.rails_root).should match 'views/person/show'.to_regexp
+    end        
 
     it "should return the file name for the persons/show view with root path" do      
-      CLASS.view_file_name(:person, :action => :show, :type => 'erb.hml', :root_path => Rails3::Assist::Directory.rails_root).should match 'views/person/show'.to_regexp
+      CLASS.view_file_name(:folder => :person, :action => :show, :type => :erb, :views_path => 'my/views').should match 'views/person/show'.to_regexp
     end        
   end
 end

data/spec/rails3_artifactor/artifact/markers_spec.rb

@@ -34,7 +34,7 @@ describe Rails3::Assist::Artifact::Permit do
 
   describe '#permit_marker' do
     it "should return the class marker for permit :person" do      
-      @clazz.permit_marker(:person).should == 'Person'
+      @clazz.permit_marker(:person).should == 'PersonPermit < Permit::Base'
     end
   end
 end

data/spec/rails3_artifactor/artifact/orm/active_record_spec.rb

@@ -3,6 +3,10 @@ require 'spec_helper'
 describe 'model with active_record' do
   use_orm :active_record
 
+  before do
+    Rails3::Assist::Directory.rails_root = File.dirname (__FILE__)
+  end
+
   before :each do              
     remove_model :account        
     create_model :account do
@@ -12,7 +16,7 @@ describe 'model with active_record' do
   end
 
   after :each do              
-    # remove_model :account
+    remove_model :account
   end
     
   it "should have an account_model file that contains an index method and two inserted comments" do

data/spec/rails3_artifactor/artifact/orm/data_mapper_spec.rb

@@ -3,6 +3,10 @@ require 'spec_helper'
 describe 'model with DataMapper' do
   use_orm :data_mapper
 
+  before do
+    Rails3::Assist::Directory.rails_root = File.dirname (__FILE__)
+  end
+
   before :each do              
     remove_model :account        
     create_model :account do

data/spec/rails3_artifactor/artifact/orm/mongo_mapper_spec.rb

@@ -3,6 +3,10 @@ require 'spec_helper'
 describe 'model with Mongo Mapper' do
   use_orm :mongo_mapper
 
+  before do
+    Rails3::Assist::Directory.rails_root = File.dirname (__FILE__)
+  end
+
   before :each do              
     remove_model :account        
     create_model :account do

data/spec/rails3_artifactor/artifact/orm/mongoid_spec.rb

@@ -3,6 +3,10 @@ require 'spec_helper'
 describe 'model with Mongoid' do
   use_orm :mongoid
 
+  before do
+    Rails3::Assist::Directory.rails_root = File.dirname (__FILE__)
+  end
+
   before :each do              
     remove_model :account        
     create_model :account do

data/spec/rails3_artifactor/artifact/orm/none_spec.rb

@@ -3,6 +3,10 @@ require 'spec_helper'
 describe 'model without any orm' do
   use_orm :none
 
+  before do
+    Rails3::Assist::Directory.rails_root = File.dirname (__FILE__)
+  end
+
   before :each do              
     remove_model :account        
     create_model :account do

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require 'rspec/core'
-# require 'autotest/rspec2'
 require 'rails3_artifactor'
 require 'rails3_artifactor/rspec'
 require 'code-spec'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-21 00:00:00 +02:00
+date: 2010-11-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,13 +28,29 @@ dependencies:
         segments: 
         - 2
         - 0
-        version: "2.0"
+        - 0
+        version: 2.0.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: generator-spec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 7
+        - 0
+        version: 0.7.0
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,11 +61,11 @@ dependencies:
         - 0
         version: 2.0.0
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: require_all
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -60,11 +76,11 @@ dependencies:
         - 0
         version: 1.2.0
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: sugar-high
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -75,11 +91,11 @@ dependencies:
         - 0
         version: 0.3.0
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rails3_assist
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -90,11 +106,11 @@ dependencies:
         - 0
         version: 0.3.0
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: migration_assist
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -105,7 +121,7 @@ dependencies:
         - 4
         version: 0.1.4
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 description: Helpers for handling Rails 3 artifacts in general, such as CRUD operations etc.
 email: kmandrup@gmail.com
 executables: []