siterest 0.1.0.pre4 → 0.1.0.pre5

data/VERSION

@@ -1 +1 @@
-0.1.0.pre4
+0.1.0.pre5

data/lib/siterest/asset.rb

@@ -3,7 +3,7 @@ require 'mime/types'
 require 'stringio'
 require 'upfile'
 require 'encoded_attachment/lib/encoded_attachment'
-
+require 'cgi'
 
 module Siterest
   class Asset < ActiveResource::Base
@@ -13,7 +13,7 @@ module Siterest
     has_encoded_attachment :data
 
     def url
-      "http://assets.siterest.com/#{self.path}"
+      "http://assets.siterest.com/#{CGI::escape(self.path)}"
     end
 
     def binary?

data/lib/siterest/client.rb

@@ -29,8 +29,7 @@ module Siterest
     
     def pull_assets(site)
       reset_path(
-        [assets_path + 'images', assets_path + 'javascripts', assets_path + 'stylesheets']
-      )
+        [assets_path + 'images', assets_path + 'javascripts', assets_path + 'stylesheets', assets_path + 'assets']      )
 
       results = []
       page = 1
@@ -85,46 +84,20 @@ module Siterest
       require 'siterest/asset'
 
       Dir.glob("assets/*/*").each do |filename|
-        file = open(filename)
-        # puts file
-        # 
-        # io = StringIO.new(open(file).read)
-        # io.original_filename = File.basename(file)
-        # 
+
         existing = Asset.first(:params => {
           :subdomain => site, :search => {:data_file_name_eq => File.basename(filename)}
         })
         
         if existing
-          existing.data = file
+          existing.data = open(filename)
           existing.save
         else
-          Asset.create(:data => file, :subdomain => site, :layout => true)
+          Asset.create(:data => open(filename), :subdomain => site, :layout => true)
         end
         
         puts "#{existing ? 'Updated' : 'Created'} #{filename}"
       end
-      # 
-      # asset = Asset.new(:subdomain => site)
-      # new_path = asset.send(:new_element_path).to_s
-      # collection_path = asset.send(:collection_path).to_s
-      # 
-      # puts Siterest.url.to_s
-      # 
-      # 
-      # resource = RestClient::Resource.new(Siterest.url.gsub('//', "//#{Siterest.token}:x@"))
-      # 
-      # resource[collection_path].post :content_type => 'application/xml', :asset => {:data => open('assets/images/bg.png'), :layout => true}
-      
-      # RestClient.post 'http://localhost:3000/foo', fields_hash.merge(:file => File.new('/path/to/file'))
-
-      #  
-      # Dir.glob("site/assets/*/*").each do |file|
-      #   Asset.create(
-      #     :data => open(file)
-      #     :subdomain => site
-      #   )
-      # end
     end
     
     def request_path

data/siterest.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{siterest}
-  s.version = "0.1.0.pre4"
+  s.version = "0.1.0.pre5"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Taylor luk"]
-  s.date = %q{2010-08-06}
+  s.date = %q{2010-08-09}
   s.default_executable = %q{siterest}
   s.description = %q{Simple content service}
   s.email = %q{taylor.luk@idealian.net}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: siterest
 version: !ruby/object:Gem::Version 
-  hash: -1876988169
+  hash: -1876988172
   prerelease: true
   segments: 
   - 0
   - 1
   - 0
-  - pre4
-  version: 0.1.0.pre4
+  - pre5
+  version: 0.1.0.pre5
 platform: ruby
 authors: 
 - Taylor luk
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-06 00:00:00 +10:00
+date: 2010-08-09 00:00:00 +10:00
 default_executable: siterest
 dependencies: 
 - !ruby/object:Gem::Dependency