RubyGems - milk - Versions diffs - 0.0.4 → 0.0.5 - Mend

milk 0.0.4 → 0.0.5

Files changed (11) hide show

data/lib/milk.rb CHANGED

@@ -7,22 +7,29 @@ autoload 'FileUtils', 'fileutils'
 # Set up our main namespace with autoloaded parts
 module Milk
-  VERSION = '0.0.1'
+  VERSION = '0.0.5'
   LIB_DIR = File.dirname(__FILE__)
-  BIN_DIR = File.absolute_path(File.dirname(__FILE__)+"/../../local/bin")
+  BIN_DIR ||= File.absolute_path(File.dirname(__FILE__)+"/../../local/bin")
   def self.get_milk_root
     c = caller(1).collect { |line| line.split(':').first }
     c = c.select { |line| line !~ /\/gems\// }
     File.absolute_path(File.dirname(c.first))
   end
-  MILK_ROOT ||= get_milk_root
-  COMPONENTS_DIR = MILK_ROOT + "/design"
-  PAGES_DIR = MILK_ROOT + "/pages"
+  MILK_ROOT = get_milk_root
   CONFIG_DIR = MILK_ROOT + "/config"
-  PUBLIC_DIR = MILK_ROOT + "/public"
-  FIELDS_DIR = LIB_DIR + "/milk/fields"
+  # Load overrides from config file
+  YAML.load(open(CONFIG_DIR+"/config.yaml")).each_pair do |key, value|
+    eval("#{key} = #{value.inspect}")
+  end
+  # Set defaults otherwise
+  COMPONENTS_DIR ||= MILK_ROOT + "/design"
+  PAGES_DIR ||= MILK_ROOT + "/pages"
+  PUBLIC_DIR ||= MILK_ROOT + "/public"
+  FIELDS_DIR ||= LIB_DIR + "/milk/fields"
   $LOAD_PATH.unshift(LIB_DIR) unless $LOAD_PATH.include?(LIB_DIR)
   autoload :Application, "milk/application"
   autoload :Component, "milk/component"

data/lib/milk/application.rb CHANGED

@@ -1,12 +1,11 @@
 module Milk
   class Application
-    PAGE_PATH_REGEX = /^\/([A-Z][a-zA-Z]+(\/[A-Z][a-zA-Z]+)*)+\/*$/
-    EDIT_PATH_REGEX = /^\/([A-Z][a-zA-Z]+(\/[A-Z][a-zA-Z]+)*)+\/edit\/*$/
-    HAXE_PATH_REGEX = /^\/(.*).hx$/
+    PAGE_PATH_REGEX = /^\/([a-zA-Z0-9_]+(\/[a-zA-Z0-9_]+)*)+\/*$/
+    EDIT_PATH_REGEX = /^\/([a-zA-Z0-9_]+(\/[a-zA-Z0-9_]+)*)+\/edit\/*$/
-    def route(req)
-      path = req.path_info
+    def route
+      path = @req.path_info
       if path == '/'
         # Special case for root
@@ -18,29 +17,31 @@ module Milk
       # Route the request to the right callback
       action = case
-        when req.get?
+        when @req.get?
           case
-            when path =~ HAXE_PATH_REGEX
-              regex = HAXE_PATH_REGEX
-              :haxe
-            when path =~ PAGE_PATH_REGEX
-              regex = PAGE_PATH_REGEX
-              :view
+            when path == "/logout"
+              :logout
             when path =~ EDIT_PATH_REGEX
               regex = EDIT_PATH_REGEX
               :edit
+            when path =~ PAGE_PATH_REGEX
+              regex = PAGE_PATH_REGEX
+              :view
           end
-        when req.delete?
+        when @req.delete?
           if path =~ PAGE_PATH_REGEX
             regex = PAGE_PATH_REGEX
             :delete
           end
-        when req.post?
+        when @req.post?
           if path =~ PAGE_PATH_REGEX
             regex = PAGE_PATH_REGEX
             :preview
           end
-        when req.put?
+          if path == '/login'
+            :login
+          end
+        when @req.put?
           if path =~ PAGE_PATH_REGEX
             regex = PAGE_PATH_REGEX
             :save
@@ -52,57 +53,130 @@ module Milk
       if (action == :view || action == :edit)
         begin
           page = Milk::Page.find(page_name)
+          page.instance_variable_set(:@app, self)
         rescue Milk::PageNotFoundError
           action = :not_found
         end
       end
-      if (action == :haxe)
-        begin
-          page = Milk::Haxe.new(page_name)
-        rescue Milk::PageNotFoundError
-          action = :not_found
-        end
-      end
       if (action == :preview || action == :save)
-        page = Milk::Page.json_unserialize(YAML.load(req.body.read), page_name)
+        page = Milk::Page.json_unserialize(YAML.load(@req.body.read), page_name)
+        page.instance_variable_set(:@app, self)
       end
+      if !@user && [:edit, :save, :delete].include?(action)
+        action = :login_form
+      end
       return action, page_name, page
     end
+    def obfuscate(value)
+      require 'base64'
+      len = Milk::SECRET.length
+      result = (0...value.length).collect { |i| value[i].ord ^ Milk::SECRET[i%len].ord }
+      Base64.encode64(result.pack("C*"))
+    end
+    def decode(code)
+      require 'base64'
+      len = Milk::SECRET.length
+      value = Base64.decode64(code)
+      result = (0...value.length).collect { |i| value[i].ord ^ Milk::SECRET[i%len].ord }
+      result.pack("C*")
+    end
+    def hash(email, password)
+      require 'digest/md5'
+      Digest::MD5.hexdigest("#{password}")
+    end
+    def logout()
+      @resp.delete_cookie('auth', :path => "/")
+      @resp.redirect(@req.params['dest'])
+    end
+    def flash(message=nil)
+      @resp.delete_cookie('flash', :path => "/") unless message
+      @resp.set_cookie('flash', :path => "/", :value => message) if message
+      @req.cookies['flash']
+    end
+    def login()
+      email = @req.params['email']
+      user = users[email]
+      if user
+        expected = user["hash"]
+        actual = hash(email, @req.params['password'])
+        if actual == expected
+          @resp.set_cookie('auth', :path => "/", :value => obfuscate(email))
+        else
+          flash "Incorrect password for user #{email}"
+        end
+      else
+        flash "User #{email} not found"
+      end
+      @resp.redirect(@req.params['dest'])
+    end
+    def users
+      users_file = Milk::CONFIG_DIR+"/users.yaml"
+      YAML.load(open(users_file).read)
+    end
+    def load_user
+      @user = nil
+      if current = @req.cookies['auth']
+        email = decode(current)
+        @user = users[email]
+        @resp.delete_cookie('auth', :path => "/") unless @user
+      end
+    end
     # Rack call interface
     def call(env)
-      req = Rack::Request.new(env)
+      @req = Rack::Request.new(env)
+      @resp = Rack::Response.new
+      load_user
       # Route the request
-      action, page_name, page = route(req)
+      action, page_name, @page = route
       # Send proper mime types for browsers that claim to accept it
+      @resp["Content-Type"] =
       if env['HTTP_ACCEPT'].include? "application/xhtml+xml"
-        html_type = "application/xhtml+xml"
+        "application/xhtml+xml"
       else
-        html_type = "text/html"
+        "text/html"
       end
-#      html_type = "text/html"
       case action
-        when :haxe
-          [200, {"Content-Type"=>"application/x-shockwave-flash"}, [page]]
         when :not_found
-          [404, {"Content-Type"=>html_type}, [Milk::Page.find('NotFound').view]]
+          @resp.status = 404
+          @resp.write Milk::Page.find('NotFound').view
         when :view
-          [200, {"Content-Type"=>html_type}, [page.view]]
+          @resp.write @page.view
         when :edit
-          [200, {"Content-Type"=>html_type}, [page.edit]]
+          @resp.write @page.edit
         when :save
-          [200, {"Content-Type"=>html_type}, [page.save]]
+          @resp.write @page.save
         when :preview
-          [200, {"Content-Type"=>html_type}, [page.preview]]
+          @resp.write @page.preview
+        when :login_form
+          filename = FIELDS_DIR + "/login.haml"
+          @resp.write(::Haml::Engine.new(File.read(filename), :filename => filename).render(self))
+        when :login
+          login
+        when :logout
+          logout
+        when :access_denied
+          @resp.staus = 403
+          @resp.write "Access Denied"
         else
-          [500, {"Content-Type"=>html_type}, [action.to_s]]
+          @resp.status = 500
+          @resp.write action.to_s
       end
+      @resp.finish
     end
   end

data/lib/milk/fields/login.haml ADDED

@@ -0,0 +1,79 @@
+!!! xml
+!!! 1.1
+%html{:xmlns =>"http://www.w3.org/1999/xhtml"}
+  %head
+    %title Please Login
+    %style{:type=>"text/css"}
+      :sass
+        !width = 400
+        !height = 150
+        table, #shadow, .ui-widget-shadow
+          :width = !width + "px"
+          :height = !height + "px"
+        table, #shadow
+          :position absolute
+          :top 50%
+          :left 50%
+          :margin
+            :top = (-!height/2)+"px"
+            :left = (-!width/2)+"px"
+        #flash
+          :padding 0pt 0.7em
+          span
+            :float left
+            :margin-right 0.3em
+        button
+          :cursor pointer
+          :line-height 1em
+          :padding 2px 5px 2px 2px
+          .ui-icon
+            :float left
+            :line-height 1em
+    %link{ :rel => "shortcut icon", :href => "/favicon.ico", :type => "image/x-icon"}/
+    %link{ :href => "http://static.creationix.com/skins/ui-lightness/jquery-ui-1.7.1.custom.css", :media => "screen", :rel => "stylesheet", :type => "text/css" }/
+    %link{ :href => "/style/style.css", :media => "screen", :rel => "stylesheet", :type => "text/css" }/
+    %script{:src=>"http://static.creationix.com/scripts/jquery-1.3.2.min.js", :type=>"text/javascript"}
+    %script{:src=>"http://static.creationix.com/scripts/jquery.json-1.3.min.js", :type=>"text/javascript"}
+    %script{:src=>"http://static.creationix.com/scripts/jquery-ui-1.7.1.custom.min.js", :type=>"text/javascript"}
+  %body
+    - if f = flash
+      #flash{:class => "ui-state-error ui-corner-all"}
+        %p
+          %span{:class => "ui-icon ui-icon-alert"}
+          %strong Alert:
+          &= f
+    %form{:action => "/login", :method=>"post"}
+      %input{:type=>"hidden", :name => "dest", :value => @req.path_info}
+      #shadow
+        .ui-widget-shadow
+      %table{:class => "ui-widget ui-widget-content ui-corner-all"}
+        %thead
+          %tr
+            %th{:colspan=>2, :class=>"ui-widget-header ui-corner-all"}
+              &= "Please Login to edit '#{@page.pagename}'"
+        %tr
+          %th Email
+          %td
+            %input{:name => "email"}
+        %tr
+          %th Password
+          %td
+            %input{:type=>"password", :name => "password"}
+        %tr
+          %th
+          %td
+            %button{:type =>"submit", :title=>'Login to the backend to edit this page.'}
+              %span{:class=>'ui-icon ui-icon-unlocked'}
+              Login
+    :javascript
+      $(function() {
+       $("button")
+        .addClass("ui-state-default ui-corner-all")
+        .hover(
+          function() { $(this).addClass('ui-state-hover'); },
+          function() { $(this).removeClass('ui-state-hover'); }
+        );
+      });

data/lib/milk/fields/xhtml.haml CHANGED

@@ -130,6 +130,9 @@
           %button#cancel_button.toolitem{:title=>'Cancel changes and go to live page.'}
             %span{:class=>'ui-icon ui-icon-cancel'}
             Cancel
+          %button#logout_button.toolitem{:title=>'Cancel changes and logout and go to live page.'}
+            %span{:class=>'ui-icon ui-icon-circle-close'}
+            Logout
       #preview
         = preview
       #divider
@@ -244,6 +247,9 @@
         $("#cancel_button").click(function(){
           window.location = $("form")[0].action;
         });
+        $("#logout_button").click(function(){
+          window.location = "/logout?dest="+$("form")[0].action;
+        });
         $(".component").click(function(evt){
           evt.stopPropagation();

data/{Rakefile → milk.gemspec} RENAMED

@@ -1,23 +1,22 @@
-require 'rake/gempackagetask'
-spec = Gem::Specification.new do |s|
+Gem::Specification.new do |s|
   s.rubyforge_project = "milk"
   s.name       = "milk"
   s.summary    = "Milk is a rack based content management system built for ease of use and simplicity. Milk tastes great with and without cookies."
-  s.description= File.read(File.join(File.dirname(__FILE__), 'README'))
+  s.description= "Milk is a rack based cms system built for ease of use and simplicity. Milk
+tastes great with and without cookies. The public facing aspect is static html
+files, and the admin side is super easy to use."
   s.requirements << 'none'
-  s.version     = "0.0.4"
+  s.version     = "0.0.5"
   s.author      = "Tim Caswell"
   s.email       = "tim@creationix.com"
   s.homepage    = "http://milk.rubyforge.org"
   s.platform    = Gem::Platform::RUBY
   s.required_ruby_version = '>=1.9'
   s.files       = Dir['**/**']
-  s.executables = [ 'milk' ]
   s.add_dependency('rack', '>= 1.0.0')
   s.add_dependency('maruku', '>= 0.6.0')
   s.add_dependency('haml', '>= 2.0.9')
   s.test_files = Dir["test/test*.rb"]
-  s.has_rdoc    = false
+  s.has_rdoc    = true
 end
-Rake::GemPackageTask.new(spec).define

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: milk
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Tim Caswell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2009-06-11 00:00:00 -05:00
+date: 2009-06-16 00:00:00 -05:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -44,8 +44,8 @@ dependencies:
     version:
 description: Milk is a rack based cms system built for ease of use and simplicity. Milk tastes great with and without cookies. The public facing aspect is static html files, and the admin side is super easy to use.
 email: tim@creationix.com
-executables:
-- milk
+executables: []
 extensions: []
 extra_rdoc_files: []
@@ -62,6 +62,7 @@ files:
 - lib/milk/fields/page_chooser.haml
 - lib/milk/fields/text_field.rb
 - lib/milk/fields/image_chooser.haml
+- lib/milk/fields/login.haml
 - lib/milk/fields/text_field.haml
 - lib/milk/fields/sprite_chooser.rb
 - lib/milk/fields/xhtml.haml
@@ -82,15 +83,8 @@ files:
 - lib/milk/templates/rackup
 - lib/milk.rb
 - LICENSE
-- README
-- pkg
-- pkg/milk-0.0.3.gem
-- Rakefile
-- Milk.tmproj
-- INSTALL
-- bin
-- bin/milk
-has_rdoc: false
+- milk.gemspec
+has_rdoc: true
 homepage: http://milk.rubyforge.org
 post_install_message:
 rdoc_options: []

data/INSTALL DELETED

@@ -1,8 +0,0 @@
-To install:
-  rake gem
-  sudo gem install pkg/milk-0.0.1.gem
-This should install milk, all it's dependencies and the `milk` command line tool
-to generate new sites.

data/Milk.tmproj DELETED

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>currentDocument</key>
-	<string>lib/milk/page.rb</string>
-	<key>documents</key>
-	<array>
-		<dict>
-			<key>expanded</key>
-			<true/>
-			<key>name</key>
-			<string>Milk</string>
-			<key>regexFolderFilter</key>
-			<string>!.*/(\.[^/]*|CVS|_darcs|_MTN|\{arch\}|blib|.*~\.nib|.*\.(framework|app|pbproj|pbxproj|xcode(proj)?|bundle))$</string>
-			<key>selected</key>
-			<true/>
-			<key>sourceDirectory</key>
-			<string></string>
-		</dict>
-	</array>
-	<key>fileHierarchyDrawerWidth</key>
-	<integer>200</integer>
-	<key>metaData</key>
-	<dict>
-		<key>lib/milk.rb</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>12</integer>
-				<key>line</key>
-				<integer>19</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>10</integer>
-		</dict>
-		<key>lib/milk/page.rb</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>2</integer>
-				<key>line</key>
-				<integer>6</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-	<key>openDocuments</key>
-	<array>
-		<string>lib/milk.rb</string>
-		<string>lib/milk/page.rb</string>
-	</array>
-	<key>showFileHierarchyDrawer</key>
-	<true/>
-	<key>windowFrame</key>
-	<string>{{281, 240}, {840, 469}}</string>
-</dict>
-</plist>

data/README DELETED

@@ -1,3 +0,0 @@
-Milk is a rack based cms system built for ease of use and simplicity. Milk
-tastes great with and without cookies. The public facing aspect is static html
-files, and the admin side is super easy to use.

data/bin/milk DELETED

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-require 'milk'
-p MILK

data/pkg/milk-0.0.3.gem DELETED

Binary file