waxx 0.1.4 → 0.2.0

data/lib/waxx/patch.rb

@@ -74,6 +74,9 @@ class NilClass
   def empty?
     true
   end
+  def any?
+    false
+  end
 end
 class Numeric
   # HTML format (self -- no escaping needed)
@@ -123,6 +126,10 @@ class String
   def capitalize_all
     split(/[ _]/).map{|l| l.capitalize}.join(' ')
   end
+  alias title_case capitalize_all
+  def any?
+    self != ""
+  end
 end
 class Time
   # HTML format

data/lib/waxx/pdf.rb

@@ -5,8 +5,8 @@
 
 module Waxx::Pdf
 
-  def new_doc(margin:50, orientation: "portrait", info: {})
-    Prawn::Document.new(:margin=>margin, :orientation=>orientation, :info=>info)
+  def new_doc(margin: 50, page_size: "LETTER", page_layout: "portrait", info: {})
+    Prawn::Document.new(margin: margin, page_size: page_size, page_layout: page_layout, info: info)
   end
 
   def doc_info(

data/lib/waxx/pg.rb

@@ -57,10 +57,17 @@ module Waxx::Pg
   def build_joins(n, col_is)
     return if col_is.nil?
     [col_is].flatten.each{|str| 
-      r, tc = str.split(":")
-      t, c = tc.split(".")
+      rt, c = str.split(".")
+      r, t = rt.split(":")
+      t = r if t.nil?
       j = c =~ /\+$/ ? "LEFT" : "INNER"
-      @joins[r] = {table: @table, col: n.to_s.strip, join: j.to_s.strip, foreign_table: t.to_s.strip, foreign_col: c.to_s.strip.sub('+','')}
+      @joins[r] = {
+        table: @table,
+        col: n.to_s.strip,
+        join: j.to_s.strip,
+        foreign_table: t.to_s.strip,
+        foreign_col: c.to_s.strip.sub('+','')
+      }
     }
   end
 
@@ -179,11 +186,22 @@ module Waxx::Pg
     ret = []
     i = 1
     cols.each{|n,v|
-      if data/n
+      if data.has_key? n or data.has_key? n.to_s
         names << n.to_s
-        vars << "$#{i}"
-        vals << cast(v, data/n)
-        i += 1
+        # Make empty array array literals
+        if v[:type].to_s == 'array' and ((data/n).nil? or (data/n).empty?)
+          vars << "'{}'"
+        else
+          if data/n === :default
+            vars << "DEFAULT"
+          elsif data/n === :now
+            vars << "NOW()"
+          else
+            vars << "$#{i}"
+            vals << cast(v, data/n)
+            i += 1
+          end
+        end
       end
       ret << n.to_s
     }
@@ -192,7 +210,7 @@ module Waxx::Pg
     sql << " RETURNING #{returning || ret.join(",")}"
     Waxx.debug(sql)
     Waxx.debug(vals)
-    x.db[@db].exec(sql, vals).first 
+    x.db[@db].exec(sql, vals).first
   end
 
   def put(x, id, data, cols:nil, returning:nil, view:nil, where:nil, &blk)
@@ -205,14 +223,24 @@ module Waxx::Pg
     sql = "UPDATE #{@table} SET "
     set = []
     vals = []
-    ret = []
+    ret = [@pkey]
     i = 1
     cols.each{|n,v|
       if data.has_key? n.to_s or data.has_key? n.to_sym
-        set << "#{n} = $#{i}"
-        vals << cast(v, data/n)
+        if data/n === :default
+          set << "#{n} = DEFAULT"
+        elsif data/n === :now
+          set << "#{n} = NOW()"
+        else
+          if !(data/n).nil? and (v/:type).to_s =~ /\[\]$/ and (data/n).empty?
+            set << "#{n} = ARRAY[]::#{v/:type}"
+          else
+            set << "#{n} = $#{i}"
+            vals << cast(v, data/n)
+            i += 1
+          end
+        end
         ret << n.to_s
-        i += 1
       end
     }
     sql << set.join(",")
@@ -237,6 +265,10 @@ module Waxx::Pg
       val.to_s.empty? ? nil : val.to_i
     when :float, :numeric
       val.to_s.empty? ? nil : val.to_f
+    when :bool, :boolean
+      val.nil? ? nil : ['t', 'true', 'y', 'yes'].include?(val.to_s.downcase) ? true : false
+    when :date, :datetime, :timestamp, :time
+      val.to_s.empty? ? nil : val
     else
       val
     end
@@ -252,6 +284,35 @@ module Waxx::Pg
     @pkey
   end
 
+  def columns_for(x, table_name, conn_name=:app)
+    # Get the primary key
+    pkey = x.db[conn_name].exec("
+      select column_name
+      from information_schema.key_column_usage
+      where table_schema = 'public'
+      and table_name = $1
+      and constraint_name like '%_pkey'",
+      [
+        table_name
+      ]
+    ).first['column_name'] rescue nil
+    columns = x.db[conn_name].exec("
+      select  column_name, data_type
+      from    information_schema.columns 
+      where   table_schema = 'public'
+      and     table_name = $1
+      order   by ordinal_position
+      ",[
+        table_name
+      ]
+    )
+    columns.map{|c|
+      c['pkey'] = c['column_name'] == pkey
+      c
+    }
+  end
+
+
   def debug(str, level=3)
     Waxx.debug(str, level)
   end

