scaffoldhub 0.0.4 → 0.0.6

data/Gemfile

@@ -1,8 +1,2 @@
 source "http://rubygems.org"
-
-# Specify your gem's dependencies in code_buddy.gemspec
 gemspec
-
-#group :test, :cucumber do
-  #gem 'rails'
-#end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    scaffoldhub (0.0.3)
+    scaffoldhub (0.0.6)
       rails
 
 GEM
@@ -40,7 +40,7 @@ GEM
     erubis (2.6.6)
       abstract (>= 1.0.0)
     i18n (0.5.0)
-    mail (2.2.15)
+    mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -78,7 +78,7 @@ GEM
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.25)
+    tzinfo (0.3.26)
 
 PLATFORMS
   ruby

data/bin/scaffoldhub

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'thor'
+require 'scaffoldhub'
+
+Scaffoldhub::Runner.start

data/lib/generators/active_record/scaffoldhub_generator.rb

@@ -16,13 +16,13 @@ module ActiveRecord
     class_option :parent,     :type => :string, :desc => "The parent class for the generated model"
 
     def create_model_file
-      model_template = find_template_file('active_record', 'templates/model.rb')
+      model_template = find_template_file(:model)
       template model_template.src, File.join('app/models', class_path, "#{file_name}.rb") if model_template
     end
 
     def create_migration_file
       return unless options[:migration] && options[:parent].nil?
-      migration_template = find_template_file('active_record', 'templates/migration.rb')
+      migration_template = find_template_file(:migration)
       migration_template migration_template.src, "db/migrate/create_#{table_name}.rb" if migration_template
     end
 

data/lib/generators/erb/scaffoldhub_generator.rb

@@ -9,7 +9,7 @@ module Erb
     class_option :local,    :default => false,     :banner => "LOCAL SCAFFOLD", :type => :boolean, :desc => "Use a local scaffold, not scaffoldhub.org"
 
     def copy_view_files
-      each_template_file(:erb) do |erb_template_file|
+      each_template_file(:view) do |erb_template_file|
         if is_layout_erb?(erb_template_file)
           copy_layout_file(erb_template_file)
         else

data/lib/generators/new_scaffoldhub/new_scaffoldhub_generator.rb

@@ -0,0 +1,37 @@
+require 'rails/generators/erb/scaffold/scaffold_generator'
+require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
+require 'rails/generators/active_record/model/model_generator'
+
+class NewScaffoldhubGenerator < Rails::Generators::NamedBase
+
+  def self.source_root
+    File.expand_path('../templates', __FILE__)
+  end
+
+  def copy_scaffold_spec
+    template 'scaffold_spec.rb.erb', "#{singular_name}_scaffold/scaffold_spec.rb"
+  end
+
+  def copy_scaffold_screenshot
+    copy_file 'screenshot.png', "#{singular_name}_scaffold/#{singular_name}_screenshot.png"
+  end
+
+  def copy_rails_erb_templates
+    %w[ _form.html.erb edit.html.erb index.html.erb new.html.erb show.html.erb ].each do |file_name|
+      copy_file File.join(Erb::Generators::ScaffoldGenerator.default_source_root, file_name),
+                "#{singular_name}_scaffold/templates/#{file_name}"
+    end
+  end
+
+  def copy_rails_model_template
+    copy_file File.join(ActiveRecord::Generators::ModelGenerator.default_source_root, 'model.rb'),
+              "#{singular_name}_scaffold/templates/model.rb"
+    copy_file File.join(ActiveRecord::Generators::ModelGenerator.default_source_root, 'migration.rb'),
+              "#{singular_name}_scaffold/templates/migration.rb"
+  end
+
+  def copy_rails_controller_template
+    copy_file File.join(Rails::Generators::ScaffoldControllerGenerator.default_source_root, 'controller.rb'),
+              "#{singular_name}_scaffold/templates/controller.rb"
+  end
+end

data/lib/generators/new_scaffoldhub/templates/scaffold_spec.rb.erb

