flatrack 0.0.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d90823dca4b0df1edc0c568691ac712057a7ea2
-  data.tar.gz: 99bdd53e90658a39b0e169be58ac515a6dadb61f
+  metadata.gz: f26f0173c80797ab99000a3ace4dd3420d755a06
+  data.tar.gz: 284e097be8f77ad7dcdda15e532d01a3f127085d
 SHA512:
-  metadata.gz: 81a880337d5fdc94f45b21cf9184e2ec7bb1ed986265aafbca65dcf8a2e23891c3046fc80bfe2b3ea555c7b8fb708aed2fa693ce59e84388f1f90e013bb3fd31
-  data.tar.gz: 9e4fc3e262e518ce79f3954e5ce807653db9d23f8ff37879635ab5f6d2c317a72723ad1c1b73141b1aab30f655aa68c7618f017878ac908987769ddf52dab489
+  metadata.gz: aaecd5dfd29f80cc54b8a6d5d4f3444b91a4d43cc62e46a01d640d0cb5e00e03669486ef60f640ebd9e6f5a2f3ee70f5adfdd4cf34ebe93b7a2fd9126ddbfe5b
+  data.tar.gz: a4c0c83aa72a5bd0f91fa9d26e309f24b97a228358c71ae5c4fb5b9416cedf6492f969d96bf467ea8408c663ac95a02caed4d2a6fc6a81b74966630772b655ee

data/.gitignore

