scaffoldhub 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    scaffold_hub (0.0.1)
+    scaffoldhub (0.0.2)
       rails
 
 GEM
@@ -87,4 +87,4 @@ DEPENDENCIES
   mocha (~> 0.9.10)
   rake (~> 0.8.7)
   rspec (~> 2.3.0)
-  scaffold_hub!
+  scaffoldhub!

data/README.rdoc

@@ -0,0 +1,5 @@
+=ScaffoldHub
+
+Browse different scaffold generators on {scaffoldhub.org}[http://scaffoldhub.org] and run any of them in your Rails 3 app with this gem.
+
+More info, documentation and examples coming soon... :)

data/Rakefile

@@ -1,2 +1,11 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
+
+require 'rspec/core'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
+end
+
+task :default => :spec

data/lib/generators/active_record/scaffoldhub_generator.rb

@@ -0,0 +1,20 @@
+require 'rails/generators/active_record'
+require 'rails/generators/active_record/model/model_generator'
+
+module ActiveRecord
+  class ScaffoldhubGenerator < ActiveRecord::Generators::ModelGenerator
+
+    include Scaffoldhub::Helper
+
+    source_root File.join(base_root, 'active_record', 'model', 'templates')
+
+    class_option :scaffold, :default => 'default', :banner => "SCAFFOLD_NAME",  :type => :string,  :desc => "Scaffold to use"
+    class_option :local,    :default => false,     :banner => "LOCAL SCAFFOLD", :type => :boolean, :desc => "Use a local scaffold, not scaffoldhub.org"
+
+    def create_model_file
+      model_template = find_template_file('active_record', 'templates/model.rb')
+      template model_template.src, File.join('app/models', class_path, "#{file_name}.rb") if model_template
+    end
+
+  end
+end

data/lib/generators/erb/scaffoldhub_generator.rb

@@ -10,8 +10,15 @@ module Erb
 
     def copy_view_files
       each_template_file(:erb) do |erb_template_file|
-        template erb_template_file.src, File.join("app/views", controller_file_path, erb_template_file.dest)
+        unless erb_template_file.dest == 'app/views/layouts/layout.erb'
+          template erb_template_file.src, File.join("app/views", controller_file_path, erb_template_file.dest)
+        end
       end
     end
+
+    def copy_layout_file
+      layout_template = find_template_file('erb', 'templates/layout.erb')
+      template layout_template.src, File.join('app/views/layouts', "#{controller_file_name}.html.erb") if layout_template
+    end
   end
 end

data/lib/generators/scaffold_controller/scaffoldhub_generator.rb

@@ -13,7 +13,7 @@ module ScaffoldController
 
     def create_controller_files
       each_template_file(:controller) do |controller_template_file|
-        template controller_template_file.src, File.join('app/controllers', class_path, controller_template_file.dest)
+        template controller_template_file.src, File.join('app/controllers', class_path, "#{controller_file_name}_controller.rb")
       end
     end
   end

data/lib/generators/scaffoldhub/scaffoldhub_generator.rb

@@ -7,6 +7,9 @@ class ScaffoldhubGenerator < Rails::Generators::ScaffoldGenerator
   remove_hook_for :scaffold_controller
   hook_for        :scaffold_controller, :as => :scaffoldhub
 
+  remove_hook_for :orm
+  hook_for        :orm, :as= => :scaffoldhub
+
   class_option :scaffold, :default => 'default', :banner => "SCAFFOLD_NAME",  :type => :string,  :desc => "Scaffold to use"
   class_option :local,    :default => false,     :banner => "LOCAL SCAFFOLD", :type => :boolean, :desc => "Use a local scaffold, not scaffoldhub.org"
 

data/lib/scaffoldhub.rb

@@ -1,9 +1,9 @@
 require 'scaffoldhub/remote_file'
-require 'scaffoldhub/spec_file'
+require 'scaffoldhub/specification'
+require 'scaffoldhub/scaffold_spec'
 require 'scaffoldhub/template_file'
-require 'scaffoldhub/scaffold'
 require 'scaffoldhub/helper'
 
 module Scaffoldhub
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/scaffoldhub/helper.rb

