siteleaf 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2dcab015e55d6e78bb8f1288441b05631455b87
-  data.tar.gz: aa7ca707564c6aceec0493dc2e24a6c28924fe39
+  metadata.gz: b58e2191052b78089839ad0f0b413ffd3a621f96
+  data.tar.gz: 6da80855926d96b93ab727d976d76a6dc3c69056
 SHA512:
-  metadata.gz: 4eb1f8dbda44ccf87e0becffb562444aaa8696ff56b92bd5076dc58effe0e6b8d1f6a8cdc88a8327d89f19f23ed5261503d148b8c192d634e2f3e9ad33250bc7
-  data.tar.gz: f49b40a6d213e78bb04c118f8aeb96b49c450eab53c997efb6db3da264d12eb604b1ce41fd0a6d552725945f69c38db820ec27b06511b574702754d272e5e58a
+  metadata.gz: 0dd932d6d6f2c16e996ef39609914b906f9c3069838af7f37db3fa9eca8c3248d1c6848eb2281ae4f5de40d8917803460c9b567cc021adc0b59d8440bc25d8f3
+  data.tar.gz: 3818d0f20838566907748e7aab27d3bc9c80b2af7dada8a01759460b93421767d938e008e76c7aecee6dd062b0ed4cf1afd626bac160c685c43ac70b977c2d42

data/bin/siteleaf

@@ -1,7 +1,9 @@
 #!/usr/bin/env ruby
 
 require 'siteleaf'
+require 'jekyll'
 require 'fileutils'
+require 'pathutil'
 require 'open-uri'
 require 'tempfile'
 require 'yaml'
@@ -30,9 +32,9 @@ See https://github.com/siteleaf/siteleaf-gem for additional documentation.
 end
 
 def auth(re_auth = false)
-  Siteleaf.load_settings if !re_auth && !Siteleaf.api_key
+  Siteleaf.load_settings if !re_auth && !(Siteleaf.api_key && Siteleaf.api_secret)
 
-  if re_auth or !Siteleaf.api_key
+  if re_auth or !(Siteleaf.api_key && Siteleaf.api_secret)
     print 'Enter your Siteleaf email: '
     email = $stdin.gets.chomp
 
@@ -42,18 +44,17 @@ def auth(re_auth = false)
     system 'stty echo'
 
     puts "\nAuthorizing..."
-
-    if (auth = Siteleaf::Client.auth(email, password)) && (auth.is_a?(Hash)) && (auth.has_key?('api_key'))
+    
+    auth = Siteleaf::Client.auth(email, password)
+    if auth.is_a?(Hash) && auth.has_key?('api_key')
       Siteleaf.save_settings({api_key: auth['api_key'], api_secret: auth['api_secret']})
-      puts "=> Gem authorized." if re_auth
+      Siteleaf.load_settings
+      puts "=> Account authorized." if re_auth
       return true
     else
-      puts auth['error'] || "Could not authorize, check your email or password."
-      return false
+      raise "Could not authorize, check your email or password."
     end
   end
-rescue Exception => e
-  print "Error: #{e.message}\n"
 end
 
 def pull(site_id)
@@ -100,8 +101,6 @@ def pull(site_id)
       puts "=> #{missing_files.size} file(s) deleted.\n"
     end
   end
-rescue Exception => e
-  print "Error: #{e.message}\n"
 end
 
 def push(site_id)
@@ -109,6 +108,7 @@ def push(site_id)
 
   # get all the things
   site = Siteleaf::Site.find(site_id)
+  
   site_files = site.source_files('.', recursive: true)
   local_files = read_dir
   updated_count = 0
@@ -124,12 +124,11 @@ def push(site_id)
   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
-    else
-      updated_count += 1
-      print "complete.\n"
+    updated_count += 1
+    print "complete.\n"
+    if response.name && response.name != path
+      local_files.push(response.name)
+      puts "Warning: Remote filename has been normalized to `#{response.name}`."
     end
   end
 
@@ -155,8 +154,6 @@ def push(site_id)
       puts "=> #{missing_assets.size} file(s) deleted.\n"
     end
   end
-rescue Exception => e
- print "Error: #{e.message}\n"
 end
 
 def import(file, quiet = true)
@@ -174,8 +171,6 @@ 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)
@@ -194,8 +189,6 @@ def publish(site_id, quiet = true)
     end
     puts "=> Publish completed.\n"
   end
-rescue Exception => e
-  print "Error: #{e.message}\n"
 end
 
 def config(site)
@@ -217,94 +210,98 @@ def get_site_id
 end
 
 def read_dir
-  jekyll_config = ::File.exist?('_config.yml') ? YAML::load(::File.read('_config.yml')) : {}
+  jekyll_site = Jekyll::Site.new(Jekyll.configuration(quiet: true))
 
   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
+  ignore_paths += jekyll_site.exclude
+  
+  entry_filter = Jekyll::EntryFilter.new(jekyll_site)
 
   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) }
+    ::File.directory?(path) || entry_filter.glob_include?(ignore_paths, path)
   end
 end
 
-case ARGV[0]
-when '-v', '--version', 'version'
-  puts Siteleaf::VERSION
-when '-h', '--help', 'help'
-  puts help
-when 'auth'
-  auth true
-when 'c', 'config', 'setup'
-  if auth != false
-    if site = Siteleaf::Site.find_by_domain(ARGV[1])
-      config site
-    else
-      puts "No site found for `#{ARGV[1]}`, run `siteleaf new #{ARGV[1]}` to create it.\n"
+begin
+  case ARGV[0]
+  when '-v', '--version', 'version'
+    puts Siteleaf::VERSION
+  when '-h', '--help', 'help'
+    puts help
+  when 'auth'
+    auth true
+  when 'c', 'config', 'setup'
+    if auth != false
+      if site = Siteleaf::Site.find_by_domain(ARGV[1])
+        config site
+      else
+        raise "No site found for `#{ARGV[1]}`, run `siteleaf new #{ARGV[1]}` to create it.\n"
+      end
     end
-  end
-when 'n', 'new'
-  if auth != false
-    if (site = Siteleaf::Site.create(:title => ARGV[1], :domain => ARGV[1])) && (!site.error)
+  when 'n', 'new'
+    if auth != false
+      site = Siteleaf::Site.create(:title => ARGV[1], :domain => ARGV[1])
       dir = ARGV.size >= 3 ? ARGV[2] : ARGV[1]
       Dir.mkdir(dir) unless ::File.directory?(dir)
       Dir.chdir(dir)
       config site
+    end
+  when 'pull'
+    if ARGV.size == 1
+      site_id = get_site_id
+      if auth != false
+        if site_id
+          pull(site_id)
+        else
+          raise "Site not configured, run `siteleaf config yoursite.com`.\n"
+        end
+      end
     else
-      puts "Could not create site `#{ARGV[1]}`.\n"
+     raise "`#{ARGV.join(' ')}` command not found.\n"
     end
-  end
-when 'pull'
-  if ARGV.size == 1
+  when 'push'
+    if ARGV.size == 1
+      site_id = get_site_id
+      if auth != false
+        if site_id
+          push(site_id)
+        else
+          raise "Site not configured, run `siteleaf config yoursite.com`.\n"
+        end
+      end
+    else
+      raise "`#{ARGV.join(' ')}` 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
-        pull(site_id)
+        publish(site_id, quiet)
       else
-        puts "Site not configured, run `siteleaf config yoursite.com`.\n"
+        raise "Site not configured, run `siteleaf config yoursite.com`.\n"
       end
     end
-  else
-   puts "`#{ARGV.join(' ')}` command not found.\n"
-  end
-when 'push'
-  if ARGV.size == 1
+  when 'import'
     site_id = get_site_id
     if auth != false
-      if site_id
-        push(site_id)
+      file = ARGV[1]
+      if File.extname(file) != '.zip'
+        raise "Import file must be ZIP format.\n"
+      elsif !File.exist?(file)
+        raise "Import file not found.\n"
       else
-        puts "Site not configured, run `siteleaf config yoursite.com`.\n"
+        quiet = %w[-q --quiet].include?(ARGV[2]) && ARGV[2]
+        import(file, quiet)
       end
     end
   else
-    puts "`#{ARGV.join(' ')}` 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
-      publish(site_id, quiet)
-    else
-      puts "Site not configured, run `siteleaf config yoursite.com`.\n"
-    end
+    puts "Error: `#{ARGV[0]}` command not found.\n"
+    puts help
+    exit(1)
   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
+rescue Exception => e
+  puts "Error: #{e.message}\n"
+  exit(1)
 end

data/lib/siteleaf/client.rb

@@ -1,17 +1,17 @@
-require 'httmultiparty'
+require 'httparty'
 
 module Siteleaf
   class Client
     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}"}
-        })
-        return request.parsed_response # parse JSON
-      rescue => e
-        return 'error' => e.message # error
+      request = HTTParty.post(Siteleaf.api_url('auth'), {
+        :basic_auth => {:username => email, :password => password},
+        :headers => {"User-Agent" => "Siteleaf Gem/#{Siteleaf::VERSION}"}
+      })
+      response = request.parsed_response
+      if response.is_a?(Hash) && error = response['message'] || response['error']
+        raise error
       end
+      response
     end
 
     def self.get(path, params = {})