@@ -0,0 +1,49 @@
+Scaffoldhub::Specification.new do
+
+  # Github URL where you will post your scaffold - the speciied folder must contain this file
+  base_url  'https://github.com/your_name/your_repo'
+
+  # The name of your new scaffold: should be a single word
+  name '<%= singular_name %>'
+
+  # Metadata about this scaffold - this info is only used for display on scaffoldhub.org:
+  metadata do
+
+    # A short paragraph describing what this scaffold does
+    description 'The <%= singular_name %> scaffold.'
+
+    # 4x3 aspect ratio screen shot
+    screenshot 'screenshot.png'
+
+    # Tag(s) to help scaffoldhub.org users find your scaffold
+    tag 'jquery'
+    tag 'autocomplete'
+  end
+
+  # Optionally specify an example of a scaffold parameter
+  parameter_example 'FIELD_NAME'
+
+  # Optionally post a link to an article you write explaining how the scaffold works.
+  blog_post 'http://patshaughnessy.net/2011/3/13/view-mapper-for-rails-3-scaffoldhub'
+
+  # Define a model template - this ERB file will be used to generate a new
+  # model class with this path & filename: app/models/NAME.rb
+  model 'templates/model.rb'
+
+  # Define an ActiveRecord migration template - this ERB file will be used to generate a new
+  # migration class with this path & filename: db/migrate/TIMESTAMP_create_PLURAL_NAME.rb
+  migration 'templates/migration.rb'
+
+  # Define a controller template - this ERB file will be used to generate a new
+  # controller class with this path & filename: app/controllers/PLURAL_NAME.rb
+  controller 'templates/controller.rb'
+
+  # You can use "with_options" to specify the same source folder for a series of templates:
+  with_options :src => 'templates' do
+    view '_form.html.erb'
+    view 'new.html.erb'
+    view 'edit.html.erb'
+    view 'index.html.erb'
+    view 'show.html.erb'
+  end
+end

data/lib/generators/scaffold_controller/scaffoldhub_generator.rb

@@ -12,9 +12,8 @@ module ScaffoldController
     class_option :local,    :default => false,     :banner => "LOCAL SCAFFOLD", :type => :boolean, :desc => "Use a local scaffold, not scaffoldhub.org"
 
     def create_controller_files
-      each_template_file(:controller) do |controller_template_file|
-        template controller_template_file.src, File.join('app/controllers', class_path, "#{controller_file_name}_controller.rb")
-      end
+      controller_template_file = find_template_file(:controller)
+      template controller_template_file.src, File.join('app/controllers', class_path, "#{controller_file_name}_controller.rb") if controller_template_file
     end
   end
 end

data/lib/generators/scaffoldhub/scaffoldhub_generator.rb

@@ -14,8 +14,11 @@ class ScaffoldhubGenerator < Rails::Generators::ScaffoldGenerator
   class_option :local,    :default => false,     :banner => "LOCAL SCAFFOLD", :type => :boolean, :desc => "Use a local scaffold, not scaffoldhub.org"
 
   def download_and_copy_other_files
-    each_template_file(:other) do |other_template_file|
-      template other_template_file.src, other_template_file.dest
+    each_template_file(:template) do |template_file|
+      template template_file.src, template_file.dest
+    end
+    each_template_file(:file) do |template_file|
+      copy_file template_file.src, template_file.dest
     end
   end
 end

data/lib/scaffoldhub.rb

@@ -3,7 +3,9 @@ require 'scaffoldhub/specification'
 require 'scaffoldhub/scaffold_spec'
 require 'scaffoldhub/template_file'
 require 'scaffoldhub/helper'
+require 'scaffoldhub/runner'
 
 module Scaffoldhub
-  VERSION = '0.0.4'
+  VERSION = '0.0.6'
+  SCAFFOLD_HUB_SERVER = 'scaffoldhub.org'
 end

data/lib/scaffoldhub/helper.rb

@@ -25,9 +25,9 @@ module Scaffoldhub
       end
     end
 
-    def find_template_file(type, name)
+    def find_template_file(type)
       begin
-        template_file = scaffold_spec.find_file(type, name)
+        template_file = scaffold_spec.find_file(type)
         template_file.download! unless template_file.nil?
       rescue Errno::ENOENT => e
         say_status :error, e.message, :red

data/lib/scaffoldhub/remote_file.rb

@@ -10,33 +10,19 @@ module Scaffoldhub
 
   class RemoteFile
 
-    def initialize(status_proc)
+    attr_accessor :url
+
+    def initialize(url = nil, status_proc = nil)
       @status_proc = status_proc
+      @url = url
     end
 