data/lib/waxx/res.rb

@@ -19,7 +19,7 @@ module Waxx
   #
   # ```
   # x.res[name] = value    # Set a response header
-  # x.res.as(extention)    # Set the Content-Type header based on extension
+  # x.res.as(extention)    # Set the content-type header based on extension
   # x.res.redirect '/path' # Redirect the client with 302 / Location header
   # x.res.location '/path' # Redirect the client with 302 / Location header
   # x.res.cookie(          # Set a cookie
@@ -45,7 +45,9 @@ module Waxx
     :no_cookies
   ) do
 
-    # Send output to the client (may be buffered)
+    attr :headers_sent
+
+    # Send output to the client buffered until flush() or complete()
     def << str
       out << str
     end
@@ -59,7 +61,7 @@ module Waxx
     end
 
     def as(ext)
-      headers['Content-Type'] = Waxx::Http.ctype(ext)
+      headers['content-type'] = Waxx::Http.ctype(ext)
     end
     
     def location(uri)
@@ -79,13 +81,29 @@ module Waxx
         "\r\n"
       ].flatten.join("\r\n")
     end
+
+    def flush(content=nil)
+      unless @headers_sent
+        server.print head
+        @headers_sent = true
+      end
+      if content.nil?
+        server.print out.join
+        out.clear
+      else
+        server.print content
+      end
+    end
     
     # Output the headers and the body
     def complete
       re = out.join
-      headers["Content-Length"] = re.bytesize
+      headers["content-length"] = re.bytesize if headers['content-length'].nil?
       begin
-        server.print head
+        unless @headers_sent
+          server.print head
+          @headers_sent = true
+        end
         server.print re
       # Connection reset by peer
       rescue Errno::ECONNRESET => e
@@ -100,9 +118,15 @@ module Waxx
       end
     end
 
-    def cookie(name:"", value:nil, domain:nil, expires:nil, path:"/", secure:true, http_only: false, same_site: "Lax")
-      expires = expires.nil? ? "" : "expires=#{Time === expires ? expires.rfc2822 : expires}; "
-      cookies << "#{name}=#{Waxx::Http.escape(value.to_s)}; #{expires}#{";domain=#{domain}" if domain}; path=#{path}#{"; secure" if secure}#{"; HttpOnly" if http_only}; SameSite=#{same_site}"
+    def cookie(name: "", value: nil, domain: nil, expires: nil, path: "/", secure: true, http_only: false, same_site: "Lax")
+      c = ["#{name}=#{Waxx::Http.escape(value.to_s)}"]
+      c << "Path=#{path}"
+      c << "SameSite=#{same_site}"
+      c << "Expires=#{Time === expires ? expires.rfc2822 : expires}" if expires
+      c << "Domain=#{domain}" if domain
+      c << "Secure" if secure
+      c << "HttpOnly" if http_only
+      cookies << c.join("; ")
     end
   end
 

data/lib/waxx/server.rb

@@ -44,7 +44,6 @@ module Waxx::Server
       if not Waxx::Csrf.ok?(x)
         true
       end
-      puts "Cleared CSRF"
     end
     false
   end
@@ -90,8 +89,7 @@ module Waxx::Server
       #Waxx.debug "no-file"
       env, head = Waxx::Http.parse_head(io)
       Waxx.debug [Time.now.to_s, meth, uri].join(" "), 2
-      #Waxx.debug head, 9
-      cookie = Waxx::Http.parse_cookie(env['Cookie'])
+      cookie = Waxx::Http.parse_cookie(env['cookie'])
       begin
         usr = cookie[Waxx['cookie']['user']['name']] ? JSON.parse(::App.decrypt(cookie[Waxx['cookie']['user']['name']][0])) : default_cookies[Waxx['cookie']['user']['name']] 
       rescue => e
@@ -119,6 +117,9 @@ module Waxx::Server
       res = Waxx::Res.new(io, 200, default_response_headers(req, ext), [], [], [])
       jobs = []
       x = Waxx::X.new(req, res, usr, ua, db, meth.downcase.to_sym, app, act, oid, args, ext, jobs).freeze
+      if usr['id'].nil? and (get/:qlk or post/:qlk)
+        App::Usr.login_by_qlk(x, post/:qlk || get/:qlk)
+      end
       if csrf?(x)
         Waxx::App.csrf_failure(x)
         finish(x, io)
@@ -181,7 +182,7 @@ module Waxx::Server
   def fatal_error(x, e)
     x.res.status = 503
     puts "FATAL ERROR: #{e}\n#{e.backtrace}"
-    report = "APPLICATION ERROR\n=================\n\nUSR:\n\n#{x.usr.map{|n,v| "#{n}: #{v}"}.join("\n") rescue nil}\n\nERROR:\n\n#{e}\n#{e.backtrace.join("\n")}\n\nENV:\n\n#{x.req.env.map{|n,v| "#{n}: #{v}"}.join("\n") rescue nil}\n\nGET:\n\n#{x.req.get.map{|n,v| "#{n}: #{v}"}.join("\n") rescue nil}\n\nPOST:\n\n#{x.req.post.map{|n,v| "#{n}: #{v}"}.join("\n") rescue nil}\n\n"
+    report = "APPLICATION ERROR\n=================\n\nUSR:\n\n#{x.usr.map{|n,v| "#{n}: #{v}"}.join("\n") rescue nil}\n\nERROR:\n\n#{e}\n#{e.backtrace.join("\n")}\n\nENV:\n\nHostname: #{`hostname`}\n#{x.req.env.map{|n,v| "#{n}: #{v}"}.join("\n") rescue nil}\n\nGET:\n\n#{x.req.get.map{|n,v| "#{n}: #{v}"}.join("\n") rescue nil}\n\nPOST:\n\n#{x.req.post.map{|n,v| "#{n}: #{v}"}.join("\n") rescue nil}\n\n"
     if Waxx['debug']['on_screen']
       x << "<pre>#{report.h}</pre>" 
     else

data/lib/waxx/version.rb

@@ -1,3 +1,3 @@
 module Waxx
-  Version = '0.1.4'
+  Version = '0.2.0'
 end

data/lib/waxx/view.rb

@@ -62,6 +62,8 @@ module Waxx::View
   attr :order_by
   # A hash of how you can sort this view
   attr :orders
+  # Initial where (view will always include this filter (plus any additional where clauses)
+  attr :initial_where
 
   ##
   # Initialize a view. This is normally done automatically when calling `has`.
@@ -78,6 +80,7 @@ module Waxx::View
     @object = App.get_const(App, @table)
     @relations = {}
     @orders = {}
+    @initial_where = ["", []]
     has(*cols) if cols
     as(layouts) if layouts
   end
@@ -130,6 +133,8 @@ module Waxx::View
         Waxx.debug "Column #{c} not defined in #{@object}."
         #raise "Column #{c} not defined in #{@object}."
       end
+      @orders[n.to_sym] = col/:order || n
+      @orders["_#{n}".to_sym] = col/:_order || "#{n} desc"
       #Waxx.debug @relations.inspect
       #TODO: Deal with relations that have different names than the tables
       col[:views] << self rescue col[:views] = [self]
@@ -158,7 +163,13 @@ module Waxx::View
       col = (App.get_const(App, j/:foreign_table)/col_name).dup
       col[:table] = rel_name
     rescue NoMethodError => e
-      Waxx.debug "ERROR: NoMethodError: #{rel_name} does not define col: #{col_name}"
+      if j.nil?
+        Waxx.debug %(ERROR: \n\n
+        NoMethodError: The #{rel_name} relationship is not defined in any columns of #{@object.name}.
+        FIX: Add "is: '#{rel_name}:table.foreign_key'" to a column definition in the 'has' method in #{@object.name}.)
+      else
+        Waxx.debug "ERROR: NoMethodError: #{rel_name} does not define col: #{col_name}"
+      end
       raise e
     rescue NameError, TypeError => e
       Waxx.debug "ERROR: Name or Type Error: #{rel_name} does not define col: #{col_name}"
@@ -259,6 +270,12 @@ module Waxx::View
     @order_by = ord
   end
 
+  ##
+  # Set the initial where clause. The view will always include this in the where.
+  def init_where(sql, args=[])
+    @initial_where = [sql, args]
+  end
+
   ##
   # Gets the data for the view and displays it. This is just a shortcut method.
   # 
@@ -301,14 +318,16 @@ module Waxx::View
   # Automatically build the where clause of SQL based on the parameters passed in and the definition of matches and searches.
   def build_where(x, args: {}, matches: @matches, searches: @searches)
     return nil if args.nil? or args.empty? or (matches.nil? and searches.nil?)
-    w_str = ""
-    w_args = []
+    w_str = @initial_where[0].dup
+    w_args = @initial_where[1].dup
     q = args/:q || x['q']
     if q and searches
+      w_str += " AND " if w_str != ""
       w_str += "("
       searches.each_with_index{|c, i|
+        col = @columns/c
         w_str += " OR " if i > 0
-        w_str += "LOWER(#{c}) like $1"
+        w_str += "LOWER(#{col/:table}.#{col/:column}) like $1"
       }
       w_args << "%#{q.downcase}%"
       w_str += ")"
@@ -318,8 +337,16 @@ module Waxx::View
         next if (x/c).to_s == "" and (args/c).to_s == ""
         w_str += " AND " if w_str != ""
         col = self[c.to_sym]
-        w_str += "#{c} #{col[:match] || "="} $#{w_args.size + 1}"
-        w_args << (args/c || x/c)
+        # match in args needs to be an array
+        if col[:match].to_s == 'in'
+          w_str += "#{c} in (#{([args/c || x/c].flatten).map{|v|
+            w_args << v
+            "$#{w_args.size}"
+          }.join(',')})"
+        else
+          w_str += "#{c} #{col[:match] || "="} $#{w_args.size + 1}"
+          w_args << (args/c || x/c)
+        end
       }
     end
     [w_str, w_args]
@@ -355,8 +382,14 @@ module Waxx::View
   def put_post(x, id, data, args:nil, returning: nil)
     @object.put_post(x, id, data, view: self, returning: returning)
   end
-  alias post put_post
-  alias put put_post
+  
+  def post(x, data, returning: nil)
+    @object.post(x, data, returning: returning, view: self)
+  end
+
+  def put(x, id, data, returning: nil)
+    @object.put(x, id, data, returning: returning, view: self)
+  end
 
   ##
   # Delete a record by ID (primary key of the primary object)

