siteleaf 2.0.0.pre.beta7 → 2.0.0.pre.beta9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b323d004281cc83a6c93bb857122cb9cfcdf919
-  data.tar.gz: 255f89f85b0e20da5cbf28696358fb41774d6973
+  metadata.gz: ffdf39daf59542b67cb85f8953690eed8e4878f6
+  data.tar.gz: cefb58dc50c17b2704cda475ace5d0c6aa35ccf6
 SHA512:
-  metadata.gz: 295888d2c12d9f1863d2891a7691911aa6981c8dfb3008fe798875bfae29eb751e586650d7d8df4d173067b26abf70cefe60cc7a4a052ba4274675f717e61c27
-  data.tar.gz: 188f454e20e56a245cfff4238181b1be54fd5abb197401c7219558e44c76da26bef6d9ad0738b6f2833665ca508e66a2a1c77636ca90b6dcc806caae02c87943
+  metadata.gz: b817f87f1733ef8aacfe0199dd0aab699ab04ecd6e1179094905743637213ef4dfefd4b09bdc5b5c5226cb27a0399ccd58509e94a5770095041e6a2b0474a8d8
+  data.tar.gz: d11c229b37885a7a89c166c24c81f0225058953f0bfee21161f2d653d34b2238f695a83376554440b210687b1487600109b49b22b5637f265140ff993c9183e3

data/README.md

@@ -118,44 +118,68 @@ site.publish
 # delete site
 site.delete
 
-# delete site by id
-Siteleaf::Site.delete('5196f137cc8591956b000001')
-
 # get all pages in site
 pages = site.pages
 
 # create new page in site
 page = Siteleaf::Page.create({
-  :site_id  => site.id,
   :title    => 'My Page',
-  :body     => 'This is my first page.'
+  :body     => 'This is my first page.',
+  :site_id  => site.id
 })
 
 # get page by id
 page = Siteleaf::Page.find('519719ddcc85910626000001')
 
-# create new post in page
-post = Siteleaf::Post.create({
-  :title     => 'My Post',
-  :body      => 'This is my first post.'
+# delete page by id
+Siteleaf::Page.delete('519719ddcc85910626000001')
+
+# get posts
+posts = site.posts # or Collection.new(path: 'posts', site_id: site.id).documents
+
+# create new post
+post = Siteleaf::Documents.create({
+  :title            => 'My Post',
+  :body             => 'This is my first post.',
+  :collection_path  => 'posts',
+  :site_id          => site.id
 })
 
-# update page, add metadata
+# update post, add metadata
 post.title = 'New Title'
-post.meta = {'foo' => 'bar'}
+post.metadata = {'foo' => 'bar'}
 post.save
 
-# upload file
-asset = Siteleaf::File.create({
-  :file     => File.open("~/image.png"), 
-  :path     => "image.png"
-})
-
 # delete post
 post.delete
 
-# delete page by id
-Siteleaf::Page.delete('519719ddcc85910626000001')
+# get files in "uploads" collection
+files = site.uploads # or Collection.new(path: 'uploads', site_id: site.id).files
+
+# upload image into "uploads" collection
+file = Siteleaf::File.create({
+  :file             => File.new('~/image.png'), 
+  :path             => 'image.png'
+  :collection_path  => 'uploads',
+  :site_id          => site.id
+})
+
+# get source files
+files = site.source_files
+
+# upload source file
+file = Siteleaf::SourceFile.create({
+  :file     => File.new('~/foo.html'), 
+  :name     => '_includes/foo.html',
+  :site_id  => site.id
+})
+
+# delete file
+file.delete
+
+# delete file by name
+Siteleaf::SourceFile.new(name: '_includes/foo.html', site_id: site.id).delete
+
 ```
 
 Troubleshooting

data/bin/siteleaf

@@ -52,102 +52,77 @@ def auth(re_auth = false)
       return false
     end
   end
-end
-
-def config(site)
-  Siteleaf.save_settings({site_id: site.id}, '.siteleaf.yml')
-  puts "=> Site configured."
-end
-
-def get_site_id
-  # check env vars
-  [:api_key, :api_secret, :api_base, :api_version].each do |key|
-    if value = ENV['SITELEAF_'+key.to_s.upcase]
-      Siteleaf.send "#{key}=", value
-    end
-  end
-  
-  ENV['SITELEAF_SITE_ID'] || if settings = Siteleaf.load_settings('.siteleaf.yml')
-    settings[:site_id]
-  end
+rescue Exception => e
+  print "Error: #{e.message}\n"
 end
 
 def pull(site_id)
+  print "Reading site...\n"
+  
   # get all the things
   site = Siteleaf::Site.find(site_id)
-  files = site.files
-  uploads = site.uploads
-  pages = site.pages
-  posts = site.posts
-  collections = site.collections
-  documents = collections.map{ |collection| collection.documents }.flatten
-  
-  assets = [site] + files + uploads + pages + posts + documents
-  
+  site_files = site.source_tree
   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) }
+  # download unmatched files
+  site_files.each do |file|
+    sha = ::File.exist?(file.name) && Siteleaf::GitHash.file(file.name)
+    if file.sha != sha
+      print "Downloading #{file.name}..."
+      FileUtils.mkdir_p(::File.dirname(file.name))
+      ::File.open(file.name, 'w') { |f| f.write(file.to_file) }
       updated_count += 1
       print "complete.\n"
     end
   end
   
-  puts "=> #{updated_count} file(s) downloaded.\n"
+  # check for old files
+  local_files = read_dir
+  missing_files = []
+  local_files.each do |path| 
+    missing_files << path if !site_files.find{|a| a.name.casecmp(path) == 0 }
+  end
+  if missing_files.empty?
+    puts "=> #{updated_count} file(s) downloaded.\n"
+  else
+    print "=> #{updated_count} file(s) downloaded. Delete the following #{missing_files.size} unmatched local file(s)?\n"
+    missing_files.each do |path|
+      puts path
+    end
+    print '(y/n)? '
+    if $stdin.gets.chomp == 'y'
+      missing_files.each do |path|
+        print "Deleting #{path}..."
+        ::File.delete(path)
+        print "complete.\n"
+      end
+      puts "=> #{missing_files.size} file(s) deleted.\n"
+    end
+  end
+rescue Exception => e
+  print "Error: #{e.message}\n"
 end
 
 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(',')
+  print "Reading site...\n"
   
   # get all the things
   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
-  
-  assets = files + uploads + pages + posts + documents
-  
+  site_files = site.source_tree
+  local_files = read_dir
   updated_count = 0
-  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
   
-  # 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
-    
+  # find changed files
+  changed_files = local_files.reject do |path|
+    file = site_files.find{|a| a.name.casecmp(path) == 0 }
+    file && Siteleaf::GitHash.file(path) == file.sha
+  end
+  changed_files.unshift('_config.yml') if changed_files.delete('_config.yml') 
+  
+  # upload changed files
+  changed_files.each do |path|  
+    print "Uploading #{path}..."   
+    response = Siteleaf::SourceFile.create(site_id: site_id, name: path, file: ::File.new(path))
     if error = !response || response.error || response.message
       print (error) ? "error: #{error}\n" : "error.\n"
       return
@@ -157,153 +132,30 @@ def push(site_id)
     end
   end
   
-  # create collections
-  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
-      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
-  
-  # 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.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))
-      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}..."
-      
-        response = if [Siteleaf::Post, Siteleaf::Document, Siteleaf::Page].include?(model)
-          
-          # 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? 
-          
-          if basedir == '_drafts'
-            attrs[:visibility] = 'draft'
-          elsif basedir == '_posts'
-            attrs[:visibility] = (metadata['published'].delete == false) ? 'hidden' : 'visible'
-          elsif model == Siteleaf::Document
-            attrs[:collection_id] = collection_id
-          else
-            attrs[:path] = path.sub(".#{ext}",'')
-          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
-        
-          # 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(file), path: path, static: static}
-          if basedir == '_uploads'
-            attrs[:path] = path.sub("#{basedir}/",'')
-          end
-          
-          asset.delete if asset
-          asset = model.create(attrs)
-          if metadata && !metadata.empty? 
-            asset = model.new(id: asset.id, metadata: metadata).save
-          end
-          asset
-          
-        end
-
-        if error = !response || response.error || response.message
-          print (error) ? "error: #{error}\n" : "error.\n"
-          return
-        else
-          updated_count += 1
-          print "complete.\n"
-        end
-        
-      end
-    end
-  end
-  
   # 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.find{|p| p.casecmp(asset.filename) == 0 }
+  site_files.each do |asset| 
+    missing_assets << asset if !local_files.find{|p| p.casecmp(asset.name) == 0 }
   end
   if missing_assets.empty?
     puts "=> #{updated_count} file(s) uploaded.\n"
   else
-    print "=> #{updated_count} file(s) uploaded. Delete the following #{missing_assets.size} unmatched file(s)?\n"
+    print "=> #{updated_count} file(s) uploaded. Delete the following #{missing_assets.size} unmatched remote file(s)?\n"
     missing_assets.each do |asset|
-      puts asset.filename
+      puts asset.name
     end
     print '(y/n)? '
     if $stdin.gets.chomp == 'y'
       missing_assets.each do |asset|
-        print "Deleting #{asset.filename}..."
+        print "Deleting #{asset.name}..."
         asset.delete
         print "complete.\n"
       end
       puts "=> #{missing_assets.size} file(s) deleted.\n"
     end
   end
+rescue Exception => e
+ print "Error: #{e.message}\n"
 end
 
 def import(file, quiet = true)
@@ -321,6 +173,8 @@ def import(file, quiet = true)
     end
     puts "=> Import completed.\n"
   end
+rescue Exception => e
+  print "Error: #{e.message}\n"
 end
 
 def publish(site_id, quiet = true)
@@ -339,20 +193,39 @@ def publish(site_id, quiet = true)
     end
     puts "=> Publish completed.\n"
   end
+rescue Exception => e
+  print "Error: #{e.message}\n"
+end
+
+def config(site)
+  Siteleaf.save_settings({site_id: site.id}, '.siteleaf.yml')
+  puts "=> Site configured."
 end
 
-def has_yaml_header?(file)
-  !!(File.open(file, 'rb') { |f| f.read(5) } =~ /\A---\r?\n/)
+def get_site_id
+  # check env vars
+  [:api_key, :api_secret, :api_base, :api_version].each do |key|
+    if value = ENV['SITELEAF_'+key.to_s.upcase]
+      Siteleaf.send "#{key}=", value
+    end
+  end
+  
+  ENV['SITELEAF_SITE_ID'] || if settings = Siteleaf.load_settings('.siteleaf.yml')
+    settings[:site_id]
+  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)
+def read_dir
+  jekyll_config = ::File.exist?('_config.yml') ? YAML::load(::File.read('_config.yml')) : {}
+  
+  ignore_paths = ['config.ru', '.*', '_site/*', 'Gemfile', 'Gemfile.lock']
+  ignore_paths += ::File.read('.siteleafignore').split(/\r?\n/) if ::File.exists?('.siteleafignore')
+  ignore_paths += jekyll_config['exclude'] if jekyll_config['exclude'].is_a? Array
+  
+  Dir.glob("**/*").reject do |path|
+    ::File.directory?(path) || 
+    ignore_paths.any? {|i| ::File.fnmatch?(i, path, File::FNM_CASEFOLD) || ::File.fnmatch?(i, ::File.basename(path), File::FNM_CASEFOLD) }
   end
-  return content, metadata
 end
 
 case ARGV[0]
@@ -382,8 +255,7 @@ when 'n', 'new'
     end
   end
 when 'pull'
-  #case ARGV[1]
-  #when 'theme'
+  if ARGV.size == 1
     site_id = get_site_id
     if auth != false
       if site_id
@@ -392,12 +264,11 @@ when 'pull'
         puts "Site not configured, run `siteleaf config yoursite.com`.\n"
       end
     end
-  #else
-  #  puts "`#{ARGV[0]}` command not found.\n"
-  #end
+  else
+   puts "`#{ARGV.join(' ')}` command not found.\n"
+  end
 when 'push'
-  #case ARGV[1]
-  #when 'theme'
+  if ARGV.size == 1
     site_id = get_site_id
     if auth != false
       if site_id
@@ -406,9 +277,9 @@ when 'push'
         puts "Site not configured, run `siteleaf config yoursite.com`.\n"
       end
     end
-  #else
-  #  puts "`#{ARGV[0]}` command not found.\n"
-  #end
+  else
+    puts "`#{ARGV.join(' ')}` command not found.\n"
+  end
 when 'publish'
   site_id = get_site_id
   if auth != false

data/lib/siteleaf.rb

@@ -2,20 +2,18 @@ libdir = ::File.dirname(__FILE__)
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 require 'siteleaf/version'
+require 'siteleaf/git_hash'
 require 'siteleaf/client'
 require 'siteleaf/entity'
-require 'siteleaf/asset'
 require 'siteleaf/file'
-require 'siteleaf/upload'
 require 'siteleaf/job'
 require 'siteleaf/content'
 require 'siteleaf/page'
-require 'siteleaf/post'
 require 'siteleaf/collection'
 require 'siteleaf/document'
 require 'siteleaf/site'
+require 'siteleaf/source_file'
 require 'siteleaf/user'
-require 'patches/time_with_zone_encode_with'
 require 'digest/sha1'
 require 'rbconfig'
 require 'uri'
@@ -25,7 +23,7 @@ module Siteleaf
 
   @api_key = ENV['SITELEAF_API_KEY']
   @api_secret = ENV['SITELEAF_API_SECRET']
-  @api_base = 'https://api.v2.siteleaf.com'
+  @api_base = 'https://api.siteleaf.com'
   @api_version = 'v2'
 
   class << self

data/lib/siteleaf/client.rb

@@ -5,7 +5,8 @@ module Siteleaf
     def self.auth(email, password)
       begin
         request = HTTParty.post(Siteleaf.api_url('auth'), {
-          :basic_auth => {:username => email, :password => password}
+          :basic_auth => {:username => email, :password => password},
+          :headers => {"User-Agent" => "Siteleaf Gem/#{Siteleaf::VERSION}"}
         })
         return request.parsed_response # parse JSON
       rescue => e
@@ -14,7 +15,7 @@ module Siteleaf
     end
 
     def self.get(path, params = {})
-      params['limit'] = 9999
+      params['per_page'] = 9999 # todo: paginate
       self.execute(:get, path, params)
     end
 
@@ -35,15 +36,19 @@ module Siteleaf
       begin
         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,
             :basic_auth => {:username => Siteleaf.api_key, :password => Siteleaf.api_secret},
+            :headers => {
+              "Content-Type" => "application/json",
+              "User-Agent" => "Siteleaf Gem/#{Siteleaf::VERSION}"
+            },
             :timeout => 300
           })
         else
           request = HTTMultiParty.send(method, Siteleaf.api_url(path), {
             :query => params,
             :basic_auth => {:username => Siteleaf.api_key, :password => Siteleaf.api_secret},
+            :headers => {"User-Agent" => "Siteleaf Gem/#{Siteleaf::VERSION}"},
             :timeout => 300
           })
         end

data/lib/siteleaf/collection.rb

@@ -1,22 +1,35 @@
 module Siteleaf
   class Collection < Entity
 
-    attr_accessor :title, :path, :permalink, :output, :site_id, :metadata
+    attr_accessor :title, :path, :permalink, :output, :site_id, :user_id, :metadata
     attr_reader :id, :directory, :created_at, :updated_at
     
     def create_endpoint
-      "sites/#{self.site_id}/collections"
+      ::File.join("sites", site_id, "collections")
+    end
+    
+    def entity_endpoint
+      ::File.join(create_endpoint, identifier)
+    end
+    
+    def identifier
+      path
     end
     
     def site
-      Site.find(self.site_id)
+      Site.find(site_id)
     end
     
     def documents
-      result = Client.get "collections/#{self.id}/documents"
+      result = Client.get "#{entity_endpoint}/documents"
       result.map { |r| Document.new(r) } if result.is_a? Array
     end
     
+    def files
+      result = Client.get "#{entity_endpoint}/files"
+      result.map { |r| File.new(r) } if result.is_a? Array
+    end
+    
     def output?
       output == true
     end

data/lib/siteleaf/content.rb

@@ -1,11 +1,11 @@
 module Siteleaf
   class Content < Entity
 
-    attr_accessor :title, :body, :path, :permalink, :visibility, :published_at, :user_id, :site_id, :metadata
-    attr_reader :id, :filename, :basename, :directory, :url, :filesize, :sha, :published, :created_at, :updated_at
+    attr_accessor :title, :body, :path, :permalink, :visibility, :date, :user_id, :site_id, :metadata
+    attr_reader :id, :filename, :basename, :directory, :url, :sha, :created_at, :updated_at
     
     def site
