rails_artifactor 0.5.0 → 0.5.1

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

@@ -1,10 +1,10 @@
 module RailsAssist::Artifact
-  module View    
+  module View
     module FileName
       DIR = RailsAssist::Artifact::Directory
 
       module Helper
-        def default_template_lang 
+        def default_template_lang
           get_type :erb
         end
 
@@ -17,17 +17,17 @@ module RailsAssist::Artifact
           else
             type
           end
-        end 
+        end
 
         def get_view_type type
           get_type(type.empty? ? default_template_lang : type)
-        end          
-        
-        def filename_type str 
+        end
+
+        def filename_type str
           str.split('.')[1..-1].join('.')
         end
-        
-        def filename_name str  
+
+        def filename_name str
           str.gsub /\.(.*)/, ''
         end
       end
@@ -39,19 +39,19 @@ module RailsAssist::Artifact
         views_path = options[:views_path]
         views_path ||= File.join(root_path, 'app/views') if root_path
         File.expand_path File.join(views_path || DIR.view_dirpath, folder.to_s, "#{action}.#{type}")
-      end 
-      
+      end
+
       def get_view_args *args
         args = args.flatten
         raise ArgumentError, "view_file_name must be called with one or more arguments to return a view file" if args.size == 0
         case args.size
-        when 1        
+        when 1
           SingleArg.get_view_args *args
         else
-          TwoArgs.get_view_args *args 
-        end 
+          TwoArgs.get_view_args *args
+        end
       end
-    end 
+    end
 
     module SingleArg
       def self.get_view_args *args
@@ -59,20 +59,20 @@ module RailsAssist::Artifact
         arg = args.first
         case arg
         when Hash
-          # view_file(:person => :show).should == /views\/person\/show\.html\.erb/          
-          return HashArg.get_view_args arg if arg.keys.size == 1 
-          # view_file(:folder => 'person', :type => :show).should == /views\/person\/show\.html\.erb/         
+          # view_file(:person => :show).should == /views\/person\/show\.html\.erb/
+          return HashArg.get_view_args arg if arg.keys.size == 1
+          # view_file(:folder => 'person', :type => :show).should == /views\/person\/show\.html\.erb/
           HashArgs.get_view_args *args
-        when Symbol, String 
+        when Symbol, String
           TwoArgs.get_view_args *args
-        end        
+        end
       end
-      
+
       module HashArg
         extend RailsAssist::Artifact::View::FileName::Helper
-        
-        # view_file(:person => :show).should == /views\/person\/show\.html\.erb/          
-        def self.get_view_args one_hash 
+
+        # view_file(:person => :show).should == /views\/person\/show\.html\.erb/
+        def self.get_view_args one_hash
           folder = one_hash.keys.first.to_s
           filename = one_hash.values.first.to_s
           action = filename_name filename
@@ -85,18 +85,18 @@ module RailsAssist::Artifact
         extend RailsAssist::Artifact::View::FileName::Helper
 
         DIR = RailsAssist::Artifact::Directory
-        
+
         # view_file(:folder => 'person', :action => :show, :type => :erb).should == /views\/person\/show\.html\.erb/         
         def self.get_view_args hash
           try_folder = hash.keys.first
           try_view_folder = File.expand_path(File.join(DIR.view_dir, try_folder.to_s))
           if File.directory? try_view_folder
-            folder = try_folder          
+            folder = try_folder
             action = hash.values.first
           else
-            folder = hash[:folder]          
-            action = hash[:action]
-          end            
+            folder = hash[:folder]
+            action = hash[:action] || hash[:name]
+          end
           type = get_view_type(hash[:type])
           [folder, action, type]
         end
@@ -105,8 +105,8 @@ module RailsAssist::Artifact
       module StringArg
         extend RailsAssist::Artifact::View::FileName::Helper
 
-        # view_file('person/show').should == /views\/person\/show\.html\.erb/                         
-        def self.get_view_args string 
+        # view_file('person/show').should == /views\/person\/show\.html\.erb/
+        def self.get_view_args string
           path_lvs = string.split('/')
           raise ArgumentError, "view must be in a subfolder #{args}" if path_lvs.size < 2
           folder = path_lvs[0..-2].join('/')
@@ -118,7 +118,7 @@ module RailsAssist::Artifact
       end
     end
 
-    module TwoArgs                
+    module TwoArgs
       def self.get_view_args *args
         args = args.flatten
         arg2 = args[1]
@@ -130,27 +130,27 @@ module RailsAssist::Artifact
         when Hash
           # view_file(:show, :folder => 'person', :type => :erb).should == /views\/person\/show\.html\.erb/
           ActionAndHash.get_view_args args
-        end        
+        end
       end
