siterest 0.1.0.pre6 → 0.1.0.pre8

data/Gemfile

@@ -1,9 +1,17 @@
-source "http://rubygems.org"
+source :rubygems
+
 gem 'h2o'
-gem 'activeresource', '~> 3.0.0.beta4'
+gem 'activeresource', '~> 3.0.0'
 gem 'launchy'
 gem 'sinatra'
 gem 'mime-types', :require => 'mime/types'
 gem 'rest-client'
 gem 'rdiscount'
-# gem 'encoded_attachment', :git => 'http://github.com/nragaz/encoded_attachment.git'
+gem 'rspec'
+
+gem 'will_paginate', '>= 3.0.pre2'
+# gem 'encoded_attachment', :git => 'http://github.com/nragaz/encoded_attachment.git'
+
+group :test do
+  gem 'ruby-debug19', :require => 'ruby-debug'
+end

data/Gemfile.lock

@@ -1,38 +1,67 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.0.rc)
-      activesupport (= 3.0.0.rc)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activeresource (3.0.0.rc)
-      activemodel (= 3.0.0.rc)
-      activesupport (= 3.0.0.rc)
-    activesupport (3.0.0.rc)
+      i18n (~> 0.4)
+    activeresource (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+    activesupport (3.0.5)
+    archive-tar-minitar (0.5.2)
     builder (2.1.2)
-    configuration (1.1.0)
-    h2o (0.2)
-    i18n (0.4.1)
-    launchy (0.3.5)
+    columnize (0.3.2)
+    configuration (1.2.0)
+    diff-lcs (1.1.2)
+    h2o (0.3.1)
+    i18n (0.5.0)
+    launchy (0.4.0)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
+    linecache19 (0.5.11)
+      ruby_core_source (>= 0.1.4)
     mime-types (1.16)
-    rack (1.2.1)
+    rack (1.2.2)
     rake (0.8.7)
-    rdiscount (1.6.5)
-    rest-client (1.4.2)
+    rdiscount (1.6.8)
+    rest-client (1.6.1)
       mime-types (>= 1.16)
-    sinatra (1.0)
-      rack (>= 1.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
+    ruby-debug-base19 (0.11.24)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.4)
+      archive-tar-minitar (>= 0.5.2)
+    sinatra (1.2.0)
+      rack (~> 1.1)
+      tilt (>= 1.2.2, < 2.0)
+    tilt (1.2.2)
+    will_paginate (3.0.pre2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activeresource (~> 3.0.0.beta4)
+  activeresource (~> 3.0.0)
   h2o
   launchy
   mime-types
   rdiscount
   rest-client
+  rspec
+  ruby-debug19
   sinatra
+  will_paginate (>= 3.0.pre2)

data/Rakefile

@@ -8,8 +8,9 @@ begin
     s.email = "taylor.luk@idealian.net"
     s.homepage = "http://www.siterest.com"
     s.authors = ["Taylor luk"]
-    s.add_dependency 'h2o'
-    s.add_dependency 'activeresource', '~> 3.0.0.beta4'
+    s.add_dependency 'h2o', '~> 0.3'
+    s.add_dependency 'will_paginate', '~> 3.0.pre2'
+    s.add_dependency 'activeresource', '~> 3.0.0'
     s.add_dependency 'launchy'
     s.add_dependency 'sinatra'
     s.add_dependency 'rest-client'

data/VERSION

@@ -1 +1 @@
-0.1.0.pre6
+0.1.0.pre8

data/data/articles/2008-04-24-my-first-blog-post.md

@@ -0,0 +1,15 @@
+---
+  title: This is my first blog post about this issue
+  excerpt: What every happens already happened, why are you so mad at yourself.
+  tags: [something, else]
+---
+
+Hello world
+----
+
+What every you do and don't panic
+
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

data/data/pages/about-us.md

@@ -0,0 +1,12 @@
+---
+  title: About us
+  tags: [one, two]
+---
+  
+We are idealian
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+

data/data/pages/contact.md

@@ -0,0 +1,12 @@
+---
+  title: Contact us
+---
+
+contact us
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+email 

data/data/pages/home.md

@@ -0,0 +1,14 @@
+---
+  title: Welcome to my website
+  tags: one, two
+---
+
+Welcome
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+

data/data/site.yaml

@@ -0,0 +1,2 @@
+title: Example site
+host: www.example.com

data/lib/siterest.rb

@@ -1,7 +1,7 @@
-require "rubygems"
+#require "rubygems"
 
-# require "bundler"
-# Bundler.setup
+#require "bundler"
+#Bundler.setup 
 
 require 'yaml'
 require 'h2o'
@@ -11,6 +11,7 @@ require 'rest_client'
 require 'yaml'
 require 'rdiscount'
 require 'ostruct'
+require 'rspec'
 
 module Siterest
 
@@ -23,10 +24,12 @@ module Siterest
   autoload :User, 'siterest/user'
   autoload :Site, 'siterest/site'
   
+  require 'siterest/template/paginate'
   # load template api
   require 'siterest/template/objects/site'
   require 'siterest/template/objects/page'
   require 'siterest/template/objects/article'
+  require 'siterest/template/objects/tag'
 
   # load filters
   require 'siterest/template/filters/core_filters'
@@ -53,4 +56,4 @@ module Siterest
     "#{self.url}/sites/:subdomain"
   end
 
-end
+end

data/lib/siterest/client.rb

@@ -84,7 +84,31 @@ module Siterest
       require 'siterest/asset'
 
       Dir.glob("assets/*/*").each do |filename|
+        
+        puts "processing #{filename}..."
+        
+        existing = Asset.first(:params => {
+          :subdomain => site, :search => {:data_file_name_eq => File.basename(filename)}
+        })
+        
+        if existing
+          existing.data = open(filename)
+          existing.save
+        else
+          Asset.create(:data => open(filename), :subdomain => site, :layout => true)
+        end
+        
+        puts "#{existing ? 'Updated' : 'Created'} #{filename}"
+      end
+    end
+    
+    def push_stylesheets(site)
+      require 'siterest/asset'
 
+      Dir.glob("assets/stylesheets/*").each do |filename|
+        
+        puts "processing #{filename}..."
+        
         existing = Asset.first(:params => {
           :subdomain => site, :search => {:data_file_name_eq => File.basename(filename)}
         })
@@ -100,9 +124,60 @@ module Siterest
       end
     end
     
-    def request_path
-      
+    def push_javascripts(site)
+      require 'siterest/asset'
+
+      Dir.glob("assets/javascripts/*").each do |filename|
+        
+        puts "processing #{filename}..."
+        
+        existing = Asset.first(:params => {
+          :subdomain => site, :search => {:data_file_name_eq => File.basename(filename)}
+        })
+        
+        if existing
+          existing.data = open(filename)
+          existing.save
+        else
+          Asset.create(:data => open(filename), :subdomain => site, :layout => true)
+        end
+        
+        puts "#{existing ? 'Updated' : 'Created'} #{filename}"
+      end
+    end
+    
+    def push_pages(site)
+      pages = Page.all
+      debugger
+      pages.each do |p|
+        puts "processing #{p.title}..."
+        
+        existing = Page.first(:params => {
+          :subdomain => site, :search => {:permalink_eq => p.permalink}
+        })
+        
+        data = {
+          :title => p.title,
+          :body => p.body_source,
+          :template => p.template,
+          :tag_list => p.tags,
+          :subdomain => site,
+          :status => "published"
+        }
+
+        if existing
+          existing.update_attributes(data)
+        else
+          Page.create(data)
+        end
+        
+        puts "#{existing ? 'Updated' : 'Created'} #{filename}"
+      end
     end
+    
+    # def request_path
+    #   
+    # end
 
     private 
       def templates_path

data/lib/siterest/command.rb

@@ -41,7 +41,7 @@ module Siterest
       put "API token: ", false
       token = input.gets.chomp
       
-      put "Server (default: http://api.siterest.com): ", false
+      put "Server (default: https://api.siterest.com): ", false
       server = input.gets.chomp
       
       server = server == '' ? 'https://api.siterest.com' : server
@@ -82,6 +82,91 @@ module Siterest
       end
     end
     
+    def push_templates
+      site = self.args.shift
+      
+      put "Are you sure you want to overwrite your site design template(type in yes)"
+      
+      put "[yes|no]: ", false
+      answer = input.gets.chomp
+      
+      if answer == 'yes'
+        put "Pushing templates..."
+        
+        client.push_templates(site)
+      else
+        put 'May be next time'
+      end
+    end
+    
+    def push_assets
+      site = self.args.shift
+      
+      put "Are you sure you want to overwrite your site assets(type in yes)"
+      
+      put "[yes|no]: ", false
+      answer = input.gets.chomp
+      
+      if answer == 'yes'
+        put "Pushing assets..."
+        
+        client.push_assets(site)
+      else
+        put 'May be next time'
+      end
+    end
+    
+    def push_stylesheets
+      site = self.args.shift
+      
+      put "Are you sure you want to overwrite your site assets/stylesheets (type in yes)"
+      
+      put "[yes|no]: ", false
+      answer = input.gets.chomp
+      
+      if answer == 'yes'
+        put "Pushing assets/stylesheets..."
+        
+        client.push_stylesheets(site)
+      else
+        put 'May be next time'
+      end
+    end
+    
+    def push_javascripts
+      site = self.args.shift
+      
+      put "Are you sure you want to overwrite your site assets/javascripts (type in yes)"
+      
+      put "[yes|no]: ", false
+      answer = input.gets.chomp
+      
+      if answer == 'yes'
+        put "Pushing assets/javascripts..."
+        
+        client.push_javascripts(site)
+      else
+        put 'May be next time'
+      end
+    end
+    
+    def push_pages
+      site = self.args.shift
+      
+      put "Are you sure you want to overwrite your site data/pages (type in yes)"
+      
+      put "[yes|no]: ", false
+      answer = input.gets.chomp
+      
+      if answer == 'yes'
+        put "Pushing data/page"
+        
+        client.push_pages(site)
+      else
+        put 'May be next time'
+      end
+    end
+    
     def help
       put <<-TEXT
     

data/lib/siterest/page.rb

@@ -0,0 +1,6 @@
+module Siterest
+  class Page < ActiveResource::Base
+    self.site = Siterest.site_resource_url
+    self.user = Siterest.token
+  end
+end

data/lib/siterest/server.rb

@@ -2,11 +2,6 @@ require 'rubygems'
 require 'sinatra/base'
 require 'cgi'
 
-# require 'h2o'
-# require 'yaml'
-# require 'rdiscount'
-# require 'ostruct'
-
 module Siterest
   class Server < Sinatra::Base
     set :public, 'assets'
@@ -15,8 +10,8 @@ module Siterest
       render_h2o 'home.html', :page => Page.find('home')
     end
 
-    get %r{/(news|blog)} do
-      render_h2o 'list.html', :collection => Article.all
+    get %r{/(news|blog)$} do
+      render_h2o 'list.html', :collection => Article.all.paginate(:page => params[:page])
     end
 
     get %r{^/(\d{4})(?:/(\d{2}))$} do
@@ -36,15 +31,16 @@ module Siterest
         a.tags.include?(params[:tag])
       end
       
-      render_h2o 'list.html', :collection => results
+      render_h2o 'list.html', :collection => results.paginate(:page => params[:page])
     end
 
     get '/:year/:month/:permalink' do
       render_h2o 'article.html', :page => Article.find(request.path_info[1..-1])
     end
 
-    get '/:permalink' do
-      render_h2o 'page.html', :page => Page.find(params[:permalink])
+    get '/*' do
+      page = Page.find(*params[:splat])
+      render_h2o page.template, :page => page
     end
   end
 end
@@ -53,6 +49,6 @@ def render_h2o(template, context = {})
   global = {
     :site => Site.new(YAML.load_file('data/site.yaml'))
   }
-  template = H2o::Template.new("templates/#{template}")
+  template = H2o::Template.new(template, :searchpath => 'templates/')
   template.render global.merge(context)
 end

data/lib/siterest/template/filters/core_filters.rb

@@ -1,5 +1,5 @@
 module CoreFilters
-  
+  require "active_support/inflector"
   # String filters
   def upper string
     string.to_s.upcase
@@ -43,6 +43,9 @@ module CoreFilters
   end
   
   #String Filters
+  def slugify(string)
+    ActiveSupport::Inflector.parameterize(string) unless string.nil?
+  end
   # def raw(stringish)
   #   stringish.to_s.html_safe
   # end

data/lib/siterest/template/filters/url_filters.rb

@@ -47,6 +47,7 @@ module UrlFilters
     "<a #{html_attr_for(attributes)}>#{anchor}</a>"
   end
 
+
   # Paginate collection
   # * <tt>:previous_label</tt> -- default: "« Previous" (this parameter is called <tt>:prev_label</tt> in versions <b>2.3.2</b> and older!)
   # * <tt>:next_label</tt> -- default: "Next »"
@@ -57,7 +58,10 @@ module UrlFilters
   #
   def paginate(collection, options = {})
     options[:request_uri] = @context.resolve(:request_uri)
-    Paginator.new.will_paginate(collection, options)
+    options[:per_page] = 5
+    
+    renderer = Object.new.send(:extend, WillPaginate::ViewHelpers::H2oCompatible)
+    renderer.will_paginate(collection, options)
   end
 
   private
@@ -74,9 +78,4 @@ module UrlFilters
     end
 
   H2o::Filters << self
-end
-# 
-# class Paginator
-#   include ActionView::Helpers::TagHelper
-#   include WillPaginate::H2oCompatible::ViewHelpers
-# end
+end

data/lib/siterest/template/objects/article.rb

@@ -1,7 +1,13 @@
 
 class Article < OpenStruct
-  h2o_expose :title, :body, :excerpt, :author_name, :url, :permalink, :created_at, :published_at
+  h2o_expose :title, :body, :excerpt, :author_name, :url, :permalink, :created_at, :published_at, :tags
 
+  def tags
+    @table[:tags].map do |tag|
+      Tag.new(:name => tag)
+    end
+  end
+  
   def self.all
     Dir.glob("data/articles/*.md").map do |path|
       build(path)

data/lib/siterest/template/objects/page.rb

@@ -1,5 +1,9 @@
 class Page < OpenStruct
-  h2o_expose :title, :body, :url, :permalink, :created_at, :published_at, :children
+  h2o_expose :title, :body, :url, :permalink, :created_at, :published_at, :children, :template
+
+  def template
+    @table[:template] || 'page.html'
+  end
 
   def self.all
     cache = {}
@@ -50,6 +54,11 @@ class Page < OpenStruct
 
   def self.build_content(filename)
     source = File.read(filename)
+    
+    if "1.9".respond_to? :encode
+      source = source.force_encoding('binary') 
+    end
+
     meta, content = source.split(/---\n(.+?)---/sm)[1,2]
 
     if meta
@@ -59,7 +68,10 @@ class Page < OpenStruct
     end
 
     attributes.merge(
+      'body_source' => content,
       'body' => content && RDiscount.new(content).to_html,
+      'status' => 'published',
+      'tag_list' => attributes['tags'],
       'published_at' => attributes['published_at'] || File.mtime(filename)
     )
   end

data/lib/siterest/template/objects/tag.rb

@@ -0,0 +1,7 @@
+class Tag < OpenStruct
+  h2o_expose :name, :url
+  
+  def url
+    "/tags/#{CGI.escape(self.name)}"
+  end
+end

data/lib/siterest/template/paginate.rb

@@ -0,0 +1,33 @@
+require 'will_paginate/view_helpers/link_renderer'
+require 'will_paginate/view_helpers/base'
+
+module WillPaginate
+  module ViewHelpers
+    module H2oCompatible
+      include WillPaginate::ViewHelpers::Base
+      
+      def will_paginate(collection, options = {})
+        options[:renderer] = H2oLinkRenderer
+        super(collection, options)
+      end
+      
+      class H2oLinkRenderer < ::WillPaginate::ViewHelpers::LinkRenderer
+        def url(page)
+          request_uri = @options[:request_uri]
+          uri = URI.parse(request_uri)
+          params = Rack::Utils.parse_query(uri.query)
+        
+          if page > 1
+            params['page'] = page
+          else
+            params.delete('page')
+            return uri.path if params.empty?
+          end
+          uri.query = Rack::Utils.build_query(params)        
+          uri.to_s
+        end
+      end
+    end
+   
+  end
+end

data/lib/upfile.rb

@@ -16,10 +16,10 @@ module Upfile
     when "csv", "xml", "css"       then "text/#{type}"
     else
       # On BSDs, `file` doesn't give a result code of 1 if the file doesn't exist.
-      content_type = (Paperclip.run("file", "--mime-type :file", :file => self.path).split(':').last.strip rescue "application/x-#{type}")
-      content_type = "application/x-#{type}" if content_type.match(/\(.*?\)/)
-      content_type
+      content_type = `file --mime --brief #{self.path}`.split(';').first
     end
+  rescue
+    'application/octet-stream'
   end
 
   # Returns the file's normal name.

data/siterest.gemspec

@@ -1,89 +1,121 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{siterest}
-  s.version = "0.1.0.pre6"
+  s.version = "0.1.0.pre8"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Taylor luk"]
-  s.date = %q{2010-08-19}
+  s.date = %q{2011-03-14}
   s.default_executable = %q{siterest}
   s.description = %q{Simple content service}
   s.email = %q{taylor.luk@idealian.net}
   s.executables = ["siterest"]
   s.files = [
     "Gemfile",
-     "Gemfile.lock",
-     "Rakefile",
-     "VERSION",
-     "bin/siterest",
-     "config.ru",
-     "lib/encoded_attachment/.gitignore",
-     "lib/encoded_attachment/Gemfile",
-     "lib/encoded_attachment/LICENSE",
-     "lib/encoded_attachment/README.md",
-     "lib/encoded_attachment/Rakefile",
-     "lib/encoded_attachment/encoded_attachment.gemspec",
-     "lib/encoded_attachment/lib/activerecord/base.rb",
-     "lib/encoded_attachment/lib/activeresource/base.rb",
-     "lib/encoded_attachment/lib/activeresource/connection.rb",
-     "lib/encoded_attachment/lib/encoded_attachment.rb",
-     "lib/encoded_attachment/lib/encoded_attachment/version.rb",
-     "lib/encoded_attachment/test/active_record_test.rb",
-     "lib/encoded_attachment/test/active_resource_test.rb",
-     "lib/encoded_attachment/test/avatars/.gitignore",
-     "lib/encoded_attachment/test/config/database.yml",
-     "lib/encoded_attachment/test/config/schema.rb",
-     "lib/encoded_attachment/test/fixtures/kitten.jpg",
-     "lib/encoded_attachment/test/fixtures/tapir.jpg",
-     "lib/encoded_attachment/test/test_helper.rb",
-     "lib/siterest.rb",
-     "lib/siterest/asset.rb",
-     "lib/siterest/client.rb",
-     "lib/siterest/command.rb",
-     "lib/siterest/server.rb",
-     "lib/siterest/site.rb",
-     "lib/siterest/template.rb",
-     "lib/siterest/template/filters/core_filters.rb",
-     "lib/siterest/template/filters/datetime_filters.rb",
-     "lib/siterest/template/filters/url_filters.rb",
-     "lib/siterest/template/objects/article.rb",
-     "lib/siterest/template/objects/page.rb",
-     "lib/siterest/template/objects/site.rb",
-     "lib/siterest/user.rb",
-     "lib/upfile.rb",
-     "readme.md",
-     "site/data/articles/2008-04-24-my-first-blog-post.md",
-     "site/data/pages/about-us.md",
-     "site/data/pages/about-us/something.md",
-     "site/data/pages/contact.md",
-     "site/data/pages/home.md",
-     "site/data/site.yaml",
-     "siterest.gemspec"
+    "Gemfile.lock",
+    "Rakefile",
+    "VERSION",
+    "bin/siterest",
+    "config.ru",
+    "data/articles/2008-04-24-my-first-blog-post.md",
+    "data/pages/about-us.md",
+    "data/pages/contact.md",
+    "data/pages/home.md",
+    "data/site.yaml",
+    "lib/encoded_attachment/.gitignore",
+    "lib/encoded_attachment/Gemfile",
+    "lib/encoded_attachment/LICENSE",
+    "lib/encoded_attachment/README.md",
+    "lib/encoded_attachment/Rakefile",
+    "lib/encoded_attachment/encoded_attachment.gemspec",
+    "lib/encoded_attachment/lib/activerecord/base.rb",
+    "lib/encoded_attachment/lib/activeresource/base.rb",
+    "lib/encoded_attachment/lib/activeresource/connection.rb",
+    "lib/encoded_attachment/lib/encoded_attachment.rb",
+    "lib/encoded_attachment/lib/encoded_attachment/version.rb",
+    "lib/encoded_attachment/test/active_record_test.rb",
+    "lib/encoded_attachment/test/active_resource_test.rb",
+    "lib/encoded_attachment/test/avatars/.gitignore",
+    "lib/encoded_attachment/test/config/database.yml",
+    "lib/encoded_attachment/test/config/schema.rb",
+    "lib/encoded_attachment/test/fixtures/kitten.jpg",
+    "lib/encoded_attachment/test/fixtures/tapir.jpg",
+    "lib/encoded_attachment/test/test_helper.rb",
+    "lib/siterest.rb",
+    "lib/siterest/asset.rb",
+    "lib/siterest/client.rb",
+    "lib/siterest/command.rb",
+    "lib/siterest/page.rb",
+    "lib/siterest/server.rb",
+    "lib/siterest/site.rb",
+    "lib/siterest/template.rb",
+    "lib/siterest/template/filters/core_filters.rb",
+    "lib/siterest/template/filters/datetime_filters.rb",
+    "lib/siterest/template/filters/url_filters.rb",
+    "lib/siterest/template/objects/article.rb",
+    "lib/siterest/template/objects/page.rb",
+    "lib/siterest/template/objects/site.rb",
+    "lib/siterest/template/objects/tag.rb",
+    "lib/siterest/template/paginate.rb",
+    "lib/siterest/user.rb",
+    "lib/upfile.rb",
+    "pkg/siterest-0.1.0.pre7.gem",
+    "readme.md",
+    "site/data/articles/2008-04-24-my-first-blog-post.md",
+    "site/data/pages/about-us.md",
+    "site/data/pages/contact.md",
+    "site/data/pages/home.md",
+    "site/data/site.yaml",
+    "siterest.gemspec",
+    "spec/siterest/page_spec.rb",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://www.siterest.com}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.0}
   s.summary = %q{Siterest client}
+  s.test_files = [
+    "spec/siterest/page_spec.rb",
+    "spec/spec_helper.rb"
+  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<h2o>, [">= 0"])
-      s.add_runtime_dependency(%q<activeresource>, ["~> 3.0.0.beta4"])
+      s.add_runtime_dependency(%q<activeresource>, ["~> 3.0.0"])
+      s.add_runtime_dependency(%q<launchy>, [">= 0"])
+      s.add_runtime_dependency(%q<sinatra>, [">= 0"])
+      s.add_runtime_dependency(%q<mime-types>, [">= 0"])
+      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
+      s.add_runtime_dependency(%q<rdiscount>, [">= 0"])
+      s.add_runtime_dependency(%q<rspec>, [">= 0"])
+      s.add_runtime_dependency(%q<will_paginate>, [">= 3.0.pre2"])
+      s.add_runtime_dependency(%q<h2o>, ["~> 0.3"])
+      s.add_runtime_dependency(%q<will_paginate>, ["~> 3.0.pre2"])
+      s.add_runtime_dependency(%q<activeresource>, ["~> 3.0.0"])
       s.add_runtime_dependency(%q<launchy>, [">= 0"])
       s.add_runtime_dependency(%q<sinatra>, [">= 0"])
       s.add_runtime_dependency(%q<rest-client>, [">= 0"])
       s.add_runtime_dependency(%q<rdiscount>, [">= 0"])
     else
       s.add_dependency(%q<h2o>, [">= 0"])
-      s.add_dependency(%q<activeresource>, ["~> 3.0.0.beta4"])
+      s.add_dependency(%q<activeresource>, ["~> 3.0.0"])
+      s.add_dependency(%q<launchy>, [">= 0"])
+      s.add_dependency(%q<sinatra>, [">= 0"])
+      s.add_dependency(%q<mime-types>, [">= 0"])
+      s.add_dependency(%q<rest-client>, [">= 0"])
+      s.add_dependency(%q<rdiscount>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<will_paginate>, [">= 3.0.pre2"])
+      s.add_dependency(%q<h2o>, ["~> 0.3"])
+      s.add_dependency(%q<will_paginate>, ["~> 3.0.pre2"])
+      s.add_dependency(%q<activeresource>, ["~> 3.0.0"])
       s.add_dependency(%q<launchy>, [">= 0"])
       s.add_dependency(%q<sinatra>, [">= 0"])
       s.add_dependency(%q<rest-client>, [">= 0"])
@@ -91,7 +123,17 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<h2o>, [">= 0"])
-    s.add_dependency(%q<activeresource>, ["~> 3.0.0.beta4"])
+    s.add_dependency(%q<activeresource>, ["~> 3.0.0"])
+    s.add_dependency(%q<launchy>, [">= 0"])
+    s.add_dependency(%q<sinatra>, [">= 0"])
+    s.add_dependency(%q<mime-types>, [">= 0"])
+    s.add_dependency(%q<rest-client>, [">= 0"])
+    s.add_dependency(%q<rdiscount>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<will_paginate>, [">= 3.0.pre2"])
+    s.add_dependency(%q<h2o>, ["~> 0.3"])
+    s.add_dependency(%q<will_paginate>, ["~> 3.0.pre2"])
+    s.add_dependency(%q<activeresource>, ["~> 3.0.0"])
     s.add_dependency(%q<launchy>, [">= 0"])
     s.add_dependency(%q<sinatra>, [">= 0"])
     s.add_dependency(%q<rest-client>, [">= 0"])

data/spec/siterest/page_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe Siterest::Page do
+  it "does something" do
+    client = Siterest::Client.new
+    
+    client.push_pages("unione")
+    # @pages = Siterest::Page.all(:params => {:subdomain => "test"})
+    # existing = Siterest::Page.first(:params => {
+    #   :subdomain => "test", :search => {:permalink_eq => "about"}
+    # })
+    # puts existing.title
+    # Dir.chdir('./site')
+    # pages = Page.all
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,3 @@
+$: << File.join(File.dirname(__FILE__), "../lib")
+require 'siterest'
+require 'siterest/page'

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: siterest
 version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-  - 0
-  - 1
-  - 0
-  - pre6
-  version: 0.1.0.pre6
+  prerelease: 6
+  version: 0.1.0.pre8
 platform: ruby
 authors: 
 - Taylor luk
@@ -15,90 +10,185 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-19 00:00:00 +10:00
+date: 2011-05-03 00:00:00 +10:00
 default_executable: siterest
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: h2o
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activeresource
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
-        - beta4
-        version: 3.0.0.beta4
+        version: 3.0.0
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: launchy
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rest-client
-  prerelease: false
+  name: mime-types
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rdiscount
-  prerelease: false
+  name: rest-client
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rdiscount
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: will_paginate
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 3.0.pre2
+  type: :runtime
+  prerelease: false
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: h2o
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "0.3"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: will_paginate
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 3.0.pre2
+  type: :runtime
+  prerelease: false
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: activeresource
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: launchy
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: sinatra
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: rest-client
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
+  name: rdiscount
+  requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id016
 description: Simple content service
 email: taylor.luk@idealian.net
 executables: 
@@ -114,6 +204,11 @@ files:
 - VERSION
 - bin/siterest
 - config.ru
+- data/articles/2008-04-24-my-first-blog-post.md
+- data/pages/about-us.md
+- data/pages/contact.md
+- data/pages/home.md
+- data/site.yaml
 - lib/encoded_attachment/.gitignore
 - lib/encoded_attachment/Gemfile
 - lib/encoded_attachment/LICENSE
@@ -137,6 +232,7 @@ files:
 - lib/siterest/asset.rb
 - lib/siterest/client.rb
 - lib/siterest/command.rb
+- lib/siterest/page.rb
 - lib/siterest/server.rb
 - lib/siterest/site.rb
 - lib/siterest/template.rb
@@ -146,23 +242,26 @@ files:
 - lib/siterest/template/objects/article.rb
 - lib/siterest/template/objects/page.rb
 - lib/siterest/template/objects/site.rb
+- lib/siterest/template/objects/tag.rb
+- lib/siterest/template/paginate.rb
 - lib/siterest/user.rb
 - lib/upfile.rb
 - readme.md
 - site/data/articles/2008-04-24-my-first-blog-post.md
 - site/data/pages/about-us.md
-- site/data/pages/about-us/something.md
 - site/data/pages/contact.md
 - site/data/pages/home.md
 - site/data/site.yaml
 - siterest.gemspec
+- spec/siterest/page_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://www.siterest.com
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -170,25 +269,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 1
       version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Siterest client
-test_files: []
-
+test_files: 
+- spec/siterest/page_spec.rb
+- spec/spec_helper.rb