siteleaf 0.9.0 → 0.9.1

data/README.md

@@ -63,7 +63,7 @@ To use this gem in your application, add the following to your Gemfile:
 Using the API
 -------------
 
-This gem also allows you to interact with the Siteleaf API.
+This gem also allows you to interact with the [Siteleaf API](https://github.com/siteleaf/siteleaf-api).
 
 ```ruby
 require 'siteleaf'

data/bin/siteleaf

@@ -2,6 +2,10 @@
 
 require 'siteleaf'
 require 'fileutils'
+require 'open-uri'
+require 'digest/md5'
+require 'securerandom'
+require 'zip'
 
 def help
   'See https://github.com/siteleaf/siteleaf-gem for documentation.'
@@ -51,6 +55,48 @@ run Siteleaf::Server.new(:site_id => '#{site.id}')" }
   end
 end
 
+def get_site_id
+  if File.exist?('config.ru')
+    if match = /:site_id => '([a-z0-9]{24})'/i.match(File.read('config.ru'))
+      return match[1]
+    end
+  end
+end
+
+def get_theme_assets(site_id)
+  if assets = Siteleaf::Client.get("sites/#{site_id}/theme/assets")
+    updated_count = 0
+    assets.each do |asset|
+      if File.exist?(asset['filename']) && (file = File.read(asset['filename'])) && (Digest::MD5.hexdigest(file) == asset['checksum'])
+        # file is up to date
+      else
+        file = open("#{asset['file']['url']}?#{SecureRandom.hex(16)}", 'r:UTF-8') { |f| f.read }
+        FileUtils.mkdir_p(File.dirname(asset['filename']))
+        File.open(asset['filename'], 'w:UTF-8') { |f| f.write(file) }
+        updated_count += 1
+      end
+    end
+    puts "=> #{updated_count} asset(s) downloaded.\n"
+  end
+end
+
+def put_theme_assets(site_id)
+  theme = 'theme.zip'
+  FileUtils.rm(theme) if File.exist?(theme)
+  Zip::ZipFile.open(theme, Zip::ZipFile::CREATE) do |zip|
+    Dir.glob("**/*").each do |path|
+      zip.add(path, path)
+    end
+  end
+  if response = Siteleaf::Client.post("sites/#{site_id}/theme/assets", {:file => File.new(theme), :replace => true})
+    updated_count = response.is_a?(Array) ? response.size : 1
+    puts "=> #{updated_count} asset(s) uploaded.\n"
+  else
+    puts "=> Could not upload assets.\n"
+  end
+  FileUtils.rm(theme) if File.exist?(theme)
+end
+
 case ARGV[0]
 when '-v', '--version'
   puts Siteleaf::VERSION
@@ -81,6 +127,30 @@ when 'n', 'new'
   else
     puts "Could not create site `#{ARGV[1]}`.\n"
   end
+when 'pull'
+  case ARGV[1]
+  when 'theme'
+    auth
+    if site_id = get_site_id
+      get_theme_assets(site_id)
+    else
+      puts "Site not configured, run `siteleaf config yoursite.com`.\n"
+    end
+  else
+    puts "`#{ARGV[0]}` command not found.\n"
+  end
+when 'put'
+  case ARGV[1]
+  when 'theme'
+    auth
+    if site_id = get_site_id
+      put_theme_assets(site_id)
+    else
+      puts "Site not configured, run `siteleaf config yoursite.com`.\n"
+    end 
+  else
+    puts "`#{ARGV[0]}` command not found.\n"
+  end
 else
   puts "`#{ARGV[0]}` command not found.\n"
   puts help

data/lib/siteleaf/client.rb

@@ -1,4 +1,4 @@
-require 'httparty'
+require 'httmultiparty'
 
 module Siteleaf
   class Client  
@@ -30,7 +30,7 @@ module Siteleaf
     def self.execute(method, path, params = nil)
       Siteleaf.load_settings if !Siteleaf.api_key
       begin
-        request = HTTParty.send(method, Siteleaf.api_url(path), {:body => params, :basic_auth => {:username => Siteleaf.api_key, :password => Siteleaf.api_secret}})
+        request = HTTMultiParty.send(method, Siteleaf.api_url(path), {:query => params, :basic_auth => {:username => Siteleaf.api_key, :password => Siteleaf.api_secret}})
         if request.respond_to?('parsed_response')
           return request.parsed_response # parse JSON
         else

data/lib/siteleaf/page.rb

@@ -5,12 +5,12 @@ module Siteleaf
     attr_reader :id, :created_at, :updated_at
     
     def self.all
-      result = Client.get "#{self.endpoint}", {'include' => ['meta']}
+      result = Client.get "#{self.endpoint}"
       result.map { |r| self.new(r) } if result
     end
     
     def self.find(id)
-      result = Client.get "#{self.endpoint}/#{id}", {'include' => ['meta']}
+      result = Client.get "#{self.endpoint}/#{id}"
       self.new(result) if result
     end
     
@@ -23,12 +23,12 @@ module Siteleaf
     end
     
     def posts
-      result = Client.get "pages/#{self.id}/posts", {'include' => ['meta','taxonomy']}
+      result = Client.get "pages/#{self.id}/posts"
       result.map { |r| Post.new(r) } if result
     end
     
     def pages
-      result = Client.get "pages/#{self.id}/pages", {'include' => ['meta']}
+      result = Client.get "pages/#{self.id}/pages"
       result.map { |r| self.new(r) } if result
     end
     

data/lib/siteleaf/post.rb

@@ -4,12 +4,12 @@ module Siteleaf
     attr_accessor :taxonomy
     
     def self.all
-      result = Client.get "#{self.endpoint}", {'include' => ['meta','taxonomy']}
+      result = Client.get "#{self.endpoint}"
       result.map { |r| self.new(r) } if result
     end
     
     def self.find(id)
-      result = Client.get "#{self.endpoint}/#{id}", {'include' => ['meta','taxonomy']}
+      result = Client.get "#{self.endpoint}/#{id}"
       self.new(result) if result
     end
     

data/lib/siteleaf/version.rb

@@ -1,3 +1,3 @@
 module Siteleaf
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/siteleaf.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |gem|
   
   gem.add_dependency 'json', '~> 1.7.7'
   gem.add_dependency 'httparty'
+  gem.add_dependency 'httmultiparty'
   gem.add_dependency 'rack'
 
   gem.files         = `git ls-files`.split($/)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: siteleaf
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: httmultiparty
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement