couch 0.0.4 → 0.1.0

data/couch.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{couch}
-  s.version = "0.0.4"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Johannes J. Schmidt"]
-  s.date = %q{2010-03-08}
+  s.date = %q{2010-03-09}
   s.default_executable = %q{couch}
   s.description = %q{With Couch you can easy build a standalone CouchDB application.}
   s.email = %q{schmidt@netzmerk.com}
@@ -27,13 +27,16 @@ Gem::Specification.new do |s|
      "couch.gemspec",
      "lib/couch.rb",
      "lib/couch/actions/base.rb",
+     "lib/couch/actions/net_base.rb",
      "lib/couch/actions/pull.rb",
      "lib/couch/actions/push.rb",
+     "lib/couch/actions/routes.rb",
      "lib/couch/commands.rb",
      "lib/couch/commands/destroy.rb",
      "lib/couch/commands/generate.rb",
      "lib/couch/commands/pull.rb",
      "lib/couch/commands/push.rb",
+     "lib/couch/commands/routes.rb",
      "lib/couch/generators.rb",
      "lib/couch/generators/application/USAGE",
      "lib/couch/generators/application/application_generator.rb",
@@ -55,6 +58,7 @@ Gem::Specification.new do |s|
      "lib/couch/generators/show/show_generator.rb",
      "lib/couch/generators/show/templates/show.js",
      "lib/couch/generators/validation/USAGE",
+     "lib/couch/generators/validation/templates/validate_doc_update.js",
      "lib/couch/generators/validation/validation_generator.rb",
      "lib/couch/generators/view/USAGE",
      "lib/couch/generators/view/templates/map.js",

data/lib/couch/actions/base.rb

@@ -1,26 +1,16 @@
 require 'couch'
-require 'couch/mapper'
 
 require 'rubygems'
-require "rest_client"
-require 'json'
 require 'thor/group'
-require 'active_support/core_ext/string/inflections'
+require 'active_support/inflector'
 
 module Couch
   module Actions
     class Base < Thor::Group
-      attr_reader :mapper
-
       include Thor::Actions
 
       class_option :database, :type => :string
 
-      def initialize(*args)
-        super
-        @mapper = Mapper.new(destination_root)
-      end
-
       def self.banner
         "couch #{to_s.split('::').last.underscore}"
       end

data/lib/couch/actions/net_base.rb

@@ -0,0 +1,21 @@
+require 'couch'
+require 'couch/mapper'
+require 'couch/actions/base'
+
+require 'rubygems'
+require "rest_client"
+require 'json'
+
+module Couch
+  module Actions
+    class NetBase < Base
+      attr_reader :mapper
+
+      def initialize(*args)
+        super
+        @mapper = Mapper.new(destination_root)
+      end
+    end
+  end
+end
+

data/lib/couch/actions/pull.rb

@@ -1,8 +1,8 @@
-require 'couch/actions/base'
+require 'couch/actions/net_base'
 
 module Couch
   module Actions
-    class Pull < Base
+    class Pull < NetBase
       add_runtime_options!
 
       def pull

data/lib/couch/actions/push.rb

@@ -1,8 +1,8 @@
-require 'couch/actions/base'
+require 'couch/actions/net_base'
 
 module Couch
   module Actions
-    class Push < Base
+    class Push < NetBase
       def create_database_unless_exists
         RestClient.put database, nil
         say "Created database %s" % database

data/lib/couch/actions/routes.rb

@@ -0,0 +1,41 @@
+require 'couch/actions/base'
+
+module Couch
+  module Actions
+    class Routes < Base
+      def routes
+        say 'Static:'
+        Dir.glob(File.join(destination_root, "_attachments/*.html")).each do |file|
+          say '  %s' % attachment_url(file)
+        end
+
+        say 'Lists:'
+        Dir.glob(File.join(destination_root, "lists/*.js")).each do |list|
+          Dir.glob(File.join(destination_root, "views/*")).each do |view|
+            say '  %s' % list_url(list, view)
+          end
+        end
+
+        say 'Shows:'
+        Dir.glob(File.join(destination_root, "shows/*.js")).each do |show|
+          say '  %s' % show_url(show)
+          say '  %s' % show_url(show, '/:id')
+        end
+      end
+
+      protected
+
+      def attachment_url(file)
+        File.join(database, '_design', File.basename(database), File.basename(file))
+      end
+
+      def list_url(list, view)
+        File.join(database, '_design', File.basename(database), '_list', File.basename(view), File.basename(list, '.js'))
+      end
+
+      def show_url(show, id = '/')
+        File.join(database, '_design', File.basename(database), '_show', File.basename(show, '.js'), id)
+      end
+    end
+  end
+end

