siteleaf 0.9.12 → 0.9.13

data/bin/siteleaf

@@ -83,16 +83,18 @@ def get_site_id
 end
 
 def get_theme_assets(site_id)
-  if assets = Siteleaf::Client.get("sites/#{site_id}/theme/assets")
+  if assets = Siteleaf::Theme.assets_by_site_id(site_id)
     updated_count = 0
     assets.each do |asset|
-      if File.exist?(asset['filename']) && (file = File.read(asset['filename'])) && (Digest::MD5.hexdigest(file) == asset['checksum'])
+      if File.exist?(asset.filename) && asset.checksum == Digest::MD5.hexdigest(File.read(asset.filename))
         # file is up to date
       else
-        file = open("#{asset['file']['url']}?#{SecureRandom.hex(16)}", /^1\.8/.match(RUBY_VERSION) ? 'r' : 'r:UTF-8') { |f| f.read }
-        FileUtils.mkdir_p(File.dirname(asset['filename']))
-        File.open(asset['filename'], /^1\.8/.match(RUBY_VERSION) ? 'w' : 'w:UTF-8') { |f| f.write(file) }
+        print "Downloading #{asset.filename}..."
+        file = open("#{asset.file['url']}?#{SecureRandom.hex(16)}", /^1\.8/.match(RUBY_VERSION) ? 'r' : 'r:UTF-8') { |f| f.read }
+        FileUtils.mkdir_p(File.dirname(asset.filename))
+        File.open(asset.filename, /^1\.8/.match(RUBY_VERSION) ? 'w' : 'w:UTF-8') { |f| f.write(file) }
         updated_count += 1
+        print "complete.\n"
       end
     end
     puts "=> #{updated_count} asset(s) downloaded.\n"
@@ -100,20 +102,53 @@ def get_theme_assets(site_id)
 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) if !['config.ru'].include?(path) && !path.start_with?('.')
+  theme = Siteleaf::Theme.find_by_site_id(site_id)
+  assets = theme.assets
+  updated_count = 0
+  ignore_paths = ['config.ru', '.*']
+  ignore_paths += File.read('.siteleafignore').split(/\r?\n/) if File.exists?('.siteleafignore')
+  
+  # upload files
+  paths = Dir.glob("**/*")
+  paths.each do |path|
+    if !File.directory?(path) && !ignore_paths.any?{|i| File.fnmatch?(i, path, File::FNM_CASEFOLD) || File.fnmatch?(i, File.basename(path), File::FNM_CASEFOLD) }
+      asset = assets.find{|a| a.filename == path }
+      if asset.nil? || (asset && asset.checksum != Digest::MD5.hexdigest(File.read(path)))
+        print "Uploading #{path}..."
+        asset.delete if asset
+        if response = Siteleaf::Asset.create({:site_id => site_id, :theme_id => theme.id, :file => File.new(path), :filename => path})
+          updated_count += 1
+          print "complete.\n"
+        else
+          print "error.\n"
+          break
+        end
+      end
     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
+  
+  # check for old files
+  missing_assets = []
+  assets.each do |asset| 
+    missing_assets << asset if !paths.include?(asset.filename)
+  end
+  if missing_assets.empty?
     puts "=> #{updated_count} asset(s) uploaded.\n"
   else
-    puts "=> Could not upload assets.\n"
+    print "=> #{updated_count} asset(s) uploaded. Delete the following #{missing_assets.size} unmatched asset(s)?\n"
+    missing_assets.each do |asset|
+      puts asset.filename
+    end
+    print '(y/n)? '
+    if $stdin.gets.chomp == 'y'
+      missing_assets.each do |asset|
+        print "Deleteing #{asset.filename}..."
+        asset.delete
+        print "complete.\n"
+      end
+      puts "=> #{missing_assets.size} asset(s) deleted.\n"
+    end
   end
-  FileUtils.rm(theme) if File.exist?(theme)
 end
 
 case ARGV[0]

data/lib/siteleaf.rb

@@ -3,11 +3,13 @@ $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 require 'siteleaf/version'
 require 'siteleaf/client'
-require 'siteleaf/server'
 require 'siteleaf/entity'
-require 'siteleaf/site'
+require 'siteleaf/asset'
 require 'siteleaf/page'
 require 'siteleaf/post'
+require 'siteleaf/server'
+require 'siteleaf/site'
+require 'siteleaf/theme'
 require 'siteleaf/user'
 require 'rbconfig'
 

data/lib/siteleaf/asset.rb

@@ -0,0 +1,36 @@
+module Siteleaf
+  class Asset < Entity
+
+    attr_accessor :file, :filename, :replace, :site_id, :page_id, :post_id, :theme_id
+    attr_reader :id, :url, :content_type, :filesize, :checksum, :created_at, :updated_at
+    
+    def create_endpoint
+      if !self.post_id.nil?
+        "posts/#{self.post_id}/assets"
+      elsif !self.page_id.nil?
+        "pages/#{self.page_id}/assets"
+      elsif !self.theme_id.nil?
+        "sites/#{self.site_id}/theme/assets"
+      else
+        "sites/#{self.site_id}/assets"
+      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
+    
+    def theme
+      Theme.find(self.theme_id) if self.theme_id
+    end
+    
+    def site
+      Site.find(self.site_id) if self.site_id
+    end
+    
+  end
+end

data/lib/siteleaf/page.rb

@@ -4,16 +4,6 @@ module Siteleaf
     attr_accessor :title, :body, :slug, :url, :parent_id, :site_id, :published_at, :user_id, :meta, :assets
     attr_reader :id, :created_at, :updated_at
     
-    def self.all
-      result = Client.get "#{self.endpoint}"
-      result.map { |r| self.new(r) } if result
-    end
-    
-    def self.find(id)
-      result = Client.get "#{self.endpoint}/#{id}"
-      self.new(result) if result
-    end
-    
     def create_endpoint
       "sites/#{self.site_id}/pages"
     end
@@ -22,6 +12,11 @@ module Siteleaf
       Site.find(self.site_id) if self.site_id
     end
     
+    def assets
+      result = Client.get "pages/#{self.id}/assets"
+      result.map { |r| Asset.new(r) } if result
+    end
+    
     def posts
       result = Client.get "pages/#{self.id}/posts"
       result.map { |r| Post.new(r) } if result

data/lib/siteleaf/post.rb

@@ -3,16 +3,6 @@ module Siteleaf
 
     attr_accessor :taxonomy
     
-    def self.all
-      result = Client.get "#{self.endpoint}"
-      result.map { |r| self.new(r) } if result
-    end
-    
-    def self.find(id)
-      result = Client.get "#{self.endpoint}/#{id}"
-      self.new(result) if result
-    end
-    
     def create_endpoint
       "pages/#{self.parent_id}/posts"
     end
@@ -21,5 +11,10 @@ module Siteleaf
       Page.find(self.parent_id)
     end
     
+    def assets
+      result = Client.get "posts/#{self.id}/assets"
+      result.map { |r| Asset.new(r) } if result
+    end
+    
   end
 end

data/lib/siteleaf/site.rb

@@ -5,10 +5,23 @@ module Siteleaf
     attr_reader :id, :user_id, :created_at, :updated_at
     
     def self.find_by_domain(domain)
-      result = Client.get "sites", {"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)
+        theme.site_id = self.id
+        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

data/lib/siteleaf/theme.rb

@@ -0,0 +1,25 @@
+module Siteleaf
+  class Theme < Entity
+
+    attr_accessor :name, :site_id
+    attr_reader :id, :created_at, :updated_at
+    
+    def self.find_by_site_id(site_id)
+      Site.new({:id => site_id}).theme
+    end
+    
+    def self.assets_by_site_id(site_id)
+      Theme.new({:site_id => site_id}).assets
+    end
+    
+    def site
+      Site.find(self.site_id)
+    end
+    
+    def assets
+      result = Client.get "sites/#{self.site_id}/theme/assets"
+      result.map { |r| Asset.new(r) } if result
+    end
+    
+  end
+end

data/lib/siteleaf/version.rb

@@ -1,3 +1,3 @@
 module Siteleaf
-  VERSION = "0.9.12"
+  VERSION = "0.9.13"
 end

data/siteleaf.gemspec

@@ -16,7 +16,6 @@ Gem::Specification.new do |gem|
   
   gem.add_dependency 'httparty'
   gem.add_dependency 'httmultiparty'
-  gem.add_dependency 'zip'
   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.12
+  version: 0.9.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2013-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -43,22 +43,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: zip
-  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
@@ -90,12 +74,14 @@ files:
 - Rakefile
 - bin/siteleaf
 - lib/siteleaf.rb
+- lib/siteleaf/asset.rb
 - lib/siteleaf/client.rb
 - lib/siteleaf/entity.rb
 - lib/siteleaf/page.rb
 - lib/siteleaf/post.rb
 - lib/siteleaf/server.rb
 - lib/siteleaf/site.rb
+- lib/siteleaf/theme.rb
 - lib/siteleaf/user.rb
 - lib/siteleaf/version.rb
 - siteleaf.gemspec