rails_artifactor 0.5.0 → 0.5.1

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

@@ -7,20 +7,20 @@ module RailsAssist::Artifact::CRUD
     class ViewHelper
       extend RailsAssist::Artifact::View::FileName
     end
-    
+
     def remove_artifact name, *args
-      file = ViewHelper.view_file_name(name, args)       
-      return FileUtils.rm_f(file) if File.exist?(file) 
-      
-      type = args.first  
+      file = ViewHelper.view_file_name(name, args)
+      return FileUtils.rm_f(file) if File.exist?(file)
+
+      type = args.first
       type = type[:type] if type.kind_of? Hash
       begin
         file = existing_file_name name, type
-        FileUtils.rm_f(file) 
-        debug "removed artifact: #{name}"  
+        FileUtils.rm_f(file)
+        debug "removed artifact: #{name}"
         true
       rescue
-        debug "artifact to remove not found: #{name}"          
+        debug "artifact to remove not found: #{name}"
         nil
       end
     end
@@ -30,6 +30,6 @@ module RailsAssist::Artifact::CRUD
       type = last_option(names)[:type]
       names.flatten.select_labels.each{|name| remove_artifact(name, type) }
     end
-    alias_method :delete_artifacts, :remove_artifacts    
+    alias_method :delete_artifacts, :remove_artifacts
   end
-end
+end

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

@@ -6,30 +6,30 @@ module RailsAssist::Artifact::CRUD
       type = get_type(options)
       file = existing_file_name(name, type)
 
-      raise "No file could be determined: #{file} from name: #{name} of type: #{type}" if !file      
+      raise "No file could be determined: #{file} from name: #{name} of type: #{type}" if !file
       raise "File to insert in not found: #{file} for #{type}" if !File.file?(file)
-                               
-      marker = marker_option(name, options) 
-      
+
+      marker = marker_option(name, options)
+
       blip = send :"#{type}_marker", name, options
-      options1 = options.merge marker 
+      options1 = options.merge marker
+
+      before_last = options[:before_last]
 
-      before_last = options[:before_last]      
-      
       res = File.insert_into file, options1, &block
       if !res
         # try with :embedded option if default doesn't work
         mrk_opt = marker_option name, options.merge(:model_type => :embedded)
         options.merge! mrk_opt
 
-        File.insert_into file, options, &block        
+        File.insert_into file, options, &block
       end
-    end 
+    end
     alias_method :update_artifact, :insert_into_artifact
-    
+
     def remove_from_artifact name, options={}, &block
       type = options[:type]
-      file = existing_file_name(name, type)      
+      file = existing_file_name(name, type)
       File.remove_content_from file, options, &block
     end
 
@@ -37,30 +37,30 @@ module RailsAssist::Artifact::CRUD
       options = last_option(names)
       type = options[:type]
       artifacts = names.flatten.select_labels
-      
+
       artifacts.each do |name|
         file = existing_file_name(name, type)
         File.remove_content_from file, options, &block
       end
-    end    
+    end
     alias_hash :remove_from_artifact => :delete_from_artifact, :pluralize => true
 
     def replace_in_artifact name, options={}, &block
       type = options[:type]
-      file = existing_file_name(name, type)      
-      File.replace_content_from file, options, &block      
+      file = existing_file_name(name, type)
+      File.replace_content_from file, options, &block
     end
-    
+
     def replace_in_artifacts *names, &block
       options = last_option(names)
       type = options[:type]
       artifacts = names.flatten.select_labels
-      
+
       artifacts.each do |name|
         file = existing_file_name(name, type)
         File.replace_content_from file, options, &block
       end
-    end      
-    alias_hash :replace_in_artifact => :update_artifact, :pluralize => true    
-  end    
-end
+    end
+    alias_hash :replace_in_artifact => :update_artifact, :pluralize => true
+  end
+end

data/lib/rails_artifactor/base/file_name.rb

@@ -1,27 +1,27 @@
 require 'rails_assist/artifact'
 
 module RailsAssist::Artifact
-  module FileName         
+  module FileName
     include RailsAssist::Artifact::Directory
     include RailsAssist::Artifact::Path
 
-    def make_file_name name, type, options={}      
+    def make_file_name name, type, options={}
       send :"#{type}_file_name", name, options
     end
 