data/lib/couch/commands.rb

@@ -9,6 +9,7 @@ The most common couch commands are:
  generate    Generate new code (short-cut alias: "g")
  push        Push application code to CouchDB
  pull        Pull latest application code from CouchDB
+ routes      List application urls
 
 In addition to those, there are:
  destroy      Undo code generated with "generate"
@@ -26,6 +27,8 @@ when 'push'
   require 'couch/commands/push'
 when 'pull'
   require 'couch/commands/pull'
+when 'routes'
+  require 'couch/commands/routes'
 
 when '--help', '-h'
   puts HELP_TEXT

data/lib/couch/commands/routes.rb

@@ -0,0 +1,4 @@
+require 'couch'
+require 'couch/actions/routes'
+
+Couch::Actions::Routes.start ARGV, :destination_root => Couch.root

data/lib/couch/generators/application/templates/_attachments/index.html

@@ -8,7 +8,4 @@
   <body>
     <h1>Welcome to <%= app_title %>!</h1>
   </body>
-  <script src="/_utils/script/json2.js"></script>
-  <script src="/_utils/script/jquery.js?1.3.2"></script>
-  <script src="/_utils/script/jquery.couch.js?0.10.0"></script>
 </html>

data/lib/couch/generators/list/templates/list.js

@@ -1,18 +1,24 @@
 function(head, req) {
   provides("html", function() {
-    var header = '<html><head><link rel="stylesheet" href="../../stylesheets/application.css" type="text/css" media="screen" charset="utf-8"></head><body><h1>Listing <%= pluralized_model_name.humanize %></h1><table><tr>';
-    <% attributes.each do |attribute| %>
-      header += '<th><%= attribute.humanize %></th>';
-    <% end %>
+    var header = '<html><head><link rel="stylesheet" href="../../stylesheets/application.css" type="text/css" media="screen" charset="utf-8"></head><body><h1>Listing <%= pluralized_model_name.humanize %></h1>';
+
+    header += '<p><a href="../../_show/<%= model_name %>/">New <%= model_name.humanize %></a></p>';
+
+    header += '<table><tr>';
+<% attributes.each do |attribute| -%>
+    header += '<th><%= attribute.humanize %></th>';
+<% end -%>
+    header += '<th></th>';
     header += '</tr>';
     send(header);
 
     var row;
     while (row = getRow()) {
       var body = '<tr>';
-      <% attributes.each do |attribute| %>
-        body += '<td>' + row.value['<%= attribute %>'] + '</td>';
-      <% end %>
+<% attributes.each do |attribute| -%>
+      body += '<td>' + row.value['<%= attribute %>'] + '</td>';
+<% end -%>
+      body += '<td><a href="../../_show/<%= model_name %>/' + row.id + '" alt="Show <%= model_name.humanize %>">Show</a></td>';
       body += '</tr>';
       send(body);
     }

data/lib/couch/generators/scaffold/scaffold_generator.rb

@@ -3,19 +3,26 @@ require 'couch/generators/named_base'
 module Couch::Generators
   class ScaffoldGenerator < NamedBase
     def create_view_function
-      Couch::Generators.invoke :view, name, :behavior => behavior
+      Couch::Generators.invoke :view, *invokation_options
     end
 
     def inject_validations
-      Couch::Generators.invoke :validation, [name] + attributes, :behavior => behavior
+      Couch::Generators.invoke :validation, *invokation_options
     end
 
     def create_list_function
-      Couch::Generators.invoke :list, [name] + attributes, :behavior => behavior
+      Couch::Generators.invoke :list, *invokation_options
     end
 
     def create_show_function
-      Couch::Generators.invoke :show, [name] + attributes, :behavior => behavior
+      Couch::Generators.invoke :show, *invokation_options
+    end
+
+    protected
+
+    # TODO: add default options, like --help, --force etc
+    def invokation_options
+      [[name] + attributes, { :behavior => behavior }]
     end
   end
 end

data/lib/couch/generators/show/templates/show.js

@@ -3,17 +3,18 @@ function(doc, req) {
   var body = '';
   var tail = '</body></html>';
   if(doc) {
-  <% attributes.each do |attribute| %>
+    body += '<p><a href="../../_list/<%= pluralized_model_name %>/<%= pluralized_model_name %>">List <%= pluralized_model_name.humanize %></a></p>';
+<% attributes.each do |attribute| -%>
     if(doc['<%= attribute %>']) {
-      body += '<p><strong><%= attribute.humanize %></strong>: ' + doc['<%= attribute %>'] + '</p>'
+      body += '<p><strong><%= attribute.humanize %></strong>: ' + doc['<%= attribute %>'] + '</p>';
     }
-  <% end %>
+<% end -%>
     return head + '<h1>Showing <%= model_name.humanize %></h1>' + body + tail;
   } else {
-  <% attributes.each do |attribute| %>
-    body += '<p><label><%= attribute.humanize %></label>: <input type="text" name="<%= model_name %>[<%= attribute %>]" id="<%= model_name %>_<%= attribute %>" /></p>'
-  <% end %>
-    body += '<p><input type="submit" /></p>'
+<% attributes.each do |attribute| -%>
+    body += '<p><label><%= attribute.humanize %></label>: <input type="text" name="<%= model_name %>[<%= attribute %>]" id="<%= model_name %>_<%= attribute %>" /></p>';
+<% end -%>
+    body += '<p><input type="submit" /> <a href="../../_list/<%= pluralized_model_name %>/<%= pluralized_model_name %>">Cancel</a></p>';
     return head + '<h1>New <%= model_name.humanize %></h1>' + body + tail;
   }
 }

data/lib/couch/generators/validation/templates/validate_doc_update.js

@@ -0,0 +1,3 @@
+function (newDoc, oldDoc, userCtx) {
+  // your validation code goes here
+}

data/lib/couch/generators/validation/validation_generator.rb

@@ -2,6 +2,11 @@ require 'couch/generators/named_base'
 
 module Couch::Generators
   class ValidationGenerator < NamedBase
+    def create_validate_doc_update
+      return if File.exists?(File.join(destination_root, "validate_doc_update.js"))
+      template "validate_doc_update.js"
+    end
+
     def inject_validations
       inject_into_file "validate_doc_update.js", model_validations, :after => "function (newDoc, oldDoc, userCtx) {\n"
     end

data/lib/couch/generators/view/templates/map.js

@@ -1,5 +1,5 @@
 function(doc) {
   if(doc.type && doc.type == '<%= model_name %>') {
-    emit(doc._id, null);
+    emit(doc._id, <%= mydoc %>);
   }
 }

data/lib/couch/generators/view/view_generator.rb

@@ -7,5 +7,11 @@ module Couch::Generators
       empty_directory path
       template "map.js", "#{path}/map.js"
     end
+
+    protected
+
+    def mydoc
+      "{ %s }" % attributes.map { |a| '"%s": doc["%s"]' % [a,a] }.join(", ")
+    end
   end
 end

data/lib/couch/version.rb

@@ -1,3 +1,3 @@
 module Couch
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 4
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors: 
 - Johannes J. Schmidt
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-08 00:00:00 +01:00
+date: 2010-03-09 00:00:00 +01:00
 default_executable: couch
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,13 +106,16 @@ files:
 - couch.gemspec
 - lib/couch.rb
 - lib/couch/actions/base.rb
+- lib/couch/actions/net_base.rb
 - lib/couch/actions/pull.rb
 - lib/couch/actions/push.rb
+- lib/couch/actions/routes.rb
 - lib/couch/commands.rb
 - lib/couch/commands/destroy.rb
 - lib/couch/commands/generate.rb
 - lib/couch/commands/pull.rb
 - lib/couch/commands/push.rb
+- lib/couch/commands/routes.rb
 - lib/couch/generators.rb
 - lib/couch/generators/application/USAGE
 - lib/couch/generators/application/application_generator.rb
@@ -134,6 +137,7 @@ files:
 - lib/couch/generators/show/show_generator.rb
 - lib/couch/generators/show/templates/show.js
 - lib/couch/generators/validation/USAGE
+- lib/couch/generators/validation/templates/validate_doc_update.js
 - lib/couch/generators/validation/validation_generator.rb
 - lib/couch/generators/view/USAGE
 - lib/couch/generators/view/templates/map.js