-    def remote_file_contents!
-      begin
-        uri = URI.parse(url)
-        @status_proc.call(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,
-             Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
-        raise NetworkErrorException.new(url)
-      end
+    def exists?
+      http_request.code.to_i == 200
     end
 
-    def response_body(resp)
+    def remote_file_contents!
+      resp = http_request
       if resp.code.to_i == 200
         resp.body
       elsif resp.code.to_i == 404
@@ -46,5 +32,23 @@ module Scaffoldhub
       end
     end
 
+    def http_request
+      begin
+        @status_proc.call(url) if @status_proc
+        uri = URI.parse(url)
+        http = Net::HTTP.new(uri.host, uri.port)
+        if uri.port == 443
+          http.use_ssl = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
+        http.start do |http|
+          http.get(uri.path)
+        end
+      rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Errno::ECONNREFUSED,
+             Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+        raise NetworkErrorException.new(url)
+      end
+    end
+
   end
 end

data/lib/scaffoldhub/runner.rb

@@ -0,0 +1,90 @@
+require 'net/http'
+require 'uri'
+require 'yaml'
+require 'thor'
+
+module Scaffoldhub
+  class Runner < Thor
+    desc "push /path/to/scaffold_spec.rb", "Compile specified scaffold spec and push it to scaffoldhub.org"
+    def push(scaffold_spec)
+      if load_spec(scaffold_spec)
+        if Specification.valid?
+          post_spec(scaffold_spec)
+        else
+          say "Unable to post your new scaffold. Please resolve these errors:"
+          Specification.errors.each { |error| say error }
+        end
+      end
+    end
+
+    private
+
+    def load_spec(scaffold_spec)
+      begin
+        require scaffold_spec
+        true
+      rescue Exception => e
+        say "There was an error parsing your scaffold spec file."
+        say e.message
+        say e.backtrace[0]
+        false
+      end
+    end
+
+    def post_spec(scaffold_spec)
+
+      begin
+        config = load_config
+        username = config[:username]
+        password = config[:password]
+      rescue
+        say "Please enter your scaffoldhub.org credentials..."
+        username = ask "Username: "
+        password = ask "Password: "
+      end
+
+      url = URI.parse("http://#{SCAFFOLD_HUB_SERVER}/admin/scaffolds")
+      req = Net::HTTP::Post.new(url.path)
+      req.basic_auth username, password
+      req.set_form_data({'scaffold' => Specification.to_yaml, 'spec_file_name' => File.basename(scaffold_spec) }, ';')
+      response = Net::HTTP.new(url.host, url.port).start {|http| http.request(req) }
+      say response.body
+      save_config(username, password) unless response.body == 'Invalid username or password.'
+    end
+
+    def config_file
+      File.join(find_home, '.scaffoldhub')
+    end
+
+    def load_config
+      YAML::load(File.read(config_file))
+    end
+
+    def save_config(username, password)
+      File.open(config_file, 'w') {|f| f.write({ :username => username, :password => password }.to_yaml) }
+    end
+
+    # Ripped from rubygems
+    def find_home
+      unless RUBY_VERSION > '1.9' then
+        ['HOME', 'USERPROFILE'].each do |homekey|
+          return File.expand_path(ENV[homekey]) if ENV[homekey]
+        end
+
+        if ENV['HOMEDRIVE'] && ENV['HOMEPATH'] then
+          return File.expand_path("#{ENV['HOMEDRIVE']}#{ENV['HOMEPATH']}")
+        end
+      end
+
+      File.expand_path "~"
+    rescue
+      if File::ALT_SEPARATOR then
+        drive = ENV['HOMEDRIVE'] || ENV['SystemDrive']
+        File.join(drive.to_s, '/')
+      else
+        "/"
+      end
+    end
+
+  end
+end

data/lib/scaffoldhub/scaffold_spec.rb

@@ -1,13 +1,11 @@
 module Scaffoldhub
   class ScaffoldSpec < RemoteFile
 
-    SCAFFOLD_HUB_SERVER = 'scaffoldhub.org'
-
-    def initialize(url, local, status_proc)
-      @scaffold    = url
+    def initialize(scaffold, local, status_proc)
+      @scaffold    = scaffold
       @local       = local
       @status_proc = status_proc
-      super(@status_proc)
+      super(url, @status_proc)
     end
 
     def download_and_parse!
@@ -19,23 +17,23 @@ module Scaffoldhub
     end
 
     def select_files(type)
-      template_file_specs.select { |file_spec| file_spec[:type] == type.to_s }.collect do |file_spec|
+      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
       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 }
+    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
       end
     end
 
     def parse_local
-      if File.exists?(url)
-        require url
+      if File.exists?(@scaffold)
+        eval(File.read(@scaffold))
       else
-        raise Errno::ENOENT.new(url)
+        raise Errno::ENOENT.new(@scaffold)
       end
     end
 
@@ -67,5 +65,16 @@ module Scaffoldhub
       end
     end
 
+    def blog_post
+      if @local
+        Specification.blog_post
+      else
+        @spec[:blog_post]
+      end
+    end
+
+    def to_yaml
+      Specification.to_yaml if @local
+    end
   end
 end

data/lib/scaffoldhub/specification.rb

@@ -1,48 +1,174 @@
 require 'yaml'
 
