siteleaf 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f74c49a1f23b1a7fa9b7ed1887a6902fe8b124a
-  data.tar.gz: 8b6938a886900939e717d62e6a8d99769cfe2530
+  metadata.gz: 379557d79b19798bedb2c6d0c81638f01f879ade
+  data.tar.gz: ed497c0fe6039b06fde30ed8dd1afb402d127fba
 SHA512:
-  metadata.gz: fc28e5260c862cf114e6b7714bad0bd0d668096befac16a5cb7924dc7913db633c75a09e9f7c205f16a417da96ea8b4418e72652db7168f6f34a48a159787ce2
-  data.tar.gz: e6f85fde2f3dba994740f17a4d56f9fcb9ab1cfbaa750c509e7ab41ca9959509f5f047e056824b3d7b7bb3341f8f3e610d61730534764794ea5dd7df4e5003c1
+  metadata.gz: 3340dadf03c7e75c05b4d7fafc8159208f11f1013861624ee378055d3553b63602fec673e015627652f99419566e7290e424b8953ed25813b0da726d3241ad30
+  data.tar.gz: ee1d3a50b0d9074005ba8b8eae72d6927b1ee571bf39782d9d1b6eccbf6fde2cc855bad558b64b4898571d088ca07799ac701ee521738750e72fee4099c0962d

data/README.md

@@ -1,6 +1,6 @@
-For v2 see: https://github.com/siteleaf/siteleaf-gem/tree/2.0.0.pre
+**Note:** This version only applies to v1 sites, for v2 see: https://github.com/siteleaf/siteleaf-gem
 
-Siteleaf Gem (v1)
+Siteleaf v1 Gem
 =================
 
 - [Installation](#installation)
@@ -17,7 +17,7 @@ Installation
 
 The Siteleaf gem is available for installation on [Rubygems](https://rubygems.org/gems/siteleaf). To install run:
 
-    gem install siteleaf
+    gem install siteleaf -v '~>1'
 
 
 Using the CLI
@@ -89,7 +89,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'
+    gem 'siteleaf', '~>1'
 
 
 
@@ -193,7 +193,7 @@ Troubleshooting
 
 Try running:
 
-    sudo gem install siteleaf
+    sudo gem install siteleaf -v '~>1'
 
 
 Contributing

data/lib/siteleaf/site.rb

@@ -3,12 +3,12 @@ module Siteleaf
 
     attr_accessor :title, :domain, :timezone, :meta, :posts_path, :version
     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
     end
-    
+
     def theme
       @theme ||= if result = Client.get("sites/#{self.id}/theme")
         theme = Theme.new(result)
@@ -16,60 +16,61 @@ module Siteleaf
         theme
       end
     end
-    
+
     def assets
       result = Client.get "sites/#{self.id}/assets"
       result.map { |r| Asset.new(r) } if result
     end
-    
+
     def pages
       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"
       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}
     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', 
+          'title' => 'Uploads',
           'output' => true
         }
       }
-      
+
       # use collections for any set of posts not called "posts"
       pages.each do |page|
         path = page.url.sub('/','').gsub('/','_')
@@ -79,35 +80,29 @@ module Siteleaf
           attrs['collections'][path]['permalink'] = "#{page.url}/:path" if path != page.slug
         end
       end
-      
+
       # set permalink style for posts
       attrs['defaults'] = [{
         'scope' => {
-          'path' => '', 
+          'path' => '',
           'type' => 'posts'
-        }, 
+        },
         'values' => {
-          'permalink' => "/#{posts_path}/:title/" 
+          'permalink' => "/#{posts_path}/:title/"
         }
       }]
-      
-      # markdown defaults to match v1 rendering
-      attrs['markdown'] = 'redcarpet'
-      attrs['redcarpet'] = {
-        'extensions' => ['autolink', 'fenced_code_blocks', 'lax_spacing', 'strikethrough', 'superscript', 'tables', 'footnotes', 'highlight']
-      }
-   
+
       attrs
     end
-    
+
     def to_file(dir = 'export')
-      assets = Dir.glob("#{dir}/_uploads/**/*").each_with_object({}) do |var, hash| 
+      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

data/lib/siteleaf/version.rb

@@ -1,3 +1,3 @@
 module Siteleaf
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end

data/siteleaf.gemspec

@@ -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.13.3'
   gem.add_dependency 'httmultiparty', '>= 0.3.13'
-  gem.add_dependency 'psych', '2.0.8'
+  gem.add_dependency 'psych', '>= 2.0.17'
   gem.add_dependency 'rack'
 
   gem.files         = `git ls-files`.split($/)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: siteleaf
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Siteleaf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-25 00:00:00.000000000 Z
+date: 2016-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -42,16 +42,16 @@ dependencies:
   name: psych
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.0.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.0.17
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -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