dayvan 0.1.2 → 0.1.3

data/README.rdoc

@@ -1,6 +1,6 @@
 = Dayvan
 
-For a full summary please see the website[http://chrislloyd.github.com/dayvan].
+For a full summary please see the website[http://chrislloyd.cloudant.com/dayvan/_design/dayvan/index.html] and it's code[http://github.com/chrislloyd/dayvan/tree/example].
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/dayvan.rb

@@ -15,5 +15,5 @@ module Dayvan
   end
 end
 
-%w(attachment view security design project cli).
+%w(attachment view validation design project cli).
   each {|lib| require "dayvan/#{lib}"}

data/lib/dayvan/attachment.rb

@@ -5,7 +5,7 @@ require 'mime/types'
 class Dayvan::Attachment
 
   def self.all(root)
-    Dir[root.join('**/**')].
+    root.exist? && Dir[root.join('**/**')].
       reject {|f| File.directory?(f)}. # Allows symlinks
       inject({}) {|all, f|
         attachment = new(f)

data/lib/dayvan/cli.rb

@@ -17,14 +17,12 @@ class Dayvan::Cli < Thor
     empty_directory 'config'
 
     create_file "config/#{name}.yaml" do
-      {'designs' => [name.to_s],
-       'database' => {
+      {'database' => {
          'url' => "http://localhost:5984/#{name}"
-       }
-      }.to_yaml.split("\n")[1..-1].join("\n") + "\n"
+      }}.to_yaml.split("\n")[1..-1].join("\n") + "\n"
     end
 
-    copy_file 'security.coffee.erb', 'config/security.coffee'
+    copy_file 'validation.coffee.erb', 'config/validation.coffee'
 
     empty_directory 'views'
     copy_file 'all.coffee.erb', 'views/all.coffee'
@@ -42,10 +40,14 @@ class Dayvan::Cli < Thor
   def push
     Dayvan.project.create_database!
     Dayvan.project.push!
-  rescue Errno::ECONNREFUSED, RestClient::Unauthorized
+  rescue SocketError, Errno::ECONNREFUSED, RestClient::Unauthorized
     abort "fatal: Couldn't connect to CouchDB at #{Dayvan.project.db.url}"
   rescue Dayvan::ConfigError
-    abort "fatal: Not a Dayvan app"
+    abort "fatal: No Dayvan config found, searched for \n" +
+      Dayvan.project.config_search_paths.
+        map {|p| ' - ' + p.relative_path_from(Dayvan.project.dir).to_s}.
+        join("\n") +
+        "\n"
   end
 
 private

data/lib/dayvan/design.rb

@@ -33,9 +33,8 @@ class Dayvan::Design
   end
 
   def attachment_path
-    config['attachments'] ||
-    config['attachment'] ||
-    Dayvan.project.dir.join('public')
+    config_val('attachment_path', 'attachments_path', 'attachments') ||
+      Dayvan.project.dir.join('public')
   end
 
   def views
@@ -43,27 +42,26 @@ class Dayvan::Design
   end
 
   def view_path
-    config['views'] ||
-    config['view'] ||
-    Dayvan.project.dir.join('views')
+    config_val('view_path', 'views_path', 'views') ||
+      Dayvan.project.dir.join('views')
   end
 
   def validate_doc_update
-    Dayvan::Security.new(validate_doc_update_path)
+    Dayvan::Validation.all(validate_doc_update_path)
   end
 
   def validate_doc_update_path
-    config['security'] ||
-    Dayvan.project.dir.join('config','security.coffee')
+    config_val('validation_path', 'validate_path', 'validation') ||
+      Dayvan.project.dir.join('config','validation.coffee')
   end
 
 
   def to_hash
-    hsh = { '_attachments' => attachments,
+    { '_rev' => rev,
+      '_attachments' => attachments,
       'views' => views,
       'validate_doc_update' => validate_doc_update
-    }
-    rev ? hsh.merge('_rev' => rev) : hsh
+    }.reject {|key, val| !val}
   end
 
   def to_json
@@ -74,4 +72,10 @@ class Dayvan::Design
     doc.put to_json
   end
 
+private
+
+  def config_val(*keys)
+    keys.find {|key| config.has_key?(key)}
+  end
+
 end

data/lib/dayvan/project.rb

@@ -12,7 +12,7 @@ class Dayvan::Project
   end
 
   def designs
-    config['designs'].
+    (config['designs'] || [dir.basename]).
       map {|design| Dayvan::Design.new_from_config(design)}
   end
 
@@ -29,15 +29,18 @@ class Dayvan::Project
     )[dbname]
   end
 
-  def config_path
+  def config_search_paths
     dirname = dir.expand_path.basename
-    ["#{dirname}.yaml", "#{dirname}.yml", 'divan.yaml', 'divan.yml'].
+    ["#{dirname}.yaml", "#{dirname}.yml", 'dayvan.yaml', 'dayvan.yml'].
       inject([]) {|dirs, f|
         dirs << dir.join('config',f)
         dirs << dir.join(f)
         dirs
-      }.
-      find {|dir| dir.file? && dir.readable?} ||
+      }.uniq
+  end
+
+  def config_path
+    config_search_paths.find {|f| f.file? && f.readable?} ||
       raise(Dayvan::ConfigError)
   end
 

data/lib/dayvan/{security.rb → validation.rb}

@@ -1,9 +1,9 @@
 require 'coffee-script'
 
-class Dayvan::Security
+class Dayvan::Validation
 
-  def self.all
-    new(Dayvan.project.security_path)
+  def self.all(path)
+    path.exist? && new(path)
   end
 
   attr_accessor :path

data/lib/dayvan/view.rb

@@ -4,7 +4,7 @@ class Dayvan::View
   attr_accessor :path
 
   def self.all(root)
-    Dir[root.join('**/*.coffee')].
+    root.exist? && Dir[root.join('**/*.coffee')].
       reject {|f| File.directory?(f)}. # Allows symlinks
       inject({}) {|all, f|
         view = new(f)

data/templates/welcome.html.erb

@@ -24,4 +24,4 @@ a:hover { color: #06C; }
 </hgroup>
 <p>Push new versions of your app again with <code>dvn push</code>.</p>
 <p>Add attachments to <code>public</code> directory and views to the <code>views</code> directory. These settings can be changed in the <code>config/<%= @name %>.yaml</code> file.</p>
-<p class=footer><a href=http://chrislloyd.github.com/dayvan>Reference</a> &middot; <a href=http://github.com/chrislloyd/dayvan>Code</a> &middot; <a href=http://thelincolnshirepoacher.com>The Poacher</a></p>
+<p class=footer><a href=http://chrislloyd.cloudant.com/dayvan/_design/dayvan/index.html>Reference</a> &middot; <a href=http://github.com/chrislloyd/dayvan>Code</a> &middot; <a href=http://thelincolnshirepoacher.com>The Poacher</a></p>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dayvan
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Chris Lloyd
@@ -81,11 +81,11 @@ files:
 - lib/dayvan/cli.rb
 - lib/dayvan/design.rb
 - lib/dayvan/project.rb
-- lib/dayvan/security.rb
+- lib/dayvan/validation.rb
 - lib/dayvan/view.rb
 - templates/all.coffee.erb
-- templates/security.coffee.erb
 - templates/size.coffee.erb
+- templates/validation.coffee.erb
 - templates/welcome.html.erb
 has_rdoc: true
 homepage: http://chrislloyd.github.com/dayvan