rails3_artifactor 0.1.1 → 0.1.2

data/Rakefile

@@ -7,8 +7,11 @@ 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.0"
-    gem.add_dependency "require_all", "~> 1.1.0"
+    gem.add_development_dependency "rspec", "~> 2.0.0.beta.19"
+    gem.add_dependency "require_all",   "~> 1.1.0"
+    gem.add_dependency "sugar-high",    "~> 0.2.3"
+    gem.add_dependency 'rails3_assist', "~> 0.3.1"
+    
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/rails3_artifactor/artifact/base.rb

@@ -0,0 +1,59 @@
+module Rails3::Assist
+  module BaseHelper
+    def self.included(base)
+      base.extend ClassMethods
+      base.class_eval do
+        include Rails3::Assist::App
+        include ::Thor::Actions
+      end
+    end
+
+    module ClassMethods
+      def multi_aliases_for name
+        multi_alias :_after_ => name, :create => :new, :insert_into => [:inject_into, :update], :read => :X_content, :remove => :delete                    
+      end
+    end
+                 
+    protected
+
+    def get_type options = {}
+      case options
+      when Hash
+        raise ArgumentError, "No artifact type specified #{options}" if !options[:type]
+        options[:type].to_sym
+      when String, Symbol
+        options.to_sym
+      else
+        raise ArgumentError, "Bad artifact type specified #{options}"        
+      end
+    end
+    
+    def debug?      
+      Rails3::Assist.debug_on
+    end    
+
+    def debug msg
+      puts msg if debug?
+    end
+
+    def set options, type
+      options.merge!(:type => type)
+      options
+    end
+
+    def orm_notify
+      ''
+    end
+
+    def marker_option name, options={}      
+      type = last_option(options)[:type]
+      marker_content = if type
+        method = :"#{type}_marker"
+        orm_marker = send method, name, options if respond_to? method 
+      else
+        name.to_s.camelize
+      end 
+      options[:before] ? {:before => marker_content} : {:after => marker_content}      
+    end
+  end
+end   

data/lib/rails3_artifactor/artifact/crud.rb

@@ -14,9 +14,14 @@ module Rails3::Assist::Artifact
 
   Rails3::Assist.artifacts.each do |name|
     class_eval %{
-      module #{name.to_s.camelize}      
+      module #{name.to_s.camelize}
         include Rails3::Assist::BaseHelper
-        include Rails3::Assist::Artifact::CRUD        
+        
+        def self.included base
+          base.class_eval do              
+            include Rails3::Assist::Artifact::CRUD        
+          end
+        end
 
         def has_#{name.to_s.pluralize}? *names
           names.flatten.each do |name|

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

@@ -19,7 +19,7 @@ module Rails3::Assist::Artifact
       def migration_file_name name, options={}
         number = options[:number]              
       
-        migration_dir_name = File.expand_path(DIR.migration_dir options[:root_path])
+        migration_dir_name = File.expand_path(DIR.migration_dir options)
               
         number = next_migration_number(migration_dir_name) if !number      
         File.join(migration_dir_name, "#{number}_#{name}.rb")      
@@ -28,7 +28,7 @@ module Rails3::Assist::Artifact
       def find_migration name, options={}
         root_path = options[:root_path]        
            
-        migration_dir_name = File.expand_path(DIR.migration_dir options[:root_path])
+        migration_dir_name = File.expand_path(DIR.migration_dir options)
 
         migration_find_expr = "#{migration_dir_name}/[0-9]*_*.rb"
         migrations = Dir.glob(migration_find_expr)

data/lib/rails3_artifactor/artifact/markers.rb

@@ -1,6 +1,3 @@
-require 'rails3_artifactor/base/class_methods'
-require 'rails3_assist/base'
-
 module Rails3::Assist::Artifact
   module Marker
     def marker name, type, options=nil

data/lib/rails3_artifactor/artifact/orm.rb

@@ -1,7 +1,11 @@
 module Rails3::Assist
   module Orm
     module Base
-      # include Rails3::Assist::Artifact::Model 
+      def self.included base
+        base.class_eval do
+          include Rails3::Assist::Artifact::Model
+        end
+      end
 
       protected
 

data/lib/rails3_artifactor/base/crud/create.rb

@@ -5,7 +5,7 @@ module Rails3::Assist::Artifact::CRUD
     def create_artifact name, options={}, &block
       type = get_type(options)
       file = make_file_name(name, type)
-      return nil if File.exist?(file)
+      return nil if File.exist?(file) && options[:no_overwrite]
 
       create_artifact_dir(file)      
       content = get_content(name, type, options, &block)
@@ -19,7 +19,7 @@ module Rails3::Assist::Artifact::CRUD
     # def new_artifact_content name, type, content=nil, &block
     def new_artifact_content name, options = {}, &block
       type = get_type(options)
-      content = get_content(name, type, options, &block)
+      content = extract_content type, options, &block
       %Q{class #{marker(name, type)}
   #{content}
 end}
@@ -37,11 +37,15 @@ end}
       method
     end
 
