siteleaf 1.0.11 → 2.0.0.pre.beta1

data/lib/siteleaf/asset.rb

@@ -1,36 +1,43 @@
 module Siteleaf
   class Asset < Entity
 
-    attr_accessor :file, :filename, :replace, :site_id, :page_id, :post_id, :theme_id, :meta
-    attr_reader :id, :url, :content_type, :filesize, :checksum, :created_at, :updated_at
-
-    def create_endpoint
-      if !self.post_id.nil?
-        "posts/#{self.post_id}/assets"
-      elsif !self.page_id.nil?
-        "pages/#{self.page_id}/assets"
-      elsif !self.theme_id.nil?
-        "sites/#{self.site_id}/theme/assets"
+    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
-        "sites/#{self.site_id}/assets"
+        [frontmatter, "---\n\n".freeze, body].join('')
       end
     end
-
-    def post
-      Post.find(self.post_id) if self.post_id
+  
+    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 page
-      Page.find(self.page_id) if self.page_id
+    
+    def body
+      open(file['url'], 'r:UTF-8') { |f| f.read }
     end
-
-    def theme
-      Theme.find(self.theme_id) if self.theme_id
-    end
-
-    def site
-      Site.find(self.site_id) if self.site_id
+    
+    def static?
+      static == true
     end
-
+    
   end
 end

data/lib/siteleaf/client.rb

@@ -5,8 +5,7 @@ module Siteleaf
     def self.auth(email, password)
       begin
         request = HTTParty.post(Siteleaf.api_url('auth'), {
-          :basic_auth => {:username => email, :password => password},
-          :headers => {"User-Agent" => "Siteleaf Gem/#{Siteleaf::VERSION}"}
+          :basic_auth => {:username => email, :password => password}
         })
         return request.parsed_response # parse JSON
       rescue => e
@@ -14,7 +13,8 @@ module Siteleaf
       end
     end
 
-    def self.get(path, params = nil)
+    def self.get(path, params = {})
+      params['limit'] = 9999
       self.execute(:get, path, params)
     end
 
@@ -33,12 +33,20 @@ module Siteleaf
     def self.execute(method, path, params = nil)
       Siteleaf.load_settings if !Siteleaf.api_key
       begin
-        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
-        })
+        if (method == :post || method == :put) && !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},
+            :timeout => 300
+          })
+        else
+          request = HTTMultiParty.send(method, Siteleaf.api_url(path), {
+            :query => params,
+            :basic_auth => {:username => Siteleaf.api_key, :password => Siteleaf.api_secret},
+            :timeout => 300
+          })
+        end
         if request.respond_to?('parsed_response')
           return request.parsed_response # parse JSON
         else

data/lib/siteleaf/collection.rb

@@ -0,0 +1,21 @@
+module Siteleaf
+  class Collection < Entity
+
+    attr_accessor :title, :path, :output, :site_id, :metadata
+    attr_reader :id, :basename, :directory, :created_at, :updated_at
+    
+    def create_endpoint
+      "sites/#{self.site_id}/collections"
+    end
+    
+    def site
+      Site.find(self.site_id)
+    end
+    
+    def documents
+      result = Client.get "collections/#{self.id}/documents"
+      result.map { |r| Document.new(r) } if result
+    end
+    
+  end
+end

data/lib/siteleaf/content.rb

@@ -0,0 +1,36 @@
+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
+    
+    def site
+      Site.find(self.site_id) if self.site_id
+    end
+    
+    def draft?
+      !published?
+    end
+    
+    def published?
+      published != false
+    end
+
+    def to_file
+      [frontmatter, "---\n\n".freeze, body].join('')
+    end
+  
+    protected
+  
+    def frontmatter
+      attrs = metadata || {}
+      attrs['title'] = title
+      attrs['date'] = Time.parse(published_at).utc.strftime('%F %T %z')
+      attrs['published'] = false if draft?
+      attrs['permalink'] = permalink unless permalink.nil?
+  
+      attrs.empty? ? "---\n".freeze : attrs.to_yaml
+    end
+    
+  end
+end

data/lib/siteleaf/document.rb

@@ -0,0 +1,15 @@
+module Siteleaf
+  class Document < Content
+
+    attr_accessor :collection_id
+    
+    def create_endpoint
+      "collections/#{self.collection_id}/documents"
+    end
+    
+    def collection
+      Collection.find(self.collection_id)
+    end
+    
+  end
+end

data/lib/siteleaf/entity.rb

@@ -1,7 +1,7 @@
 module Siteleaf
   class Entity
   
-    attr_reader :error
+    attr_reader :error, :message
 
     def initialize(attributes = {})
       self.attributes = attributes

data/lib/siteleaf/file.rb

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

data/lib/siteleaf/page.rb

@@ -1,92 +1,9 @@
 module Siteleaf
-  class Page < Entity
-
-    attr_accessor :title, :custom_slug, :body, :visibility, :published_at, :user_id, :site_id, :parent_id, :meta, :user
-    attr_reader :id, :slug, :url, :created_at, :updated_at, :assets
-    
-    def self.find(id)
-      super "#{id}?include=user"
-    end
+  class Page < Content
 
     def create_endpoint
       "sites/#{self.site_id}/pages"
     end
-
-    def site
-      Site.find(self.site_id) if self.site_id
-    end
-
-    def assets
-      result = Client.get "pages/#{self.id}/assets"
-      result.map { |r| Asset.new(r) } if result
-    end
-
-    def posts
-      result = Client.get "pages/#{self.id}/posts"
-      result.map { |r| Post.new(r) } if result
-    end
-
-    def pages
-      result = Client.get "pages/#{self.id}?include=pages"
-      result["pages"].map { |r| Page.new(r) } if result
-    end
-
-    def page
-      Page.find(self.parent_id) if self.parent_id
-    end
-
-    def draft?
-      visibility == 'draft'
-    end
-
-    def published?
-      visibility == 'visible'
-    end
-
-    def filename
-      "#{url.sub('/','')}.markdown"
-    end
-
-    def frontmatter
-      attrs = {}
-      attrs['title'] = title
-      attrs['date'] = Time.parse(published_at).utc if published_at
-      attrs['published'] = false if !published?
-      attrs['author'] = user['fullname'] if user && user['fullname']
-
-      meta.each{|m| attrs[m['key'].to_s.downcase] = m['value'].to_s == '' ? nil : m['value'].to_s.gsub("\r\n","\n")} unless meta.nil?
-
-      unless assets.to_a.empty?
-        attrs['assets'] = assets.map do |a|
-          asset = {'path' => "/uploads/#{a.filename}"}
-          a.meta.each{|m| asset[m['key'].to_s.downcase] = m['value'].to_s == '' ? nil : m['value'].to_s.gsub("\r\n","\n")} unless meta.nil?
-          asset
-        end
-      end
-
-      if defined?(taxonomy) && !taxonomy.nil?
-        taxonomy.each do |t|
-          next if t['values'].empty?
-          key = t['key']
-          key.downcase! if key =~ /^(tags|category|categories)$/i
-          attrs[key] = t['values'].map{|v| v['value'] }
-        end
-      end
-
-      attrs
-    end
-
-    def to_file(dir = 'export')
-      assets = Dir.glob("#{dir}/_uploads/**/*").each_with_object({}) do |var, hash|
-        # remap assets to _uploads
-        hash[var.sub("#{dir}/_uploads",'/assets')] = var.sub("#{dir}/_uploads",'/uploads')
-      end
-
-      attrs = frontmatter
-      attrs_yaml = attrs.empty? ? "---\n".freeze : attrs.to_yaml
-
-      (attrs_yaml + "---\n\n".freeze + body.to_s.gsub("\r\n","\n")).gsub(Regexp.union(assets.keys), assets)
-    end
-
+    
   end
-end
+end

data/lib/siteleaf/post.rb

@@ -1,35 +1,10 @@
 module Siteleaf
-  class Post < Page
+  class Post < Content
 
     attr_accessor :taxonomy
     
     def create_endpoint
-      "pages/#{self.parent_id}/posts"
-    end
-    
-    def parent
-      Page.find(self.parent_id)
-    end
-    
-    def assets
-      result = Client.get "posts/#{self.id}/assets"
-      result.map { |r| Asset.new(r) } if result
-    end
-    
-    def filename(posts_path = 'posts')
-      paths = url.sub('/','').split('/')
-      basename = "#{paths.pop}.markdown"
-      path = paths.join('_')
-      if path == posts_path 
-        if draft?
-          path = 'drafts'
-        else
-          path = 'posts'
-          date = Time.parse(published_at).strftime('%Y-%m-%d')
-          basename = "#{date}-#{basename}"
-        end
-      end
-      "_#{path}/#{basename}"
+      "sites/#{self.parent_id}/posts"
     end
     
   end

data/lib/siteleaf/site.rb

@@ -1,108 +1,44 @@
 module Siteleaf
   class Site < Entity
 
-    attr_accessor :title, :domain, :timezone, :meta, :posts_path, :version
+    attr_accessor :title, :domain, :timezone, :metadata
     attr_reader :id, :user_id, :created_at, :updated_at
-
+    
     def self.find_by_domain(domain)
-      result = Client.get self.endpoint, {"domain" => domain}
-      self.new(result.first) if result and result.size >= 1
+      results = Client.get self.endpoint
+      result = results.find {|d| d['domain'] == domain }
+      self.new(result) if result
     end
-
-    def theme
-      @theme ||= if result = Client.get("sites/#{self.id}/theme")
-        theme = Theme.new(result)
-        theme.site_id = self.id
-        theme
-      end
+    
+    def files
+      result = Client.get "sites/#{self.id}/files"
+      result.map { |r| File.new(r) } if result
     end
-
-    def assets
-      result = Client.get "sites/#{self.id}/assets"
-      result.map { |r| Asset.new(r) } if result
+    
+    def uploads
+      result = Client.get "sites/#{self.id}/uploads"
+      result.map { |r| Upload.new(r) } if result
     end
-
+    
     def pages
-      result = Client.get "sites/#{self.id}/pages?include=user"
+      result = Client.get "sites/#{self.id}/pages"
       result.map { |r| Page.new(r) } if result
     end
-
+    
     def posts
-      result = Client.get "sites/#{self.id}/posts?include=user"
+      result = Client.get "sites/#{self.id}/posts"
       result.map { |r| Post.new(r) } if result
     end
-
-    def resolve(url = '/')
-      Client.get "sites/#{self.id}/resolve", {"url" => url}
-    end
-
-    def preview(url = '/', template = nil)
-      Client.post "sites/#{self.id}/preview", {"url" => url, "template" => template}
+    
+    def collections
+      result = Client.get "sites/#{self.id}/collections"
+      result.map { |r| Collection.new(r) } if result
     end
-
+    
     def publish
       result = Client.post "sites/#{self.id}/publish", {}
       Job.new(id: result.parsed_response["job_id"]) if result
     end
-
-    def posts_path
-      @posts_path || 'posts'
-    end
-
-    def filename
-      "_config.yml"
-    end
-
-    def config
-      attrs = {}
-      attrs['title'] = title
-      attrs['url'] = "http://#{domain}"
-      attrs['timezone'] = timezone
-      attrs['permalink'] = 'pretty'
-      attrs['markdown'] = 'kramdown'
-
-      meta.each{|m| attrs[m['key'].to_s.downcase] = m['value'].to_s == '' ? nil : m['value'].to_s.gsub("\r\n","\n")} unless meta.nil?
-
-      # output uploads using v1 /assets path
-      attrs['collections'] = {
-        'uploads' => {
-          'title' => 'Uploads',
-          'output' => true
-        }
-      }
-
-      # use collections for any set of posts not called "posts"
-      pages.each do |page|
-        path = page.url.sub('/','').gsub('/','_')
-        if path != posts_path && page.posts.size > 0
-          attrs['collections'][path] = {'output' => true}
-          # output permalink for non-standard urls (e.g. posts inside sub-pages)
-          attrs['collections'][path]['permalink'] = "#{page.url}/:path" if path != page.slug
-        end
-      end
-
-      # set permalink style for posts
-      attrs['defaults'] = [{
-        'scope' => {
-          'path' => '',
-          'type' => 'posts'
-        },
-        'values' => {
-          'permalink' => "/#{posts_path}/:title/"
-        }
-      }]
-
-      attrs
-    end
-
-    def to_file(dir = 'export')
-      assets = Dir.glob("#{dir}/_uploads/**/*").each_with_object({}) do |var, hash|
-        # remap assets to _uploads
-        hash[var.sub("#{dir}/_uploads",'/assets')] = var.sub("#{dir}/_uploads",'/uploads')
-      end
-
-      config.to_yaml.gsub(Regexp.union(assets.keys), assets)
-    end
-
+    
   end