data/lib/waxx/waxx.rb

@@ -23,15 +23,15 @@ module Waxx
   # A few helper functions
 
   ##
-  # Shortcut to Waxx::Waxx variables
+  # Shortcut to Waxx::Conf variables
   def [](str)
-    Waxx::Conf[str]
+    Waxx::Conf[str.to_s]
   end
 
   ##
-  # Shortcut to Waxx::Waxx variables
+  # Shortcut to Waxx::Conf variables
   def /(str)
-    Waxx::Conf/str
+    Waxx::Conf[str.to_s]
   end
 
   ##

data/lib/waxx/x.rb

@@ -76,10 +76,22 @@ module Waxx
       res << str.to_s
     end
     def [](k)
-      req.post[k.to_s] || req.get[k.to_s]
+      begin
+        req.post.has_key?(k) ? req.post[k] :
+          req.post.has_key?(k.to_s) ? req.post[k.to_s] :
+            req.get/k
+      rescue
+        nil
+      end
     end
     def /(k)
-      req.post[k.to_s] || req.get[k.to_s]
+      begin
+        req.post.has_key?(k) ? req.post[k] :
+          req.post.has_key?(k.to_s) ? req.post[k.to_s] :
+            req.get/k
+      rescue
+        nil
+      end
     end
     def usr?
       not (usr['id'].nil? or usr['id'].to_i == 0) 

data/lib/waxx.rb

@@ -14,7 +14,6 @@
 
 # Libs (core & std)
 require 'socket'
-require 'thread'
 require 'openssl'
 require 'base64'
 require 'json'
@@ -35,6 +34,7 @@ require_relative 'waxx/csrf'
 require_relative 'waxx/database'
 require_relative 'waxx/encrypt'
 require_relative 'waxx/error'
+require_relative 'waxx/generate'
 require_relative 'waxx/html'
 require_relative 'waxx/http'
 require_relative 'waxx/json'

data/skel/app/about/about.rb

@@ -0,0 +1,32 @@
+module App::About
+  extend Waxx::Object
+  extend self
+
+  runs(
+    index: {
+      desc: "The about main page.",
+      get: -> (x) {
+        App::Html.page(x, title: "About", content: %(
+          This is the main about page.
+        ))
+      }
+    },
+    privacy: {
+      desc: "The privacy policy",
+      get: -> (x) {
+        App::Html.page(x, title: "Privacy Policy", content: %(
+          You can pull this content from the file system or the database or just leave it in the code.
+        ))
+      }
+    },
+    terms: {
+      desc: "The terms of use",
+      get: -> (x) {
+        App::Html.page(x, title: "Terms of Use", content: %(
+          You can pull this content from the file system or the database or just leave it in the code.
+        ))
+      }
+    },
+  )
+
+end

data/skel/app/home/html.rb

@@ -4,142 +4,12 @@ module App::Home::Html
 
   def welcome(x)
     App::Html.render(x, title: "Welcome to Waxx", content: %(
-      #{carousel(x)}
-      <div class="container marketing">
-        #{main_points(x)}
-        #{featurettes(x)}
-      </div>
+      <h1>Waxx</h1>
+      <p>
+        This is the default home page of your Waxx app. 
+        The file is <code>app/home/html.rb</code>
+      </p>
     ))
   end
-      
 