+def mattr_accessor(*syms)
+  syms.each do |sym|
+    class_eval(<<-EOS, __FILE__, __LINE__)
+      @@#{sym} = nil
+
+      def self.#{sym}
+        @@#{sym}
+      end
+
+      def self.#{sym}=(obj)
+        @@#{sym} = obj
+      end
+    EOS
+  end
+end
+
+def define_dsl_attributes(*syms)
+  syms.each do |sym|
+    class_eval(<<-EOS, __FILE__, __LINE__)
+      def #{sym}(val)
+        self.class.#{sym} = val
+      end
+    EOS
+  end
+end
+
+def define_dsl_file_keyword(*syms)
+  syms.each do |sym|
+    class_eval(<<-EOS, __FILE__, __LINE__)
+      def #{sym}(src, options = {})
+        file(src, options, :#{sym})
+      end
+    EOS
+  end
+end
+
 module Scaffoldhub
   class Specification
 
+    mattr_accessor        :name, :description, :base_url, :blog_post, :screenshot, :parameter_example
+    define_dsl_attributes :name, :description, :base_url, :blog_post, :screenshot, :parameter_example
+
+    mattr_accessor :files, :errors, :tags
     @@files  = []
-    @@base_url = nil
+    @@errors = []
+    @@tags   = []
+
+    define_dsl_file_keyword :model, :migration, :controller, :view, :layout
 
     class << self
-      def files
-        @@files
+
+      def add_file(src, dest, type)
+        @@files << { :type => type, :src => src, :dest => dest }
       end
 
-      def files=(files)
-        @@files = files
+      def add_tag(keyword)
+        @@tags << keyword
       end
 
-      def add_file(type, src, dest)
-        @@files << { :type => type, :src => src, :dest => dest }
+      def to_yaml
+        {
+          :name        => name,
+          :description => description,
+          :base_url    => adjusted_base_url,
+          :blog_post   => blog_post,
+          :files       => files,
+          :screenshot  => screenshot,
+          :tags        => tags,
+          :parameter_example => parameter_example
+        }.to_yaml
       end
 
-      def base_url
-        @@base_url
+      def adjusted_base_url
+        if base_url =~ /github.com\/(\w+\/\w+)\/(tree|blob)\/(.*)$/
+          "https://github.com/#{$1}/raw/#{$3}"
+        elsif base_url =~ /github.com\/(\w+\/\w+)\/?$/
+          "https://github.com/#{$1}/raw/master"
+        else
+          base_url
+        end
       end
 
-      def base_url=(url)
-        @@base_url = url
+      def valid?
+        has_name? && has_description? && has_base_url? && has_screenshot? && all_template_files_exist?
       end
 
-      def to_yaml
-        { :base_url => base_url, :files => files }.to_yaml
+      def has_name?
+        has_string_value?(:name)
+      end
+
+      def has_description?
+        has_string_value?(:description)
+      end
+
+      def has_base_url?
+        has_string_value?(:base_url)
+      end
+
+      def has_string_value?(value)
+        val = send(value)
+        valid = (val && val != '')
+        errors.push("Error: missing scaffold #{value}.") unless valid
+        valid
+      end
+
+      def has_screenshot?
+        has_string_value?(:screenshot) && remote_file_exists?(File.join(adjusted_base_url, screenshot))
+      end
+
+      def all_template_files_exist?
+        files.all? { |file| remote_file_exists?(File.join(adjusted_base_url, file[:src])) }
+      end
+
+      def remote_file_exists?(url)
+        valid = RemoteFile.new(url).exists?
+        errors.push("Error: unable to access remote URL #{url}") unless valid
+        valid
       end
     end
 
-    def initialize
-      yield self
+    def initialize(&block)
+      @context_stack = []
+      @context_options = {}
+      instance_eval(&block) if block_given?
     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]
+    def with_options(options, &block)
+      @context_stack.push(@context_options)
+      @context_options = options_relative_to_parent(@context_options, options)
+      yield if block_given?
+      @context_options = @context_stack.pop
+    end
+
+    def metadata
+      yield if block_given?
+    end
+
+    def file(src, options = {}, type = :file)
+      self.class.add_file(
+        join_with_parent(@context_options[:src], src),
+        join_with_parent(@context_options[:dest], options[:dest]),
+        type
+      )
+    end
+
+    def template(src, options = {})
+      raise ':dest option is required for templates' unless options[:dest]
+      file(src, options, :template)
+    end
+
+    def tag(keyword)
+      self.class.add_tag(keyword)
+    end
+
+    protected
+
+    def join_with_parent(parent_value, new_value)
+      if parent_value && new_value
+        File.join(parent_value, new_value)
+      else
+        parent_value || new_value
       end
     end
 
+    def options_relative_to_parent(parent_options, options)
+      {
+        :src  => join_with_parent(parent_options[:src],  options[:src]),
+        :dest => join_with_parent(parent_options[:dest], options[:dest])
+      }
+    end
   end
 end

data/lib/scaffoldhub/template_file.rb

@@ -6,7 +6,7 @@ module Scaffoldhub
       @dest     = dest || ''
       @local    = local
       @base_url = base_url
-      super(status_proc)
+      super(url, status_proc)
     end
 
     def src

data/spec/fixtures/local_template_file.txt

@@ -0,0 +1 @@
+TEMPLATE

data/spec/fixtures/test_scaffold.rb

@@ -0,0 +1,85 @@
+Scaffoldhub::Specification.new do
+
+  # Github URL where you will post your scaffold - the speciied folder must contain this file
+  base_url  'https://github.com/your_name/your_repo'
+
+  # The name of your new scaffold: should be a single word
+  name 'test_scaffold'
+
+  # Metadata about this scaffold - this info is only used for display on scaffoldhub.org:
+  metadata do
+
+    # A short paragraph describing what this scaffold does
+    description 'The test_scaffold scaffold.'
+
+    # 4x3 aspect ratio screen shot
+    screenshot 'screenshot.png'
+
+    # Tag(s) to help scaffoldhub.org users find your scaffold
+    tag 'jquery'
+    tag 'autocomplete'
+  end
+
+  # Optionally specify an example of a scaffold parameter
+  parameter_example 'FIELD_NAME'
+
+  # Optionally post a link to an article you write explaining how the scaffold works.
+  blog_post 'http://patshaughnessy.net/2011/3/13/view-mapper-for-rails-3-scaffoldhub'
+
+  # Define a model template - this ERB file will be used to generate a new
+  # model class with this path & filename: app/models/NAME.rb
+  model 'templates/model.rb'
+
+  # Define a controller template - this ERB file will be used to generate a new
+  # controller class with this path & filename: app/controllers/PLURAL_NAME.rb
+  controller 'templates/controller.rb'
+
+  # Define a view template - this ERB file will be used to generate a new
+  # view file with this path & filename: app/views/PLURAL_NAME/view_file_name.rb
+  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
+  layout 'templates/layout.erb'
+
+  # You can use "with_options" to specify the same source folder for a series of templates:
+  with_options :src => 'templates' do
+    view 'new.html.erb'
+    view 'edit.html.erb'
+    view 'index.html.erb'
+    view 'show.html.erb'
+  end
+
+  # Specify some other code file that should be generated from an ERB template; use
+  # the :dest option is required to indicate where the generated file should go
+  template 'templates/other_code_file.erb', :dest => 'lib/other_code_file.rb'
+
+  # Specify some other file that should be simply copied into the target app somwhere
+  # 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'
+    with_options :src => 'ui-lightness', :dest => 'ui-lightness' do
+      file 'jquery-ui-1.8.10.custom.css'
+      with_options :src => 'images', :dest => 'images' do
+        file 'ui-bg_diagonals-thick_18_b81900_40x40.png'
+        file 'ui-bg_diagonals-thick_20_666666_40x40.png'
+        file 'ui-bg_flat_10_000000_40x100.png'
+        file 'ui-bg_glass_100_f6f6f6_1x400.png'
+        file 'ui-bg_glass_100_fdf5ce_1x400.png'
+        file 'ui-bg_glass_65_ffffff_1x400.png'
+        file 'ui-bg_gloss-wave_35_f6a828_500x100.png'
+        file 'ui-bg_highlight-soft_100_eeeeee_1x100.png'
+        file 'ui-bg_highlight-soft_75_ffe45c_1x100.png'
+        file 'ui-icons_222222_256x240.png'
+        file 'ui-icons_228ef1_256x240.png'
+        file 'ui-icons_ef8c08_256x240.png'
+        file 'ui-icons_ffd27a_256x240.png'
+      end
+      file 'images/ui-icons_ffffff_256x240.png', :dest => 'images'
+    end
+  end
+end

data/spec/remote_file_spec.rb

@@ -1,21 +1,20 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-module Net
-  class HTTP
+class MockHTTP
 
-    def self.set_mock_http(mock_http)
-      @mock_http = mock_http
-    end
+  def self.set_mock_http(mock_http)
+    @mock_http = mock_http
+  end
 
-    def self.start(host, port)
-      yield @mock_http
-    end
+  def start
+    yield self
   end
 end
 
 describe Scaffoldhub::RemoteFile do
 
   FAKE_SCAFFOLDHUB_URL = 'http://fake.scaffoldhub.org:1234/scaffolds/autocomplete/spec'
+  FAKE_GITHUB_URL = 'https://fake.github.com/patshaughnessy/scaffolds'
 
   describe '#remote_file_contents' do
 
@@ -23,14 +22,13 @@ describe Scaffoldhub::RemoteFile do
       subject do
         @status_proc = mock
         @status_proc.expects(:call).with(FAKE_SCAFFOLDHUB_URL)
-        Scaffoldhub::RemoteFile.new(@status_proc)
+        Scaffoldhub::RemoteFile.new(FAKE_SCAFFOLDHUB_URL, @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)
+        Net::HTTP.stubs(:new).returns(http = mock)
+        http.stubs(:start).returns(response = mock)
+        response.stubs(:code).returns(200)
+        response.stubs(:body).returns('')
         subject.remote_file_contents!
       end
     end
@@ -39,44 +37,53 @@ describe Scaffoldhub::RemoteFile 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)
+        Scaffoldhub::RemoteFile.new(FAKE_SCAFFOLDHUB_URL, status_proc)
       end
 
       it 'should call Net::HTTP with the proper host and port' do
-        Net::HTTP.expects(:start).with('fake.scaffoldhub.org', 1234)
+        Net::HTTP.expects(:new).with('fake.scaffoldhub.org', 1234).returns(http = mock)
+        http.stubs(:start).returns(response = mock)
+        response.stubs(:code).returns(200)
+        response.stubs(:body).returns('')
         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)
+        Net::HTTP.stubs(:new).returns(mock_http = MockHTTP.new)
+        mock_http.expects(:get).with('/scaffolds/autocomplete/spec').returns(response = mock)
+        response.stubs(:code).returns(200)
+        response.stubs(:body).returns('RESPONSE')
         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)
+        Net::HTTP.stubs(:new).returns(mock_http = MockHTTP.new)
+        mock_http.expects(:get).returns(response = mock)
+        response.stubs(:code).returns(404)
         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)
+        Net::HTTP.stubs(:new).returns(mock_http = MockHTTP.new)
+        mock_http.expects(:get).raises(Errno::ECONNREFUSED)
         lambda { subject.remote_file_contents! }.should raise_error(Scaffoldhub::NetworkErrorException)
       end
     end
 
     describe 'Net:HTTP SSL calls' do
-      #TBD
+      subject do
+        (status_proc = mock).stubs(:call).with(FAKE_GITHUB_URL)
+        Scaffoldhub::RemoteFile.new(FAKE_GITHUB_URL, status_proc)
+      end
+      it 'should call Net::HTTP with the proper SSL options' do
+        Net::HTTP.expects(:new).with('fake.github.com', 443).returns(http = mock)
+        http.expects(:use_ssl=).with(true)
+        http.expects(:verify_mode=).with(OpenSSL::SSL::VERIFY_NONE)
+        http.stubs(:start).returns(response = mock)
+        response.stubs(:code).returns(200)
+        response.stubs(:body).returns('')
+        subject.remote_file_contents!
+      end
     end
 
   end

data/spec/scaffold_spec_spec.rb

@@ -1,5 +1,13 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
+def find_spec(scaffold_spec, type, src)
+  find_spec_in_array(scaffold_spec.template_file_specs, type, src)
+end
+
+def find_spec_in_array(array, type, src)
+  array.detect { |spec| spec[:type] == type && spec[:src] == src }
+end
+
 describe Scaffoldhub::ScaffoldSpec do
 
   before do
@@ -12,41 +20,94 @@ describe Scaffoldhub::ScaffoldSpec 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)
+        test_spec_path = File.join(File.dirname(__FILE__), 'fixtures', 'test_scaffold.rb')
+        scaffold = Scaffoldhub::ScaffoldSpec.new(test_spec_path, true, @status_proc)
+        scaffold.download_and_parse!
+        scaffold
       end
 
-      before do
-        Scaffoldhub::Specification.files = []
-        Scaffoldhub::Specification.base_url = nil
+      it 'should set the base_url to the scaffold specs folder' do
+        subject.base_url.should == File.expand_path(File.join(File.dirname(__FILE__), 'fixtures'))
       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'))
+      it 'should parse the blog_post' do
+        subject.blog_post.should == 'http://patshaughnessy.net/2011/3/13/view-mapper-for-rails-3-scaffoldhub'
+      end
+
+      it 'should parse the model file' do
+        model_spec = subject.template_file_specs.detect { |spec| spec[:type] == :model }
+        find_spec(subject, :model, 'templates/model.rb').should_not be_nil
+      end
+
+      it 'should parse the controller file' do
+        find_spec(subject, :controller, 'templates/controller.rb').should_not be_nil
+      end
+
+      it 'should parse a view file' do
+        find_spec(subject, :view, 'templates/_form.html.erb').should_not be_nil
+      end
+
+      it 'should parse a layout file' do
+        find_spec(subject, :layout, 'templates/layout.erb').should_not be_nil
+      end
+
+      it 'should parse with_options and use :src as a folder for the given file' do
+        find_spec(subject, :view, 'templates/new.html.erb').should_not be_nil
+        find_spec(subject, :view, 'templates/edit.html.erb').should_not be_nil
+        find_spec(subject, :view, 'templates/index.html.erb').should_not be_nil
+        find_spec(subject, :view, 'templates/show.html.erb').should_not be_nil
+      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
+        template_spec[:dest].should == 'lib/other_code_file.rb'
+      end
+
+      it 'should parse a normal file with a dest attribute' do
+        template_spec = find_spec(subject, :file, 'templates/jquery/jquery-1.4.4.min.js')
+        file_spec = subject.template_file_specs.detect { |spec| spec[:type] == :file }
+        file_spec.should_not be_nil
+        file_spec[:dest].should == 'public/javascripts'
+      end
+
+      it 'should recursively parse with_options' do
+        template_spec1 = find_spec(subject, :file, 'templates/jquery/jquery-ui-1.8.10.custom.min.js')
+        template_spec1.should_not be_nil
+        template_spec1[:dest].should == 'public/javascripts'
+        template_spec2 = find_spec(subject, :file, 'templates/jquery/ui-lightness/jquery-ui-1.8.10.custom.css')
+        template_spec2.should_not be_nil
+        template_spec2[:dest].should == 'public/javascripts/ui-lightness'
+        template_spec3 = find_spec(subject, :file, 'templates/jquery/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png')
+        template_spec3.should_not be_nil
+        template_spec3[:dest].should == 'public/javascripts/ui-lightness/images'
+        template_spec4 = find_spec(subject, :file, 'templates/jquery/ui-lightness/images/ui-icons_ffffff_256x240.png')
+        template_spec4.should_not be_nil
+        template_spec4[:dest].should == 'public/javascripts/ui-lightness/images'
       end
     end
 
+
     describe 'parsing remote scaffold spec' do
 
+      before do
+        Scaffoldhub::Specification.files = []
+        Scaffoldhub::Specification.base_url = nil
+      end
+
       TEST_YAML = <<YAML
   --- 
   :base_url: http://github.com/patshaughnessy/scaffolds/default
   :files: 
   - :src: templates/index3.html.erb
     :dest: 
-    :type: erb
+    :type: view
   - :src: templates/index2.html.erb
     :dest: 
     :type: controller
   - :src: templates/index.html.erb
     :dest: app/views/welcome
-    :type: other
+    :type: file
 YAML
 
       subject do
@@ -59,18 +120,66 @@ YAML
         subject.expects(:remote_file_contents!).returns(TEST_YAML)
       end
 
-      it 'should require a local scaffold spec' do
+      it 'should parse a remote yaml scaffold' do
         subject.download_and_parse!
         subject.template_file_specs.should == [
-          { :type => 'erb',        :src => 'templates/index3.html.erb', :dest => nil },
+          { :type => 'view',       :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' }
+          { :type => 'file',       :src => 'templates/index.html.erb',  :dest => 'app/views/welcome' }
         ]
         subject.base_url.should == 'http://github.com/patshaughnessy/scaffolds/default'
       end
     end
   end
 
+  describe 'generating yaml' do
+
+    subject do
+      test_spec_path = File.join(File.dirname(__FILE__), 'fixtures', 'test_scaffold.rb')
+      scaffold = Scaffoldhub::ScaffoldSpec.new(test_spec_path, true, @status_proc)
+      scaffold.download_and_parse!
+      scaffold
+    end
+
+    it 'should generate yaml from a scaffold spec' do
+      yaml = subject.to_yaml
+      parsed_yaml = YAML::load(yaml)
+      parsed_yaml[:base_url].should          == 'https://github.com/your_name/your_repo/raw/master'
+      parsed_yaml[:blog_post].should         == 'http://patshaughnessy.net/2011/3/13/view-mapper-for-rails-3-scaffoldhub'
+      parsed_yaml[:name].should              == 'test_scaffold'
+      parsed_yaml[:description].should       == 'The test_scaffold scaffold.'
+      parsed_yaml[:parameter_example].should == 'FIELD_NAME'
+      model_spec = find_spec_in_array(parsed_yaml[:files], :model, 'templates/model.rb')
+      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
+    end
+
+    describe '#adjusted_base_url' do
+
+      it 'should use the raw github url when a repo root is specified' do
+        Scaffoldhub::Specification.base_url = 'https://github.com/your_name/your_repo'
+        Scaffoldhub::Specification.adjusted_base_url.should == 'https://github.com/your_name/your_repo/raw/master'
+      end
+
+      it 'should use the raw github url when a repo root is specified with a trailing slash' do
+        Scaffoldhub::Specification.base_url = 'https://github.com/your_name/your_repo/'
+        Scaffoldhub::Specification.adjusted_base_url.should == 'https://github.com/your_name/your_repo/raw/master'
+      end
+
+      it 'should use the raw github url when a blob url is specified' do
+        Scaffoldhub::Specification.base_url = 'https://github.com/patshaughnessy/scaffolds/blob/master/autocomplete/scaffold_spec.rb'
+        Scaffoldhub::Specification.adjusted_base_url.should == 'https://github.com/patshaughnessy/scaffolds/raw/master/autocomplete/scaffold_spec.rb'
+      end
+
+      it 'should use the raw github url when a tree url is specified' do
+        Scaffoldhub::Specification.base_url = 'https://github.com/patshaughnessy/scaffolds/tree/master/autocomplete/scaffold_spec.rb'
+        Scaffoldhub::Specification.adjusted_base_url.should == 'https://github.com/patshaughnessy/scaffolds/raw/master/autocomplete/scaffold_spec.rb'
+      end
+
+    end
+  end
+
   describe '#select_files' do
 
     subject do
@@ -79,10 +188,10 @@ YAML
 
     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' }
+        { :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
 
@@ -90,7 +199,7 @@ YAML
       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 = subject.select_files(:type1)
       files.include?(mock1).should be_true
       files.include?(mock2).should be_true
       files.include?(mock3).should be_true
@@ -105,27 +214,20 @@ YAML
 
     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' }
+        { :type => :type1, :src => 'some_src',  :dest => 'some_dest' },
+        { :type => :type2, :src => 'some_src2', :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
+      Scaffoldhub::TemplateFile.expects(:new).with('some_src', 'some_dest', true, 'base', @status_proc).returns(mock1 = mock)
+      subject.find_file(:type1).should == mock1
     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
+      subject.find_file(:type3).should be_nil
     end
   end
 end

data/spec/template_file_spec.rb

@@ -19,11 +19,11 @@ describe Scaffoldhub::TemplateFile do
 
   describe 'remote template file' do
 
-    FAKE_GITHUB_URL = 'http://github.com/patshaughnessy/scaffolds/default'
+    FAKE_TEMPLATE_FILE_URL = 'http://github.com/patshaughnessy/scaffolds/default'
 
-    subject { Scaffoldhub::TemplateFile.new('templates/index.html', 'public', false, FAKE_GITHUB_URL, @status_proc) }
+    subject { Scaffoldhub::TemplateFile.new('templates/index.html', 'public', false, FAKE_TEMPLATE_FILE_URL, @status_proc) }
 
-    its(:url)  { should == FAKE_GITHUB_URL + '/templates/index.html' }
+    its(:url)  { should == FAKE_TEMPLATE_FILE_URL + '/templates/index.html' }
     its(:dest) { should == File.join('public', 'index.html') }
 
     describe '#download!' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scaffoldhub
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Pat Shaughnessy
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-24 00:00:00 -04:00
+date: 2011-04-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,8 +83,8 @@ dependencies:
 description: Run Rails scaffold generator with customized templates downloaded from scaffoldhub.org
 email: 
 - pat@patshaughnessy.net
-executables: []
-
+executables: 
+- scaffoldhub
 extensions: []
 
 extra_rdoc_files: []
@@ -95,24 +95,29 @@ files:
 - Gemfile.lock
 - README.rdoc
 - Rakefile
+- bin/scaffoldhub
 - lib/generators/active_record/scaffoldhub_generator.rb
 - lib/generators/erb/scaffoldhub_generator.rb
+- lib/generators/new_scaffoldhub/new_scaffoldhub_generator.rb
+- lib/generators/new_scaffoldhub/templates/scaffold_spec.rb.erb
+- lib/generators/new_scaffoldhub/templates/screenshot.png
 - 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/runner.rb
 - lib/scaffoldhub/scaffold_spec.rb
 - lib/scaffoldhub/specification.rb
 - lib/scaffoldhub/template_file.rb
 - scaffoldhub.gemspec
-- spec/fixtures/test_scaffoldspec.rb
+- spec/fixtures/local_template_file.txt
+- spec/fixtures/test_scaffold.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: []
@@ -148,7 +153,8 @@ signing_key:
 specification_version: 3
 summary: Generate customized Rails scaffolding from scaffoldhub.org
 test_files: 
-- spec/fixtures/test_scaffoldspec.rb
+- spec/fixtures/local_template_file.txt
+- spec/fixtures/test_scaffold.rb
 - spec/helper_spec.rb
 - spec/remote_file_spec.rb
 - spec/scaffold_spec_spec.rb

data/spec/fixtures/test_scaffoldspec.rb

@@ -1,21 +0,0 @@
-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/util/spec_to_yaml.rb

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