rails3_assist 0.3.4 → 0.3.5

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/lib/rails3_assist/artifact.rb

@@ -5,7 +5,7 @@ module Rails3::Assist::Artifact
     end
 
     def app_artifacts
-      [:controller, :mailer, :helper, :view, :model, :permit]
+      [:controller, :mailer, :helper, :view, :model, :permit, :license, :validator]
     end
   
     def rails_artifacts

data/lib/rails3_assist/artifact/files.rb

@@ -14,7 +14,7 @@ module Rails3::Assist::Artifact
       end
 
       # artifact files using xxx_[artifact].rb convention, i.e postfixing with type of artifact
-      [:mailer, :observer, :permit, :controller, :helper].each do |name|
+      [:mailer, :observer, :permit, :license, :controller, :helper, :validator].each do |name|
         class_eval %{
           def #{name}_files expr=nil
             files = Rails3::Assist::Files.rails_app_files(:#{name.to_s.pluralize}, :pattern => '**/*_#{name}.rb').grep_it expr
@@ -34,7 +34,7 @@ module Rails3::Assist::Artifact
       end
 
 
-      [:erb, :haml].each do |name|
+      [:erb, :haml, :slim].each do |name|
         class_eval %{
           def #{name}_view_files *args 
             view_files args, :template_language => :#{name}

data/rails3_assist.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails3_assist}
-  s.version = "0.3.4"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-12-20}
+  s.date = %q{2010-12-24}
   s.description = %q{Basic file operation helpers for working with Rails 3 artifacts}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -53,10 +53,12 @@ Gem::Specification.new do |s|
     "spec/fixtures/app/controllers/users_controller.rb",
     "spec/fixtures/app/helpers/application_helper.rb",
     "spec/fixtures/app/helpers/users_helper.rb",
+    "spec/fixtures/app/licenses/blogging_license.rb",
     "spec/fixtures/app/mailers/user_mailer.rb",
     "spec/fixtures/app/models/user.rb",
     "spec/fixtures/app/models/user_observer.rb",
     "spec/fixtures/app/permits/user_permit.rb",
+    "spec/fixtures/app/validators/email_validator.rb",
     "spec/fixtures/app/views/layouts/application.html.erb",
     "spec/fixtures/app/views/users/_form.html.erb",
     "spec/fixtures/app/views/users/edit.html.erb",
@@ -137,10 +139,12 @@ Gem::Specification.new do |s|
     "spec/fixtures/app/controllers/users_controller.rb",
     "spec/fixtures/app/helpers/application_helper.rb",
     "spec/fixtures/app/helpers/users_helper.rb",
+    "spec/fixtures/app/licenses/blogging_license.rb",
     "spec/fixtures/app/mailers/user_mailer.rb",
     "spec/fixtures/app/models/user.rb",
     "spec/fixtures/app/models/user_observer.rb",
     "spec/fixtures/app/permits/user_permit.rb",
+    "spec/fixtures/app/validators/email_validator.rb",
     "spec/fixtures/config/application.rb",
     "spec/fixtures/config/boot.rb",
     "spec/fixtures/config/environment.rb",

data/spec/fixtures/Gemfile

@@ -4,3 +4,6 @@ gem 'cream'
 gem 'devise'
 gem "mm-devise"
 gem "roles_mongo_mapper"
+gem 'hello'
+gem 'hi'
+gem 'blip'

data/spec/rails3_assist/artifact/files_spec.rb

@@ -8,7 +8,9 @@ class ArtDir
 end
 
 describe Rails3::Assist::Artifact::Files do
-  use_helper :directory
+  extend Rails3::Assist::UseMacro
+
+  use_helpers :directory
 
   before do
     Rails3::Assist::Directory.rails_root = fixtures_dir
@@ -23,19 +25,31 @@ describe Rails3::Assist::Artifact::Files do
 
   describe '#mailer_files' do 
     it "should return :mailer files" do
-      puts @test.mailer_files.file_names.should include 'user_mailer.rb'
+      @test.mailer_files.file_names.should include 'user_mailer.rb'
     end
   end
 
   describe '#observer_files' do 
     it "should return :observer files" do
-      puts @test.observer_files.file_names.should include 'user_observer.rb'
+      @test.observer_files.file_names.should include 'user_observer.rb'
     end
   end
 
   describe '#permit_files' do 
     it "should return :permit files" do
-      puts @test.permit_files.file_names.should include 'user_permit.rb'
+      @test.permit_files.file_names.should include 'user_permit.rb'
+    end
+  end
+
+  describe '#license_files' do 
+    it "should return :license files" do
+      @test.license_files.file_names.should include 'blogging_license.rb'
+    end
+  end
+
+  describe '#validator_files' do 
+    it "should return :validator files" do
+      @test.validator_files.file_names.should include 'email_validator.rb'
     end
   end
    

data/spec/rails3_assist/file/special_spec.rb

@@ -7,6 +7,26 @@ class AppDir
   use_helper :special
 end
 
+def test_routes_file &block
+  old_content = AppDir.new.read_routes_file
+
+  yield if block
+
+  File.overwrite CLASS.routes_file do
+    old_content
+  end            
+end  
+
+def test_gem_file &block
+  old_content = AppDir.new.read_gem_file
+
+  yield if block
+
+  File.overwrite CLASS.gem_file do
+    old_content
+  end            
+end  
+
 describe Rails3::Assist::File::Special do
   before do
     Rails3::Assist::Directory.rails_root = fixtures_dir     
@@ -63,18 +83,14 @@ describe Rails3::Assist::File::Special do
     end
   end
 
+  # create test_routes macro
+
   describe '#insert_into_routes' do  
     it 'should insert into block of Routes file' do
-      old_routes_content = AppDir.new.read_routes_file
-
-      routes_stmt = 'devise_for :users'
-
-      CLASS.insert_into_routes routes_stmt
-
-      AppDir.new.read_routes_file.should match /do\s*#{Regexp.escape(routes_stmt)}\s*/
-
-      File.overwrite CLASS.routes_file do
-        old_routes_content
+      test_routes_file do
+        routes_stmt = 'devise_for :users'
+        CLASS.insert_into_routes routes_stmt
+        AppDir.new.read_routes_file.should match /do\s*#{Regexp.escape(routes_stmt)}\s*/
       end            
     end
   end
@@ -97,38 +113,26 @@ describe Rails3::Assist::File::Special do
 
   describe '#clean_gemfile' do    
     it 'should be true that it has cleaned the Gemfile ensuring newlines between each gem' do
-      old_gem_file_content = AppDir.new.read_gem_file
-
-      CLASS.append_to_gem_file do
-        "gem 'hello'gem 'hi'gem 'blip'"
-      end
-
-      AppDir.new.clean_gemfile
-
-      expected = "gem 'hello'\ngem 'hi'"
-
-      AppDir.new.read_gem_file.should match /#{Regexp.escape(expected)}/      
+      test_gem_file do
+        CLASS.append_to_gem_file do
+          "gem 'hello'gem 'hi'gem 'blip'"
+        end
 
-      File.overwrite CLASS.gem_file do
-        old_gem_file_content
+        AppDir.new.clean_gemfile
+        expected = "gem 'hello'\ngem 'hi'"
+        AppDir.new.read_gem_file.should match /#{Regexp.escape(expected)}/
       end
     end
 
     it 'should be true that it has cleaned the Gemfile ensuring newlines between each gem and after end' do
-      old_gem_file_content = AppDir.new.read_gem_file
-
-      CLASS.append_to_gem_file do
-        "group :dev endgem 'hi'gem 'blip'"
-      end
-
-      AppDir.new.clean_gemfile
-
-      expected = "group :dev end\ngem 'hi'"
-
-      AppDir.new.read_gem_file.should match /#{Regexp.escape(expected)}/      
+      test_gem_file do
+        CLASS.append_to_gem_file do
+          "group :dev endgem 'hi'gem 'blip'"
+        end
 
-      File.overwrite CLASS.gem_file do
-        old_gem_file_content
+        AppDir.new.clean_gemfile
+        expected = "group :dev end\ngem 'hi'"
+        AppDir.new.read_gem_file.should match /#{Regexp.escape(expected)}/
       end
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-20 00:00:00 +01:00
+date: 2010-12-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -167,10 +167,12 @@ files:
 - spec/fixtures/app/controllers/users_controller.rb
 - spec/fixtures/app/helpers/application_helper.rb
 - spec/fixtures/app/helpers/users_helper.rb
+- spec/fixtures/app/licenses/blogging_license.rb
 - spec/fixtures/app/mailers/user_mailer.rb
 - spec/fixtures/app/models/user.rb
 - spec/fixtures/app/models/user_observer.rb
 - spec/fixtures/app/permits/user_permit.rb
+- spec/fixtures/app/validators/email_validator.rb
 - spec/fixtures/app/views/layouts/application.html.erb
 - spec/fixtures/app/views/users/_form.html.erb
 - spec/fixtures/app/views/users/edit.html.erb
@@ -278,10 +280,12 @@ test_files:
 - spec/fixtures/app/controllers/users_controller.rb
 - spec/fixtures/app/helpers/application_helper.rb
 - spec/fixtures/app/helpers/users_helper.rb
+- spec/fixtures/app/licenses/blogging_license.rb
 - spec/fixtures/app/mailers/user_mailer.rb
 - spec/fixtures/app/models/user.rb
 - spec/fixtures/app/models/user_observer.rb
 - spec/fixtures/app/permits/user_permit.rb
+- spec/fixtures/app/validators/email_validator.rb
 - spec/fixtures/config/application.rb
 - spec/fixtures/config/boot.rb
 - spec/fixtures/config/environment.rb