siteleaf 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 381d797618975d09040410063221c28047e1e4cb
-  data.tar.gz: f672e44c0c7476f66cbf936ccdaaf99d1c4edc0b
+  metadata.gz: 65d48226cecb838d1278ade7c5b7541b34a1109d
+  data.tar.gz: f0bf3187c1fc2421569d9ceb3bca7ca653c32c19
 SHA512:
-  metadata.gz: 1fd6a066558b67b11360c4412e2936c04e2b8545d293ca6fd93eb91fcbda321b358eb262afcb5120d6019a1fcc5bb74b20882b5d1ac06b50d7ffecce0f3f4f1e
-  data.tar.gz: 073d3a4f6acf1c36484d6ea6116bd6f38df5dc4a96ac42c3f4ea12613af8c9195ebc6b91d23b3bd7a29207a8ad8516e7883be5ded383dd7bb56d5df99f303489
+  metadata.gz: 2bba0b5d62f3b7b2dddcafaa5be8d578880cca38781b560d7b4b24f6478b8700c507484dd9d86c0143be1a3f2fbcf7baf4a55adcea2a25315f0e0495fc8ae4a2
+  data.tar.gz: 91412e0252c46d6e4a9648c31a45a82133d2555091791f1a4ad2bff6866e8831ecd596a02302d82153f1d554c27189d817f6b897e4de285f95fbaa7e636d6da5

data/README.md

