siteleaf 0.8.1 → 0.8.3

data/bin/siteleaf

@@ -18,15 +18,15 @@ def auth(re_auth = false)
     password = $stdin.gets.chomp
     system 'stty echo'
     
-    print "\nAuthorizing...\n"
+    puts "Authorizing..."
     
-    if auth = Siteleaf::Client.auth(email, password) and auth.has_key?('api_key')    
+    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|
         Marshal.dump({:api_key => auth['api_key'], :api_secret => auth['api_secret']}, file)
       end
-      print "=> Gem authorized.\n" if re_auth
+      puts "=> Gem authorized." if re_auth
     else
-      print "Could not authorize, check your e-mail or password.\n"
+      puts "Could not authorize, check your e-mail or password."
     end
   end
 end
@@ -36,14 +36,14 @@ def config(site)
 # See https://github.com/siteleaf/siteleaf-gem for documentation.
 
 require 'siteleaf'
-run Siteleaf::Server.new(site_id:'#{site.id}')" }
+run Siteleaf::Server.new(:site_id => '#{site.id}')" }
   
   pow_path = "#{Etc.getpwuid.dir}/.pow"
-  if Dir.exists?(pow_path)
+  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.absolute_path("."), site_symlink)
+    FileUtils.symlink(File.dirname(__FILE__), 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"
@@ -56,7 +56,7 @@ when '-v', '--version'
 when '-h', '--help'
   puts help
 when 's', 'server'
-  if File.exists?('config.ru')
+  if File.exist?('config.ru')
     `rackup config.ru`
   else
     puts "No config found, run `siteleaf config yoursite.com`.\n"
@@ -74,7 +74,7 @@ when 'n', 'new'
   auth
   if site = Siteleaf::Site.create(:title => ARGV[1], :domain => ARGV[1])
     dir = ARGV.size >= 3 ? ARGV[2] : ARGV[1]
-    Dir.mkdir(dir) unless Dir.exists?(dir)
+    Dir.mkdir(dir) unless File.directory?(dir)
     Dir.chdir(dir)
     config site
   else

data/lib/siteleaf/client.rb

@@ -32,16 +32,16 @@ module Siteleaf
     def self.execute(method, path, payload = nil, 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
+      #begin
         response = request.execute
         if response.headers[:content_type].to_s.include?('json')
           return JSON.parse(response) # parse JSON
         else
           return response # 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 respond_to?(name = "#{k}=") and send(name, v) }
+      attributes.each_pair { |k, v| k != "attributes" and self.instance_variable_set("@#{k}", v) }
     end
     
     def self.class_name

data/lib/siteleaf/meta.rb

@@ -1,8 +1,8 @@
 module Siteleaf
   class Meta < Entity
 
-    attr_accessor :id, :key, :value, :page_id, :post_id
-    protected :id=
+    attr_accessor :key, :value, :page_id, :post_id
+    attr_reader :id
     
     def create_endpoint
       if self.page_id

data/lib/siteleaf/page.rb

@@ -1,8 +1,8 @@
 module Siteleaf
   class Page < Entity
 
-    attr_accessor :id, :title, :body, :slug, :url, :parent_id, :site_id, :published_at, :created_at, :updated_at, :meta
-    protected :id=, :created_at=, :updated_at=
+    attr_accessor :title, :body, :slug, :url, :parent_id, :site_id, :published_at, :meta
+    attr_reader :id, :created_at, :updated_at
     
     def create_endpoint
       "sites/#{self.site_id}/pages"

data/lib/siteleaf/server.rb

@@ -1,5 +1,6 @@
 module Siteleaf
   class Server
+  
     attr_accessor :site_id
     
     def initialize(attributes = {})
@@ -25,7 +26,7 @@ module Siteleaf
       templates.push("default.html")
       
       templates.each do |t|
-        return File.read(t) if File.exists?(t)
+        return File.read(t) if File.exist?(t)
       end
       
       return nil
@@ -37,7 +38,7 @@ module Siteleaf
       url = env['PATH_INFO']
       path = url.gsub(/\/\z|\A\//, '') #strip beginning and trailing slashes
       
-      if !File.directory?(path) and File.exists?(path)
+      if !File.directory?(path) and File.exist?(path)
         Rack::File.new(Dir.pwd).call(env)
       else
         template_data = nil

data/lib/siteleaf/site.rb

@@ -1,8 +1,8 @@
 module Siteleaf
   class Site < Entity
 
-    attr_accessor :id, :title, :domain, :timezone, :user_id, :created_at, :updated_at
-    protected :id=, :user_id=, :created_at=, :updated_at=
+    attr_accessor :title, :domain, :timezone
+    attr_reader :id, :user_id, :created_at, :updated_at
     
     def self.find_by_domain(domain)
       result = Client.get "sites", {"domain" => domain}

data/lib/siteleaf/user.rb

@@ -1,8 +1,8 @@
 module Siteleaf
   class User < Entity
 
-    attr_accessor :id, :email, :firstname, :lastname, :created_at, :updated_at
-    protected :id=, :created_at=, :updated_at=
+    attr_accessor :email, :firstname, :lastname
+    attr_reader :id, :created_at, :updated_at
     
   end
 end

data/lib/siteleaf/version.rb

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

data/lib/siteleaf.rb

@@ -28,7 +28,7 @@ module Siteleaf
   end
   
   def self.load_settings
-    if File.exists?(self.settings_file)
+    if File.exist?(self.settings_file)
       config = File.open(self.settings_file) do|file|
         Marshal.load(file)
       end

data/siteleaf.gemspec

@@ -12,11 +12,11 @@ Gem::Specification.new do |gem|
   gem.summary       = "Siteleaf Ruby interface"
   gem.homepage      = "http://siteleaf.com"
   
-  # gem.required_ruby_version = '>= 1.9.2'
+  gem.required_ruby_version = '>= 1.8'
   
   gem.add_dependency 'rest-client'
   gem.add_dependency 'json'
-  # gem.add_dependency 'liquid'
+  gem.add_dependency 'rack'
 
   gem.files         = `git ls-files`.split($/)
   gem.files         += Dir.glob("lib/**/*.rb")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: siteleaf
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  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'
 description: A Ruby interface and command line utility for the Siteleaf API.
 email:
 - api@siteleaf.com
@@ -79,7 +95,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '1.8'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: