lib/storys/package.rb in storys-0.0.4 vs lib/storys/package.rb in storys-0.0.5

@@ -1,50 +1,51 @@
 class Storys::Package
-  attr_reader :root_path
-  attr_reader :package_path
+  attr_reader :path
+  attr_reader :app_path
 
-  def initialize(root_path)
-    raise "root_path must be an instance of Pathname" unless root_path.is_a?(Pathname)
+  def initialize(path)
+    raise "path must be an instance of Pathname" unless path.is_a?(Pathname)
 
-    @root_path = root_path
-    @package_path = root_path + ".storys/"
+    @path = path
+    @app_path = path + ".storys/"
   end
 
   def pathname_to_url(path, relative_from)
-    URI.escape(path.relative_path_from(relative_from).to_s)
+    URI.escape(path.relative_path_from(relative_from).cleanpath.to_s)
   end
 
+  #FIXME: Doesn't work!
   def url_to_pathname(url)
     path = Addressable::URI.unencode_component(url.normalized_path)
     path.gsub!(/^\//, "") #Make relative, if we allow mounting at a different root URL this will need to remove the root instead of just '/'
     root_url_path + path
   end
 
   def update
-    package_path.mkdir unless File.exists?(package_path)
+    app_path.mkdir unless File.exists?(app_path)
     update_app
     Storys::Update.new(self)
   end
 
   def update_app
     dev = ENV["STORYS_ENV"] == "development"
 
     app_children_paths.each do |file|
-      storys_file = package_path + file.basename
+      storys_file = app_path + file.basename
       FileUtils.rm_rf(storys_file, :verbose => dev)
     end
 
     if dev
       app_children_paths.each do |file|
-        storys_file = package_path + file.basename
+        storys_file = app_path + file.basename
         FileUtils.ln_sf(file, storys_file, :verbose => dev)
       end
     else
-      FileUtils.cp_r(Storys::Package.gem_path + "app/.", package_path, :verbose => dev)
+      FileUtils.cp_r(Storys::Package.gem_path + "app/.", app_path, :verbose => dev)
     end
 
-    FileUtils.chmod_R(0755, package_path, :verbose => dev)
+    FileUtils.chmod_R(0755, app_path, :verbose => dev)
   end
 
   def self.gem_path
     Pathname.new(__FILE__).dirname.parent.parent
   end
@@ -61,9 +62,9 @@
     File.open(path, "w") { |f| f << data.to_json }
   end
 
   private
   def app_children_paths
-    app_path = Storys::Package.gem_path + "app/"
-    app_path.children.reject { |f| f.basename.to_s == "img"} #TODO: Deal with this directory properly
+    gem_app_path = Storys::Package.gem_path + "app/"
+    gem_app_path.children.reject { |f| f.basename.to_s == "img"} #TODO: Deal with this directory properly
   end
 end