@@ -1,36 +1,73 @@
 module Scaffoldhub
   module Helper
 
-    def self.scaffold
-      @scaffold
-    end
+    class << self
+      def scaffold_spec
+        @scaffold_spec
+      end
 
-    def self.scaffold=(scaffold)
-      @scaffold = scaffold
+      def scaffold_spec=(scaffold)
+        @scaffold_spec = scaffold
+      end
     end
 
     def each_template_file(type)
       begin
-        Scaffoldhub::Helper.scaffold ||= Scaffoldhub::Scaffold.new(options[:scaffold], options[:local], status_proc)
-        Scaffoldhub::SpecFile.new(status_proc).select_files(type).each do |template_file|
-          if options[:local]
-            raise Errno::ENOENT.new(template_file.src) unless File.exists?(template_file.src)
-          else
-            template_file.download
-          end
-          yield template_file
+        scaffold_spec.select_files(type).each do |template_file|
+          yield template_file.download!
         end
-      rescue Errno::ENOENT
-        say_status :error, "File not found error for #{File.expand_path(options[:scaffold])}", :red
+      rescue Errno::ENOENT => e
+        say_status :error, e.message, :red
+      rescue Scaffoldhub::NotFoundException => e
+        say_status :error, "HTTP 404 not found error for #{e.message}", :red
+      rescue Scaffoldhub::NetworkErrorException => e
+        say_status :error, "HTTP error connecting to #{e.message}", :red
+      end
+    end
+
+    def find_template_file(type, name)
+      begin
+        template_file = scaffold_spec.find_file(type, name)
+        template_file.download! unless template_file.nil?
+      rescue Errno::ENOENT => e
+        say_status :error, e.message, :red
+        nil
       rescue Scaffoldhub::NotFoundException => e
         say_status :error, "HTTP 404 not found error for #{e.message}", :red
+        nil
       rescue Scaffoldhub::NetworkErrorException => e
         say_status :error, "HTTP error connecting to #{e.message}", :red
+        nil
       end
     end
 
+    def scaffold_spec
+      Helper.scaffold_spec ||= download_scaffold_spec!
+    end
+
+    def download_scaffold_spec!
+      scaffold_spec = ScaffoldSpec.new(scaffold_name, options[:local], status_proc)
+      scaffold_spec.download_and_parse!
+      scaffold_spec
+    end
+
+    def scaffold_name
+      parse_scaffold_option(0)
+    end
+
+    def scaffold_parameter
+      parse_scaffold_option(1)
+    end
+
     def status_proc
-      @proc ||= lambda { |url| say_status :download, url }
+      @status_proc ||= lambda { |url| say_status :download, url }
     end
+
+    private
+
+    def parse_scaffold_option(index)
+      options[:scaffold].split(':')[index]
+    end
+
   end
 end

data/lib/scaffoldhub/remote_file.rb

@@ -1,4 +1,4 @@
-require 'net/http'
+require 'net/https'
 
 module Scaffoldhub
 
@@ -14,18 +14,20 @@ module Scaffoldhub
       @status_proc = status_proc
     end
 
-    def download
+    def remote_file_contents!
       begin
         uri = URI.parse(url)
         @status_proc.call(url)
-        Net::HTTP.start(uri.host, uri.port) do |http|
-          resp = http.get(uri.path)
-          if resp.code.to_i == 200
-            resp.body
-          elsif resp.code.to_i == 404
-            raise NotFoundException.new(url)
-          else
-            raise NetworkErrorException.new(url)
+        if uri.port == 443
+          https = Net::HTTP.new(uri.host, uri.port)
+          https.use_ssl = true
+          https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          https.start do |https|
+            response_body(https.get(uri.path))
+          end
+        else
+          Net::HTTP.start(uri.host, uri.port) do |http|
+            response_body(http.get(uri.path))
           end
         end
       rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Errno::ECONNREFUSED,
@@ -34,5 +36,15 @@ module Scaffoldhub
       end
     end
 