-      
+
       module TwoLabels
         extend RailsAssist::Artifact::View::FileName::Helper
 
         # view_file(:person, :show).should == /views\/person\/show\.html\.erb/
         # view_file('person/admin', :show, :type => :erb).should == /views\/person\/show\.html\.erb/
         def self.get_view_args *args
-          args = args.flatten 
+          args = args.flatten
           folder = args.first.to_s
           action = args[1].to_s
-          hash = args[2] if args.size > 2          
+          hash = args[2] if args.size > 2
           type = get_view_type(hash ? hash[:type] : nil)
           [folder, action, type]
-        end        
+        end
       end
 
       module ActionAndHash
         extend RailsAssist::Artifact::View::FileName::Helper
-        
+
         # view_file(:show, :folder => 'person', :type => :erb).should == /views\/person\/show\.html\.erb/
         def self.get_view_args *args
           args = args.flatten 
@@ -159,13 +159,13 @@ module RailsAssist::Artifact
           hash = args.last
           folder = hash[:folder]
           type = get_view_type(hash[:type])
-          
+
           [folder, action, type]
-        end        
-      end                
+        end
+      end
     end
-    
+
     include FileName
     extend FileName
   end
-end
+end

data/lib/rails_artifactor/artifact/markers.rb

@@ -1,21 +1,21 @@
 module RailsAssist::Artifact
   module Marker
     def marker name, type, options=nil
-      method = "#{type}_marker"  
+      method = "#{type}_marker"
       raise "No such marker method in this context: #{self}, ##{method}" if !respond_to? method
-      send method, name, options 
+      send method, name, options
     end
   end
-  
+
   module Controller
     def controller_marker name, options=nil
       "#{name.to_s.camelize}Controller < ActionController::Base"
     end
-    
+
     extend self
   end
 
-  module Helper   
+  module Helper
     def helper_marker name, options=nil
       "#{name.to_s.camelize}Helper"
     end
@@ -26,48 +26,47 @@ module RailsAssist::Artifact
   module Permit
     def permit_marker name, options=nil
       "#{name.to_s.camelize}Permit < Permit::Base"
-    end        
-    
-    extend self    
+    end
+
+    extend self
   end
-  
+
   module Mailer
     def mailer_marker name, options=nil
       "#{name.to_s.camelize}Mailer < ActionMailer::Base"
     end
-    
-    extend self    
-  end    
+
+    extend self
+  end
 
   module Observer
     def observer_marker name, options=nil
       "#{name.to_s.camelize}Observer < ActiveRecord::Observer"
     end
-    
+
     extend self
   end
 
   module Migration
     def migration_marker name, options=nil
       "#{name.to_s.camelize} < ActiveRecord::Migration"
-    end    
-    
+    end
+
     extend self
   end
-  
-  module Model   
-    include RailsAssist::BaseHelper    
-    
+
+  module Model
+    include RailsAssist::BaseHelper
+
     def model_marker name, options={}
       return send :orm_marker_name, name, options if respond_to?(:orm_marker_name)
-      name.to_s.camelize      
+      name.to_s.camelize
     end
-    
+
     def orm_notify
       ". You must specify an ORM with the macro use_orm, f.ex -- use_orm :active_record"
-    end 
-    
-    extend self       
+    end
+
+    extend self
   end
-  
 end

data/lib/rails_artifactor/artifact/orm.rb

@@ -42,14 +42,14 @@ end}
         %Q{#{clazz name} < #{module_name}
   #{yield if block}
 end}
-      end 
-      
+      end
+
       def field name, type = nil
         return "#{field_name} :#{name}, #{type}" if type
         "#{field_name} :#{name}"
-      end      
+      end
     end
   end
 end
-              
-require_all File.dirname(__FILE__) + '/orm'
+
+require_all File.dirname(__FILE__) + '/orm'

data/lib/rails_artifactor/artifact/orm/active_record.rb

@@ -6,9 +6,9 @@ module RailsAssist::Orm
       'ActiveRecord::Base'
     end
 
-    def new_model_content name, options={}, &block        
+    def new_model_content name, options={}, &block
       content = block ? yield : options[:content]
       file_w_inherit(name, orm_marker_name(name, options)) { content }
     end
   end
-end
+end

data/lib/rails_artifactor/artifact/orm/data_mapper.rb

@@ -10,7 +10,7 @@ module RailsAssist::Orm
       "#{orm_name}::Resource"
     end
 
-    def new_model_content name, options={}, &block        
+    def new_model_content name, options={}, &block
       content = block ? yield : options[:content]
       file_w_include(name, orm_marker_name(name, options)) { content }
     end
@@ -19,4 +19,4 @@ module RailsAssist::Orm
       'property'
     end
   end
-end
+end

data/lib/rails_artifactor/artifact/orm/mongo_mapper.rb

@@ -4,9 +4,9 @@ module RailsAssist::Orm
 
     def orm_name
       'MongoMapper'