-  def carousel(x)
-    %(
-    <!-- Carousel
-    ================================================== -->
-    <div id="myCarousel" class="carousel slide" data-ride="carousel">
-      <!-- Indicators -->
-      <ol class="carousel-indicators">
-        <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
-        <li data-target="#myCarousel" data-slide-to="1"></li>
-        <li data-target="#myCarousel" data-slide-to="2"></li>
-      </ol>
-      <div class="carousel-inner" role="listbox">
-        <div class="item active">
-          <img class="first-slide" src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="First slide">
-          <div class="container">
-            <div class="carousel-caption">
-              <h1>Fast and Smooth</h1>
-              <p>Waxx makes web development fast and smooth. You can edit this page at <br><code>app/home/html.rb</code></p>
-              <p><a class="btn btn-lg btn-primary" href="#" role="button">Sign up today</a></p>
-            </div>
-          </div>
-        </div>
-        <div class="item">
-          <img class="second-slide" src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="Second slide">
-          <div class="container">
-            <div class="carousel-caption">
-              <h1>Another example headline.</h1>
-              <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
-              <p><a class="btn btn-lg btn-primary" href="#" role="button">Learn more</a></p>
-            </div>
-          </div>
-        </div>
-        <div class="item">
-          <img class="third-slide" src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="Third slide">
-          <div class="container">
-            <div class="carousel-caption">
-              <h1>One more for good measure.</h1>
-              <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
-              <p><a class="btn btn-lg btn-primary" href="#" role="button">Browse gallery</a></p>
-            </div>
-          </div>
-        </div>
-      </div>
-      <a class="left carousel-control" href="#myCarousel" role="button" data-slide="prev">
-        <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
-        <span class="sr-only">Previous</span>
-      </a>
-      <a class="right carousel-control" href="#myCarousel" role="button" data-slide="next">
-        <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
-        <span class="sr-only">Next</span>
-      </a>
-    </div><!-- /.carousel -->
-    )
-  end
-
-  def main_points(x)
-    %(
-      <!-- Main Points 
-      ================================================== -->
-
-      <!-- Three columns of text below the carousel -->
-      <div class="row">
-        <div class="col-lg-4">
-          <img class="img-circle" src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="Generic placeholder image" width="140" height="140">
-          <h2>Heading</h2>
-          <p>Donec sed odio dui. Etiam porta sem malesuada magna mollis euismod. Nullam id dolor id nibh ultricies vehicula ut id elit. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Praesent commodo cursus magna.</p>
-          <p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
-        </div><!-- /.col-lg-4 -->
-        <div class="col-lg-4">
-          <img class="img-circle" src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="Generic placeholder image" width="140" height="140">
-          <h2>Heading</h2>
-          <p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh.</p>
-          <p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
-        </div><!-- /.col-lg-4 -->
-        <div class="col-lg-4">
-          <img class="img-circle" src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="Generic placeholder image" width="140" height="140">
-          <h2>Heading</h2>
-          <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
-          <p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
-        </div><!-- /.col-lg-4 -->
-      </div><!-- /.row -->
-    )
-  end
-
-  def featurettes(x)
-    %(
-      <!-- START THE FEATURETTES -->
-
-      <hr class="featurette-divider">
-
-      <div class="row featurette">
-        <div class="col-md-7">
-          <h2 class="featurette-heading">First featurette heading. <span class="text-muted">It'll blow your mind.</span></h2>
-          <p class="lead">Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.</p>
-        </div>
-        <div class="col-md-5">
-          <img class="featurette-image img-responsive center-block" data-src="holder.js/500x500/auto" alt="Generic placeholder image">
-        </div>
-      </div>
-
-      <hr class="featurette-divider">
-
-      <div class="row featurette">
-        <div class="col-md-7 col-md-push-5">
-          <h2 class="featurette-heading">Oh yeah, it's that good. <span class="text-muted">See for yourself.</span></h2>
-          <p class="lead">Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.</p>
-        </div>
-        <div class="col-md-5 col-md-pull-7">
-          <img class="featurette-image img-responsive center-block" data-src="holder.js/500x500/auto" alt="Generic placeholder image">
-        </div>
-      </div>
-
-      <hr class="featurette-divider">
-
-      <div class="row featurette">
-        <div class="col-md-7">
-          <h2 class="featurette-heading">And lastly, this one. <span class="text-muted">Checkmate.</span></h2>
-          <p class="lead">Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.</p>
-        </div>
-        <div class="col-md-5">
-          <img class="featurette-image img-responsive center-block" data-src="holder.js/500x500/auto" alt="Generic placeholder image">
-        </div>
-      </div>
-
-      <hr class="featurette-divider">
-
-      <!-- /END THE FEATURETTES -->
-    )
-  end
 end