rails3_artifactor 0.2.8 → 0.3.0

data/Rakefile

@@ -7,12 +7,12 @@ 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.rc"
+    gem.add_development_dependency "rspec", ">= 2.0"
 
-    gem.add_dependency "rspec",             ">= 2.0.0.rc"
+    gem.add_dependency "rspec",             ">= 2.0.0"
     gem.add_dependency "require_all",       "~> 1.2.0"
-    gem.add_dependency "sugar-high",        "~> 0.2.10"
-    gem.add_dependency 'rails3_assist',     "~> 0.2.10"
+    gem.add_dependency "sugar-high",        "~> 0.3.0"
+    gem.add_dependency 'rails3_assist',     "~> 0.3.0"
     gem.add_dependency 'migration_assist',  "~> 0.1.4"
     
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.3.0

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

@@ -5,15 +5,15 @@ module Rails3::Assist::Artifact
 
       module Helper
         def default_template_lang 
-          'erb.html'
+          get_type :erb
         end
 
         def get_type type
           case type.to_s
           when 'erb'
-            'erb.html'
+            'html.erb'
           when 'haml'
-            'haml.html'
+            'html.haml'
           else
             type
           end
@@ -32,7 +32,6 @@ module Rails3::Assist::Artifact
         end
       end
 
-      # TODO: Refactor all code below to make much more DRY !!!
       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}")
@@ -45,7 +44,7 @@ module Rails3::Assist::Artifact
         when 1        
           SingleArg.get_view_args *args
         else
-          SingleArg.get_view_args *args 
+          TwoArgs.get_view_args *args 
         end 
       end
     end 
@@ -80,11 +79,20 @@ module Rails3::Assist::Artifact
 
       module HashArgs
         extend Rails3::Assist::Artifact::View::FileName::Helper
+
+        DIR = Rails3::Assist::Artifact::Directory
         
         # view_file(:folder => 'person', :action => :show, :type => :erb).should == /views\/person\/show\.html\.erb/         
-        def self.get_view_args hash 
-          folder = hash[:folder]          
-          action = hash[:action]
+        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          
+            action = hash.values.first
+          else
+            folder = hash[:folder]          
+            action = hash[:action]
+          end            
           type = get_view_type(hash[:type])
           [folder, action, type]
         end
@@ -110,7 +118,7 @@ module Rails3::Assist::Artifact
       def self.get_view_args *args
         args = args.flatten
         arg2 = args[1]
-        case arg2
+        res = case arg2
         when String, Symbol
           # view_file(:person, :show).should == /views\/person\/show\.html\.erb/
           # view_file('person/admin', :show, :type => :erb).should == /views\/person\/show\.html\.erb/
@@ -130,7 +138,7 @@ module Rails3::Assist::Artifact
           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        

data/lib/rails3_artifactor/artifact/view_artifact.rb

@@ -16,13 +16,13 @@ module Rails3::Assist::Artifact
       true
     end
 
-    def view_file name, *args
-      view_file_name(name, args)
+    def view_file *args
+      view_file_name(args)
     end
     
     # CREATE
-    def create_view name, *args, &block
-      file_name = view_file_name(name, args)      
+    def create_view *args, &block
+      file_name = view_file_name(args)      
       dir = File.dirname(file_name)
       FileUtils.mkdir_p dir if !File.directory?(dir)
 
@@ -40,8 +40,8 @@ module Rails3::Assist::Artifact
     end  
 
     # READ
-    def read_view name, *args, &block
-      file_name = view_file_name(name, args)
+    def read_view *args, &block
+      file_name = view_file_name(args)
       debug "reading from: #{file_name}"
       begin
         file = File.new(file_name)
@@ -69,8 +69,8 @@ module Rails3::Assist::Artifact
     end
 
     # DELETE
-    def remove_view name, *args
-      file = view_file_name(name, args)
+    def remove_view *args
+      file = view_file_name(args)
       FileUtils.rm_f(file) if File.exist?(file)
     end
 

data/rails3_artifactor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails3_artifactor}
-  s.version = "0.2.8"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-10-07}
+  s.date = %q{2010-10-21}
   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 = [
@@ -60,6 +60,8 @@ Gem::Specification.new do |s|
      "spec/fixtures.rb",
      "spec/fixtures/app/views/account/edit.erb.html",
      "spec/fixtures/app/views/account/edit.html.erb",
+     "spec/fixtures/app/views/layouts/application.erb.html",
+     "spec/fixtures/app/views/layouts/application.html.erb",
      "spec/rails3_artifactor/artifact/base_spec.rb",
      "spec/rails3_artifactor/artifact/crud/controller_spec.rb",
      "spec/rails3_artifactor/artifact/crud/helper_spec.rb",
@@ -129,26 +131,26 @@ 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.rc"])
-      s.add_runtime_dependency(%q<rspec>, [">= 2.0.0.rc"])
+      s.add_development_dependency(%q<rspec>, [">= 2.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.2.10"])
-      s.add_runtime_dependency(%q<rails3_assist>, ["~> 0.2.10"])
+      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.0.rc"])
-      s.add_dependency(%q<rspec>, [">= 2.0.0.rc"])
+      s.add_dependency(%q<rspec>, [">= 2.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.2.10"])
-      s.add_dependency(%q<rails3_assist>, ["~> 0.2.10"])
+      s.add_dependency(%q<sugar-high>, ["~> 0.3.0"])
+      s.add_dependency(%q<rails3_assist>, ["~> 0.3.0"])
       s.add_dependency(%q<migration_assist>, ["~> 0.1.4"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 2.0.0.rc"])
-    s.add_dependency(%q<rspec>, [">= 2.0.0.rc"])
+    s.add_dependency(%q<rspec>, [">= 2.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.2.10"])
-    s.add_dependency(%q<rails3_assist>, ["~> 0.2.10"])
+    s.add_dependency(%q<sugar-high>, ["~> 0.3.0"])
+    s.add_dependency(%q<rails3_assist>, ["~> 0.3.0"])
     s.add_dependency(%q<migration_assist>, ["~> 0.1.4"])
   end
 end

data/spec/fixtures/app/views/layouts/application.erb.html

@@ -0,0 +1,3 @@
+
+        app layout
+      

data/spec/fixtures/app/views/layouts/application.html.erb

@@ -0,0 +1,16 @@
+
+        <!DOCTYPE html>
+        <html>
+        <head>
+          <title>App Layout</title>
+          <%= stylesheet_link_tag :all %>
+          <%= javascript_include_tag :defaults %>
+          <%= csrf_meta_tag %>
+        </head>
+        <body>
+
+        <%= yield %>
+
+        </body>
+        </html>
+      

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

@@ -12,6 +12,25 @@ describe 'view API - symbols' do
         <h1><%= title %></h1>
       }
     end    
+
+    create_view :layouts, :application do
+      %q{
+        <!DOCTYPE html>
+        <html>
+        <head>
+          <title>App Layout</title>
+          <%= stylesheet_link_tag :all %>
+          <%= javascript_include_tag :defaults %>
+          <%= csrf_meta_tag %>
+        </head>
+        <body>
+
+        <%= yield %>
+
+        </body>
+        </html>
+      }
+    end    
   end
 
   after :each do              
@@ -20,11 +39,24 @@ describe 'view API - symbols' do
 
   context "Non-existant view(s)" do
 
+    it "should read application layouts view" do
+      view_file_name(:layouts => :application).should match /html\.erb/
+      read_view(:layouts => :application).should match /App Layout/
+      read_view(:layouts, :application).should match /App Layout/
+    end
+
+    it "should insert into application layouts view" do
+      insert_into_view :layouts => :application, :after => '<body>' do
+        %Q{<p class="alert"><%= alert %></p>}
+      end
+      read_view(:layouts, :application).should match /<%= alert %>/      
+    end
+
     it "should not fail trying to remove non-existant views" do
       remove_views :edit, :show, :folder => :person
       remove_artifacts :view, :edit, :show, :folder => :person
 
-      remove_view :show, :folder => :person
+      remove_view :person => :show
       remove_artifact :view, :show, :folder => :person
     end
   
@@ -42,7 +74,7 @@ describe 'view API - symbols' do
     end
   
     it "should not read from non-existant view" do
-      read_view :show, :folder => :person do |content|
+      read_view :person => :show do |content|
         fail "should not find person content!"
       end.should_not be_true
     end   

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 8
-  version: 0.2.8
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 +02:00
+date: 2010-10-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,9 +28,7 @@ dependencies:
         segments: 
         - 2
         - 0
-        - 0
-        - rc
-        version: 2.0.0.rc
+        version: "2.0"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -45,8 +43,7 @@ dependencies:
         - 2
         - 0
         - 0
-        - rc
-        version: 2.0.0.rc
+        version: 2.0.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -74,9 +71,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 2
-        - 10
-        version: 0.2.10
+        - 3
+        - 0
+        version: 0.3.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -89,9 +86,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 2
-        - 10
-        version: 0.2.10
+        - 3
+        - 0
+        version: 0.3.0
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -162,6 +159,8 @@ files:
 - spec/fixtures.rb
 - spec/fixtures/app/views/account/edit.erb.html
 - spec/fixtures/app/views/account/edit.html.erb
+- spec/fixtures/app/views/layouts/application.erb.html
+- spec/fixtures/app/views/layouts/application.html.erb
 - spec/rails3_artifactor/artifact/base_spec.rb
 - spec/rails3_artifactor/artifact/crud/controller_spec.rb
 - spec/rails3_artifactor/artifact/crud/helper_spec.rb