-    end      
-  
-    def new_model_content name, options={}, &block        
+    end
+
+    def new_model_content name, options={}, &block
       content = block ? yield : options[:content]
       file_w_include(name, orm_marker_name(name, options)) { content }
     end
@@ -15,4 +15,4 @@ module RailsAssist::Orm
       'key'
     end
   end
-end
+end

data/lib/rails_artifactor/artifact/orm/mongoid.rb

@@ -10,7 +10,7 @@ module RailsAssist::Orm
       'field'
     end
 
-    def new_model_content name, options={}, &block        
+    def new_model_content name, options={}, &block
       content = block ? yield : options[:content]
       file_w_include(name, orm_marker_name(name, options)) { content }
     end
@@ -20,4 +20,4 @@ module RailsAssist::Orm
       "#{field_name} :#{name}"
     end
   end
-end
+end

data/lib/rails_artifactor/artifact/orm/none.rb

@@ -8,7 +8,7 @@ module RailsAssist::Orm
       name.to_s.camelize
     end
 
-    def new_model_content name, options={}, &block        
+    def new_model_content name, options={}, &block
       content = block ? yield : options[:content]
       simple_file(name, orm_marker_name(name, options)) { content }
     end

data/lib/rails_artifactor/artifact/view_artifact.rb

@@ -19,25 +19,25 @@ module RailsAssist::Artifact
     def view_file *args
       view_file_name(args)
     end
-    
+
     # CREATE
     def create_view *args, &block
-      file_name = view_file_name(args)      
+      file_name = view_file_name(args)
       dir = File.dirname(file_name)
       FileUtils.mkdir_p dir if !File.directory?(dir)
 
       content = get_view_content(args) || yield if block
-      
+
       # abort if no content given
       debug "Warning: Content must be passed in either as a :content hash or a block" if !content
       return nil if !content
 
       debug "Writing view file: #{file_name}"
       # write file content of view
-      File.open(file_name, 'w') do |f|  
-        f.puts content 
+      File.open(file_name, 'w') do |f|
+        f.puts content
       end
-    end  
+    end
 
     # READ
     def read_view *args, &block
@@ -53,7 +53,7 @@ module RailsAssist::Artifact
         nil
       end
     end
-    
+
     # UPDATE
     def insert_into_view *args, &block
       begin
@@ -78,7 +78,7 @@ module RailsAssist::Artifact
     def remove_views *args
       options = last_option args
       raise ArgumentError, "Missing :folder option in the last argument which must be a Hash" if !options && !options[:folder]
-      args.to_symbols.each{|name| remove_view name, options}      
+      args.to_symbols.each{|name| remove_view name, options}
     end
 
     def get_view_content args
@@ -87,8 +87,8 @@ module RailsAssist::Artifact
       when Hash
         args.first[:content]
       end
-    end    
+    end
 
-    multi_aliases_for :view 
+    multi_aliases_for :view
   end
-end
+end

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

@@ -1,17 +1,17 @@
 require 'rails_artifactor/ruby_mutator'
 
 module RailsAssist::Artifact::CRUD
-  module Create             
+  module Create
     include RailsAssist::Artifact::Marker
-    
+
     def create_artifact name, options={}, &block
       type = get_type(options)
       file = make_file_name(name, type)
       return nil if File.exist?(file) && options[:no_overwrite]
 
-      create_artifact_dir(file)      
+      create_artifact_dir(file)
       content = get_content(name, type, options, &block)
-      
+
       superclass = options[:superclass] if options[:superclass]
 
       if superclass
@@ -19,14 +19,14 @@ module RailsAssist::Artifact::CRUD
         content.remove_superclass
         content.inherit_from "#{superclass}_permit"
       end
-      
+
       return if content.blank?
 
-      File.overwrite file, content      
+      File.overwrite file, content
     end
 
     protected
-    
+
     def new_artifact_content name, options = {}, &block
       type = get_type(options)
       content = extract_content type, options, &block
@@ -36,13 +36,13 @@ end}
     end
 
     def create_artifact_dir file
-      # make dir        
+      # make dir
       dir = File.dirname(file)
       FileUtils.mkdir_p dir if !File.directory?(dir)
     end
 
-    def content_method type 
-      method = :"new_#{type}_content"      
+    def content_method type
+      method = :"new_#{type}_content"
       raise "Content method #{content_method} not found #{orm_notify}" if !respond_to?(method)
       method
     end
@@ -50,13 +50,13 @@ end}
     def extract_content type, options, &block
       content = block ? yield : options[:content]
       content = type == :model ? options.merge(:content => content) : content
-    end    
+    end
 
     def get_content name, type, options = {}, &block
       content = extract_content type, options, &block
       method = content_method(type)
       options[:content] = content
       send method, name, options, &block 
-    end        
-  end 
-end
+    end
+  end
+end