frank 0.2.6 → 0.3.0.beta

data/lib/frank/lorem.rb

@@ -2,81 +2,122 @@ module Frank
   class Lorem
     WORDS = %w(alias consequatur aut perferendis sit voluptatem accusantium doloremque aperiam eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo aspernatur aut odit aut fugit sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt neque dolorem ipsum quia dolor sit amet consectetur adipisci velit sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem ut enim ad minima veniam quis nostrum exercitationem ullam corporis nemo enim ipsam voluptatem quia voluptas sit suscipit laboriosam nisi ut aliquid ex ea commodi consequatur quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae et iusto odio dignissimos ducimus qui blanditiis praesentium laudantium totam rem voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident sed ut perspiciatis unde omnis iste natus error similique sunt in culpa qui officia deserunt mollitia animi id est laborum et dolorum fuga et harum quidem rerum facilis est et expedita distinctio nam libero tempore cum soluta nobis est eligendi optio cumque nihil impedit quo porro quisquam est qui minus id quod maxime placeat facere possimus omnis voluptas assumenda est omnis dolor repellendus temporibus autem quibusdam et aut consequatur vel illum qui dolorem eum fugiat quo voluptas nulla pariatur at vero eos et accusamus officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae itaque earum rerum hic tenetur a sapiente delectus ut aut reiciendis voluptatibus maiores doloribus asperiores repellat)
   
-    class << self
-  
-      def word
-        words 1
-      end
+    def initialize(environment)
+      @environment = environment
+      
+    end
+        
+    def word(replacement = nil)
+      words 1, replacement
+    end
+    
+    require 'ruby-debug'
     
-      def words(total)
+    def words(total, replacement = nil)
+      if @environment == :output && replacement
+        replacement
+      else
         (1..total).map do
           randm(WORDS)
         end.join(' ')
       end
-  
-      def sentence
-        sentences 1
-      end
+    end
+
+    def sentence(replacement = nil)
+      sentences 1, replacement
+    end
 
-      def sentences(total)
+    def sentences(total, replacement = nil)
+      # TODO: Don't capitalize replacement field
+      if @environment == :output && replacement
+        replacement
+      else
         (1..total).map do
           words(randm(4..15)).capitalize
         end.join('. ')
       end
-    
-      def paragraph
-        paragraphs 1
-      end
+    end
   
-      def paragraphs(total)
+    def paragraph(replacement = nil)
+      paragraphs 1, replacement
+    end
+
+    def paragraphs(total, replacement = nil)
+      if @environment == :output && replacement
+        replacement
+      else
         (1..total).map do
-          sentences(randm(3..7)).capitalize
+          sentences(randm(3..7), replacement).capitalize
         end.join("\n\n")
       end
-      
-      def date(fmt='%a %b %d, %Y')
+    end
+    
+    def date(fmt = '%a %b %d, %Y', replacement = nil)
+      if @environment == :output && replacement
+        replacement
+      else
         y = rand(20) + 1990
         m = rand(12) + 1
         d = rand(31) + 1
         Time.local(y,m,d).strftime(fmt)
       end
-      
-      def name
+    end
+    
+    def name(replacement = nil)
+      if @environment == :output && replacement
+        replacement
+      else
         "#{first_name} #{last_name}"
       end
-      
-      def first_name
+    end
+    
+    def first_name(replacement = nil)
+      if @environment == :output && replacement
+        replacement
+      else
         names = %w(Judith Angelo Margarita Kerry Elaine Lorenzo Justice Doris Raul Liliana Kerry Elise Ciaran Johnny Moses Davion Penny Mohammed Harvey Sheryl Hudson Brendan Brooklynn Denis Sadie Trisha Jacquelyn Virgil Cindy Alexa Marianne Giselle Casey Alondra Angela Katherine Skyler Kyleigh Carly Abel Adrianna Luis Dominick Eoin Noel Ciara Roberto Skylar Brock Earl Dwayne Jackie Hamish Sienna Nolan Daren Jean Shirley Connor Geraldine Niall Kristi Monty Yvonne Tammie Zachariah Fatima Ruby Nadia Anahi Calum Peggy Alfredo Marybeth Bonnie Gordon Cara John Staci Samuel Carmen Rylee Yehudi Colm Beth Dulce Darius inley Javon Jason Perla Wayne Laila Kaleigh Maggie Don Quinn Collin Aniya Zoe Isabel Clint Leland Esmeralda Emma Madeline Byron Courtney Vanessa Terry Antoinette George Constance Preston Rolando Caleb Kenneth Lynette Carley Francesca Johnnie Jordyn Arturo Camila Skye Guy Ana Kaylin Nia Colton Bart Brendon Alvin Daryl Dirk Mya Pete Joann Uriel Alonzo Agnes Chris Alyson Paola Dora Elias Allen Jackie Eric Bonita Kelvin Emiliano Ashton Kyra Kailey Sonja Alberto Ty Summer Brayden Lori Kelly Tomas Joey Billie Katie Stephanie Danielle Alexis Jamal Kieran Lucinda Eliza Allyson Melinda Alma Piper Deana Harriet Bryce Eli Jadyn Rogelio Orlaith Janet Randal Toby Carla Lorie Caitlyn Annika Isabelle inn Ewan Maisie Michelle Grady Ida Reid Emely Tricia Beau Reese Vance Dalton Lexi Rafael Makenzie Mitzi Clinton Xena Angelina Kendrick Leslie Teddy Jerald Noelle Neil Marsha Gayle Omar Abigail Alexandra Phil Andre Billy Brenden Bianca Jared Gretchen Patrick Antonio Josephine Kyla Manuel Freya Kellie Tonia Jamie Sydney Andres Ruben Harrison Hector Clyde Wendell Kaden Ian Tracy Cathleen Shawn)
         names[rand(names.size)]
       end
-      
-      def last_name
+    end
+    
+    def last_name(replacement = nil)
+      if @environment == :output && replacement
+        replacement
+        else
         names = %w(Chung Chen Melton Hill Puckett Song Hamilton Bender Wagner McLaughlin McNamara Raynor Moon Woodard Desai Wallace Lawrence Griffin Dougherty Powers May Steele Teague Vick Gallagher Solomon Walsh Monroe Connolly Hawkins Middleton Goldstein Watts Johnston Weeks Wilkerson Barton Walton Hall Ross Chung Bender Woods Mangum Joseph Rosenthal Bowden Barton Underwood Jones Baker Merritt Cross Cooper Holmes Sharpe Morgan Hoyle Allen Rich Rich Grant Proctor Diaz Graham Watkins Hinton Marsh Hewitt Branch Walton O'Brien Case Watts Christensen Parks Hardin Lucas Eason Davidson Whitehead Rose Sparks Moore Pearson Rodgers Graves Scarborough Sutton Sinclair Bowman Olsen Love McLean Christian Lamb James Chandler Stout Cowan Golden Bowling Beasley Clapp Abrams Tilley Morse Boykin Sumner Cassidy Davidson Heath Blanchard McAllister McKenzie Byrne Schroeder Griffin Gross Perkins Robertson Palmer Brady Rowe Zhang Hodge Li Bowling Justice Glass Willis Hester Floyd Graves Fischer Norman Chan Hunt Byrd Lane Kaplan Heller May Jennings Hanna Locklear Holloway Jones Glover Vick O'Donnell Goldman McKenna Starr Stone McClure Watson Monroe Abbott Singer Hall Farrell Lucas Norman Atkins Monroe Robertson Sykes Reid Chandler Finch Hobbs Adkins Kinney Whitaker Alexander Conner Waters Becker Rollins Love Adkins Black Fox Hatcher Wu Lloyd Joyce Welch Matthews Chappell MacDonald Kane Butler Pickett Bowman Barton Kennedy Branch Thornton McNeill Weinstein Middleton Moss Lucas Rich Carlton Brady Schultz Nichols Harvey Stevenson Houston Dunn West O'Brien Barr Snyder Cain Heath Boswell Olsen Pittman Weiner Petersen Davis Coleman Terrell Norman Burch Weiner Parrott Henry Gray Chang McLean Eason Weeks Siegel Puckett Heath Hoyle Garrett Neal Baker Goldman Shaffer Choi Carver)
         names[rand(names.size)]
       end
+    end
 
-      def email
+    def email(replacement = nil)
+      if @environment == :output && replacement
+        replacement
+      else
         delimiters = ['_','-','']
         domains = %w(gmail.com yahoo.com hotmail.com email.com live.com me.com mac.com aol.com fastmail.com mail.com)        
         username = name.gsub(/[^\w]/, delimiters[rand(delimiters.size)])
         "#{username}@#{domains[rand(domains.size)]}".downcase
       end
-    
-      def image(width, height, random=false)
+    end
+  
+    def image(width, height, random=false, replacement=nil)
+      if @environment == :output && replacement
+        replacement
+      else
         if defined? MiniMagick
           "/_img/#{width.to_s}x#{height.to_s}.jpg#{'?random' + (10000 + rand(10000)).to_s if random}"
         else
           raise Frank::ConfigError, 'mini_magick is required for lorem.image, please install it with `gem install mini_magick`'
         end
       end
-    
-      private
-    
-      def randm(range)
-        a = range.to_a
-        a[rand(a.length)]
-      end
-    
     end
+  
+    private
+  
+    def randm(range)
+      a = range.to_a
+      a[rand(a.length)]
+    end
+    
   end
 end

data/lib/frank/middleware/imager.rb

@@ -0,0 +1,43 @@
+module Frank
+  module Middleware
+    
+    begin
+      require 'mini_magick'
+    rescue LoadError
+    end
+
+    class Imager
+  
+      def initialize(app, options={})
+        @app = app
+      end
+  
+      # choose a random image if random is in the query
+      def image_filename(dims, query)      
+        if query.include?('random')
+          "frank#{rand(10)}.jpg"
+        else
+          "frank#{dims.hash.to_s[-1..-1]}.jpg"
+        end  
+      end
+  
+      # catch a request for _img/0x0, get an image, resize it to given dims
+      def call(env)
+        path = env['PATH_INFO']
+        image_path = File.expand_path(File.dirname(__FILE__)) + '/templates/imager/'
+
+        if defined?(MiniMagick) && path.include?('_img')
+          dims = '!' + path.split('/').last.match(/\d+x\d+/i).to_s
+          filename = image_filename(dims, env['QUERY_STRING'])
+      
+          image = MiniMagick::Image.from_file(image_path + filename)
+          image.resize dims
+          return [ 200, { 'Content-Type' => 'image/jpg' }, image.to_blob ] 
+        end
+        @app.call(env)
+      end
+      
+    end
+    
+  end
+end

data/lib/frank/middleware/refresh.rb

@@ -0,0 +1,42 @@
+module Frank
+  module Middleware
+    class Refresh
+ 
+      def initialize(app, options={})
+        @app     = app
+        @folders = options[:watch]
+      end
+    
+      # catch __refrank__ path and
+      # return the most recent timestamp
+      def call(env)
+        request = Rack::Request.new(env)
+        if request.path_info.match /^\/__refresh__$/
+          [ 200, { 'Content-Type' => 'application/json' }, "[#{get_mtime}]" ]
+        else
+          @app.call(env)
+        end
+      
+      end
+    
+      private
+    
+      # build list of mtimes for watched files
+      # return the most recent
+      def get_mtime
+        pwd        = Dir.pwd
+        timestamps = []
+        helpers    = File.join(pwd, 'helpers.rb')
+        
+        timestamps << File.mtime(helpers).to_i if File.exist? helpers
+        @folders.each do |folder|
+          Dir[File.join(pwd, folder, '**/*.*')].each do |found|
+            timestamps << File.mtime(found).to_i unless File.directory?(found)
+          end
+        end
+        timestamps.sort.last
+      end
+      
+    end
+  end
+end

data/lib/frank/middleware/statik.rb

@@ -0,0 +1,41 @@
+module Frank
+  module Middleware
+    class Statik
+ 
+      def initialize(app, options={})
+        @app = app
+        frank_root = File.expand_path(File.dirname(File.dirname(__FILE__))) + '/templates'
+        root = options[:root] || Dir.pwd
+        @frank_server = Rack::File.new(frank_root)
+        @static_server = Rack::File.new(root)
+      end
+ 
+      # handles serving from __frank__
+      # looks for static access, if not found,
+      # passes request to frank
+      def call(env)
+        path = env['PATH_INFO'].dup
+ 
+        if path.include? '__frank__'
+          env['PATH_INFO'].gsub!('/__frank__', '')
+          result = @frank_server.call(env)
+        else
+          env['PATH_INFO'] << '/' unless path.match(/(\.\w+|\/)$/)
+          env['PATH_INFO'] << 'index.html' if path[-1..-1] == '/'
+          result = @static_server.call(env)
+        end
+      
+        # return if static assets found
+        # else reset the path and pass to frank
+        if result[0] == 200
+          result
+        else
+          env['PATH_INFO'] = path
+          @app.call(env)
+        end
+      
+      end
+      
+    end
+  end
+end

data/lib/frank/output.rb

@@ -1,5 +1,3 @@
-require 'find'
-
 module Frank
   class Output < Frank::Base
     include Frank::Render
@@ -10,46 +8,36 @@ module Frank
       instance_eval &block
     end
     
-    # get all of the templates and compile them
-    def compile_templates(options)
+    # compile the templates
+    # if production and template isn't index and is html    
+    # name a folder based on the template and compile to index.html
+    # otherwise compile as is
+    def compile_templates(production)
       dir = File.join(@proj_dir, @dynamic_folder)
-      layouts = templates['layouts'].map { |l| l['name'] }
       
-      Find.find(dir) do |path|
-        if FileTest.file?(path) && !File.basename(path).match(/^(\.|_)/)
-          # get the path name
-          path = path[ dir.size + 1 ..-1 ]
-          # get name and ext
-          name, ext = name_ext(path)
-          # get output extension
-          new_ext = reverse_ext_lookup(ext)
-
-          # if production is true and this template isn't a layout
-          if options[:production] == true && !layouts.include?(name)
-            # if template isn't index or template doesn't compile to html
-            # then compile it as is, otherwise name a folder based on the template
-            # and compile to index.html
-            if "#{name}.#{new_ext}" == 'index.html' || new_ext != 'html'
-              new_file = File.join(@output_folder, "#{name}.#{new_ext}")
-            else
-              new_file = File.join(@output_folder, name, "index.#{new_ext}")
-              name = "#{name}/index"
-            end
-            create_dir(new_file)
-            File.open(new_file, 'w') {|f| f.write render_path(path) }
-          elsif options[:production] == false
-            new_file = File.join(@output_folder, "#{name}.#{new_ext}")  
-            create_dir(new_file)
-            File.open(new_file, 'w') {|f| f.write render_path(path) }
+      Dir[File.join(dir, '**/*')].each do |path|
+        if File.file?(path) && !File.basename(path).match(/^(\.|_)/)
+          path    = path[ (dir.size + 1)..-1 ]
+          ext     = File.extname(path)
+          new_ext = ext_from_handler(ext)  
+          name    = File.basename(path, ext)
+          
+          if production == true && "#{name}.#{new_ext}" != 'index.html' && new_ext == 'html'
+            new_file = File.join(@output_folder, path.sub(/(\/?[\w-]+)\.[\w-]+$/, "\\1/index.#{new_ext}"))
+          else
+            new_file = File.join(@output_folder, path.sub(/\.[\w-]+$/, ".#{new_ext}"))  
           end
-          puts " - \033[32mCreating\033[0m '#{@output_folder}/#{name}.#{new_ext}'"
+          
+          create_dirs(new_file)
+          File.open(new_file, 'w') {|f| f.write render(path) }
+          puts " - \033[32mCreating\033[0m '#{new_file}'"
         end
       end
     end
     
     # use path to determine folder name and
-    # create the required folder if it doesn't exist
-    def create_dir(path)
+    # create the required folders if they don't exist
+    def create_dirs(path)
       FileUtils.makedirs path.split('/').reverse[1..-1].reverse.join('/')
     end
     
@@ -61,15 +49,15 @@ module Frank
     end
     
     # create the dump dir, compile templates, copy over static assets
-    def dump(options={:production => false})
+    def dump(production = false)
       FileUtils.mkdir(@output_folder)
       puts "\nFrank is..."
       puts " - \033[32mCreating\033[0m '#{@output_folder}'"
       
-      compile_templates(options)
+      compile_templates(production)
       copy_static
       puts "\n \033[32mCongratulations, project dumped to '#{@output_folder}' successfully!\033[0m"
     end
   end
   
-end
+end

data/lib/frank/rescue.rb

@@ -9,19 +9,26 @@ module Frank
                  :environment => @environment }
                  
       @response['Content-Type'] = 'text/html'
-      @response.status = 404
-      @response.body = Tilt.new(template, 1).render(Object.new, locals = locals)
+      @response.status          = 404
+      obj                       = Object.new.extend(TemplateHelpers)
+      @response.body            = Tilt::HamlTemplate.new(template).render(obj, locals = locals)
+      
       log_request('404')
     end
   
     def render_500(excp)
       template = File.expand_path(File.dirname(__FILE__)) + '/templates/500.haml'
-      locals = { :request => @env, :params => @request.params, :exception => excp }
+      locals   = { :request => @env, 
+                   :params => @request.params, 
+                   :exception => excp }
 
       @response['Content-Type'] = 'text/html'
-      @response.status = 500
-      @response.body = Tilt.new(template, 1).render(Object.new, locals = locals)   
+      @response.status          = 500
+      obj                       = Object.new.extend(TemplateHelpers)
+      @response.body            = Tilt::HamlTemplate.new(template).render(obj, locals = locals)  
+      
       log_request('500', excp)
     end
+    
   end
-end
+end

data/lib/frank/template_helpers.rb

@@ -7,12 +7,43 @@ module Frank
     def render_partial(path)
       pieces = path.split('/')
       partial = '_' + pieces.pop
-      render_path File.join(pieces.join('/'), partial)
+      render(File.join(pieces.join('/'), partial))
     end
     
     def lorem
-      Frank::Lorem
+      Frank::Lorem.new(@environment)
+    end
+    
+    def refresh
+      if @environment == :output || @environment == :production
+        nil
+      else
+        <<-JS
+          <script type="text/javascript">
+          (function(){
+            var when = #{Time.now.to_i};
+
+            function process( raw ){
+              if( eval(raw)[0] > when )
+                window.location.reload();
+            }
+
+            (function poll(){
+              var req = new XMLHttpRequest();  
+              req.open('GET', '/__refresh__', true);  
+              req.onreadystatechange = function (aEvt) {  
+                if ( req.readyState == 4 && req.status == 200 )
+                  process(req.responseText);
+              };
+              req.send(null);
+              setTimeout( poll, 1000 );
+            })();
+
+          })();
+          </script>
+        JS
+      end
     end
     
   end
-end
+end