-    def existing_file_name name, type=nil, options = {} 
+    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, 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}" 
+      finder_method = :"find_#{type}"
+      if respond_to?(finder_method)
+        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
         return result
       elsif type == :migration
         raise StandardError, "The method #find_#{type} to find the migration is not available!"
       end
-      
+
       # default for non-migration
       file_name = make_file_name name, type, options
       raise IOError, "No file for :#{type} found at location: #{file_name}" if !File.file?(file_name)
@@ -33,9 +33,9 @@ module RailsAssist::Artifact
         def existing_#{name}_file name, type=nil, options = {}
           existing_file_name name, type, options
         end
-      } 
+      }
     end
   end  # file_name
-  
+
   include FileName
-end    
+end

data/lib/rails_artifactor/template_language/base.rb

@@ -5,10 +5,10 @@ module RailsAssist
       end
 
       def insert_ruby_block statement, options = {}, &block
-      end      
+      end
 
       def insert_tag tag, css, options= {}, &block
-      end      
+      end
     end
   end
-end
+end

data/lib/rails_artifactor/template_language/erb.rb

@@ -4,21 +4,21 @@ module RailsAssist
       def insert_ruby_statement statement, options = {}
         "<%= #{statement} %>"
       end
-      
+
       def insert_ruby_block statement, options = {}, &block
         %Q{"<%= #{statement} %>"
 #{yield}
 <% end %>
 }
         # insert_content options
-      end      
+      end
 
       def insert_tag tag, attributes, options= {}, &block
         %Q{"<#{tag} #{attributes}>"
 #{yield}
 <#{tag}/>
 }
-      end            
+      end
     end
   end
-end
+end

data/lib/rails_artifactor/template_language/haml.rb

@@ -4,14 +4,13 @@ module RailsAssist
       def insert_ruby_statement statement, options = {}
         "\n= #{statement}"
       end
-      
       def insert_ruby_block statement, options = {}, &block
         # get indentation of previous line
         %Q{"<%= #{statement} %>"
 #{yield}
 <% end %>
 }
-      end      
+      end
 
       def insert_tag tag, options= {}, &block
         attributes = options[:attributes]
@@ -20,13 +19,13 @@ module RailsAssist
 #{yield}
 <#{tag}/>
 }
-      end      
-      
+      end
+
       protected
-      
+
       def format attributes
         attributes.map{|key, value| ":#{key} => \"#{value}\""}        
       end
     end
   end
-end
+end

data/lib/rails_artifactor/template_language/slim.rb

@@ -2,14 +2,14 @@ module RailsAssist
   module TemplateLanguage
     class Slim < Base
       def insert_ruby_statement statement, options = {}
-        "\n= #{statement}"        
+        "\n= #{statement}"
       end
-      
+
       def insert_ruby_block statement, options = {}, &block
-      end      
+      end
 
       def insert_tag tag, css, options= {}, &block
-      end            
+      end
     end
   end
-end
+end

data/rails_artifactor.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{rails_artifactor}
-  s.version = "0.5.0"
+  s.name = "rails_artifactor"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Kristian Mandrup}]
-  s.date = %q{2011-08-24}
-  s.description = %q{Helpers for handling Rails 3 artifacts in general, such as CRUD operations etc.}
-  s.email = %q{kmandrup@gmail.com}
+  s.authors = ["Kristian Mandrup"]
+  s.date = "2011-09-21"
+  s.description = "Helpers for handling Rails 3 artifacts in general, such as CRUD operations etc."
+  s.email = "kmandrup@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.markdown"
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/rails_artifactor.rb",
     "lib/rails_artifactor/artifact.rb",
+    "lib/rails_artifactor/artifact/asset_artifact.rb",
     "lib/rails_artifactor/artifact/base.rb",
     "lib/rails_artifactor/artifact/crud.rb",
     "lib/rails_artifactor/artifact/crud/create.rb",
@@ -35,6 +36,7 @@ Gem::Specification.new do |s|
     "lib/rails_artifactor/artifact/crud/read.rb",
     "lib/rails_artifactor/artifact/crud/update.rb",
     "lib/rails_artifactor/artifact/file_name/artifacts.rb",
+    "lib/rails_artifactor/artifact/file_name/asset.rb",
     "lib/rails_artifactor/artifact/file_name/view.rb",
     "lib/rails_artifactor/artifact/markers.rb",
     "lib/rails_artifactor/artifact/orm.rb",
