siteleaf 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75e7b85ae46ef7e9a4acb9f91e7cfa6aad12d461
-  data.tar.gz: f3fad5f5f09556a6d2e850300ea5f3a5ebb75483
+  metadata.gz: 4625aee84a44eb9f07f7d8500060446eeec72a99
+  data.tar.gz: 47767d4e1d46f4e6d88ffc4ba3b69d44ced29199
 SHA512:
-  metadata.gz: ae362f7cba5c44002055e3eb7ac4110003738a34780af46f3e2f0509d33b780e6562f968ab8716e775a79aff119ca2849741aa8b60d4ecd88d7fef47bbb63e88
-  data.tar.gz: c19eace8a1bf47b3e4e079cbc2f021bc47e05eb26a8f3148234d75b7f37c30526ab7e774cb051a011f2516c48c9e56cce671dce34699bc340b30e4afecfd46f3
+  metadata.gz: ec90b144dfa9ddf7faf832edc949b82f8e2a09b7a985923f4416a9c954e867b70029e018829cd157fa3053d3fea19ca665ea8f7a5edaaf3cded4afb213207bec
+  data.tar.gz: 6fa276f547fc28f8394a80f6960bc148661543e74e4b2a38a075b9eeefcb11b4787bd5cb617c0ee59b7a5b7bb5e7a2ad8a81521b7019cf93ef3141bfe409371f

data/bin/siteleaf

@@ -4,6 +4,7 @@ require 'siteleaf'
 require 'fileutils'
 require 'open-uri'
 require 'digest/md5'
+require 'yaml'
 
 def help
   %Q(
@@ -46,9 +47,7 @@ def auth(re_auth = false)
     puts "\nAuthorizing..."
 
     if (auth = Siteleaf::Client.auth(email, password)) && (auth.is_a?(Hash)) && (auth.has_key?('api_key'))
-      File.open(Siteleaf.settings_file,'w') do|file|
-        Marshal.dump({:api_key => auth['api_key'], :api_secret => auth['api_secret']}, file)
-      end
+      Siteleaf.save_settings({api_key: auth['api_key'], api_secret: auth['api_secret']})
       puts "=> Gem authorized." if re_auth
       return true
     else
@@ -106,6 +105,10 @@ end
 
 def put_theme_assets(site_id)
   theme = Siteleaf::Theme.find_by_site_id(site_id)
+  unless theme.id
+    puts "Could not retrieve theme, check your site configuration and try again.\n"
+    return false
+  end
   assets = theme.assets
   updated_count = 0
   ignore_paths = ['config.ru', '.*']
@@ -172,31 +175,30 @@ def publish(site_id, quiet = true)
   end
 end
 
-def export(site_id, posts_path = "posts")
-  FileUtils.mkdir_p 'export'
+def export(site_id, posts_path = "posts", dir = 'export')
   posts_path = "posts" if posts_path == ""
   
   site = Siteleaf::Site.find(site_id)
   site.posts_path = posts_path
   
-  export_uploads(site)
-  export_content(site)
-  export_config(site)
+  export_uploads(site, dir)
+  export_content(site, dir)
+  export_config(site, dir)
 end
 
-def export_config(site)
+def export_config(site, dir = 'export')
   filename = site.filename
   print "Exporting #{filename}..."
   
-  filename = File.join("export", filename)
+  filename = File.join(dir, filename)
   open(filename, 'w:UTF-8') do |f|
-    f.puts site.to_file
+    f.puts site.to_file(dir)
   end
   
   print "complete.\n"
 end
 
-def export_content(site)
+def export_content(site, dir = 'export')
   pages = site.pages
 
   pages.each do |page|
@@ -205,10 +207,10 @@ def export_content(site)
       filename = page.filename
       print "Exporting #{filename}..."
       
-      filename = File.join("export", filename)
+      filename = File.join(dir, filename)
       FileUtils.mkdir_p File.dirname(filename)
       open(filename, 'w:UTF-8') do |f|
-        f.puts page.to_file
+        f.puts page.to_file(dir)
       end
       
       print "complete.\n"
@@ -218,10 +220,10 @@ def export_content(site)
       filename = post.filename(site.posts_path)
       print "Exporting #{filename}..."
       
-      filename = File.join("export", filename)
+      filename = File.join(dir, filename)
       FileUtils.mkdir_p File.dirname(filename)
       open(filename, 'w:UTF-8') do |f|
-        f.puts post.to_file
+        f.puts post.to_file(dir)
       end
       
       print "complete.\n"
@@ -229,20 +231,10 @@ def export_content(site)
   end
 end
 
-def export_uploads(site)
-  FileUtils::mkdir_p 'export/_uploads'
-
+def export_uploads(site, dir = 'export')
   if assets = site.assets
     assets.each do |asset|
-      filename = File.join("export", "_uploads", asset.filename)
-      arr_path = filename.split('/')
-
-      # Make subdirectories if needed
-      if arr_path.length > 3
-        subdir = arr_path[0..(arr_path.length - 2)].join('/')
-        FileUtils::mkdir_p subdir
-      end
-
+      filename = File.join(dir, "_uploads", asset.filename)
       if !File.exist?(filename) or (asset.checksum != Digest::MD5.hexdigest(IO.binread(filename)))
         print "Exporting #{filename}..."
         
@@ -282,8 +274,8 @@ when 'n', 'new'
   if auth != false
     if (site = Siteleaf::Site.create(:title => ARGV[1], :domain => ARGV[1])) && (!site.error)
       dir = ARGV.size >= 3 ? ARGV[2] : ARGV[1]
-      Dir.mkdir(dir) unless File.directory?(dir)
-      Dir.chdir(dir)
+      FileUtils.mkdir_p dir
+      Dir.chdir dir
       config site
     else
       puts "Could not create site `#{ARGV[1]}`.\n"
@@ -329,7 +321,9 @@ when 'export'
     if site_id = get_site_id
       print 'Enter your main posts path (default "posts"): '
       posts_path = $stdin.gets.chomp
-      export(site_id, posts_path)
+      dir = ARGV.size >= 2 ? ARGV[1] : 'export'
+      FileUtils.mkdir_p dir
+      export(site_id, posts_path, dir)
     else
       puts "Site not configured, run `siteleaf config yoursite.com`.\n"
     end

data/lib/siteleaf.rb

@@ -30,12 +30,50 @@ module Siteleaf
   end
 
   def self.settings_file
-    File.expand_path('~/.siteleaf')
+    ::File.expand_path('~/.siteleaf.yml')
   end
 
-  def self.load_settings
-    if File.exist?(self.settings_file)
-      config = File.open(self.settings_file) do|file|
+  def self.load_settings(file = self.settings_file)
+    if ::File.exist?(file)
+      settings = ::File.open(file) { |f| YAML.load(f) }
+      
+      [:api_key, :api_secret, :api_base, :api_version].each do |key|
+        self.send "#{key}=", settings[key.to_s] if settings.has_key?(key.to_s)
+      end
+        
+      symbolized_settings = Hash.new
+      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
+    nil
+  end
+  
+  def self.save_settings(settings, file = self.settings_file)
+    stringified_settings = Hash.new
+    settings.each{|k,v| stringified_settings[k.to_s] = v}
+    
+    ::File.open(file, 'w') { |f| f.write stringified_settings.to_yaml }
+    
+    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)

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
@@ -35,6 +36,7 @@ module Siteleaf
         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 request.respond_to?('parsed_response')

data/lib/siteleaf/page.rb

@@ -43,8 +43,11 @@ module Siteleaf
       "#{url.sub('/','')}.markdown"
     end
     
-    def to_file
-      assets = Dir.glob("export/_uploads/**/*").each_with_object({}) { |var, hash| hash[var.sub('export/_uploads','/assets')] = var.sub('export/_uploads','/uploads') }
+    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
       (frontmatter + "---\n\n".freeze + body.to_s).gsub(Regexp.union(assets.keys), assets)
     end
   

data/lib/siteleaf/site.rb

@@ -1,7 +1,7 @@
 module Siteleaf
   class Site < Entity
 
-    attr_accessor :title, :domain, :timezone, :meta, :posts_path
+    attr_accessor :title, :domain, :timezone, :meta, :posts_path, :version
     attr_reader :id, :user_id, :created_at, :updated_at
     
     def self.find_by_domain(domain)
@@ -53,8 +53,11 @@ module Siteleaf
       "_config.yml"
     end
     
-    def to_file
-      assets = Dir.glob("export/_uploads/**/*").each_with_object({}) { |var, hash| hash[var.sub('export/_uploads','/assets')] = var.sub('export/_uploads','/uploads') }
+    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.gsub(Regexp.union(assets.keys), assets)
     end
   
@@ -64,12 +67,11 @@ module Siteleaf
       attrs = {}
       attrs['title'] = title
       attrs['url'] = "http://#{domain}"
-      
-      meta.each{|m| attrs[m['key']] = m['value'].to_s.gsub("\r\n","\n")} unless meta.nil?
-      
       attrs['timezone'] = timezone
       attrs['permalink'] = 'pretty'
       
+      meta.each{|m| attrs[m['key']] = m['value'].to_s.gsub("\r\n","\n")} unless meta.nil?
+      
       # output uploads using v1 /assets path
       attrs['collections'] = {
         'uploads' => {

data/lib/siteleaf/version.rb

@@ -1,3 +1,3 @@
 module Siteleaf
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: siteleaf
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Siteleaf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty