scaffoldhub 0.0.7 → 0.0.8

data/Gemfile.lock

@@ -1,39 +1,39 @@
 PATH
   remote: .
   specs:
-    scaffoldhub (0.0.7)
+    scaffoldhub (0.0.8)
       rails
 
 GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.5)
-      actionpack (= 3.0.5)
+    actionmailer (3.0.7)
+      actionpack (= 3.0.7)
       mail (~> 2.2.15)
-    actionpack (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
+    actionpack (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4)
+      i18n (~> 0.5.0)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
+      rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.5)
-      activesupport (= 3.0.5)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
+      i18n (~> 0.5.0)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
-    activesupport (3.0.5)
+    activeresource (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+    activesupport (3.0.7)
     arel (2.0.9)
     builder (2.1.2)
     diff-lcs (1.1.2)
@@ -53,17 +53,17 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.5)
-      actionmailer (= 3.0.5)
-      actionpack (= 3.0.5)
-      activerecord (= 3.0.5)
-      activeresource (= 3.0.5)
-      activesupport (= 3.0.5)
+    rails (3.0.7)
+      actionmailer (= 3.0.7)
+      actionpack (= 3.0.7)
+      activerecord (= 3.0.7)
+      activeresource (= 3.0.7)
+      activesupport (= 3.0.7)
       bundler (~> 1.0)
-      railties (= 3.0.5)
-    railties (3.0.5)
-      actionpack (= 3.0.5)
-      activesupport (= 3.0.5)
+      railties (= 3.0.7)
+    railties (3.0.7)
+      actionpack (= 3.0.7)
+      activesupport (= 3.0.7)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)

data/lib/generators/erb/scaffoldhub_generator.rb

@@ -10,22 +10,8 @@ module Erb
 
     def copy_view_files
       each_template_file(:view) do |erb_template_file|
-        if is_layout_erb?(erb_template_file)
-          copy_layout_file(erb_template_file)
-        else
-          template erb_template_file.src, File.join("app/views", controller_file_path, erb_template_file.dest)
-        end
+        template erb_template_file.src, File.join("app/views", controller_file_path, erb_template_file.dest)
       end
     end
-
-    private
-
-    def copy_layout_file(layout_template)
-      template layout_template.src, File.join('app/views/layouts', "#{controller_file_name}.html.erb")
-    end
-
-    def is_layout_erb?(template_file)
-      template_file.dest == 'app/views/layouts/layout.erb'
-    end
   end
 end

data/lib/generators/scaffoldhub/scaffoldhub_generator.rb

@@ -15,10 +15,10 @@ class ScaffoldhubGenerator < Rails::Generators::ScaffoldGenerator
 
   def download_and_copy_other_files
     each_template_file(:template) do |template_file|
-      template template_file.src, template_file.dest
+      template  template_file.src, replace_name_tokens(template_file.dest)
     end
     each_template_file(:file) do |template_file|
-      copy_file template_file.src, template_file.dest
+      copy_file template_file.src, replace_name_tokens(template_file.dest)
     end
   end
 end

data/lib/scaffoldhub.rb

@@ -6,6 +6,6 @@ require 'scaffoldhub/helper'
 require 'scaffoldhub/runner'
 
 module Scaffoldhub
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
   SCAFFOLD_HUB_SERVER = 'scaffoldhub.org'
 end

data/lib/scaffoldhub/helper.rb

@@ -59,6 +59,10 @@ module Scaffoldhub
       parse_scaffold_option(1)
     end
 
+    def replace_name_tokens(dest)
+      dest.gsub(/PLURAL_NAME/, file_name.pluralize).gsub(/NAME/, file_name)
+    end
+
     def status_proc
       @status_proc ||= lambda { |url| say_status :download, url }
     end

data/lib/scaffoldhub/scaffold_spec.rb

@@ -18,14 +18,14 @@ module Scaffoldhub
 
     def select_files(type)
       template_file_specs.select { |file_spec| file_spec[:type].to_sym == type }.collect do |file_spec|
-        TemplateFile.new file_spec[:src], file_spec[:dest], @local, base_url, @status_proc
+        TemplateFile.new file_spec[:src], file_spec[:dest], file_spec[:rename], @local, base_url, @status_proc
       end
     end
 
     def find_file(type)
       file_spec = template_file_specs.detect { |file_spec| file_spec[:type].to_sym == type }
       unless file_spec.nil?
-        TemplateFile.new file_spec[:src], file_spec[:dest], @local, base_url, @status_proc
+        TemplateFile.new file_spec[:src], file_spec[:dest], file_spec[:rename], @local, base_url, @status_proc
       end
     end
 

data/lib/scaffoldhub/specification.rb

@@ -51,8 +51,8 @@ module Scaffoldhub
 
     class << self
 
-      def add_file(src, dest, type)
-        @@files << { :type => type, :src => src, :dest => dest }
+      def add_file(src, dest, rename, type)
+        @@files << { :type => type, :src => src, :rename => rename, :dest => dest }
       end
 
       def add_tag(keyword)
@@ -141,6 +141,7 @@ module Scaffoldhub
       self.class.add_file(
         join_with_parent(@context_options[:src], src),
         join_with_parent(@context_options[:dest], options[:dest]),
+        options[:rename],
         type
       )
     end

data/lib/scaffoldhub/template_file.rb

@@ -1,9 +1,10 @@
 module Scaffoldhub
   class TemplateFile < RemoteFile
 
-    def initialize(src, dest, local, base_url, status_proc)
+    def initialize(src, dest, rename, local, base_url, status_proc)
       @src      = src
       @dest     = dest || ''
+      @rename   = rename
       @local    = local
       @base_url = base_url
       super(url, status_proc)
@@ -18,7 +19,11 @@ module Scaffoldhub
     end
 
     def dest
-      File.join(@dest, File.basename(@src))
+      if @rename
+        File.join(@dest, @rename)
+      else
+        File.join(@dest, File.basename(@src))
+      end
     end
 
     def download!

data/spec/fixtures/test_scaffold.rb

@@ -39,7 +39,7 @@ Scaffoldhub::Specification.new do
   view 'templates/_form.html.erb'
 
   # Define a view layout template - this ERB file will be used to generate a new
-  # view layout file with this path & filename: app/views/layouts/PLURAL_NAME.rb
+  # view layout file with this path & filename: app/views/layouts/PLURAL_NAME.html.erb
   layout 'templates/layout.erb'
 
   # You can use "with_options" to specify the same source folder for a series of templates:
@@ -48,6 +48,7 @@ Scaffoldhub::Specification.new do
     view 'edit.html.erb'
     view 'index.html.erb'
     view 'show.html.erb'
+    view 'partial.erb', :rename => '_NAME.html.erb'
   end
 
   # Specify some other code file that should be generated from an ERB template; use
@@ -58,10 +59,11 @@ Scaffoldhub::Specification.new do
   # the :dest option is required to indicate where the generated file should go
   file 'templates/jquery/jquery-1.4.4.min.js', :dest => 'public/javascripts'
 
-  # You can use with_options recursively - both the :src and :dest options values
-  # will be constructed relative to the parent with_option values.
   with_options :src => 'templates/jquery', :dest => 'public/javascripts' do
     file 'jquery-ui-1.8.10.custom.min.js'
+
+    # You can use with_options recursively - both the :src and :dest options values
+    # will be constructed relative to the parent with_option values.
     with_options :src => 'ui-lightness', :dest => 'ui-lightness' do
       file 'jquery-ui-1.8.10.custom.css'
       with_options :src => 'images', :dest => 'images' do

data/spec/helper_spec.rb

@@ -34,9 +34,9 @@ describe Scaffoldhub::Helper do
       Scaffoldhub::ScaffoldSpec.stubs(:new).with('some_scaffold', true, status_proc).returns(mock_spec)
       mock_spec.stubs(:download_and_parse!)
       mock_template_file_array = [
-        Scaffoldhub::TemplateFile.new('src1', 'dest1', true, '/some/path', status_proc),
-        Scaffoldhub::TemplateFile.new('src2', 'dest2', true, '/some/path', status_proc),
-        Scaffoldhub::TemplateFile.new('src3', 'dest3', true, '/some/path', status_proc)
+        Scaffoldhub::TemplateFile.new('src1', 'dest1', nil, true, '/some/path', status_proc),
+        Scaffoldhub::TemplateFile.new('src2', 'dest2', nil, true, '/some/path', status_proc),
+        Scaffoldhub::TemplateFile.new('src3', 'dest3', nil, true, '/some/path', status_proc)
       ]
       mock_spec.stubs(:select_files).with(:sometype).returns(mock_template_file_array)
       @gen = FakeGenerator.new(true)
@@ -69,13 +69,13 @@ describe Scaffoldhub::Helper do
       mock_spec = mock
       Scaffoldhub::ScaffoldSpec.stubs(:new).with('some_scaffold', false, status_proc).returns(mock_spec)
       mock_spec.stubs(:download_and_parse!)
-      template1 = Scaffoldhub::TemplateFile.new('src1', 'dest1', false, 'http://some.server/some/path', status_proc)
+      template1 = Scaffoldhub::TemplateFile.new('src1', 'dest1', nil, false, 'http://some.server/some/path', status_proc)
       template1.expects(:download!).returns(template1)
       template1.stubs(:src).returns('src1')
-      template2 = Scaffoldhub::TemplateFile.new('src2', 'dest2', false, 'http://some.server/some/path', status_proc)
+      template2 = Scaffoldhub::TemplateFile.new('src2', 'dest2', nil, false, 'http://some.server/some/path', status_proc)
       template2.expects(:download!).returns(template2)
       template2.stubs(:src).returns('src2')
-      template3 = Scaffoldhub::TemplateFile.new('src3', 'dest3', false, 'http://some.server/some/path', status_proc)
+      template3 = Scaffoldhub::TemplateFile.new('src3', 'dest3', nil, false, 'http://some.server/some/path', status_proc)
       template3.expects(:download!).returns(template3)
       template3.stubs(:src).returns('src3')
       mock_template_file_array = [ template1, template2, template3 ]

data/spec/scaffold_spec_spec.rb

@@ -58,6 +58,12 @@ describe Scaffoldhub::ScaffoldSpec do
         find_spec(subject, :view, 'templates/show.html.erb').should_not be_nil
       end
 
+      it 'should parse the :rename option' do
+        partial_spec = find_spec(subject, :view, 'templates/partial.erb')
+        partial_spec.should_not be_nil
+        partial_spec[:rename].should == '_NAME.html.erb'
+      end
+
       it 'should parse a vanilla template file with a dest attribute' do
         template_spec = find_spec(subject, :template, 'templates/other_code_file.erb')
         template_spec.should_not be_nil
@@ -153,6 +159,9 @@ YAML
       model_spec.should_not be_nil
       some_file_spec = find_spec_in_array(parsed_yaml[:files], :file, 'templates/jquery/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png')
       some_file_spec.should_not be_nil
+      partial_view_spec = find_spec_in_array(parsed_yaml[:files], :view, 'templates/partial.erb')
+      partial_view_spec.should_not be_nil
+      partial_view_spec[:rename].should == '_NAME.html.erb'
     end
 
     describe '#adjusted_base_url' do
@@ -221,7 +230,7 @@ YAML
     end
 
     it 'should find the file with the given type and src' do
-      Scaffoldhub::TemplateFile.expects(:new).with('some_src', 'some_dest', true, 'base', @status_proc).returns(mock1 = mock)
+      Scaffoldhub::TemplateFile.expects(:new).with('some_src', 'some_dest', nil, true, 'base', @status_proc).returns(mock1 = mock)
       subject.find_file(:type1).should == mock1
     end
 

data/spec/template_file_spec.rb

@@ -10,18 +10,27 @@ describe Scaffoldhub::TemplateFile do
 
   describe 'local template file' do
 
-    subject { Scaffoldhub::TemplateFile.new('templates/index.html', 'public', true, File.expand_path(File.dirname(__FILE__)), @status_proc) }
+    subject { Scaffoldhub::TemplateFile.new('templates/index.html', 'public', nil, true, File.expand_path(File.dirname(__FILE__)), @status_proc) }
 
     its(:src)  { should == File.expand_path(File.join(File.dirname(__FILE__), 'templates', 'index.html')) }
     its(:url)  { should == File.expand_path(File.join(File.dirname(__FILE__), 'templates', 'index.html')) }
     its(:dest) { should == File.join('public', 'index.html') }
   end
 
+  describe 'local template file with rename option' do
+
+    subject { Scaffoldhub::TemplateFile.new('templates/index.html', 'public', 'other_file_name.html', true, File.expand_path(File.dirname(__FILE__)), @status_proc) }
+
+    its(:src)  { should == File.expand_path(File.join(File.dirname(__FILE__), 'templates', 'index.html')) }
+    its(:url)  { should == File.expand_path(File.join(File.dirname(__FILE__), 'templates', 'index.html')) }
+    its(:dest) { should == File.join('public', 'other_file_name.html') }
+  end
+
   describe 'remote template file' do
 
     FAKE_TEMPLATE_FILE_URL = 'http://github.com/patshaughnessy/scaffolds/default'
 
-    subject { Scaffoldhub::TemplateFile.new('templates/index.html', 'public', false, FAKE_TEMPLATE_FILE_URL, @status_proc) }
+    subject { Scaffoldhub::TemplateFile.new('templates/index.html', 'public', nil, false, FAKE_TEMPLATE_FILE_URL, @status_proc) }
 
     its(:url)  { should == FAKE_TEMPLATE_FILE_URL + '/templates/index.html' }
     its(:dest) { should == File.join('public', 'index.html') }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scaffoldhub
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Pat Shaughnessy
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-30 00:00:00 -04:00
+date: 2011-05-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency