glog 0.0.1 → 0.0.2

data/lib/glog.rb

@@ -0,0 +1,20 @@
+require 'rubygems'
+require 'rack'
+require 'jadof'
+require 'haml'
+require 'glog/page'
+require 'glog/server'
+
+module Glog
+
+  @@config = nil
+
+  def self.config
+    @@config ||= YAML.load_file('glog.yaml')
+  end
+  
+  def self.config=(config)
+    @@config = config
+  end
+
+end

data/lib/glog/page.rb

@@ -0,0 +1,41 @@
+module Glog
+  class Page < JADOF::Page
+    def self.root
+      get(Glog.config['root'])
+    end
+    
+    def render
+      self.template == false ? super : wrap_with_template(super)
+    end
+    
+    def template_path
+      if self.template
+        "templates/#{self.template}.haml"
+      else self.parent.size > 0
+        detect_template_from_parent
+      end
+    end
+    
+    def detect_template_from_parent
+      first_match = false
+      segments = self.parent.split(File::SEPARATOR)
+      segments.size.times do |i|
+        template_path = (['templates'] + segments[0..-(i-1)] + ['default.haml']).join(File::SEPARATOR)
+        if File.exists?(template_path)
+          first_match = template_path
+          break
+        end
+        segments.pop
+      end
+      first_match || 'templates/default.haml'
+    end
+    
+    private
+
+    def wrap_with_template(content)
+      locals = { :page => self, :config => Glog.config, :pages => self.class }
+      Haml::Engine.new(File.read(template_path)).to_html(nil, locals)
+    end
+    
+  end
+end

data/lib/glog/server.rb

@@ -0,0 +1,40 @@
+module Glog
+  class Server
+        
+    def call(env)
+      env['PATH_INFO'] == '/' ? send_root_page : send_path(env['PATH_INFO'])
+    end
+    
+    private
+
+    def send_path(path)
+      path = path[1..-1] # /my/page => my/page
+      # First trying to load page
+      if page = Page.get(path)
+        send_page(page)
+      # Then trying to load directory index if any
+      elsif page = try_dir_index(path)
+        send_page(page)
+      else
+        send_not_found
+      end
+    end
+    
+    def try_dir_index(path)
+      File.directory?(File.join('pages', path))
+      Page.get(File.join(path, 'index'))
+    end
+      
+    def send_page(page)
+      [200, { 'Content-Type' => 'text/html' }, page.render]
+    end
+    
+    def send_not_found
+      [404, { 'Content-Type' => 'text/html'}, '404 Not Found']
+    end
+    
+    def send_root_page
+      Page.root ? send_page(Page.root) : send_not_found
+    end
+  end # Server
+end # Glog

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Antono Vasiljev
@@ -18,9 +18,23 @@ date: 2010-03-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: jadof
+  name: rack
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: jadof
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -30,11 +44,11 @@ dependencies:
         - 6
         version: 0.1.6
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: haml
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -44,11 +58,25 @@ dependencies:
         - 0
         version: 2.2.0
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: maruku
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        - 0
+        version: 0.6.0
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -58,11 +86,11 @@ dependencies:
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id003
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rack-test
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -72,19 +100,19 @@ dependencies:
         - 3
         version: 0.5.3
   type: :development
-  version_requirements: *id004
-description: Blog your git repository
+  version_requirements: *id006
+description: 
 email: antono.vasiljev@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.markdown
+extra_rdoc_files: []
+
 files: 
-- LICENSE
-- README.markdown
+- lib/glog.rb
+- lib/glog/page.rb
+- lib/glog/server.rb
 has_rdoc: true
 homepage: http://github.com/antono/glog
 licenses: []
@@ -114,11 +142,6 @@ rubyforge_project:
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Git powered bogging engine
-test_files: 
-- spec/fixtures/example/plugins/google_analytics.rb
-- spec/fixtures/example/plugins/chrome_frame.rb
-- spec/fixtures/example/plugins/canonical_host.rb
-- spec/fixtures/example/plugins/no_ie.rb
-- spec/glog_spec.rb
-- spec/spec_helper.rb
+summary: Git powered bogging/cms engine
+test_files: []
+

data/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2009 Antono Vasiljev
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.markdown

@@ -1,42 +0,0 @@
-Glog - simplier than toto
-=========================
-
-Glog is Rack Middleware to serve directory of files as blog or site.
-
-Glog inspired by [toto](http://github.com/cloudhead/toto) and based on
-[JADOF](http://github.com/remi/jadof).
-
-Glog makes less assumptions about your urls.
-**J**ust **a** **D**irectory **o**f **F**iles.
-
-
-TODO
-
-
-Plugins
--------
-
-Use rack middleware as plugins:
-
-    require 'rack/noie'
-    use Rack::NoIE, :redirect => '/noie.html'
-
-    require 'rack/google\_analytics'
-    use Rack::GoogleAnalytics, 'UA-1234567-0'
-
-
-Note on Patches/Pull Requests
------------------------------
-
-- Fork the project.
-- Make your feature addition or bug fix.
-- Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-- Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-- Send me a pull request. Bonus points for topic branches.
-
-Copyright
----------
-
-Copyright (c) 2010 Antono Vasiljev. See LICENSE for details.

data/spec/fixtures/example/plugins/canonical_host.rb

@@ -1,25 +0,0 @@
-# http://gist.github.com/206213
-module Rack
-  class CanonicalHost
-    def initialize(app, host=nil, &block)
-      @app = app
-      @host = (block_given? && block.call) || host
-    end
-   
-    def call(env)
-      if url = url(env)
-        [301, { 'Location' => url }, ['Redirecting...']]
-      else
-        @app.call(env)
-      end
-    end
-   
-    def url(env)
-      if @host && env['SERVER_NAME'] != @host
-        url = Rack::Request.new(env).url
-        url.sub(%r{\A(https?://)(.*?)(:\d+)?(/|$)}, "\\1#{@host}\\3/")
-      end
-    end
-    private :url
-  end
-end

data/spec/fixtures/example/plugins/chrome_frame.rb

@@ -1,50 +0,0 @@
-# http://gist.github.com/206201
-# http://coderack.org/users/luigi/entries/4-rackchromeframe
-module Rack
-  class ChromeFrame
-
-    def initialize(app, options={})
-      @app = app
-    end
-
-    def call(env)
-      status, headers, response = @app.call(env)
-      if env['HTTP_USER_AGENT'] =~ /MSIE/ && response.content_type == 'text/html'
-        new_body = insert_goods(build_response_body(response)) 
-        new_headers = recalculate_body_length(headers, new_body)
-        [status, new_headers, new_body]
-      else
-        [status, headers, response]
-      end
-    end
-    
-    def build_response_body(response)
-      response_body = ""
-      response.each { |part| response_body += part }
-      response_body
-    end
-    
-    def recalculate_body_length(headers, body)
-      new_headers = headers
-      new_headers["Content-Length"] = body.length.to_s
-      new_headers
-    end
-
-    def insert_goods(body)
-      head = <<-HEAD
-      <meta http-equiv="X-UA-Compatible" content="chrome=1">
-      HEAD
-      
-      bod = <<-BOD
-      <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js"></script>
-      <div id="cf-placeholder"></div>
-      <script>CFInstall.check({node: "cf-placeholder"});</script>
-      BOD
-
-      body.gsub!(/<\/head>/, head + "\n</head>")
-      body.gsub!(/<\/body>/, bod  + "\n</body>")
-      body
-    end
-
-  end
-end

data/spec/fixtures/example/plugins/google_analytics.rb

@@ -1,45 +0,0 @@
-# http://gist.github.com/207948
-# http://coderack.org/users/sam/entries/21-rackgoogleanalytics
-module Rack
-  class GoogleAnalytics
-    TRACKING_CODE = <<-EOCODE
-<script type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-try {
-var pageTracker = _gat._getTracker("{{ID}}");
-pageTracker._trackPageview();
-} catch(err) {}</script>
-EOCODE
-    
-    def initialize(app, id)
-      @app = app
-      @id = id
-    end
-    
-    def call(env)
-      status, headers, body = @app.call(env)
-      
-      body.each do |part|
-        if part =~ /<\/body>/
-          part.sub!(/<\/body>/, "#{tracking_code}</body>")
-
-          if headers['Content-Length']
-            headers['Content-Length'] = (headers['Content-Length'].to_i + tracking_code.length).to_s
-          end
-
-          break
-        end
-      end
-      
-      [status, headers, body]
-    end
-  
-  private
-    def tracking_code
-      TRACKING_CODE.sub(/\{\{ID\}\}/, @id)
-    end
-  end
-end

data/spec/fixtures/example/plugins/no_ie.rb

@@ -1,38 +0,0 @@
-# http://gist.github.com/207947
-# http://coderack.org/users/julioody/entries/20-racknoie
-module Rack
-  class NoIE
-    def initialize(app, options = {})
-      @app = app
-      @options = options
-      @options[:redirect] ||= 'http://www.microsoft.com/windows/internet-explorer/default.aspx'
-      @options[:minimum] ||= 7.0
-    end
- 
-    def call(env)
-      ie_found_in?(env) ? kick_it : @app.call(env)
-    end
- 
-    private
-    def ie_found_in?(env)
-      if env['HTTP_USER_AGENT']
-        is_ie?(env['HTTP_USER_AGENT']) and ie_version(env['HTTP_USER_AGENT']) < @options[:minimum] and @options[:redirect] != env['PATH_INFO']
-      end
-    end
-    
-    def is_ie?(ua_string)
-      # We need at least one digit to be able to get the version, hence the \d
-      ua_string.match(/MSIE \d/) ? true : false
-    end
-    
-    def ie_version(ua_string)
-      ua_string.match(/MSIE (\S+)/)[1].to_f
-    end
- 
-    def kick_it
-      [301, {'Location' => @options[:redirect]}, 'Fail browser is fail']
-    end
-  end
-end
-
-use Rack::NoIE, :redirect => Glog.config['plugins']['no_ie']

data/spec/glog_spec.rb

@@ -1,82 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "Glog" do
-
-  let(:app) { create_from_fixture('example') }
-
-  it "should have config accessor" do
-    Glog.config = 'config'
-    Glog.config.should == 'config'
-  end
-
-  describe "Glog::Page" do
-    describe "Page.root" do
-      it "should return root page defined in Glog.config" do
-        Glog::Page.root.title.should == 'Hello All'
-      end
-    end
-    
-    describe "#template_path" do
-      describe "when template defined in file" do
-        it "should return templates/{Page#template}.haml" do
-          page = Glog::Page.get('template_test/template1_test')
-          page.should_not be_nil
-          page.template_path.should == 'templates/template1.haml'
-        end
-      end
-      
-      describe "when Page#template is undefined" do
-        it "should should use default.html from tepmlates/{Page#parent}" do
-          page = Glog::Page.get("template_test/undefined_template")
-          page.parent.should == 'template_test'
-          page.template_path.should == "templates/#{page.parent}/default.haml"
-        end
-        
-        describe "if there is no defaut.html in templats/{Page#parent}" do
-          it "should inherit default.html template from parent dirs" do
-            page = Glog::Page.get("template_test/deep/template")
-            page.parent.should == 'template_test/deep'
-            page.template_path.should == "templates/template_test/default.haml"
-            # And very deep page...
-            page = Glog::Page.get("deep/deep/deep/page/with/undefined/template/here")
-            page.parent.should == 'deep/deep/deep/page/with/undefined/template'
-            page.template_path.should == "templates/default.haml"
-          end
-        end        
-      end      
-    end
-  end
-
-  describe "Glog::Server" do
-    include Rack::Test::Methods
-        
-    describe "GET /" do
-      it "should be ok" do
-        get '/'
-        last_response.should be_ok
-      end
-      
-      it "should render text from page defined as root in Glog.config" do
-        get '/'
-        last_response.body.should =~ /Hello All/
-      end
-    end
-    
-    describe "GET /some/dir" do
-      it "should try to render /some/dir/index if index exists" do
-        dir = 'spec/fixtures/example/pages/epo/2010'
-        File.exists?(dir).should be_true
-        File.directory?(dir).should be_true
-        get '/epo/2010'
-        last_response.should be_ok
-        last_response.body.should match(/this is index/)
-      end
-      
-      it "should return 404 if no index found" do
-        get '/epo/2010'
-        last_response.should be_ok
-        last_response.body.should match(/this is index/)
-      end
-    end
-  end # describe Server
-end # describe Glog

data/spec/spec_helper.rb

@@ -1,18 +0,0 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-require 'rubygems'
-require 'glog'
-require 'spec'
-require 'spec/autorun'
-require 'spec/interop/test'
-require 'rack/test'
-
-def create_from_fixture(name)
-  Dir.chdir(File.join(File.dirname(__FILE__), "fixtures", name))
-  Glog.config = YAML.load_file('glog.yaml')
-  @app = Glog::Server.new
-end
-
-Spec::Runner.configure do |config|
-end