siteleaf 1.0.10 → 2.0.0.pre.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8b486fbba3394631d5451785526552e3d9cd83a
-  data.tar.gz: 5ba7b39d6c040dcd61426bdd93f81f61bac3020f
+  metadata.gz: 5b163f9a10681add3de4aee5e6eb18e16634a50a
+  data.tar.gz: 4683680196a957815215170ed5c0c535fa144b80
 SHA512:
-  metadata.gz: 965f00e8bc082b645631038cdc059c150c938f437d60c7681c1db0362a1811040e38a2b442aed4eba8fb6f2f6675cbe9a9092b652e0fb7ca67703900d27dee38
-  data.tar.gz: 8ee18e1725439ccb4854c24cd63029a1f2360805b1c3ce621a33823e91cc8d3b63495c65a74d685604a34f525d165591203ed4a5d175ca1a4288a3304253f1bd
+  metadata.gz: 96d07c4683161d4b174a1b4253f82cd81de741c4d90e4ee6cf861d30aa0376d259f7a8878060eb1d3b4fd74bb3cc0ed0020d9b43f57ca4956d5f0ebc5b3bb633
+  data.tar.gz: 54194023b24413f1703f5a0ff23ee722cef7e2f75cbcd7c5c8468e72406795262b62109a729ebad7be253d7107acd9a3172b3c3cebc617cdc07f57cc26fc6856

data/.gitignore

@@ -17,6 +17,3 @@ test/version_tmp
 tmp
 .ruby-version
 .DS_Store
-source/
-export/
-config.ru

data/README.md

@@ -1,35 +1,44 @@
-**Note:** This version only applies to v1 sites, for v2 see: https://github.com/siteleaf/siteleaf-gem
-
-Siteleaf v1 Gem
-=================
+Siteleaf Gem V2
+===============
 
 - [Installation](#installation)
 - [Using the CLI](#using-the-cli)
 - [Using this gem in your application](#using-this-gem-in-your-application)
 - [Using the API](#using-the-api)
-- [Exporting your site](#exporting-your-site)
 - [Troubleshooting](#troubleshooting)
 - [Contributing](#contributing)
 
-
 Installation
 ------------
 
 The Siteleaf gem is available for installation on [Rubygems](https://rubygems.org/gems/siteleaf). To install run:
 
-    gem install siteleaf -v '~>1'
+    gem install siteleaf --pre
+    
+Important: make sure to use `--pre` for V2. If maintaining sites with multiple versions, we recommend using a Gemfile.
 
 
 Using the CLI
 -------------
 
-Important: if using a Gemfile, make sure to prepend all commands with bundle exec (e.g. bundle exec siteleaf auth).
+Important: if using a Gemfile, make sure to prepend all commands with `bundle exec` (e.g. `bundle exec siteleaf auth`).
+
+**Authorize your account:**
 
-The Siteleaf gem allows you to test and develop your sites locally. If using [Pow](http://pow.cx) or [Anvil](http://anvilformac.com), your local website will be automatically set up and can be accessed at `http://yoursite.dev`.
+    siteleaf auth
+    
+This will create an authorization file located at `~/.siteleaf.yml`. 
 
-**(Optional, Mac-only) Install Pow for extra goodness:**
+Alternatively, you can also use environment variables: `API_KEY=xxx API_SECRET=yyy siteleaf command`
 
-    curl get.pow.cx | sh
+You can also include use a `.siteleaf.yml` file in the root of your project:
+
+```yaml
+---
+api_key: xxx
+api_secret: yyy
+site_id: zzz
+```
 
 **Set up a new site locally:**
 
@@ -41,33 +50,17 @@ This will create a new theme folder called `yoursite.com` in the directory where
 
     siteleaf config yoursite.com
 
-Your site should now be accessible at `http://yoursite.dev`.
+**Upload your files:**
 
-*or*
-
-**If you don't want to install Pow, local sites can also be manually run:**
-
-    siteleaf server
-  
-In this case, your local site can be accessed at `http://localhost:9292`.
-
-**Lastly...**
-
-Your local folder should contain at least one template file (`default.html`), for sample themes and documentation see: https://github.com/siteleaf/siteleaf-themes
-
-For new sites, you will also need to create at least one page or post on https://manage.siteleaf.com in order to preview.
+To upload your theme to Siteleaf, run the following command:
 
-**Download your theme:**
+    siteleaf push
+    
+**Download your files:**
 
 To download your theme (or the default theme for new sites) from Siteleaf, run the following command:
 
-    siteleaf pull theme
-
-**Upload your theme:**
-
-To upload your theme to Siteleaf, run the following command:
-
-    siteleaf push theme
+    siteleaf pull
     
 **Publish your site:**
 
@@ -75,10 +68,6 @@ To publish your site changes to your hosting provider, run the following command
 
     siteleaf publish
     
-**Switch Siteleaf users or re-authenticate:**
-
-    siteleaf auth
-    
 **For a full list of commands, run:**
 
     siteleaf help
@@ -89,8 +78,7 @@ Using this gem in your application
     
 To use this gem in your application, add the following to your Gemfile:
 
-    gem 'siteleaf', '~>1'
-
+    gem 'siteleaf', :git => 'git://github.com/siteleaf/siteleaf-gem.git', :branch => '2.0.0.pre'
 
 
 Using the API
@@ -148,22 +136,19 @@ page = Siteleaf::Page.find('519719ddcc85910626000001')
 
 # create new post in page
 post = Siteleaf::Post.create({
-  :parent_id => page.id,
   :title     => 'My Post',
   :body      => 'This is my first post.'
 })
 
-# update page, add metadata, add taxonomy
+# update page, add metadata
 post.title = 'New Title'
-post.meta = [ {"key" => "foo", "value" => "bar"} ]
-post.taxonomy = [ {"key" => "Tags", "values" => ["One","Two","Three"]} ]
+post.meta = {'foo' => 'bar'}
 post.save
 
-# upload asset to post (use site_id, page_id, or theme_id to upload to Site, Page, or Theme instead)
-asset = Siteleaf::Asset.create({
-  :post_id  => post.id, 
+# upload file
+asset = Siteleaf::File.create({
   :file     => File.open("~/image.png"), 
-  :filename => "image.png"
+  :path     => "image.png"
 })
 
 # delete post
@@ -173,19 +158,6 @@ post.delete
 Siteleaf::Page.delete('519719ddcc85910626000001')
 ```
 
-
-Exporting your site
----------------------------------
-
-You can backup or export your Siteleaf content to Jekyll-compatible format by running the following command:
-
-    siteleaf export
-    
-You will be asked to enter your main posts path, this is typically `posts` (default) or `blog` (if your posts are located at `/blog/hello-world` for example). If your site does not have any posts, leave blank to use the default.
-
-All content including Pages, Posts, Site Metadata, and Assets will be exported to a sub-folder called `export`. Theme files are not included in the export.
-
-
 Troubleshooting
 ------------
 
@@ -193,7 +165,7 @@ Troubleshooting
 
 Try running:
 
-    sudo gem install siteleaf -v '~>1'
+    sudo gem install siteleaf
 
 
 Contributing

data/bin/siteleaf

@@ -3,7 +3,8 @@
 require 'siteleaf'
 require 'fileutils'
 require 'open-uri'
-require 'digest/md5'
+require 'digest/sha1'
+require 'tempfile'
 require 'yaml'
 
 def help
@@ -12,20 +13,17 @@ Usage: siteleaf [COMMAND] [OPTIONS]
 
 Commands:
   auth                Login in with your credentials
-  s, server           Starts a local server
   c, config DOMAIN    Configure an existing directory
   n, new DOMAIN       Creates new site on siteleaf.net
-  pull theme          Pulls theme files for configured site from Siteleaf
-  push theme          Pushes all files in dir as theme to configured site
+  pull                Pulls files for configured site from Siteleaf
+  push                Pushes all files in dir to configured site
   publish             Publish website to hosting provider
-  export              Exports site content to Jekyll-compatible format
   help                Prints this help document
   version             Prints the siteleaf gem version
 
 Options:
   -h, --help          Prints this help document
   -v, --version       Prints the siteleaf gem version
-  -p, --port PORT     Binds local server to PORT (default: 9292)
   -q, --quiet         Suppress publish status
 
 See https://github.com/siteleaf/siteleaf-gem for additional documentation.
@@ -58,90 +56,193 @@ def auth(re_auth = false)
 end
 
 def config(site)
-  File.open('config.ru', 'w') { |file| file.write "# Intended for development purposes only, do not upload or use in production.
-# See https://github.com/siteleaf/siteleaf-gem for documentation.
-require 'rubygems'
-require 'siteleaf'
-run Siteleaf::Server.new(:site_id => '#{site.id}')" }
-
-  pow_path = File.expand_path('~/.pow')
-  if File.directory?(pow_path)
-    site_no_tld = site.domain.gsub(/\.[a-z]{0,4}$/i,'')
-    site_symlink = "#{pow_path}/#{site_no_tld}"
-    FileUtils.rm(site_symlink) if File.symlink?(site_symlink)
-    FileUtils.symlink(File.expand_path('.'), site_symlink)
-    puts "=> Site configured with Pow, open `http://#{site_no_tld}.dev` to test site locally.\n"
-  else
-    puts "=> Site configured, run `siteleaf server` to test site locally.\n"
-  end
+  Siteleaf.save_settings({site_id: site.id}, '.siteleaf.yml')
+  puts "=> Site configured."
 end
 
 def get_site_id
-  if File.exist?('config.ru')
-    if match = /:site_id => '([a-z0-9]{24})'/i.match(File.read('config.ru'))
-      return match[1]
+  # check env vars
+  [:api_key, :api_secret, :api_base, :api_version].each do |key|
+    if value = ENV[key.to_s.upcase]
+      Siteleaf.send "#{key}=", value
     end
   end
+  
+  ENV['SITE_ID'] || if settings = Siteleaf.load_settings('.siteleaf.yml')
+    settings[:site_id]
+  end
 end
 
-def get_theme_assets(site_id)
-  if assets = Siteleaf::Theme.assets_by_site_id(site_id)
-    updated_count = 0
-    assets.each do |asset|
-      if File.exist?(asset.filename) && (asset.checksum == Digest::MD5.hexdigest(IO.binread(asset.filename)))
-        # file is up to date
-      else
-        print "Downloading #{asset.filename}..."
-        file = open(asset.file['url'], 'r:UTF-8') { |f| f.read }
-        FileUtils.mkdir_p(File.dirname(asset.filename))
-        File.open(asset.filename, 'w:UTF-8') { |f| f.write(file) }
-        updated_count += 1
-        print "complete.\n"
-      end
+def pull(site_id)
+  # get all the things
+  site = Siteleaf::Site.new(id: site_id)
+  files = site.files
+  uploads = site.uploads
+  pages = site.pages
+  posts = site.posts
+  collections = site.collections
+  documents = []
+  collections.each do |collection|
+    documents += collection.documents
+  end
+  
+  assets = files + uploads + pages + posts + documents
+  
+  updated_count = 0
+  
+  assets.each do |asset|
+    sha = ::File.exist?(asset.filename) && Digest::SHA1.hexdigest(::File.read(asset.filename))
+    if asset.sha == sha
+      # file is up to date
+    else
+      print "Downloading #{asset.filename}..."
+      FileUtils.mkdir_p(::File.dirname(asset.filename))
+      ::File.open(asset.filename, 'w:UTF-8') { |f| f.write(asset.to_file) }
+      updated_count += 1
+      print "complete.\n"
     end
-    puts "=> #{updated_count} asset(s) downloaded.\n"
   end
+  
+  puts "=> #{updated_count} file(s) downloaded.\n"
 end
 
-def put_theme_assets(site_id)
-  theme = Siteleaf::Theme.find_by_site_id(site_id)
-  unless theme.id
-    puts "Could not retrieve theme, check your site configuration and try again.\n"
-    return false
+def push(site_id)
+  # check config
+  config = ::File.exist?('_config.yml') ? YAML::load(::File.read('_config.yml')) : {}
+  markdown_ext = (config['markdown_ext'] || 'markdown,mdw,mdwn,md,text').split(',')
+  
+  # get all the things
+  site = Siteleaf::Site.new(id: site_id)
+  files = site.files
+  uploads = site.uploads
+  pages = site.pages
+  posts = site.posts
+  collections = site.collections
+  documents = []
+  collections.each do |collection|
+    documents += collection.documents
   end
-  assets = theme.assets
+  
+  assets = files + uploads + pages + posts + documents
+  
   updated_count = 0
-  ignore_paths = ['config.ru', '.*']
-  ignore_paths += File.read('.siteleafignore').split(/\r?\n/) if File.exists?('.siteleafignore')
-
+  ignore_paths = ['_config.yml', 'config.ru', '.*', '_site/*', 'Gemfile', 'Gemfile.lock']
+  ignore_paths += ::File.read('.siteleafignore').split(/\r?\n/) if ::File.exists?('.siteleafignore')
+  ignore_paths += config['exclude'] if config['exclude'].is_a? Array
+  
+  # create collections
+  existing_collections = config['collections'] || {} 
+  existing_collections.each do |label, metadata|
+    path = label.gsub(/[^a-z0-9_\-\.]/i, '')
+    unless collections.find {|c| c.path == path } 
+      # create any new collections
+      output = metadata.delete('output')
+      permalink = metadata.delete('permalink')
+      collections << Siteleaf::Collection.create(site_id: site.id, title: label, path: path, permalink: permalink, metadata: metadata)
+    end
+  end
+  collection_dirs = collections.map{|c| c.basename }
+  
   # upload files
   paths = Dir.glob("**/*")
   paths.each do |path|
-    if !File.directory?(path) && !ignore_paths.any?{|i| File.fnmatch?(i, path, File::FNM_CASEFOLD) || File.fnmatch?(i, File.basename(path), File::FNM_CASEFOLD) }
+    if !::File.directory?(path) && !ignore_paths.any?{|i| ::File.fnmatch?(i, path, File::FNM_CASEFOLD) || ::File.fnmatch?(i, ::File.basename(path), File::FNM_CASEFOLD) }
       asset = assets.find{|a| a.filename == path }
-      if asset.nil? || (asset && asset.checksum != Digest::MD5.hexdigest(IO.binread(path)))
+      sha = Digest::SHA1.hexdigest(::File.read(path))
+      if asset.nil? || asset.sha != sha
+        
         print "Uploading #{path}..."
-        asset.delete if asset
-        if response = Siteleaf::Asset.create({:site_id => site_id, :theme_id => theme.id, :file => File.new(path), :filename => path})
-          updated_count += 1
-          print "complete.\n"
+        
+        static = !has_yaml_header?(path)
+        basename = ::File.basename(path)
+        basedir = ::File.dirname(path).split('/').first
+        ext = ::File.extname(path).sub('.', '')
+
+        response = if !static && markdown_ext.include?(ext) && basedir != '_uploads'
+          
+          # handle content
+          metadata = {}
+          unless static
+            body, metadata = read_frontmatter(path)
+          end
+        
+          clean_path = path.sub("#{basedir}/",'').sub(".#{ext}",'')
+          title = metadata.delete('title') || ::File.basename(clean_path)
+          
+          attrs = {site_id: site.id, title: title, path: clean_path, static: static}
+          attrs[:body] = body if body && body != ""
+          attrs[:metadata] = metadata if metadata && !metadata.empty? 
+          model = if basedir == '_drafts'
+            attrs[:visibility] = 'draft'
+            Siteleaf::Post
+          elsif basedir == '_posts'
+            attrs[:visibility] = (metadata['published'].delete == false) ? 'hidden' : 'visible'
+            Siteleaf::Post
+          elsif collection = collections.find {|c| c.basename == basedir }
+            attrs[:collection_id] = collection.id
+            Siteleaf::Document
+          else
+            attrs[:path] = path.sub(".#{ext}",'')
+            Siteleaf::Page
+          end
+          
+          if asset && asset.is_a?(model)
+            attrs[:id] = asset.id
+            asset = model.new(attrs).save
+          else
+            asset.delete if asset
+            asset = model.create(attrs)
+          end
+        
         else
-          print "error.\n"
+        
+          # handle assets      
+          file = path
+          metadata = {}
+          unless static
+            body, metadata = read_frontmatter(path)
+            file = Tempfile.new(basename)
+            ::File.open(file, 'w:UTF-8') { |f| f.write(body) }
+          end
+          
+          attrs = {site_id: site.id, file: ::File.new(path), path: path, static: static}
+          model = if basedir == '_uploads'
+            attrs[:path] = path.sub("#{basedir}/",'')
+            Siteleaf::Upload
+          else
+            Siteleaf::File
+          end
+          
+          asset.delete if asset
+          asset = model.create(attrs)
+          if metadata && !metadata.empty? 
+            asset.metadata = metadata
+            asset.save
+          end
+          
+        end
+
+        if error = !response || response.error || response.message
+          print (error) ? "error: #{error}\n" : "error.\n"
           break
+        else
+          updated_count += 1
+          print "complete.\n"
         end
+        
       end
     end
   end
-
+  
   # check for old files
   missing_assets = []
-  assets.each do |asset|
+  assets.each do |asset| 
     missing_assets << asset if !paths.include?(asset.filename)
   end
   if missing_assets.empty?
-    puts "=> #{updated_count} asset(s) uploaded.\n"
+    puts "=> #{updated_count} file(s) uploaded.\n"
   else
-    print "=> #{updated_count} asset(s) uploaded. Delete the following #{missing_assets.size} unmatched asset(s)?\n"
+    print "=> #{updated_count} file(s) uploaded. Delete the following #{missing_assets.size} unmatched file(s)?\n"
     missing_assets.each do |asset|
       puts asset.filename
     end
@@ -152,7 +253,7 @@ def put_theme_assets(site_id)
         asset.delete
         print "complete.\n"
       end
-      puts "=> #{missing_assets.size} asset(s) deleted.\n"
+      puts "=> #{missing_assets.size} file(s) deleted.\n"
     end
   end
 end
@@ -175,77 +276,18 @@ def publish(site_id, quiet = true)
   end
 end
 
-def export(site_id, posts_path = "posts", dir = 'export')
-  posts_path = "posts" if posts_path == ""
-  
-  site = Siteleaf::Site.find(site_id)
-  site.posts_path = posts_path
-  
-  export_uploads(site, dir)
-  export_content(site, dir)
-  export_config(site, dir)
+def has_yaml_header?(file)
+  !!(File.open(file, 'rb') { |f| f.read(5) } =~ /\A---\r?\n/)
 end
 
-def export_config(site, dir = 'export')
-  filename = site.filename
-  print "Exporting #{filename}..."
-  
-  filename = File.join(dir, filename)
-  open(filename, 'w:UTF-8') do |f|
-    f.puts site.to_file(dir)
-  end
-  
-  print "complete.\n"
-end
-
-def export_content(site, dir = 'export')
-  pages = site.pages
-
-  pages.each do |page|
-    # export non-blank pages
-    unless page.body.to_s == "" and page.meta.empty?
-      filename = page.filename
-      print "Exporting #{filename}..."
-      
-      filename = File.join(dir, filename)
-      FileUtils.mkdir_p File.dirname(filename)
-      open(filename, 'w:UTF-8') do |f|
-        f.puts page.to_file(dir)
-      end
-      
-      print "complete.\n"
-    end
-
-    page.posts.each do |post|
-      filename = post.filename(site.posts_path)
-      print "Exporting #{filename}..."
-      
-      filename = File.join(dir, filename)
-      FileUtils.mkdir_p File.dirname(filename)
-      open(filename, 'w:UTF-8') do |f|
-        f.puts post.to_file(dir)
-      end
-      
-      print "complete.\n"
-    end
-  end
-end
-
-def export_uploads(site, dir = 'export')
-  if assets = site.assets
-    assets.each do |asset|
-      filename = File.join(dir, "_uploads", asset.filename)
-      if !File.exist?(filename) or (asset.checksum != Digest::MD5.hexdigest(IO.binread(filename)))
-        print "Exporting #{filename}..."
-        
-        file = open(asset.file['url'], 'r:UTF-8') { |f| f.read }
-        FileUtils.mkdir_p(File.dirname(filename))
-        File.open(filename, 'w:UTF-8') { |f| f.write(file) }
-
-        print "complete.\n"
-      end
-    end
+def read_frontmatter(file)  
+  content = ::File.read(file)
+  metadata = {}
+  if content =~ /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
+    content = $POSTMATCH
+    metadata = YAML.load($1)
   end
+  return content, metadata
 end
 
 case ARGV[0]
@@ -253,13 +295,6 @@ when '-v', '--version', 'version'
   puts Siteleaf::VERSION
 when '-h', '--help', 'help'
   puts help
-when 's', 'server'
-  if File.exist?('config.ru')
-    port = ARGV[2] if %w[-p --port].include?(ARGV[1]) && ARGV[1]
-    `rackup config.ru -p #{port || '9292'} >&2`
-  else
-    puts "No config found, run `siteleaf config yoursite.com`.\n"
-  end
 when 'auth'
   auth true
 when 'c', 'config', 'setup'
@@ -274,60 +309,51 @@ when 'n', 'new'
   if auth != false
     if (site = Siteleaf::Site.create(:title => ARGV[1], :domain => ARGV[1])) && (!site.error)
       dir = ARGV.size >= 3 ? ARGV[2] : ARGV[1]
-      FileUtils.mkdir_p dir
-      Dir.chdir dir
+      Dir.mkdir(dir) unless ::File.directory?(dir)
+      Dir.chdir(dir)
       config site
     else
       puts "Could not create site `#{ARGV[1]}`.\n"
     end
   end
 when 'pull'
-  case ARGV[1]
-  when 'theme'
+  #case ARGV[1]
+  #when 'theme'
+    site_id = get_site_id
     if auth != false
-      if site_id = get_site_id
-        get_theme_assets(site_id)
+      if site_id
+        pull(site_id)
       else
         puts "Site not configured, run `siteleaf config yoursite.com`.\n"
       end
     end
-  else
-    puts "`#{ARGV[0]}` command not found.\n"
-  end
+  #else
+  #  puts "`#{ARGV[0]}` command not found.\n"
+  #end
 when 'push'
-  case ARGV[1]
-  when 'theme'
+  #case ARGV[1]
+  #when 'theme'
+    site_id = get_site_id
     if auth != false
-      if site_id = get_site_id
-        put_theme_assets(site_id)
+      if site_id
+        push(site_id)
       else
         puts "Site not configured, run `siteleaf config yoursite.com`.\n"
       end
     end
-  else
-    puts "`#{ARGV[0]}` command not found.\n"
-  end
+  #else
+  #  puts "`#{ARGV[0]}` command not found.\n"
+  #end
 when 'publish'
+  site_id = get_site_id
   if auth != false
     quiet = %w[-q --quiet].include?(ARGV[1]) && ARGV[1]
-    if site_id = get_site_id
+    if site_id
       publish(site_id, quiet)
     else
       puts "Site not configured, run `siteleaf config yoursite.com`.\n"
     end
   end
-when 'export'
-  if auth != false
-    if site_id = get_site_id
-      print 'Enter your main posts path (default "posts"): '
-      posts_path = $stdin.gets.chomp
-      dir = ARGV.size >= 2 ? ARGV[1] : 'export'
-      FileUtils.mkdir_p dir
-      export(site_id, posts_path, dir)
-    else
-      puts "Site not configured, run `siteleaf config yoursite.com`.\n"
-    end
-  end
 else
   puts "`#{ARGV[0]}` command not found.\n"
   puts help