-    def get_content name, type, options = {}, &block
+    def extract_content type, options, &block
       content = block ? yield : options[:content]
-      content = type == :model ? content : options.merge(:content => content)
+      content = type == :model ? options.merge(:content => content) : content
+    end    
+
+    def get_content name, type, options = {}, &block
+      content = extract_content type, options, &block
       method = content_method(type)
-      send method, name, :content => content
+      send method, name, content
     end        
   end 
 end

data/lib/rails3_artifactor/base/crud/delete.rb

@@ -4,8 +4,15 @@ module Rails3::Assist::Artifact::CRUD
   module Delete
     def remove_artifact name, type
       type = type[:type] if type.kind_of? Hash
-      file = existing_file_name name, type
-      debug "removed artifact: #{name}" if File.exist?(file) && FileUtils.rm_f(file) 
+      begin
+        file = existing_file_name name, type
+        FileUtils.rm_f(file) 
+        debug "removed artifact: #{name}"  
+        true
+      rescue
+        debug "artifact to remove not found: #{name}"          
+        nil
+      end
     end
     alias_method :delete_artifact, :remove_artifact
 

data/lib/rails3_artifactor/base/file_name.rb

@@ -9,11 +9,11 @@ module Rails3::Assist::Artifact
       send :"#{type}_file_name", name, options
     end
 
-    def existing_file_name name, type=nil 
+    def existing_file_name name, type=nil, options = {} 
       # first try finder method
       finder_method = :"find_#{type}"       
       if respond_to?(finder_method)          
-        result = send finder_method, name 
+        result = send finder_method, name, options 
         if !result.kind_of? String          
           raise IOError, "The call to #find_#{type}(#{name}) didn't find an existing #{type} file. Error in find expression: #{result.find_expr}" 
         end
@@ -23,15 +23,15 @@ module Rails3::Assist::Artifact
       end
       
       # default for non-migration
-      file_name = make_file_name(name, type)      
+      file_name = make_file_name name, type, options
       raise IOError, "No file for :#{type} found at location: #{file_name}" if !File.file?(file_name)
       file_name
     end
 
     Rails3::Assist.artifacts.each do |name|
       class_eval %{
-        def existing_#{name}_file name, type=nil
-          existing_file_name name, type
+        def existing_#{name}_file name, type=nil, options = {}
+          existing_file_name name, type, options
         end
       } 
     end

data/lib/rails3_artifactor.rb

@@ -1,6 +1,8 @@
 require 'require_all'
 require 'sugar-high/file'
 require 'sugar-high/alias'
+require 'sugar-high/regexp'
 require 'rails3_assist'
 
+require 'rails3_artifactor/artifact/base'
 require_all File.dirname(__FILE__) + '/rails3_artifactor'