@@ -0,0 +1,2 @@
+Gemfile.lock
+pkg/*

data/.rubocop.yml

@@ -0,0 +1,6 @@
+AllCops:
+  Excludes:
+    - vendor/bundle/**
+
+Documentation:
+  Enabled: false

data/Gemfile

@@ -1,4 +1,8 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in flatrack-rack.gemspec
+<<<<<<< Updated upstream
 gemspec
+=======
+  gemspec unless ENV['RM_INFO']
+>>>>>>> Stashed changes

data/bin/flatrack

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+require 'flatrack'
+Flatrack::CLI.start

data/flatrack.gemspec

@@ -6,28 +6,29 @@ require 'flatrack/version'
 Gem::Specification.new do |spec|
 
   # Information
-  spec.name          = "flatrack"
-  spec.version       = Flatrack::VERSION
-  spec.authors       = ["Jason Waldrip"]
-  spec.email         = ["jason@waldrip.net"]
-  spec.summary       = 'A template based flat rack site'
-  spec.homepage      = "https://github.com/jwaldrip/flatrack"
-  spec.license       = "MIT"
+  spec.name                  = "flatrack"
+  spec.version               = Flatrack::VERSION
+  spec.authors               = ["Jason Waldrip"]
+  spec.email                 = ["jason@waldrip.net"]
+  spec.summary               = 'A template based flat rack site'
+  spec.homepage              = "https://github.com/jwaldrip/flatrack"
+  spec.license               = "MIT"
 
   # Files
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.files                 = `git ls-files`.split($/)
+  spec.executables           = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files            = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths         = ["lib"]
 
   # Ruby Version
-  spec.required_ruby_version = '>= 1.6.8'
+  spec.required_ruby_version = '>= 1.9.3'
 
   # Dependencies
   spec.add_dependency 'rack'
   spec.add_dependency 'activesupport'
   spec.add_dependency 'sass'
   spec.add_dependency 'sprockets'
+  spec.add_dependency 'sprockets-sass'
   spec.add_dependency 'thor'
   spec.add_dependency 'coffee-script'
   spec.add_dependency 'rake'

data/lib/flatrack/asset_extensions.rb

@@ -1,9 +1,7 @@
 module Flatrack
   module AssetExtensions
-
     def asset_path(path, options={})
-      File.join('assets', path.to_s)
+      File.join('/assets', path.to_s)
     end
-
   end
 end

data/lib/flatrack/cli.rb

@@ -0,0 +1,50 @@
+require 'thor'
+require 'flatrack'
+
+module Flatrack
+  class CLI < Thor
+    include FileUtils
+    include Thor::Actions
+
+    source_root File.join Flatrack.gem_root, '..', 'templates'
+
+    desc 'new NAME', 'create a new flatrack site with the given name'
+
+    def new(name)
+      @name = name.titleize
+      mkdir_p name
+      path                  = File.expand_path name
+      self.destination_root = path
+
+      # Store keep files
+      template '.keep', 'assets/stylesheets/.keep'
+      template '.keep', 'assets/javascripts/.keep'
+      template '.keep', 'assets/images/.keep'
+      template '.keep', 'pages/.keep'
+      template '.keep', 'layouts/.keep'
+
+      # Write from templates
+      template '.gitignore', '.gitignore'
+      template 'boot.rb', 'boot.rb'
+      template 'Rakefile', 'Rakefile'
+      template 'Gemfile.erb', 'Gemfile'
+      template 'config.ru', 'config.ru'
+      template 'layout.html.erb', 'layouts/layout.html.erb'
+      template 'page.html.erb', 'pages/index.html.erb'
+      template 'stylesheet.css.scss', 'assets/stylesheets/main.css.scss'
+      template 'javascript.js.coffee', 'assets/javascripts/main.js.coffee'
+
+      Dir.chdir(path) do
+        system 'bundle install'
+      end
+    end
+
+    desc 'start PORT', 'run the site on the given port'
+
+    def start(port=5959)
+      require './boot'
+      Rack::Server.start app: Flatrack::Site, Port: port
+    end
+
+  end
+end

data/lib/flatrack/renderer.rb

@@ -10,7 +10,7 @@ module Flatrack
       raise FileNotFound, "could not find #{file}" unless template
       ext = File.extname(template).sub(/\./, '')
 
-      renderer = Base.descendants.find { |descendant| descendant.renders?(ext)  } ||
+      renderer = Base.descendants.find { |descendant| descendant.renders?(ext) } ||
         raise(RendererNotFound, "could not find a renderer for #{file}")
 
       renderer.new template

data/lib/flatrack/request.rb

@@ -7,7 +7,7 @@ module Flatrack
 
     def initialize(env)
       @rack_request = Rack::Request.new(env)
-      @env = env
+      @env          = env
     end
 
     def path

data/lib/flatrack/response/view_context.rb

@@ -1,13 +1,14 @@
 module Flatrack
   class Response
     class ViewContext
+      include AssetExtensions
 
       def initialize(response)
         @response = response
       end
 
-      def get_binding
-        binding
+      def get_binding(&block)
+        binding(&block)
       end
 
       def path
@@ -31,7 +32,7 @@ module Flatrack
 
       def javascript_tag(uri)
         uri = File.join('/assets', uri.to_s) + '.js' if uri.is_a? Symbol
-        html_tag(:script, src: uri){ nil }
+        html_tag(:script, src: uri) { nil }
       end
 
       def stylesheet_tag(uri)
@@ -40,19 +41,19 @@ module Flatrack
       end
 
       def page_stylesheet_tag
-        file = @response.send(:file_for, path.to_s)
-        base_path = File.join File.dirname(file), File.basename(file,  '.*')
+        file      = @response.send(:file_for, path.to_s)
+        base_path = File.join File.dirname(file), File.basename(file, '.*')
         stylesheet_tag base_path if stylesheet_exists?(base_path)
       end
 
       def link_to(name, link, options={})
         link = [link, options.delete(:params).to_param].join('?') if options[:params].is_a?(Hash) && options[:params].present?
-        html_tag(:a, { href: link }.merge(options) ){ name }
+        html_tag(:a, { href: link }.merge(options)) { name }
       end
 
       def html_tag(tag, options={}, &block)
         [].tap do |lines|
-          lines << "<#{tag} " + options.map{ |k, v| "#{k}=\"#{v}\"" }.join(' ') + (block_given? ? ">" : "/>")
+          lines << "<#{tag} " + options.map { |k, v| "#{k}=\"#{v}\"" }.join(' ') + (block_given? ? ">" : "/>")
           if block_given?
             lines << yield
             lines << "</#{tag}>"

data/lib/flatrack/response.rb

@@ -3,7 +3,7 @@ module Flatrack
 
     autoload :ViewContext, 'flatrack/response/view_context'
 
-    DEFAULT_FILE   = 'index'
+    DEFAULT_FILE  = 'index'
     CONTENT_TYPES = {
       html: 'text/html',
       rb:   'text/html'
@@ -42,10 +42,10 @@ module Flatrack
 
     def render_file(file = nil, options={})
       status, layout = options.values_at(:status, :layout)
-      layout ||= :layout
-      file ||= file_for(request.path)
-      contents = renderer_for(file).render(view_context)
-      contents = layout_for(layout).render(view_context){ contents } if layout
+      layout         ||= :layout
+      file           ||= file_for(request.path)
+      contents       = renderer_for(file).render(view_context)
+      contents       = layout_for(layout).render(view_context) { contents } if layout
       self.body << contents
       [status, headers, body]
     end

data/lib/flatrack/site.rb

@@ -1,12 +1,21 @@
+require 'rack/server'
+
 module Flatrack
   Site = Rack::Builder.app do
+
+    # Static Assets Should be served directly
+    use Rack::Static, urls: ["/favicon.ico", "assets"], root: "public"
+
+    Flatrack.middleware.each do |middleware|
+      use *middleware
+    end
+
     map '/assets' do
       run Flatrack.assets
     end
 
     map '/' do
-      use Rack::Static, urls: ["/favicon.ico", "assets"], root: "public"
-      run ->(env){ Request.new(env).response }
+      run ->(env) { Request.new(env).response }
     end
   end
 end

data/lib/flatrack/version.rb

@@ -1,3 +1,3 @@
 module Flatrack
-  VERSION = "0.0.1"
+  VERSION = "0.9.0"
 end

data/lib/flatrack.rb

@@ -1,6 +1,9 @@
 require 'flatrack/version'
-require 'sprockets'
 require 'active_support/all'
+require 'sprockets'
+require 'sprockets-sass'
+require 'sass'
+require 'rack'
 
 module Flatrack
   extend ActiveSupport::Autoload
@@ -10,14 +13,26 @@ module Flatrack
   autoload :Response
   autoload :Site
   autoload :AssetExtensions
+  autoload :CLI
 
   RendererNotFound = Class.new StandardError
   FileNotFound     = Class.new StandardError
 
-  FORMATS = {
-    'html' => 'text/html',
-    'rb'   => 'text/html'
-  }
+  FORMATS = {}
+
+  def self.gem_root
+    File.expand_path File.join __FILE__, '..'
+  end
+
+  def self.site_root
+    File.expand_path Dir.pwd
+  end
+
+  def self.config(&block)
+    yield self
+  end
+
+  protected
 
   def self.assets
     @assets ||= begin
@@ -30,8 +45,25 @@ module Flatrack
     end
   end
 
+  def self.register_format(ext, mime)
+    FORMATS[ext.to_s] = mime
+  end
+
+  def self.middleware
+    @middleware ||= []
+  end
+
+  def self.use(*args)
+    self.middleware << args
+  end
+
+  # By default we know how to render 'text/html'
+  register_format :html, 'text/html'
+
+  # Fix Locales issue
   I18n.enforce_available_locales = false
 
+  # Load all renderers
   Dir.glob(File.expand_path File.join __FILE__, '../../renderers/**/*.rb').each { |f| require f }
 
 end

data/lib/rake/asset_tasks.rb

@@ -56,36 +56,16 @@ module Rake
     def assets
       Dir['assets/**/*.*'].map do |file|
         file_basename = File.basename file
-        file = file.split('.').tap(&:pop).join('.') if file_basename.split('.').size > 2
-        File.expand_path(file).sub(/(#{environment.paths.join('|')})\//,'')
+        parts         = file_basename.split('.').size
+        file          = file.split('.').tap(&:pop).join('.') if parts > 2
+        File.expand_path(file).sub(/(#{environment.paths.join('|')})\//, '')
       end
     end
 
     # Define tasks
     def define
-      namespace :assets do
-        desc 'precompile assets'
-        task :precompile do
-          with_logger do
-            manifest.compile(assets)
-          end
-        end
-
-        desc "Remove all assets"
-        task :clobber do
-          with_logger do
-            manifest.clobber
-          end
-        end
-
-        desc "Clean old assets"
-        task :clean do
-          with_logger do
-            manifest.clean(keep)
-          end
-        end
-
-      end
+      file = File.expand_path File.join __FILE__, '../assets.rake'
+      eval File.read file
     end
 
     private

data/lib/rake/assets.rake

@@ -0,0 +1,22 @@
+namespace :assets do
+  desc 'precompile assets'
+  task :precompile do
+    with_logger do
+      manifest.compile(assets)
+    end
+  end
+
+  desc "Remove all assets"
+  task :clobber do
+    with_logger do
+      manifest.clobber
+    end
+  end
+
+  desc "Clean old assets"
+  task :clean do
+    with_logger do
+      manifest.clean(keep)
+    end
+  end
+end

data/renderers/erb.rb

@@ -5,7 +5,7 @@ class Flatrack::Renderer::ERB < Flatrack::Renderer::Base
   renders :erb
 
   def render(context = binding, &block)
-    ::ERB.new(contents).result(context, &block)
+    ::ERB.new(contents).result context.get_binding(&block)
   end
 
 end

data/renderers/rb.rb

@@ -5,9 +5,9 @@ class Flatrack::Renderer::Rb < Flatrack::Renderer::Base
   renders :rb
 
   def render(context)
-    result = nil
+    result    = nil
     evaluator = Thread.start do
-      $SAFE = 3
+      $SAFE  = 3
       result = eval contents, context
     end
     nil while evaluator.alive?

data/spec/spec_helper.rb

@@ -4,6 +4,6 @@ require 'flatrack'
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.run_all_when_everything_filtered = true
+  config.run_all_when_everything_filtered                = true
   config.filter_run :focus
 end

data/templates/.gitignore

@@ -0,0 +1,3 @@
+public/assets
+.sass-cache
+tmp

data/templates/Gemfile.erb

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'flatrack', '~> <%= Flatrack::VERSION %>'

data/templates/Rakefile

@@ -0,0 +1,4 @@
+require './boot'
+require 'rake/asset_tasks'
+
+Rake::AssetTasks.new

data/templates/boot.rb

@@ -0,0 +1,4 @@
+STDOUT.sync = true
+
+require 'bundler/setup'
+Bundler.require(:default)

data/templates/config.ru

@@ -0,0 +1,2 @@
+require './boot'
+run Flatrack::Site

data/templates/layout.html.erb

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<head>
+  <title>
+    <% @name %></title>
+  <%%= stylesheet_tag :main %>
+  <%%= javascript_tag :main %>
+</head>
+<body>
+<%%= yield %>
+</body>

data/templates/page.html.erb

@@ -0,0 +1 @@
+Welcome to <%= @name %>, this is your first page! You can find me at pages/index.html.erb

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flatrack
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Jason Waldrip
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sprockets-sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -144,9 +158,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -154,6 +169,7 @@ files:
 - flatrack.gemspec
 - lib/flatrack.rb
 - lib/flatrack/asset_extensions.rb
+- lib/flatrack/cli.rb
 - lib/flatrack/renderer.rb
 - lib/flatrack/renderer/base.rb
 - lib/flatrack/request.rb
@@ -162,12 +178,24 @@ files:
 - lib/flatrack/site.rb
 - lib/flatrack/version.rb
 - lib/rake/asset_tasks.rb
+- lib/rake/assets.rake
+- logo.png
 - renderers/erb.rb
 - renderers/html.rb
 - renderers/rb.rb
 - spec/lib/flatrack_spec.rb
 - spec/rake/asset_tasks_spec.rb
 - spec/spec_helper.rb
+- templates/.gitignore
+- templates/.keep
+- templates/Gemfile.erb
+- templates/Rakefile
+- templates/boot.rb
+- templates/config.ru
+- templates/javascript.js.coffee
+- templates/layout.html.erb
+- templates/page.html.erb
+- templates/stylesheet.css.scss
 homepage: https://github.com/jwaldrip/flatrack
 licenses:
 - MIT
@@ -180,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.6.8
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -188,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A template based flat rack site

data/Gemfile.lock

@@ -1,61 +0,0 @@
-PATH
-  remote: .
-  specs:
-    flatrack (0.0.1)
-      activesupport
-      coffee-script
-      rack
-      rake
-      sass
-      sprockets
-      thor
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (4.0.2)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    atomic (1.1.14)
-    coffee-script (2.2.0)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.6.3)
-    diff-lcs (1.2.5)
-    execjs (2.0.2)
-    hike (1.2.3)
-    i18n (0.6.9)
-    minitest (4.7.5)
-    multi_json (1.8.2)
-    rack (1.5.2)
-    rake (10.1.0)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    sass (3.2.12)
-    sprockets (2.10.1)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
-    tilt (1.4.1)
-    tzinfo (0.3.38)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.5)
-  flatrack!
-  rspec