-end
+end

data/lib/siteleaf/upload.rb

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

data/lib/siteleaf/version.rb

@@ -1,3 +1,3 @@
 module Siteleaf
-  VERSION = "1.0.11"
+  VERSION = "2.0.0.pre.beta1"
 end

data/lib/siteleaf.rb

@@ -1,32 +1,37 @@
-libdir = File.dirname(__FILE__)
+libdir = ::File.dirname(__FILE__)
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 require 'siteleaf/version'
 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/server'
+require 'siteleaf/collection'
+require 'siteleaf/document'
 require 'siteleaf/site'
-require 'siteleaf/theme'
 require 'siteleaf/user'
-require 'patches/time_with_zone_encode_with'
 require 'rbconfig'
 require 'uri'
 require 'yaml'
 
 module Siteleaf
 
-  @api_base = 'https://api.siteleaf.com/v1'
+  @api_key = ENV['SITELEAF_API_KEY']
+  @api_secret = ENV['SITELEAF_API_SECRET']
+  @api_base = 'http://api.v2.siteleaf.com'
+  @api_version = 'v2'
 
   class << self
-    attr_accessor :api_key, :api_secret, :api_base
+    attr_accessor :api_key, :api_secret, :api_base, :api_version
   end
 
-  def self.api_url(url='')
-    "#{@api_base}/#{url}"
+  def self.api_url(url = '')
+    ::File.join(@api_base, @api_version, url)
   end
 
   def self.settings_file
@@ -45,15 +50,8 @@ module Siteleaf
       settings.each{|k,v| symbolized_settings[k.to_sym] = v}
       
       symbolized_settings
-      
-    # read legacy settings, upgrade old marshal format into yaml
-    elsif self.load_legacy_settings
-      symbolized_settings = {api_key: self.api_key, api_secret: self.api_secret}
-      self.save_settings(symbolized_settings)
-      ::File.unlink(self.legacy_settings_file)
-      symbolized_settings
     end
-  rescue
+  rescue 
     nil
   end
   
@@ -65,20 +63,5 @@ module Siteleaf
     
     settings
   end
-  
-  # here for v1 legacy purposes
-  def self.legacy_settings_file
-    ::File.expand_path('~/.siteleaf')
-  end
-  
-  def self.load_legacy_settings
-    if ::File.exist?(legacy_settings_file)
-      config = ::File.open(legacy_settings_file) do|file|
-        Marshal.load(file)
-      end
-      self.api_key = config[:api_key] if config.has_key?(:api_key)
-      self.api_secret = config[:api_secret] if config.has_key?(:api_secret)
-    end
-  end
 
 end

data/siteleaf.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
+lib = ::File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'siteleaf/version'
 
@@ -12,12 +12,12 @@ Gem::Specification.new do |gem|
   gem.description   = %q{A Ruby interface and command line utility for the Siteleaf API.}
   gem.summary       = "Siteleaf Ruby interface"
   gem.homepage      = "http://siteleaf.com"
-
+  
   gem.required_ruby_version = '>= 1.9.3'
-
-  gem.add_dependency 'httparty', '>= 0.14.0'
+  
+  gem.add_dependency 'httparty', '>= 0.13.3'
   gem.add_dependency 'httmultiparty', '>= 0.3.13'
-  gem.add_dependency 'psych', '>= 2.0.17'
+  gem.add_dependency 'psych', '2.0.8'
   gem.add_dependency 'rack'
 
   gem.files         = `git ls-files`.split($/)