+    def response_body(resp)
+      if resp.code.to_i == 200
+        resp.body
+      elsif resp.code.to_i == 404
+        raise NotFoundException.new(url)
+      else
+        raise NetworkErrorException.new(url)
+      end
+    end
+
   end
 end

data/lib/scaffoldhub/scaffold_spec.rb

@@ -0,0 +1,71 @@
+module Scaffoldhub
+  class ScaffoldSpec < RemoteFile
+
+    SCAFFOLD_HUB_SERVER = 'scaffoldhub.org'
+
+    def initialize(url, local, status_proc)
+      @scaffold    = url
+      @local       = local
+      @status_proc = status_proc
+      super(@status_proc)
+    end
+
+    def download_and_parse!
+      if @local
+        parse_local
+      else
+        parse_remote!
+      end
+    end
+
+    def select_files(type)
+      template_file_specs.select { |file_spec| file_spec[:type] == type.to_s }.collect do |file_spec|
+        TemplateFile.new file_spec[:src], file_spec[:dest], @local, base_url, @status_proc
+      end
+    end
+
+    def find_file(type, name)
+      file_spec = template_file_specs.detect { |file_spec| file_spec[:src] == name && file_spec[:type] == type.to_s }
+      unless file_spec.nil?
+        TemplateFile.new file_spec[:src], file_spec[:dest], @local, base_url, @status_proc
+      end
+    end
+
+    def parse_local
+      if File.exists?(url)
+        require url
+      else
+        raise Errno::ENOENT.new(url)
+      end
+    end
+
+    def parse_remote!
+      @spec = YAML::load(remote_file_contents!)
+    end
+
+    def template_file_specs
+      if @local
+        Specification.files
+      else
+        @spec[:files]
+      end
+    end
+
+    def url
+      if @local
+        @scaffold
+      else
+        "http://#{SCAFFOLD_HUB_SERVER}/scaffolds/#{@scaffold}/spec"
+      end
+    end
+
+    def base_url
+      if @local
+        File.dirname(File.expand_path(@scaffold))
+      else
+        @spec[:base_url]
+      end
+    end
+
+  end
+end

data/lib/scaffoldhub/specification.rb

@@ -0,0 +1,48 @@
+require 'yaml'
+
+module Scaffoldhub
+  class Specification
+
+    @@files  = []
+    @@base_url = nil
+
+    class << self
+      def files
+        @@files
+      end
+
+      def files=(files)
+        @@files = files
+      end
+
+      def add_file(type, src, dest)
+        @@files << { :type => type, :src => src, :dest => dest }
+      end
+
+      def base_url
+        @@base_url
+      end
+
+      def base_url=(url)
+        @@base_url = url
+      end
+
+      def to_yaml
+        { :base_url => base_url, :files => files }.to_yaml
+      end
+    end
+
+    def initialize
+      yield self
+    end
+
+    def method_missing(name, *args, &blk)
+      if name.to_s =~ /(.*)_file/ && args[0].is_a?(Hash)
+        self.class.add_file($1, args[0][:src], args[0][:dest])
+      elsif name == :base_url
+        self.class.base_url = args[0]
+      end
+    end
+
+  end
+end

data/lib/scaffoldhub/template_file.rb

@@ -1,15 +1,16 @@
 module Scaffoldhub
   class TemplateFile < RemoteFile
 
-    def initialize(src, dest, status_proc)
+    def initialize(src, dest, local, base_url, status_proc)
       @src      = src
       @dest     = dest || ''
-      @base_url = Scaffoldhub::Helper.scaffold.base_url
+      @local    = local
+      @base_url = base_url
       super(status_proc)
     end
 
     def src
-      if Scaffoldhub::Helper.scaffold.local
+      if @local
         File.join(@base_url, @src)
       else
         @local_path
@@ -20,11 +21,16 @@ module Scaffoldhub
       File.join(@dest, File.basename(@src))
     end
 
-    def download
-      @local_path = Tempfile.new(File.basename(@src)).path
-      open(@local_path, "wb") do |file|
-        file.write(super)
+    def download!
+      if @local
+        raise Errno::ENOENT.new(src) unless File.exists?(src)
+      else
+        @local_path = Tempfile.new(File.basename(@src)).path
+        open(@local_path, "wb") do |file|
+          file.write(remote_file_contents!)
+        end
       end
+      self
     end
 
     def url

data/scaffoldhub.gemspec

@@ -10,10 +10,8 @@ Gem::Specification.new do |s|
   s.authors     = ['Pat Shaughnessy']
   s.email       = ['pat@patshaughnessy.net']
   s.homepage    = "http://scaffoldhub.org"
-  s.summary     = %q{Generate Rails scaffolding from scaffoldhub.org}
-  s.description = %q{Generate Rails scaffolding from scaffoldhub.org}
-
-  #s.rubyforge_project = "scaffoldhub"
+  s.summary     = %q{Generate customized Rails scaffolding from scaffoldhub.org}
+  s.description = %q{Run Rails scaffold generator with customized templates downloaded from scaffoldhub.org}
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/fixtures/test_scaffoldspec.rb

@@ -0,0 +1,21 @@
+Scaffoldhub::Specification.new do |s|
+  s.base_url        'http://github.com/patshaughnessy/scaffolds/default'
+  s.erb_file        :src => 'templates/index3.html.erb', :dest => ''
+  s.controller_file :src => 'templates/index2.html.erb', :dest => ''
+  s.other_file      :src => 'templates/index.html.erb',  :dest => 'app/views/welcome'
+end
+
+# Yaml hash of scaffold options
+#
+#--- 
+#:base_url: http://github.com/patshaughnessy/scaffolds/default
+#:files: 
+#- :src: templates/index.html.erb
+#  :dest: app/views/welcome
+#  :type: other
+#- :src: templates/index2.html.erb
+#  :dest: 
+#  :type: controller
+#- :src: templates/index3.html.erb
+#  :dest: 
+#  :type: erb

data/spec/helper_spec.rb

@@ -0,0 +1,139 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+class FakeGenerator
+  include Scaffoldhub::Helper
+
+  attr_accessor :files
+
+  def initialize(local, options = 'some_scaffold:some_parameter')
+    @files   = []
+    @local   = local
+    @options = options
+  end
+
+  def copy_files
+    each_template_file(:sometype) do |template_file|
+      files << template_file
+    end
+  end
+
+  def options
+    { :scaffold => @options, :local => @local }
+  end
+end
+
+describe Scaffoldhub::Helper do
+
+  describe 'local scaffold' do
+
+    before(:all) do
+      Scaffoldhub::Helper.scaffold_spec = nil
+      status_proc = mock
+      status_proc.stubs(:call)
+      mock_spec = mock
+      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)
+      ]
+      mock_spec.stubs(:select_files).with(:sometype).returns(mock_template_file_array)
+      @gen = FakeGenerator.new(true)
+      @gen.stubs(:status_proc).returns(status_proc)
+    end
+
+    it 'should yield the template files' do
+      File.expects(:exists?).with('/some/path/src1').returns(true)
+      File.expects(:exists?).with('/some/path/src2').returns(true)
+      File.expects(:exists?).with('/some/path/src3').returns(true)
+      @gen.copy_files
+      @gen.files[0].src.should == '/some/path/src1'
+      @gen.files[1].src.should == '/some/path/src2'
+      @gen.files[2].src.should == '/some/path/src3'
+    end
+
+    it 'should raise an exception if the template file doesn\'t exist' do
+      File.expects(:exists?).with('/some/path/src1').returns(false)
+      @gen.expects(:say_status).with(:error, 'No such file or directory - /some/path/src1', :red)
+      @gen.copy_files
+    end
+  end
+
+  describe 'remote scaffold' do
+
+    before do
+      Scaffoldhub::Helper.scaffold_spec = nil
+      status_proc = mock
+      status_proc.stubs(:call)
+      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.expects(:download!).returns(template1)
+      template1.stubs(:src).returns('src1')
+      template2 = Scaffoldhub::TemplateFile.new('src2', 'dest2', 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.expects(:download!).returns(template3)
+      template3.stubs(:src).returns('src3')
+      mock_template_file_array = [ template1, template2, template3 ]
+      mock_spec.stubs(:select_files).with(:sometype).returns(mock_template_file_array)
+      @gen = FakeGenerator.new(false)
+      @gen.stubs(:status_proc).returns(status_proc)
+    end
+
+    it 'should yield the template files' do
+      @gen.copy_files
+      @gen.files[0].src.should == 'src1'
+      @gen.files[1].src.should == 'src2'
+      @gen.files[2].src.should == 'src3'
+    end
+  end
+
+  describe 'sharing scaffold spec among generators' do
+
+    before do
+      Scaffoldhub::Helper.scaffold_spec = nil
+      @mock_spec = mock
+      @mock_spec.stubs(:download_and_parse!)
+      status_proc = mock
+      Scaffoldhub::ScaffoldSpec.expects(:new).once.with('some_scaffold', false, status_proc).returns(@mock_spec)
+      @gen =  FakeGenerator.new(false)
+      @gen.stubs(:status_proc).returns(status_proc)
+      @gen2 = FakeGenerator.new(false)
+      @gen2.stubs(:status_proc).returns(status_proc)
+    end
+
+    it 'should save the scaffold spec in the module among different generators' do
+      @gen.scaffold_spec.should  == @mock_spec
+      @gen2.scaffold_spec.should == @mock_spec
+    end
+  end
+
+  describe '#find_template_file' do
+
+    it 'should call find_file on the scaffold spec' do
+      gen = FakeGenerator.new(false)
+      gen.expects(:find_file).with('type', 'name')
+      gen.find_file('type', 'name')
+    end
+  end
+
+  describe '#scaffold_name' do
+
+    describe 'both values present' do
+      subject { FakeGenerator.new(false) }
+      its(:scaffold_name)      { should == 'some_scaffold' }
+      its(:scaffold_parameter) { should == 'some_parameter' }
+    end
+
+    describe 'only scaffold name present' do
+      subject { FakeGenerator.new(false, 'scaffold_name_only') }
+      its(:scaffold_name)      { should == 'scaffold_name_only' }
+      its(:scaffold_parameter) { should == nil }
+    end
+
+  end
+end

data/spec/remote_file_spec.rb

@@ -0,0 +1,83 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+module Net
+  class HTTP
+
+    def self.set_mock_http(mock_http)
+      @mock_http = mock_http
+    end
+
+    def self.start(host, port)
+      yield @mock_http
+    end
+  end
+end
+
+describe Scaffoldhub::RemoteFile do
+
+  FAKE_SCAFFOLDHUB_URL = 'http://fake.scaffoldhub.org:1234/scaffolds/autocomplete/spec'
+
+  describe '#remote_file_contents' do
+
+    describe 'status proc' do
+      subject do
+        @status_proc = mock
+        @status_proc.expects(:call).with(FAKE_SCAFFOLDHUB_URL)
+        Scaffoldhub::RemoteFile.new(@status_proc)
+      end
+      before do
+        subject.stubs(:url).returns(FAKE_SCAFFOLDHUB_URL)
+      end
+
+      it 'should call the status proc with the url' do
+        Net::HTTP.stubs(:start)
+        subject.remote_file_contents!
+      end
+    end
+
+    describe 'Net:HTTP calls' do
+
+      subject do
+        (status_proc = mock).stubs(:call).with(FAKE_SCAFFOLDHUB_URL)
+        Scaffoldhub::RemoteFile.new(status_proc)
+      end
+      before do
+        subject.stubs(:url).returns(FAKE_SCAFFOLDHUB_URL)
+      end
+
+      it 'should call Net::HTTP with the proper host and port' do
+        Net::HTTP.expects(:start).with('fake.scaffoldhub.org', 1234)
+        subject.remote_file_contents!
+      end
+
+      it 'should call GET on the url path and return the response body' do
+        mock_http = mock
+        mock_http.expects(:get).with('/scaffolds/autocomplete/spec').returns(mock_response = mock)
+        mock_response.stubs(:code).returns(200)
+        mock_response.stubs(:body).returns('RESPONSE')
+        Net::HTTP.set_mock_http(mock_http)
+        subject.remote_file_contents!.should == 'RESPONSE'
+      end
+
+      it 'should throw a NotFoundException on 404' do
+        mock_http = mock
+        mock_http.expects(:get).with('/scaffolds/autocomplete/spec').returns(mock_response = mock)
+        mock_response.stubs(:code).returns(404)
+        Net::HTTP.set_mock_http(mock_http)
+        lambda { subject.remote_file_contents! }.should raise_error(Scaffoldhub::NotFoundException)
+      end
+
+      it 'should throw a NetworkErrorException on some other error' do
+        mock_http = mock
+        mock_http.expects(:get).with('/scaffolds/autocomplete/spec').raises(Errno::ECONNREFUSED)
+        Net::HTTP.set_mock_http(mock_http)
+        lambda { subject.remote_file_contents! }.should raise_error(Scaffoldhub::NetworkErrorException)
+      end
+    end
+
+    describe 'Net:HTTP SSL calls' do
+      #TBD
+    end
+
+  end
+end

data/spec/scaffold_spec_spec.rb

@@ -0,0 +1,131 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Scaffoldhub::ScaffoldSpec do
+
+  before do
+    @status_proc = mock
+    @status_proc.stubs(:call)
+  end
+
+  describe 'parsing scaffold spec' do
+
+    describe 'parsing local scaffold spec' do
+
+      subject do
+        test_spec_path = File.join(File.dirname(__FILE__), 'fixtures', 'test_scaffoldspec.rb')
+        Scaffoldhub::ScaffoldSpec.new(test_spec_path, true, @status_proc)
+      end
+
+      before do
+        Scaffoldhub::Specification.files = []
+        Scaffoldhub::Specification.base_url = nil
+      end
+
+      it 'should require a local scaffold spec and parse the file list' do
+        subject.download_and_parse!
+        subject.template_file_specs.should == [
+          { :type => 'erb',        :src => 'templates/index3.html.erb', :dest => '' },
+          { :type => 'controller', :src => 'templates/index2.html.erb', :dest => '' },
+          { :type => 'other',      :src => 'templates/index.html.erb',  :dest => 'app/views/welcome' }
+        ]
+        subject.base_url.should == File.expand_path(File.join(File.dirname(__FILE__), 'fixtures'))
+      end
+    end
+
+    describe 'parsing remote scaffold spec' do
+
+      TEST_YAML = <<YAML
+  --- 
+  :base_url: http://github.com/patshaughnessy/scaffolds/default
+  :files: 
+  - :src: templates/index3.html.erb
+    :dest: 
+    :type: erb
+  - :src: templates/index2.html.erb
+    :dest: 
+    :type: controller
+  - :src: templates/index.html.erb
+    :dest: app/views/welcome
+    :type: other
+YAML
+
+      subject do
+        Scaffoldhub::ScaffoldSpec.new('http://fake.scaffoldhub.org:1234/scaffolds/autocomplete/spec', false, @status_proc)
+      end
+
+      before do
+        Scaffoldhub::Specification.files = []
+        Scaffoldhub::Specification.base_url = nil
+        subject.expects(:remote_file_contents!).returns(TEST_YAML)
+      end
+
+      it 'should require a local scaffold spec' do
+        subject.download_and_parse!
+        subject.template_file_specs.should == [
+          { :type => 'erb',        :src => 'templates/index3.html.erb', :dest => nil },
+          { :type => 'controller', :src => 'templates/index2.html.erb', :dest => nil },
+          { :type => 'other',      :src => 'templates/index.html.erb',  :dest => 'app/views/welcome' }
+        ]
+        subject.base_url.should == 'http://github.com/patshaughnessy/scaffolds/default'
+      end
+    end
+  end
+
+  describe '#select_files' do
+
+    subject do
+      Scaffoldhub::ScaffoldSpec.new('unused', true, @status_proc)
+    end
+
+    before do
+      subject.stubs(:template_file_specs).returns([
+        { :type => 'type1', :src => 'some_src',  :dest => 'some_dest' },
+        { :type => 'type1', :src => 'some_src2', :dest => 'some_dest' },
+        { :type => 'type1', :src => 'some_src3', :dest => 'some_dest' },
+        { :type => 'type2', :src => 'some_src4', :dest => 'some_dest' }
+      ])
+    end
+
+    it 'should select the files with the given type' do
+      Scaffoldhub::TemplateFile.expects(:new).returns(mock1 = mock)
+      Scaffoldhub::TemplateFile.expects(:new).returns(mock2 = mock)
+      Scaffoldhub::TemplateFile.expects(:new).returns(mock3 = mock)
+      files = subject.select_files('type1')
+      files.include?(mock1).should be_true
+      files.include?(mock2).should be_true
+      files.include?(mock3).should be_true
+    end
+  end
+
+  describe '#find_file' do
+
+    subject do
+      Scaffoldhub::ScaffoldSpec.new('unused', true, @status_proc)
+    end
+
+    before do
+      subject.stubs(:template_file_specs).returns([
+        { :type => 'type1', :src => 'some_src',  :dest => 'some_dest' },
+        { :type => 'type1', :src => 'some_src2', :dest => 'some_dest' },
+        { :type => 'type1', :src => 'some_src3', :dest => 'some_dest' },
+        { :type => 'type2', :src => 'some_src4', :dest => 'some_dest' }
+      ])
+      subject.stubs(:base_url).returns('base')
+    end
+
+    it 'should find the file with the given type and src' do
+      Scaffoldhub::TemplateFile.expects(:new).with('some_src2', 'some_dest', true, 'base', @status_proc).returns(mock1 = mock)
+      subject.find_file('type1', 'some_src2').should == mock1
+    end
+
+    it 'should return nil if the name is not found' do
+      Scaffoldhub::TemplateFile.expects(:new).never
+      subject.find_file('type1', 'some_src5').should be_nil
+    end
+
+    it 'should return nil if the type is not found' do
+      Scaffoldhub::TemplateFile.expects(:new).never
+      subject.find_file('type3', 'some_src2').should be_nil
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,13 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'rspec'
+require 'mocha'
+require 'scaffoldhub'
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[File.join(File.dirname(__FILE__), "spec/support/**/*.rb")].each {|f| require f}
+
+RSpec.configure do |config|
+  config.mock_with :mocha
+end

data/spec/template_file_spec.rb

@@ -0,0 +1,50 @@
+require 'tempfile'
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Scaffoldhub::TemplateFile do
+
+  before do
+    @status_proc = mock
+    @status_proc.stubs(:call)
+  end
+
+  describe 'local template file' do
+
+    subject { Scaffoldhub::TemplateFile.new('templates/index.html', 'public', 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 'remote template file' do
+
+    FAKE_GITHUB_URL = 'http://github.com/patshaughnessy/scaffolds/default'
+
+    subject { Scaffoldhub::TemplateFile.new('templates/index.html', 'public', false, FAKE_GITHUB_URL, @status_proc) }
+
+    its(:url)  { should == FAKE_GITHUB_URL + '/templates/index.html' }
+    its(:dest) { should == File.join('public', 'index.html') }
+
+    describe '#download!' do
+
+      before do
+        @local_path = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', 'local_template_file.txt'))
+        File.delete(@local_path) if File.exists?(@local_path)
+        subject.stubs(:remote_file_contents!).returns('TEMPLATE')
+        tempfile = mock
+        Tempfile.stubs(:new).returns(tempfile)
+        tempfile.stubs(:path).returns(@local_path)
+        subject.download!
+      end
+
+      it 'should set the src to the local path after a download' do
+        subject.src.should == @local_path
+      end
+
+      it 'should write the template file contents into a local file' do
+        File.new(@local_path).read.should == 'TEMPLATE'
+      end
+    end
+  end
+end

data/util/spec_to_yaml.rb

@@ -0,0 +1,7 @@
+require 'yaml'
+require '../lib/scaffoldhub/specification'
+require ARGV[0]
+
+open('scaffold_spec.yaml', 'wb') do |file|
+  file.write(Scaffoldhub::Specification.to_yaml)
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scaffoldhub
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Pat Shaughnessy
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-04 00:00:00 -05:00
+date: 2011-03-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,7 +80,7 @@ dependencies:
         version: 0.9.10
   type: :development
   version_requirements: *id004
-description: Generate Rails scaffolding from scaffoldhub.org
+description: Run Rails scaffold generator with customized templates downloaded from scaffoldhub.org
 email: 
 - pat@patshaughnessy.net
 executables: []
@@ -93,17 +93,26 @@ files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
+- README.rdoc
 - Rakefile
+- lib/generators/active_record/scaffoldhub_generator.rb
 - lib/generators/erb/scaffoldhub_generator.rb
 - lib/generators/scaffold_controller/scaffoldhub_generator.rb
 - lib/generators/scaffoldhub/scaffoldhub_generator.rb
 - lib/scaffoldhub.rb
 - lib/scaffoldhub/helper.rb
 - lib/scaffoldhub/remote_file.rb
-- lib/scaffoldhub/scaffold.rb
-- lib/scaffoldhub/spec_file.rb
+- lib/scaffoldhub/scaffold_spec.rb
+- lib/scaffoldhub/specification.rb
 - lib/scaffoldhub/template_file.rb
 - scaffoldhub.gemspec
+- spec/fixtures/test_scaffoldspec.rb
+- spec/helper_spec.rb
+- spec/remote_file_spec.rb
+- spec/scaffold_spec_spec.rb
+- spec/spec_helper.rb
+- spec/template_file_spec.rb
+- util/spec_to_yaml.rb
 has_rdoc: true
 homepage: http://scaffoldhub.org
 licenses: []
@@ -137,6 +146,11 @@ rubyforge_project:
 rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
-summary: Generate Rails scaffolding from scaffoldhub.org
-test_files: []
-
+summary: Generate customized Rails scaffolding from scaffoldhub.org
+test_files: 
+- spec/fixtures/test_scaffoldspec.rb
+- spec/helper_spec.rb
+- spec/remote_file_spec.rb
+- spec/scaffold_spec_spec.rb
+- spec/spec_helper.rb
+- spec/template_file_spec.rb

data/lib/scaffoldhub/scaffold.rb

@@ -1,38 +0,0 @@
-module Scaffoldhub
-  class Scaffold < RemoteFile
-
-    SERVER_NAME = 'scaffoldhub.org'
-
-    def initialize(scaffold, local, status_proc)
-      @scaffold    = scaffold
-      @local       = local
-      super(status_proc)
-    end
-
-    def base_url
-      if @local
-        File.dirname(File.expand_path(@scaffold))
-      else
-        spec_url.split(/\/(?=[^\/]+(?: |$))/)[0]
-      end
-    end
-
-    def spec_url
-      @spec_url ||=
-        if @local
-          @scaffold
-        else
-          download.strip
-        end
-    end
-
-    def local
-      @local
-    end
-
-    def url
-      "http://#{SERVER_NAME}/scaffolds/#{@scaffold}/spec"
-    end
-
-  end
-end

data/lib/scaffoldhub/spec_file.rb

@@ -1,42 +0,0 @@
-module Scaffoldhub
-  class SpecFile < RemoteFile
-
-    def initialize(status_proc)
-      @status_proc = status_proc
-      super(status_proc)
-    end
-
-    def url
-      Scaffoldhub::Helper.scaffold.spec_url
-    end
-
-    def select_files(type)
-      if Scaffoldhub::Helper.scaffold.local
-        load_local
-      else
-        load_remote
-      end
-      @spec[:files].select { |file_spec| file_spec[:type] == type.to_s }.collect do |file_spec|
-        TemplateFile.new file_spec[:src], file_spec[:dest], @status_proc
-      end
-    end
-
-    protected
-
-    def load_local
-      parse(File.new(url).read)
-    end
-
-    def load_remote
-      parse(download)
-    end
-
-    def parse(data)
-      @spec = YAML::load(data) unless data.nil?
-    end
-
-    #def method_missing(name, *args, &blk)
-      ##@spec.send(name)
-    #end
-  end
-end