@@ -1,4 +1,4 @@
-Siteleaf Gem V2
+Siteleaf v2 Gem
 ===============
 
 - [Installation](#installation)
@@ -13,9 +13,11 @@ Installation
 
 The Siteleaf gem is available for installation on [Rubygems](https://rubygems.org/gems/siteleaf). To install run:
 
-    gem install siteleaf --pre
+    gem install siteleaf
     
-Important: make sure to use `--pre` for V2. If maintaining sites with multiple versions, we recommend using a Gemfile.
+**Note:** the v2 gem only works with v2 sites. For documentation on v1 see: https://github.com/siteleaf/siteleaf-gem/tree/v1
+
+If maintaining sites with multiple versions, we recommend using a [Gemfile](#using-this-gem-in-your-application).
 
 
 Using the CLI
@@ -78,7 +80,7 @@ Using this gem in your application
     
 To use this gem in your application, add the following to your Gemfile:
 
-    gem 'siteleaf', :git => 'git://github.com/siteleaf/siteleaf-gem.git', :branch => '2.0.0.pre'
+    gem 'siteleaf', '~>2'
 
 
 Using the API

data/bin/siteleaf

@@ -58,12 +58,13 @@ end
 
 def pull(site_id)
   print "Reading site...\n"
-  
+
   # get all the things
   site = Siteleaf::Site.find(site_id)
-  site_files = site.source_tree
+  site_files = site.source_files('.', recursive: true)
+
   updated_count = 0
-  
+
   # download unmatched files
   site_files.each do |file|
     sha = ::File.exist?(file.name) && Siteleaf::GitHash.file(file.name)
@@ -75,11 +76,11 @@ def pull(site_id)
       print "complete.\n"
     end
   end
-  
+
   # check for old files
   local_files = read_dir
   missing_files = []
-  local_files.each do |path| 
+  local_files.each do |path|
     missing_files << path if !site_files.find{|a| a.name.casecmp(path) == 0 }
   end
   if missing_files.empty?
@@ -105,23 +106,23 @@ end
 
 def push(site_id)
   print "Reading site...\n"
-  
+
   # get all the things
   site = Siteleaf::Site.find(site_id)
-  site_files = site.source_tree
+  site_files = site.source_files('.', recursive: true)
   local_files = read_dir
   updated_count = 0
-  
+
   # 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') 
-  
+  changed_files.unshift('_config.yml') if changed_files.delete('_config.yml')
+
   # upload changed files
-  changed_files.each do |path|  
-    print "Uploading #{path}..."   
+  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"
@@ -131,10 +132,10 @@ def push(site_id)
       print "complete.\n"
     end
   end
-  
+
   # check for old files
   missing_assets = []
-  site_files.each do |asset| 
+  site_files.each do |asset|
     missing_assets << asset if !local_files.find{|p| p.casecmp(asset.name) == 0 }
   end
   if missing_assets.empty?
@@ -160,7 +161,7 @@ end
 
 def import(file, quiet = true)
   job = Siteleaf::Site.import(file: ::File.new(file))
-  
+
   if quiet
     puts "=> Import queued.\n"
   else
@@ -180,7 +181,7 @@ end
 def publish(site_id, quiet = true)
   site = Siteleaf::Site.new(id: site_id)
   job = site.publish
-  
+
   if quiet
     puts "=> Publish queued.\n"
   else
@@ -209,7 +210,7 @@ def get_site_id
       Siteleaf.send "#{key}=", value
     end
   end
-  
+
   ENV['SITELEAF_SITE_ID'] || if settings = Siteleaf.load_settings('.siteleaf.yml')
     settings[:site_id]
   end
@@ -217,13 +218,13 @@ end
 
 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) || 
+    ::File.directory?(path) ||
     ignore_paths.any? {|i| ::File.fnmatch?(i, path, File::FNM_CASEFOLD) || ::File.fnmatch?(i, ::File.basename(path), File::FNM_CASEFOLD) }
   end
 end

data/lib/siteleaf/collection.rb

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

data/lib/siteleaf/content.rb

@@ -3,27 +3,27 @@ module Siteleaf
 
     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(site_id) if site_id
     end
-    
+
     def draft?
       visibility == 'draft'
     end
-    
+
     def hidden?
       visibility == 'hidden'
     end
-    
+
     def visible?
       visibility == 'visible'
     end
     alias_method :published?, :visible?
-    
+
     def to_file
       SourceFile.new(site_id: site_id, name: filename).to_file
     end
-    
+
   end
 end

data/lib/siteleaf/entity.rb

@@ -1,6 +1,6 @@
 module Siteleaf
   class Entity
-  
+
     attr_reader :error, :message
 
     def initialize(attributes = {})
@@ -9,7 +9,7 @@ module Siteleaf
 
     def self.all
       result = Client.get endpoint
-      result.map { |r| new(r) } if result.is_a? Array
+      result.map { |r| new(r) } if result.parsed_response.is_a? Array
     end
 
     def self.find(identifier)
@@ -20,7 +20,7 @@ module Siteleaf
     def self.create(attributes = {})
       new(attributes).save
     end
-    
+
     def self.delete(identifier)
       Client.delete "#{endpoint}/#{identifier}"
     end
@@ -60,11 +60,11 @@ module Siteleaf
     def create_endpoint
       self.class.endpoint
     end
-    
+
     def entity_endpoint
       "#{self.class.endpoint}/#{identifier}"
     end
-    
+
     def identifier
       id
     end

data/lib/siteleaf/site.rb

@@ -3,79 +3,57 @@ module Siteleaf
 
     attr_accessor :title, :domain, :timezone, :metadata, :defaults
     attr_reader :id, :user_id, :created_at, :updated_at
-    
+
     def self.find_by_domain(domain)
       results = Client.get self.endpoint
       result = results.find {|d| d['domain'] == domain }
       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 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
+
+    def source_files(dir = '.', opts = {})
+      result = Client.get ::File.join(entity_endpoint, "source", dir), opts
+      result.map { |r| SourceFile.new(r.merge('site_id' => id)) } if result.parsed_response.is_a? Array
     end
-    
+
     def pages
       result = Client.get "#{entity_endpoint}/pages"
-      result.map { |r| Page.new(r) } if result.is_a? Array
-    end    
-    
+      result.map { |r| Page.new(r) } if result.parsed_response.is_a? Array
+    end
+
     def collections
       result = Client.get "#{entity_endpoint}/collections"
-      result.map { |r| Collection.new(r) } if result.is_a? Array
+      result.map { |r| Collection.new(r) } if result.parsed_response.is_a? Array
     end
-    
+
     def posts
       Collection.new(path: 'posts', site_id: id).documents
     end
-    
+
     def uploads
       Collection.new(path: 'uploads', site_id: id).files
     end
-    
+
     def publish
       result = Client.post "#{entity_endpoint}/publish", {}
       Job.new(id: result["job_id"]) if result
     end
-    
+
     def full_url
       "http://#{domain}"
     end
-    
+
     def filename
       "_config.yml"
     end
-    
+
     def sha
       Siteleaf::GitHash.string(to_file)
     end
-    
-    def source_tree(dir = '.')
-      @tree_files = []
-      @tree_dirs = []
-      recursive_source_files(dir)
-      @tree_files
-    end
-  
-    protected
-    
-    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
-    
+
   end
 end

data/lib/siteleaf/source_file.rb

@@ -1,26 +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 
+      raise response['message'] if response.parsed_response.is_a?(Hash) && 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"
+  VERSION = "2.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: siteleaf
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Siteleaf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Siteleaf Ruby interface