-      Site.find(self.site_id) if self.site_id
+      Site.find(site_id) if site_id
     end
     
     def draft?
@@ -20,21 +20,9 @@ module Siteleaf
       visibility == 'visible'
     end
     alias_method :published?, :visible?
-
+    
     def to_file
-      frontmatter + "---\n\n".freeze + body.to_s
-    end
-  
-    protected
-  
-    def frontmatter
-      attrs = metadata || {}
-      attrs['title'] = title
-      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
+      SourceFile.new(site_id: site_id, name: filename).to_file
     end
     
   end

data/lib/siteleaf/document.rb

@@ -1,14 +1,18 @@
 module Siteleaf
   class Document < Content
 
-    attr_accessor :collection_id
+    attr_accessor :collection_path
     
     def create_endpoint
-      "collections/#{self.collection_id}/documents"
+      ::File.join("sites", site_id, "collections", collection_identifier, "documents")
     end
     
     def collection
-      Collection.find(self.collection_id)
+      Collection.find(collection_identifier)
+    end
+    
+    def collection_identifier
+      collection_path || directory.match(/_(.*)/).try(:last)
     end
     
   end

data/lib/siteleaf/entity.rb

@@ -8,24 +8,28 @@ module Siteleaf
     end
 
     def self.all
-      result = Client.get "#{self.endpoint}"
-      result.map { |r| self.new(r) } if result.is_a? Array
+      result = Client.get endpoint
+      result.map { |r| new(r) } if result.is_a? Array
     end
 
-    def self.find(id)
-      result = Client.get "#{self.endpoint}/#{id}"
-      self.new(result) if result
+    def self.find(identifier)
+      result = Client.get "#{endpoint}/#{identifier}"
+      new(result) if result
     end
 
     def self.create(attributes = {})
-      self.new(attributes).save
+      new(attributes).save
+    end
+    
+    def self.delete(identifier)
+      Client.delete "#{endpoint}/#{identifier}"
     end
 
     def save
-      if self.id
-        result = Client.put "#{self.class.endpoint}/#{self.id}", self.attributes
+      if identifier
+        result = Client.put entity_endpoint, attributes
       else
-        result = Client.post "#{self.create_endpoint}", self.attributes
+        result = Client.post create_endpoint, attributes
       end
       if result
         self.attributes = result
@@ -33,12 +37,8 @@ module Siteleaf
       end
     end
 
-    def self.delete(id)
-      Client.delete "#{self.endpoint}/#{id}"
-    end
-
     def delete
-      Client.delete "#{self.class.endpoint}/#{self.id}"
+      Client.delete entity_endpoint
     end
 
     def attributes
@@ -60,6 +60,14 @@ module Siteleaf
     def create_endpoint
       self.class.endpoint
     end
+    
+    def entity_endpoint
+      "#{self.class.endpoint}/#{identifier}"
+    end
+    
+    def identifier
+      id
+    end
 
   end
 end

data/lib/siteleaf/file.rb

@@ -1,8 +1,27 @@
 module Siteleaf
-  class File < Asset
-
+  class File < Entity
+    
+    attr_accessor :file, :filename, :path, :collection_path, :site_id, :user_id
+    attr_reader :id, :basename, :directory, :url, :download_url, :thumbnail_url, :content_type, :filesize, :sha, :created_at, :updated_at
+    
     def create_endpoint
-      "sites/#{self.site_id}/files"
+      ::File.join("sites", site_id, "collections", collection_identifier, "files")
+    end
+    
+    def site
+      Site.find(site_id) if site_id
+    end
+    
+    def collection
+      Collection.find(collection_identifier)
+    end
+    
+    def collection_identifier
+      collection_path || (directory && directory.match(/_(.*)/).try(:last))
+    end
+    
+    def to_file
+      SourceFile.new(site_id: site_id, name: filename).to_file
     end
     
   end

data/lib/siteleaf/git_hash.rb

@@ -0,0 +1,14 @@
+module Siteleaf
+  module GitHash
+    # equivalent of `git hash-object file.txt`
+    def self.file(filename)
+      ::File.open(filename, 'r') do |f|
+        Digest::SHA1.hexdigest("blob #{f.size}\0#{f.read}")
+      end
+    end
+    
+    def self.string(str)
+      Digest::SHA1.hexdigest("blob #{str.bytesize}\0#{str}")
+    end
+  end
+end

data/lib/siteleaf/page.rb

@@ -2,7 +2,7 @@ module Siteleaf
   class Page < Content
 
     def create_endpoint
-      "sites/#{self.site_id}/pages"
+      "sites/#{site_id}/pages"
     end
     
   end

data/lib/siteleaf/site.rb

@@ -15,33 +15,31 @@ module Siteleaf
       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.is_a? Array
-    end
-    
-    def uploads
-      result = Client.get "sites/#{self.id}/uploads"
-      result.map { |r| Upload.new(r) } if result.is_a? Array
+    def source_files(dir = '.')
+      result = Client.get ::File.join(entity_endpoint, "source", dir)
+      result.map { |r| SourceFile.new(r.merge('site_id' => id)) } if result.is_a? Array
     end
     
     def pages
-      result = Client.get "sites/#{self.id}/pages"
+      result = Client.get "#{entity_endpoint}/pages"
       result.map { |r| Page.new(r) } if result.is_a? Array