@@ -33,33 +33,28 @@ 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') && !params.has_key?(:file)
-          request = HTTParty.send(method, Siteleaf.api_url(path), {
-            :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
-        if request.respond_to?('parsed_response')
-          return request.parsed_response # parse JSON
-        else
-          return request # raw
-        end
-      rescue => e
-        return 'error' => e.message # error
+      
+      options = {
+        :basic_auth => {:username => Siteleaf.api_key, :password => Siteleaf.api_secret},
+        :headers => {"User-Agent" => "Siteleaf Gem/#{Siteleaf::VERSION}"},
+        :timeout => 300
+      }
+      
+      if method == :get || method == :delete
+        options[:query] = params
+      elsif params.has_key?('file') || params.has_key?(:file)
+        options[:body] = params
+      else
+        options[:body] = params.to_json
+        options[:headers]["Content-Type"] = "application/json"
       end
+      
+      request = HTTParty.send(method, Siteleaf.api_url(path), options)
+      response = request.parsed_response
+      if response.is_a?(Hash) && error = response['message'] || response['error']
+        raise error
+      end
+      response
     end
   end
 end

data/lib/siteleaf/collection.rb

@@ -22,12 +22,12 @@ module Siteleaf
 
     def documents
       result = Client.get "#{entity_endpoint}/documents"
-      result.map { |r| Document.new(r) } if result.parsed_response.is_a? Array
+      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.parsed_response.is_a? Array
+      result.map { |r| File.new(r) } if result.is_a? Array
     end
 
     def output?
@@ -39,4 +39,4 @@ module Siteleaf
     end
 
   end
-end
+end

data/lib/siteleaf/entity.rb

@@ -9,7 +9,7 @@ module Siteleaf
 
     def self.all
       result = Client.get endpoint
-      result.map { |r| new(r) } if result.parsed_response.is_a? Array
+      result.map { |r| new(r) } if result.is_a? Array
     end
 
     def self.find(identifier)
@@ -31,9 +31,11 @@ module Siteleaf
       else
         result = Client.post create_endpoint, attributes
       end
-      if result
+      if result.is_a?(Hash)
         self.attributes = result
         return self
+      else
+        raise 'Invalid response'
       end
     end
 

data/lib/siteleaf/site.rb

@@ -17,17 +17,17 @@ module Siteleaf
 
     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
+      result.map { |r| SourceFile.new(r.merge('site_id' => id)) } if result.is_a? Array
     end
 
     def pages
       result = Client.get "#{entity_endpoint}/pages"
-      result.map { |r| Page.new(r) } if result.parsed_response.is_a? Array
+      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.parsed_response.is_a? Array
+      result.map { |r| Collection.new(r) } if result.is_a? Array
     end
 
     def posts
@@ -56,4 +56,4 @@ module Siteleaf
     end
 
   end
-end
+end

data/lib/siteleaf/source_file.rb

@@ -17,10 +17,8 @@ module Siteleaf
     end
 
     def to_file
-      response = Client.get(::File.join("sites", site_id, "source", "#{URI.escape(identifier)}?download"))
-      raise response['message'] if response.parsed_response.is_a?(Hash) && response['message'] # indicates API error
-      response.body
+      Client.get(::File.join("sites", site_id, "source", "#{URI.escape(identifier)}?download"))
     end
 
   end
-end
+end

data/lib/siteleaf/version.rb

@@ -1,3 +1,3 @@
 module Siteleaf
-  VERSION = "2.0.2"
+  VERSION = "2.1.0"
 end

data/siteleaf.gemspec

@@ -11,13 +11,13 @@ Gem::Specification.new do |gem|
   gem.email         = ["api@siteleaf.com"]
   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.homepage      = "https://www.siteleaf.com"
 
   gem.required_ruby_version = '>= 1.9.3'
 
-  gem.add_dependency 'httparty', '~> 0.14.0'
-  gem.add_dependency 'httmultiparty', '~> 0.3.13'
-  gem.add_dependency 'psych', '>= 2.0.17'
+  gem.add_dependency 'httparty', '>= 0.16.0'
+  gem.add_dependency 'psych', '>= 2.1.0'
+  gem.add_dependency 'jekyll', '>= 1.4.1'
   gem.add_dependency 'rack'
 
   gem.files         = `git ls-files`.split($/)

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: siteleaf
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Siteleaf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-01 00:00:00.000000000 Z
+date: 2018-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
-  name: httmultiparty
+  name: psych
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.13
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.13
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
-  name: psych
+  name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.17
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.17
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +96,7 @@ files:
 - lib/siteleaf/user.rb
 - lib/siteleaf/version.rb
 - siteleaf.gemspec
-homepage: http://siteleaf.com
+homepage: https://www.siteleaf.com
 licenses:
 - MIT
 metadata: {}
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Siteleaf Ruby interface