siteleaf 0.8.3 → 0.9.0

data/README.md

@@ -19,27 +19,27 @@ The Siteleaf gem is available for installation on [Rubygems](https://rubygems.or
 Testing sites locally
 ---------------------
 
-The Siteleaf gem allows you to test and develop your sites locally.
+The Siteleaf gem allows you to test and develop your sites locally. If using [Pow](http://pow.cx) or [Anvil](http://anvilformac.com), your local website will be automatically set up and can be accessed at `http://yoursite.dev`.
+
+**(Optional) Install Pow for extra goodness:**
+
+    curl get.pow.cx | sh
 
 **Set up a new site locally:**
 
     siteleaf new yoursite.com
 
-This will create a new theme folder in the directory where you ran this command. It will also create the site for you in your Siteleaf account.
+This will create a new theme folder called `yoursite.com` in the directory where you ran this command. It will also create the site for you in your Siteleaf account. If you prefer not to create a new directory, run `siteleaf new yoursite.com .` instead.
 
 **Configure an existing site:**
 
     siteleaf config yoursite.com
 
-**(Optional) Install Pow for extra goodness:**
+Your site should now be accessible at `http://yoursite.dev`.
 
-If using [Pow](http://pow.cx), your local website will be automatically set up and can be accessed at `http://yoursite.dev`.
+*or*
 
-If you don't have Pow (or Anvil) installed, run:
-
-    curl get.pow.cx | sh
-
-**Or if you don't want to install Pow, local sites can also be manually run:**
+**If you don't want to install Pow, local sites can also be manually run:**
 
     siteleaf server
   
@@ -49,6 +49,8 @@ In this case, your local site can be accessed at `http://localhost:9292`.
 
 Your local folder should contain at least one template file (`default.html`), for sample themes and documentation see: https://github.com/siteleaf/siteleaf-themes
 
+For new sites, you will also need to create at least one page or post on https://manage.siteleaf.com in order to preview.
+
 
 Using this gem in your application
 ----------------------------------
@@ -108,9 +110,10 @@ page = Siteleaf::Page.create({
 # get page by id
 page = Siteleaf::Page.find('519719ddcc85910626000001')
 
-# update page, add metadata
+# update page, add metadata, add taxonomy
 page.title = 'New Title'
-page.meta = [{"key" => "foo", "value" => "bar"}]
+page.meta = [ {"key" => "foo", "value" => "bar"} ]
+post.taxonomy = [ {"key" => "Tags", "values" => ["One","Two","Three"]} ]
 page.save
 
 # delete page

data/bin/siteleaf

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'siteleaf'
+require 'fileutils'
 
 def help
   'See https://github.com/siteleaf/siteleaf-gem for documentation.'
@@ -18,7 +19,7 @@ def auth(re_auth = false)
     password = $stdin.gets.chomp
     system 'stty echo'
     
-    puts "Authorizing..."
+    puts "\nAuthorizing..."
     
     if auth = Siteleaf::Client.auth(email, password) and auth.is_a?(Hash) and auth.has_key?('api_key')    
       File.open(Siteleaf.settings_file,'w') do|file|
@@ -38,12 +39,12 @@ def config(site)
 require 'siteleaf'
 run Siteleaf::Server.new(:site_id => '#{site.id}')" }
   
-  pow_path = "#{Etc.getpwuid.dir}/.pow"
+  pow_path = File.expand_path('~/.pow')
   if File.directory?(pow_path)
     site_no_tld = site.domain.gsub(/\.[a-z]{0,4}$/i,'')
     site_symlink = "#{pow_path}/#{site_no_tld}"
     FileUtils.rm(site_symlink) if File.symlink?(site_symlink)
-    FileUtils.symlink(File.dirname(__FILE__), site_symlink)
+    FileUtils.symlink(File.expand_path('.'), site_symlink)
     puts "=> Site configured with Pow, open `http://#{site_no_tld}.dev` to test site locally.\n"
   else
     puts "=> Site configured, run `siteleaf server` to test site locally.\n"

data/lib/siteleaf/client.rb

@@ -1,20 +1,18 @@
-require 'rest-client'
-require 'json'
+require 'httparty'
 
 module Siteleaf
   class Client  
     def self.auth(email, password)
-      request = RestClient::Request.new(:url => Siteleaf.api_url('auth'), :method => :post, :user => email, :password => password)
       begin
-        response = request.execute
-        return JSON.parse(response) # parse JSON
+        request = HTTParty.post(Siteleaf.api_url('auth'), {:basic_auth => {:username => email, :password => password}})
+        return request.parsed_response # parse JSON
       rescue => e
         return e.inspect # error
       end
     end
   
     def self.get(path, params = nil)
-      self.execute(:get, path, nil, params)
+      self.execute(:get, path, params)
     end
     
     def self.post(path, params)
@@ -25,23 +23,22 @@ module Siteleaf
      self.execute(:put, path, params)
     end
     
-    def self.delete(path)
-      self.execute(:delete, path)
+    def self.delete(path, params = nil)
+      self.execute(:delete, path, params)
     end
     
-    def self.execute(method, path, payload = nil, params = nil)
+    def self.execute(method, path, params = nil)
       Siteleaf.load_settings if !Siteleaf.api_key
-      request = RestClient::Request.new(:url => Siteleaf.api_url(path), :method => method, :payload => payload, :headers => { :params => params }, :user => Siteleaf.api_key, :password => Siteleaf.api_secret)
-      #begin
-        response = request.execute
-        if response.headers[:content_type].to_s.include?('json')
-          return JSON.parse(response) # parse JSON
+      begin
+        request = HTTParty.send(method, Siteleaf.api_url(path), {:body => params, :basic_auth => {:username => Siteleaf.api_key, :password => Siteleaf.api_secret}})
+        if request.respond_to?('parsed_response')
+          return request.parsed_response # parse JSON
         else
-          return response # raw
+          return request # raw
         end
-      #rescue => e
-      #  return e.inspect # error
-      #end
+      rescue => e
+        return e.inspect # error
+      end
     end
   end
 end

data/lib/siteleaf/entity.rb

@@ -44,7 +44,7 @@ module Siteleaf
     end
     
     def attributes=(attributes = {})
-      attributes.each_pair { |k, v| k != "attributes" and self.instance_variable_set("@#{k}", v) }
+      attributes.each_pair { |k, v| self.instance_variable_set("@#{k}", v) }
     end
     
     def self.class_name

data/lib/siteleaf/page.rb

@@ -4,6 +4,16 @@ module Siteleaf
     attr_accessor :title, :body, :slug, :url, :parent_id, :site_id, :published_at, :meta
     attr_reader :id, :created_at, :updated_at
     
+    def self.all
+      result = Client.get "#{self.endpoint}", {'include' => ['meta']}
+      result.map { |r| self.new(r) } if result
+    end
+    
+    def self.find(id)
+      result = Client.get "#{self.endpoint}/#{id}", {'include' => ['meta']}
+      self.new(result) if result
+    end
+    
     def create_endpoint
       "sites/#{self.site_id}/pages"
     end
@@ -13,12 +23,12 @@ module Siteleaf
     end
     
     def posts
-      result = Client.get "pages/#{self.id}/posts"
+      result = Client.get "pages/#{self.id}/posts", {'include' => ['meta','taxonomy']}
       result.map { |r| Post.new(r) } if result
     end
     
     def pages
-      result = Client.get "pages/#{self.id}/pages"
+      result = Client.get "pages/#{self.id}/pages", {'include' => ['meta']}
       result.map { |r| self.new(r) } if result
     end
     

data/lib/siteleaf/post.rb

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

data/lib/siteleaf/server.rb

@@ -42,7 +42,7 @@ module Siteleaf
         Rack::File.new(Dir.pwd).call(env)
       else
         template_data = nil
-        is_asset = /(^assets|\.)/.match(path)
+        is_asset = /^(?!(sitemap|feed)\.xml)(assets|.*\.)/.match(path)
         
         if is_asset 
           if asset = site.resolve(url) and asset_url = asset['file']['url']

data/lib/siteleaf/version.rb

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

data/lib/siteleaf.rb

@@ -8,25 +8,25 @@ require 'siteleaf/entity'
 require 'siteleaf/site'
 require 'siteleaf/page'
 require 'siteleaf/post'
-require 'siteleaf/meta'
 require 'siteleaf/user'
+require 'rbconfig'
 
 module Siteleaf
 
   @api_base = 'https://api.siteleaf.com/v1'
-  
+
   class << self
     attr_accessor :api_key, :api_secret, :api_base
   end
-  
+
   def self.api_url(url='')
     "#{@api_base}/#{url}"
   end
-  
+
   def self.settings_file
-    "#{Etc.getpwuid.dir}/.siteleaf"
+    File.expand_path('~/.siteleaf')
   end
-  
+
   def self.load_settings
     if File.exist?(self.settings_file)
       config = File.open(self.settings_file) do|file|
@@ -36,5 +36,5 @@ module Siteleaf
       self.api_secret = config[:api_secret] if config.has_key?(:api_secret)
     end
   end
-  
+
 end

data/siteleaf.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |gem|
   
   gem.required_ruby_version = '>= 1.8'
   
-  gem.add_dependency 'rest-client'
-  gem.add_dependency 'json'
+  gem.add_dependency 'json', '~> 1.7.7'
+  gem.add_dependency 'httparty'
   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.8.3
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,26 +9,26 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.7
 - !ruby/object:Gem::Dependency
-  name: json
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -76,7 +76,6 @@ files:
 - lib/siteleaf.rb
 - lib/siteleaf/client.rb
 - lib/siteleaf/entity.rb
-- lib/siteleaf/meta.rb
 - lib/siteleaf/page.rb
 - lib/siteleaf/post.rb
 - lib/siteleaf/server.rb

data/lib/siteleaf/meta.rb

@@ -1,24 +0,0 @@
-module Siteleaf
-  class Meta < Entity
-
-    attr_accessor :key, :value, :page_id, :post_id
-    attr_reader :id
-    
-    def create_endpoint
-      if self.page_id
-        "pages/#{self.page_id}/meta"
-      elsif self.post_id
-        "posts/#{self.post_id}/meta"
-      end
-    end
-    
-    def post
-      Post.find(self.post_id) if self.post_id
-    end
-    
-    def page
-      Page.find(self.page_id) if self.page_id
-    end
-    
-  end
-end