siteleaf 2.0.0.pre.beta5 → 2.0.0.pre.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48d3961018a2ae31f7ca22554980a52a96475580
-  data.tar.gz: e740115d270c4aa5ecc5445ee17354f041199984
+  metadata.gz: 4b323d004281cc83a6c93bb857122cb9cfcdf919
+  data.tar.gz: 255f89f85b0e20da5cbf28696358fb41774d6973
 SHA512:
-  metadata.gz: 474722209144aa393cfef32d18ebe46084fff1e7f27373b0b0d7fcd403e15ce119d24a5f20bcfe1ea092aaa9b74c335b2d3bb5807894274c3a17f9eb2d760e8a
-  data.tar.gz: 233518fcafc51888e0d73204e782543f8f1da09df4239add4b8f52ecc20e199903c608c0236c79801699e19cf87cd20d25370b75a2695b0eb0cf562bea8d11cd
+  metadata.gz: 295888d2c12d9f1863d2891a7691911aa6981c8dfb3008fe798875bfae29eb751e586650d7d8df4d173067b26abf70cefe60cc7a4a052ba4274675f717e61c27
+  data.tar.gz: 188f454e20e56a245cfff4238181b1be54fd5abb197401c7219558e44c76da26bef6d9ad0738b6f2833665ca508e66a2a1c77636ca90b6dcc806caae02c87943

data/bin/siteleaf

@@ -3,7 +3,6 @@
 require 'siteleaf'
 require 'fileutils'
 require 'open-uri'
-require 'digest/sha1'
 require 'tempfile'
 require 'yaml'
 
@@ -34,7 +33,7 @@ def auth(re_auth = false)
   Siteleaf.load_settings if !re_auth && !Siteleaf.api_key
 
   if re_auth or !Siteleaf.api_key
-    print 'Enter your Siteleaf e-mail: '
+    print 'Enter your Siteleaf email: '
     email = $stdin.gets.chomp
 
     print 'Enter your Siteleaf password: '
@@ -49,7 +48,7 @@ def auth(re_auth = false)
       puts "=> Gem authorized." if re_auth
       return true
     else
-      puts auth['error'] || "Could not authorize, check your e-mail or password."
+      puts auth['error'] || "Could not authorize, check your email or password."
       return false
     end
   end
@@ -75,18 +74,15 @@ end
 
 def pull(site_id)
   # get all the things
-  site = Siteleaf::Site.new(id: site_id)
+  site = Siteleaf::Site.find(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
+  documents = collections.map{ |collection| collection.documents }.flatten
   
-  assets = files + uploads + pages + posts + documents
+  assets = [site] + files + uploads + pages + posts + documents
   
   updated_count = 0
   
@@ -112,7 +108,7 @@ def push(site_id)
   markdown_ext = (config['markdown_ext'] || 'markdown,mdw,mdwn,md,text').split(',')
   
   # get all the things
-  site = Siteleaf::Site.new(id: site_id)
+  site = Siteleaf::Site.find(site_id)
   files = site.files
   uploads = site.uploads
   pages = site.pages
@@ -130,35 +126,90 @@ def push(site_id)
   ignore_paths += ::File.read('.siteleafignore').split(/\r?\n/) if ::File.exists?('.siteleafignore')
   ignore_paths += config['exclude'] if config['exclude'].is_a? Array
   
+  # push site config
+  path = '_config.yml'
+  if site.sha != Digest::SHA1.hexdigest(::File.read(path))
+    print "Uploading #{path}..."
+    
+    metadata = config.dup
+    metadata.delete('collections')
+    attrs = { 'id' => site_id }
+    attrs['title'] = metadata.delete('title') if metadata['title']
+    attrs['domain'] = metadata.delete('url') if metadata['url']
+    attrs['timezone'] = metadata.delete('timezone') if metadata['timezone']
+    attrs['defaults'] = metadata.delete('defaults').map{|default|
+      {
+        'path' => default['scope']['path'],
+        'type' => default['scope']['type'],
+        'values' => default['values']
+      }
+    } if metadata['defaults']
+    attrs['metadata'] = metadata
+    
+    response = Siteleaf::Site.new(attrs).save
+    
+    if error = !response || response.error || response.message
+      print (error) ? "error: #{error}\n" : "error.\n"
+      return
+    else
+      updated_count += 1
+      print "complete.\n"
+    end
+  end
+  
   # 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 } 
+  collection_paths = []
+  collections_config = config['collections'] || {} 
+  collections_config.each do |path, metadata|
+    path = path.gsub(/[^a-z0-9_\-\.]/i, '')
+    collection_paths << "_#{path}"
+    collection = collections.find{|c| c.path.casecmp(path) == 0 }
+    title = metadata.delete('title') || path
+    output = metadata.delete('output')
+    permalink = metadata.delete('permalink')
+
+    if !collection
       # 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)
+      collections << Siteleaf::Collection.create(site_id: site.id, title: title, path: path, output: output, permalink: permalink, metadata: metadata)
+    elsif collection.title != title || collection.output != output || collection.permalink != permalink || collection.metadata != metadata
+      # update any changed collections
+      collections.delete(collection)
+      colllection = Siteleaf::Collection.new(id: collection.id, title: title, path: path, output: output, permalink: permalink, metadata: metadata).save
+      collections << colllection
     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) }
-      asset = assets.find{|a| a.filename == path }
+    
+      asset = assets.find{|a| a.filename.casecmp(path) == 0 }
+      basedir = ::File.dirname(path).split('/').first
+      basename = ::File.basename(path)
+      ext = ::File.extname(path).sub('.', '')
       sha = Digest::SHA1.hexdigest(::File.read(path))
-      if asset.nil? || asset.sha != sha
+      static = !has_yaml_header?(path)
+      collection_id = nil
+      
+      model = if ['_drafts', '_posts'].include?(basedir)
+        Siteleaf::Post
+      elsif basedir == '_uploads'
+        Siteleaf::Upload
+      elsif collection_paths.include?(basedir) && (collection = collections.find {|c| basedir == "_#{c.path}" })
+        collection_id = collection.id
+        Siteleaf::Document
+      elsif !static && markdown_ext.include?(ext)
+        Siteleaf::Page
+      else
+        Siteleaf::File
+      end
+      
+      if asset.nil? || asset.sha != sha || !asset.is_a?(model) || asset.filename != path
         
         print "Uploading #{path}..."
-        
-        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'
+      
+        response = if [Siteleaf::Post, Siteleaf::Document, Siteleaf::Page].include?(model)
           
           # handle content
           metadata = {}
@@ -172,18 +223,15 @@ def push(site_id)
           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'
+          
+          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
+          elsif model == Siteleaf::Document
+            attrs[:collection_id] = collection_id
           else
             attrs[:path] = path.sub(".#{ext}",'')
-            Siteleaf::Page
           end
           
           if asset && asset.is_a?(model)
@@ -206,11 +254,8 @@ def push(site_id)
           end
           
           attrs = {site_id: site.id, file: ::File.new(file), path: path, static: static}
-          model = if basedir == '_uploads'
+          if basedir == '_uploads'
             attrs[:path] = path.sub("#{basedir}/",'')
-            Siteleaf::Upload
-          else
-            Siteleaf::File
           end
           
           asset.delete if asset
@@ -224,7 +269,7 @@ def push(site_id)
 
         if error = !response || response.error || response.message
           print (error) ? "error: #{error}\n" : "error.\n"
-          break
+          return
         else
           updated_count += 1
           print "complete.\n"
@@ -236,8 +281,11 @@ def push(site_id)
   
   # check for old files
   missing_assets = []
+  collections.each do |collection| 
+    missing_assets << collection if !collection_paths.find{|p| p.casecmp("_#{collection.path}") == 0}
+  end
   assets.each do |asset| 
-    missing_assets << asset if !paths.include?(asset.filename)
+    missing_assets << asset if !paths.find{|p| p.casecmp(asset.filename) == 0 }
   end
   if missing_assets.empty?
     puts "=> #{updated_count} file(s) uploaded.\n"
@@ -258,6 +306,23 @@ def push(site_id)
   end
 end
 
+def import(file, quiet = true)
+  job = Siteleaf::Site.import(file: ::File.new(file))
+  
+  if quiet
+    puts "=> Import queued.\n"
+  else
+    last_msg = nil
+    job.stream do |s|
+      if (msg = s["message"]) && (msg != last_msg)
+        puts msg
+        last_msg = msg
+      end
+    end
+    puts "=> Import completed.\n"
+  end
+end
+
 def publish(site_id, quiet = true)
   site = Siteleaf::Site.new(id: site_id)
   job = site.publish
@@ -354,6 +419,19 @@ when 'publish'
       puts "Site not configured, run `siteleaf config yoursite.com`.\n"
     end
   end
+when 'import'
+  site_id = get_site_id
+  if auth != false
+    file = ARGV[1]
+    if File.extname(file) != '.zip'
+      puts "Import file must be ZIP format.\n"
+    elsif !File.exist?(file)
+      puts "Import file not found.\n"
+    else
+      quiet = %w[-q --quiet].include?(ARGV[2]) && ARGV[2]
+      import(file, quiet)
+    end
+  end
 else
   puts "`#{ARGV[0]}` command not found.\n"
   puts help

data/lib/patches/time_with_zone_encode_with.rb

@@ -0,0 +1,12 @@
+class Time
+  def encode_with(coder)
+    label =
+      if utc?
+        usec.zero? ? '%Y-%m-%d %H:%M:%S Z' : '%Y-%m-%d %H:%M:%S.%9N Z'
+      else
+        usec.zero? ? '%Y-%m-%d %H:%M:%S %:z' : '%Y-%m-%d %H:%M:%S.%9N %:z'
+      end
+
+    coder.represent_scalar(nil, strftime(label))
+  end
+end

data/lib/siteleaf.rb

@@ -15,6 +15,8 @@ require 'siteleaf/collection'
 require 'siteleaf/document'
 require 'siteleaf/site'
 require 'siteleaf/user'
+require 'patches/time_with_zone_encode_with'
+require 'digest/sha1'
 require 'rbconfig'
 require 'uri'
 require 'yaml'
@@ -23,7 +25,7 @@ module Siteleaf
 
   @api_key = ENV['SITELEAF_API_KEY']
   @api_secret = ENV['SITELEAF_API_SECRET']
-  @api_base = 'http://api.v2.siteleaf.com'
+  @api_base = 'https://api.v2.siteleaf.com'
   @api_version = 'v2'
 
   class << self

data/lib/siteleaf/client.rb

@@ -33,7 +33,7 @@ module Siteleaf
     def self.execute(method, path, params = nil)
       Siteleaf.load_settings if !Siteleaf.api_key
       begin
-        if (method == :post || method == :put) && !params.has_key?('file')
+        if (method == :post || method == :put) && !params.has_key?('file') && !params.has_key?(:file)
           request = HTTParty.send(method, Siteleaf.api_url(path), {
             :headers => { 'Content-Type' => 'application/json' },
             :body => params.to_json,

data/lib/siteleaf/collection.rb

@@ -1,8 +1,8 @@
 module Siteleaf
   class Collection < Entity
 
-    attr_accessor :title, :path, :output, :site_id, :metadata
-    attr_reader :id, :basename, :directory, :created_at, :updated_at
+    attr_accessor :title, :path, :permalink, :output, :site_id, :metadata
+    attr_reader :id, :directory, :created_at, :updated_at
     
     def create_endpoint
       "sites/#{self.site_id}/collections"
@@ -14,7 +14,15 @@ module Siteleaf
     
     def documents
       result = Client.get "collections/#{self.id}/documents"
-      result.map { |r| Document.new(r) } if result
+      result.map { |r| Document.new(r) } if result.is_a? Array
+    end
+    
+    def output?
+      output == true
+    end
+    
+    def filename
+      path
     end
     
   end

data/lib/siteleaf/content.rb

@@ -9,15 +9,20 @@ module Siteleaf
     end
     
     def draft?
-      !published?
+      visibility == 'draft'
     end
     
-    def published?
-      published != false
+    def hidden?
+      visibility == 'hidden'
     end
+    
+    def visible?
+      visibility == 'visible'
+    end
+    alias_method :published?, :visible?
 
     def to_file
-      [frontmatter, "---\n\n".freeze, body].join('')
+      frontmatter + "---\n\n".freeze + body.to_s
     end
   
     protected
@@ -25,8 +30,8 @@ module Siteleaf
     def frontmatter
       attrs = metadata || {}
       attrs['title'] = title
-      attrs['date'] = Time.parse(published_at).utc.strftime('%F %T %z') unless published_at.nil?
-      attrs['published'] = false if draft?
+      attrs['date'] = Time.parse(published_at).utc unless published_at.nil?
+      attrs['published'] = false if hidden?
       attrs['permalink'] = permalink unless permalink.nil?
   
       attrs.empty? ? "---\n".freeze : attrs.to_yaml

data/lib/siteleaf/entity.rb

@@ -9,7 +9,7 @@ module Siteleaf
 
     def self.all
       result = Client.get "#{self.endpoint}"
-      result.map { |r| self.new(r) } if result
+      result.map { |r| self.new(r) } if result.is_a? Array
     end
 
     def self.find(id)

data/lib/siteleaf/site.rb

@@ -1,7 +1,7 @@
 module Siteleaf
   class Site < Entity
 
-    attr_accessor :title, :domain, :timezone, :metadata
+    attr_accessor :title, :domain, :timezone, :metadata, :defaults
     attr_reader :id, :user_id, :created_at, :updated_at
     
     def self.find_by_domain(domain)
@@ -10,34 +10,89 @@ module Siteleaf
       self.new(result) if result
     end
     
+    def self.import(attrs)
+      result = Client.post "import", attrs
+      Job.new(id: result["job_id"]) if result
+    end
+    
     def files
       result = Client.get "sites/#{self.id}/files"
-      result.map { |r| File.new(r) } if result
+      result.map { |r| File.new(r) } if result.is_a? Array
     end
     
     def uploads
       result = Client.get "sites/#{self.id}/uploads"
-      result.map { |r| Upload.new(r) } if result
+      result.map { |r| Upload.new(r) } if result.is_a? Array
     end
     
     def pages
       result = Client.get "sites/#{self.id}/pages"
-      result.map { |r| Page.new(r) } if result
+      result.map { |r| Page.new(r) } if result.is_a? Array
     end
     
     def posts
       result = Client.get "sites/#{self.id}/posts"
-      result.map { |r| Post.new(r) } if result
+      result.map { |r| Post.new(r) } if result.is_a? Array
     end
     
     def collections
       result = Client.get "sites/#{self.id}/collections"
-      result.map { |r| Collection.new(r) } if result
+      result.map { |r| Collection.new(r) } if result.is_a? Array
     end
     
     def publish
       result = Client.post "sites/#{self.id}/publish", {}
-      Job.new(id: result.parsed_response["job_id"]) if result
+      Job.new(id: result["job_id"]) if result
+    end
+    
+    def full_url
+      "http://#{domain}"
+    end
+    
+    def filename
+      "_config.yml"
+    end
+    
+    def sha
+      Digest::SHA1.hexdigest(to_file)
+    end
+    
+    def to_file
+      config
+    end
+  
+    protected
+    
+    def uploads_collection
+      Collection.new('title' => 'Uploads', 'path' => 'uploads', 'output' => true)
+    end
+    
+    def defaults_config
+      defaults.map do |d|
+        { 'scope' => {}, 'values' => d['values'] }.tap do |default|
+          default['scope']['path'] = d['path'] if d['path']
+          default['scope']['type'] = d['type'] if d['type']
+        end
+      end
+    end
+    
+    def collections_config
+      collections.unshift(uploads_collection).each_with_object({}) do |collection, hash|
+        hash[collection.path] = collection.metadata || {}
+        hash[collection.path]['title'] = collection.title
+        hash[collection.path]['output'] = collection.output
+        hash[collection.path]['permalink'] = collection.permalink unless collection.permalink.nil?
+      end
+    end
+  
+    def config
+      attrs = metadata || {}
+      attrs['title'] = title
+      attrs['url'] = full_url
+      attrs['timezone'] = timezone
+      attrs['collections'] = collections_config
+      attrs['defaults'] = defaults_config unless defaults.empty?
+      attrs.to_yaml
     end
     
   end

data/lib/siteleaf/version.rb

@@ -1,3 +1,3 @@
 module Siteleaf
-  VERSION = "2.0.0.pre.beta5"
+  VERSION = "2.0.0.pre.beta7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: siteleaf
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.beta5
+  version: 2.0.0.pre.beta7
 platform: ruby
 authors:
 - Siteleaf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -80,6 +80,7 @@ files:
 - README.md
 - Rakefile
 - bin/siteleaf
+- lib/patches/time_with_zone_encode_with.rb
 - lib/siteleaf.rb
 - lib/siteleaf/asset.rb
 - lib/siteleaf/client.rb