@@ -66,6 +68,7 @@ Gem::Specification.new do |s|
     "spec/fixtures/app/views/layouts/application.erb.html",
     "spec/fixtures/app/views/layouts/application.html.erb",
     "spec/rails_artifactor/artifact/base_spec.rb",
+    "spec/rails_artifactor/artifact/crud/asset_spec.rb",
     "spec/rails_artifactor/artifact/crud/controller_spec.rb",
     "spec/rails_artifactor/artifact/crud/helper_spec.rb",
     "spec/rails_artifactor/artifact/crud/mailer_spec.rb",
@@ -92,10 +95,10 @@ Gem::Specification.new do |s|
     "spec/rails_artifactor/base/file_name_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/kristianmandrup/rails_artifactor}
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.8}
-  s.summary = %q{Helpers for handling Rails 3 artifacts}
+  s.homepage = "http://github.com/kristianmandrup/rails_artifactor"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "Helpers for handling Rails 3 artifacts"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/spec/rails_artifactor/artifact/crud/asset_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe 'asset API - symbols' do
+  use_helpers :asset
+
+  before :each do
+    RailsAssist::Directory.rails_root = fixtures_dir
+
+    remove_asset :javascript, :edit if has_asset? :account, :edit
+    create_asset :javascript, :edit do
+      "edit me"
+    end
+
+    create_asset :javascript, :show do
+      "show me"
+    end
+  end
+
+  after :each do
+    remove_view :account
+  end
+
+  context "Non-existant view(s)" do
+
+    it "should read application layouts view" do
+      asset_file_name(:javascripts => :edit).should match /edit/
+      read_asset(:javascripts => :edit).should match /edit me/
+      read_asset(:javascripts => :show).should match /show me/
+    end
+
+    it "should not fail trying to remove non-existant views" do
+      remove_assets :edit, :show, :folder => :javascripts
+      remove_artifacts :asset, :edit, :show, :folder => :javascripts
+
+      remove_asset :javascripts => :show
+      remove_artifact :asset, :show, :folder => :javascripts
+    end
+
+    it "should not find a non-existant asset" do
+      asset_file :show, :folder => :javascripts do |person|
+        fail "should not find asset show!"
+      end
+
+      has_asset?(:show, :folder => :javascripts).should be_false
+      has_assets?(:show, :edit, :folder => :javascripts).should be_false
+    end
+
+    it "should not read from non-existant view" do
+      read_asset :javascripts => :show do |content|
+        fail "should not find person content!"
+      end.should_not be_true
+    end
+  end
+end
+
+

data/spec/rails_artifactor/artifact/crud/view_controller_action_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'view API - symbols' do
   use_helpers :view
 
-  before :each do              
+  before :each do
     RailsAssist::Directory.rails_root = fixtures_dir
 
     remove_view :account, :edit if has_view? :account, :edit
@@ -11,7 +11,7 @@ describe 'view API - symbols' do
       %q{
         <h1><%= title %></h1>
       }
-    end    
+    end
 
     create_view :layouts, :application do
       %q{
@@ -30,10 +30,10 @@ describe 'view API - symbols' do
         </body>
         </html>
       }
-    end    
+    end
   end
 
-  after :each do              
+  after :each do
     remove_view :account
   end
 
@@ -59,27 +59,27 @@ describe 'view API - symbols' do
       remove_view :person => :show
       remove_artifact :view, :show, :folder => :person
     end
-  
+
     it "should not find a non-existant view" do
       view_file :show, :folder => :person do |person|
         fail "should not find person view!"
-      end                                       
-    
+      end
+
       has_view?(:show, :folder => :person).should be_false
       has_views?(:show, :edit, :folder => :person).should be_false
     end
-     
+
     it "should not insert into non-existant view" do
       insert_into_view(:show, :folder => :person, :after => 'Hello', :content => 'Yes').should_not be_true
     end
-  
+
     it "should not read from non-existant view" do
       read_view :person => :show do |content|
         fail "should not find person content!"
       end.should_not be_true
-    end   
+    end
   end
-    
+
   it "should have an account_view file that contains an index method and two inserted comments" do
     insert_into_view :account, :edit, :content => '# hello', :before => '<h1>'
     insert_into_view :account, :edit, :before => '<h1>' do
@@ -88,5 +88,5 @@ describe 'view API - symbols' do
     puts read_view(:account, :edit)
     read_view(:account, :edit).should have_comment 'hello'
   end
-end     
+end