data/rails3_artifactor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails3_artifactor}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-09-04}
+  s.date = %q{2010-09-11}
   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 = [
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "lib/rails3_artifactor.rb",
+     "lib/rails3_artifactor/artifact/base.rb",
      "lib/rails3_artifactor/artifact/crud.rb",
      "lib/rails3_artifactor/artifact/crud/view.rb",
      "lib/rails3_artifactor/artifact/file_name/artifacts.rb",
@@ -56,6 +57,7 @@ Gem::Specification.new do |s|
      "spec/fixtures/app/views/account/edit.html.erb",
      "spec/fixtures/app/views/account/show.html.erb",
      "spec/fixtures/db/migrations/20100904095012_create_account.rb",
+     "spec/rails3_artifactor/artifact/base_spec.rb",
      "spec/rails3_artifactor/artifact/crud/controller_spec.rb",
      "spec/rails3_artifactor/artifact/crud/helper_spec.rb",
      "spec/rails3_artifactor/artifact/crud/migration_spec.rb",
@@ -88,12 +90,14 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/fixtures/app/controllers/account_controller.rb",
      "spec/fixtures/app/helpers/account_helper.rb",
+     "spec/fixtures/app/mailers/account_mailer.rb",
      "spec/fixtures/app/models/account.rb",
      "spec/fixtures/db/migrations/20100904095012_create_account.rb",
      "spec/fixtures.rb",
      "spec/rails3_artifactor/artifact/base_spec.rb",
      "spec/rails3_artifactor/artifact/crud/controller_spec.rb",
      "spec/rails3_artifactor/artifact/crud/helper_spec.rb",
+     "spec/rails3_artifactor/artifact/crud/mailer_spec.rb",
      "spec/rails3_artifactor/artifact/crud/migration_spec.rb",
      "spec/rails3_artifactor/artifact/crud/model_spec.rb",
      "spec/rails3_artifactor/artifact/crud/observer_spec.rb",
@@ -122,15 +126,21 @@ 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.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.0.0.beta.19"])
       s.add_runtime_dependency(%q<require_all>, ["~> 1.1.0"])
+      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.2.3"])
+      s.add_runtime_dependency(%q<rails3_assist>, ["~> 0.3.1"])
     else
-      s.add_dependency(%q<rspec>, ["~> 2.0.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.19"])
       s.add_dependency(%q<require_all>, ["~> 1.1.0"])
+      s.add_dependency(%q<sugar-high>, ["~> 0.2.3"])
+      s.add_dependency(%q<rails3_assist>, ["~> 0.3.1"])
     end
   else
-    s.add_dependency(%q<rspec>, ["~> 2.0.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.19"])
     s.add_dependency(%q<require_all>, ["~> 1.1.0"])
+    s.add_dependency(%q<sugar-high>, ["~> 0.2.3"])
+    s.add_dependency(%q<rails3_assist>, ["~> 0.3.1"])
   end
 end
 

data/spec/fixtures/app/controllers/account_controller.rb

@@ -1,4 +1,8 @@
 class AccountController < ActionController::Base
+  # goodbye
   # hello
-  {:type=>:controller, :content=>"\n        def index\n        end\n      "}
+  
+        def index
+        end
+      
 end

data/spec/fixtures/app/helpers/account_helper.rb

@@ -1,4 +1,3 @@
 class AccountHelper
-  # hello
-  {:type=>:helper, :content=>"\n        def index\n        end\n      "}
+  {:type=>:helper, :content=>{:content=>{:type=>:helper, :content=>"\n        def index\n        end\n      "}}}
 end

data/spec/fixtures/app/mailers/account_mailer.rb

@@ -0,0 +1,6 @@
+class AccountMailer < ActionMailer::Base
+  
+        def mail_it
+        end
+      
+end

data/spec/fixtures/app/models/account.rb

@@ -1,10 +1,5 @@
 class Account
-  
-  
-  
-  
-  
-  
+  # goodbye
   # hello
   def index
   end

data/spec/fixtures/app/views/account/edit.html.erb

@@ -1,4 +1,5 @@
 
         # hello
+  # goodbye
   <h1><%= title %></h1>
       

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

@@ -6,7 +6,7 @@ describe 'helper' do
   before :each do              
     Rails3::Assist::Directory.rails_root = fixtures_dir
     
-    remove_helper :account if has_helper? :account        
+    # remove_helper :account if has_helper? :account        
     create_helper :account do
       %q{
         def index
@@ -20,12 +20,12 @@ describe 'helper' do
   end
     
   it "should have an account_helper file that contains an index method and two inserted comments" do
-    insert_into_helper :account, :content => '# hello'
-    insert_into_helper :account do
-      '# goodbye'
-    end
-    read_helper(:account).should have_comment 'hello'
-    puts read_helper(:account)
+    # insert_into_helper :account, :content => '# hello'
+    # insert_into_helper :account do
+    #   '# goodbye'
+    # end
+    # read_helper(:account).should have_comment 'hello'
+    # puts read_helper(:account)
     # root_dir.should have_helper :account do |helper_file|
     #   helper_file.should have_method :index
     #   helper_file.should have_comment 'hello'

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

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe 'mailer' do
+  use_helpers :mailer
+
+  before :each do              
+    Rails3::Assist::Directory.rails_root = fixtures_dir
+    
+    # remove_helper :account if has_helper? :account        
+    create_mailer :account do
+      %q{  def mail_it
+  end}
+    end    
+  end
+
+  after :each do              
+    # remove_helper :account
+  end
+    
+  it "should have an account_mailer file that contains a #mail_it method and two inserted comments" do
+    insert_into_mailer :account, :content => '# hello'
+    insert_into_mailer :account do
+      '# goodbye'
+    end
+    read_mailer(:account).should have_comment 'hello'
+    puts read_mailer(:account)
+    # root_dir.should have_mailer :account do |helper_file|
+    #   helper_file.should have_method :index
+    #   helper_file.should have_comment 'hello'
+    #   helper_file.should have_comment 'goodbye'
+    # end
+  end
+end

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

@@ -2,12 +2,11 @@ require 'spec_helper'
 
 describe 'model without orm' do
   use_orm :none
-  use_helper :model
 
   before :each do  
     Rails3::Assist::Directory.rails_root = fixtures_dir
     
-    remove_model :account if has_model? :account                
+    delete_model(:account) if has_model? :account                
     create_model :account do
       %q{def index
   end}
@@ -26,7 +25,6 @@ describe 'model without orm' do
     puts read_model(:account)
     read_model(:account).should have_comment 'hello'
 
-
     # root_dir.should have_model :account do |model_file|
     #   model_file.should have_method :index
     #   model_file.should have_comment 'hello'

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

@@ -1,6 +1,4 @@
-require 'require_all'
-require 'rails3_artifactor/namespaces'
-require 'rails3_artifactor/artifact/file_name/artifacts'
+require 'spec_helper'
 
 CLASS = Rails3::Assist::Artifact::FileName
 
@@ -19,10 +17,16 @@ describe Rails3::Assist::Artifact::FileName do
   (Rails3::Assist.artifacts - [:migration, :view]).each do |name|
     eval %{
       describe '##{name}_file_name' do
-        it "should return the file name for #{name}" do
+        it "should return the file name for #{name} using class method" do
           clazz = Rails3::Assist::Artifact::#{name.to_s.camelize}
           clazz.#{name}_file_name('user').should match /user/
         end
+
+        it "should return the file name for #{name} using instance method" do
+          art = ArtDir.new
+          art.extend Rails3::Assist::Artifact::#{name.to_s.camelize}
+          art.#{name}_file_name('user').should match /user/
+        end
       end
     }
   end

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

@@ -1,9 +1,4 @@
-# require 'spec_helper'
-require 'require_all'
-require 'rails3_artifactor/namespaces'
-require 'rails3_artifactor/artifact/file_name/migration'
-require 'rails3_artifactor/artifact/orm'
-require 'rails3_artifactor/rspec/configure'
+require 'spec_helper'
 
 CLASS = Rails3::Assist::Artifact::Migration
 
@@ -26,5 +21,11 @@ describe Rails3::Assist::Artifact::Migration::FileName do
       CLASS.migration_file_name(:create_persons).should match /create_persons/
     end
   end
+
+  describe '#migration_file_name' do
+    it "should return the file name for migration" do      
+      CLASS.migration_file_name(:create_persons, :root_path => 'my_root').should match /my_root/
+    end
+  end
 end
 

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

@@ -1,9 +1,4 @@
-# require 'spec_helper'
-require 'require_all'
-require 'sugar-high/regexp'
-require 'rails3_artifactor/namespaces'
-require 'rails3_artifactor/artifact/file_name/view'
-# require 'rails3_artifactor/rspec/configure'
+require 'spec_helper'
 
 CLASS = Rails3::Assist::Artifact::View
 

data/spec/rails3_artifactor/artifact/markers_spec.rb

@@ -1,8 +1,4 @@
-require 'require_all'
-require 'sugar-high/regexp'
-require 'rails3_artifactor/namespaces'
-require 'rails3_artifactor/artifact/markers'
-# require 'rails3_artifactor/rspec/configure'
+require 'spec_helper'
 
 describe Rails3::Assist::Artifact::Controller do
   before do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-04 00:00:00 +02:00
+date: 2010-09-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,7 +29,9 @@ dependencies:
         - 2
         - 0
         - 0
-        version: 2.0.0
+        - beta
+        - 19
+        version: 2.0.0.beta.19
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -47,6 +49,36 @@ dependencies:
         version: 1.1.0
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: sugar-high
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 3
+        version: 0.2.3
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rails3_assist
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 1
+        version: 0.3.1
+  type: :runtime
+  version_requirements: *id004
 description: Helpers for handling Rails 3 artifacts in general, such as CRUD operations etc.
 email: kmandrup@gmail.com
 executables: []
@@ -66,6 +98,7 @@ files:
 - Rakefile
 - VERSION
 - lib/rails3_artifactor.rb
+- lib/rails3_artifactor/artifact/base.rb
 - lib/rails3_artifactor/artifact/crud.rb
 - lib/rails3_artifactor/artifact/crud/view.rb
 - lib/rails3_artifactor/artifact/file_name/artifacts.rb
@@ -96,6 +129,7 @@ files:
 - spec/fixtures/app/views/account/edit.html.erb
 - spec/fixtures/app/views/account/show.html.erb
 - spec/fixtures/db/migrations/20100904095012_create_account.rb
+- spec/rails3_artifactor/artifact/base_spec.rb
 - spec/rails3_artifactor/artifact/crud/controller_spec.rb
 - spec/rails3_artifactor/artifact/crud/helper_spec.rb
 - spec/rails3_artifactor/artifact/crud/migration_spec.rb
@@ -119,7 +153,8 @@ files:
 - spec/rails3_artifactor/base/crud/update_spec.rb
 - spec/rails3_artifactor/base/file_name_spec.rb
 - spec/spec_helper.rb
-- spec/rails3_artifactor/artifact/base_spec.rb
+- spec/fixtures/app/mailers/account_mailer.rb
+- spec/rails3_artifactor/artifact/crud/mailer_spec.rb
 has_rdoc: true
 homepage: http://github.com/kristianmandrup/rails3_artifact_helper
 licenses: []
@@ -155,12 +190,14 @@ summary: Helpers for handling Rails 3 artifacts
 test_files: 
 - spec/fixtures/app/controllers/account_controller.rb
 - spec/fixtures/app/helpers/account_helper.rb
+- spec/fixtures/app/mailers/account_mailer.rb
 - spec/fixtures/app/models/account.rb
 - spec/fixtures/db/migrations/20100904095012_create_account.rb
 - spec/fixtures.rb
 - spec/rails3_artifactor/artifact/base_spec.rb
 - spec/rails3_artifactor/artifact/crud/controller_spec.rb
 - spec/rails3_artifactor/artifact/crud/helper_spec.rb
+- spec/rails3_artifactor/artifact/crud/mailer_spec.rb
 - spec/rails3_artifactor/artifact/crud/migration_spec.rb
 - spec/rails3_artifactor/artifact/crud/model_spec.rb
 - spec/rails3_artifactor/artifact/crud/observer_spec.rb