+    end    
+    
+    def collections
+      result = Client.get "#{entity_endpoint}/collections"
+      result.map { |r| Collection.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.is_a? Array
+      Collection.new(path: 'posts', site_id: id).documents
     end
     
-    def collections
-      result = Client.get "sites/#{self.id}/collections"
-      result.map { |r| Collection.new(r) } if result.is_a? Array
+    def uploads
+      Collection.new(path: 'uploads', site_id: id).files
     end
     
     def publish
-      result = Client.post "sites/#{self.id}/publish", {}
+      result = Client.post "#{entity_endpoint}/publish", {}
       Job.new(id: result["job_id"]) if result
     end
     
@@ -54,46 +52,30 @@ module Siteleaf
     end
     
     def sha
-      Digest::SHA1.hexdigest(to_file)
+      Siteleaf::GitHash.string(to_file)
     end
     
-    def to_file
-      config
+    def source_tree(dir = '.')
+      @tree_files = []
+      @tree_dirs = []
+      recursive_source_files(dir)
+      @tree_files
     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']
+    def recursive_source_files(dir = '.')
+      source_files(dir).each do |file|
+        if file.type == 'directory'
+          unless @tree_dirs.include?(file.name)
+            @tree_dirs << file.name
+            recursive_source_files(file.name) 
+          end
+        else
+          @tree_files << file
         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
 end

data/lib/siteleaf/source_file.rb

@@ -0,0 +1,26 @@
+module Siteleaf
+  class SourceFile < Entity
+    
+    attr_accessor :file, :name, :site_id
+    attr_reader :name, :url, :download_url, :type, :filesize, :sha, :created_at, :updated_at, :user_id
+    
+    def create_endpoint
+      ::File.join("sites", site_id, "source", URI.escape(identifier))
+    end
+    
+    def entity_endpoint
+      create_endpoint
+    end
+    
+    def identifier
+      name
+    end
+    
+    def to_file
+      response = Client.get(::File.join("sites", site_id, "source", "#{URI.escape(identifier)}?download"))
+      raise response['message'] if response['message'] # indicates API error
+      response.body 
+    end
+    
+  end
+end

data/lib/siteleaf/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: siteleaf
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.beta7
+  version: 2.0.0.pre.beta9
 platform: ruby
 authors:
 - Siteleaf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -80,20 +80,18 @@ 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
 - lib/siteleaf/collection.rb
 - lib/siteleaf/content.rb
 - lib/siteleaf/document.rb
 - lib/siteleaf/entity.rb
 - lib/siteleaf/file.rb
+- lib/siteleaf/git_hash.rb
 - lib/siteleaf/job.rb
 - lib/siteleaf/page.rb
-- lib/siteleaf/post.rb
 - lib/siteleaf/site.rb
-- lib/siteleaf/upload.rb
+- lib/siteleaf/source_file.rb
 - lib/siteleaf/user.rb
 - lib/siteleaf/version.rb
 - siteleaf.gemspec

data/lib/patches/time_with_zone_encode_with.rb

@@ -1,12 +0,0 @@
-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/asset.rb

@@ -1,43 +0,0 @@
-module Siteleaf
-  class Asset < Entity
-
-    attr_accessor :file, :filename, :path, :basename, :directory, :permalink, :replace, :site_id, :metadata
-    attr_reader :id, :basename, :directory, :url, :content_type, :filesize, :sha, :static, :created_at, :updated_at
-    
-    def site
-      Site.find(self.site_id) if self.site_id
-    end
-    
-    def filename
-      # todo: temporary fix
-      (directory == '.') ? basename : ::File.join(directory, basename)
-    end
-    
-    def to_file
-      if static?
-        body
-      else
-        [frontmatter, "---\n\n".freeze, body].join('')
-      end
-    end
-  
-    protected
-  
-    def frontmatter
-      attrs = metadata || {}
-      attrs.delete('name') # todo: temporary fix
-      attrs['permalink'] = permalink unless permalink.nil?
-  
-      attrs.empty? ? "---\n".freeze : attrs.to_yaml
-    end
-    
-    def body
-      open(file['url'], 'r:UTF-8') { |f| f.read }
-    end
-    
-    def static?
-      static == true
-    end
-    
-  end
-end

data/lib/siteleaf/post.rb

@@ -1,11 +0,0 @@
-module Siteleaf
-  class Post < Content
-
-    attr_accessor :taxonomy
-    
-    def create_endpoint
-      "sites/#{self.parent_id}/posts"
-    end
-    
-  end
-end

data/lib/siteleaf/upload.rb

@@ -1,9 +0,0 @@
-module Siteleaf
-  class Upload < Asset
-
-    def create_endpoint
-      "sites/#{self.site_id}/uploads"
-    end
-    
-  end
-end