couch 0.1.0 → 0.1.1

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "lib/couch/generators/application/templates/lib/mustache"]
+	path = lib/couch/generators/application/templates/lib/mustache
+	url = git://github.com/janl/mustache.js.git

data/Rakefile

@@ -17,7 +17,7 @@ begin
     gem.add_dependency "rest-client", ">= 1.4.1"
     gem.add_dependency "json_pure", ">= 1.2.2"
     gem.add_dependency "activesupport", ">= 3.0.0.beta"
-    gem.add_development_dependency "rspec", ">= 1.2.9"
+    # gem.add_development_dependency "rspec", ">= 1.2.9"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/bin/couch

@@ -3,4 +3,5 @@
 couch_path = File.expand_path('../../lib', __FILE__)
 $:.unshift(couch_path) if File.directory?(couch_path) && !$:.include?(couch_path)
 
+require 'couch'
 require 'couch/commands'

data/couch.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{couch}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   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-09}
+  s.date = %q{2010-03-10}
   s.default_executable = %q{couch}
   s.description = %q{With Couch you can easy build a standalone CouchDB application.}
   s.email = %q{schmidt@netzmerk.com}
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     ".gitmodules",
      "LICENSE",
      "README.rdoc",
      "Rakefile",
@@ -27,7 +28,6 @@ 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",
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
      "lib/couch/commands/pull.rb",
      "lib/couch/commands/push.rb",
      "lib/couch/commands/routes.rb",
+     "lib/couch/design_document.rb",
      "lib/couch/generators.rb",
      "lib/couch/generators/application/USAGE",
      "lib/couch/generators/application/application_generator.rb",
@@ -63,11 +64,7 @@ Gem::Specification.new do |s|
      "lib/couch/generators/view/USAGE",
      "lib/couch/generators/view/templates/map.js",
      "lib/couch/generators/view/view_generator.rb",
-     "lib/couch/mapper.rb",
-     "lib/couch/version.rb",
-     "spec/couch_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+     "lib/couch/version.rb"
   ]
   s.homepage = %q{http://github.com/jo/couch}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -75,10 +72,6 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{couch}
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{Standalone CouchDB Application Development Suite}
-  s.test_files = [
-    "spec/spec_helper.rb",
-     "spec/couch_spec.rb"
-  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -89,20 +82,17 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rest-client>, [">= 1.4.1"])
       s.add_runtime_dependency(%q<json_pure>, [">= 1.2.2"])
       s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0.beta"])
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
       s.add_dependency(%q<thor>, [">= 0.13.4"])
       s.add_dependency(%q<rest-client>, [">= 1.4.1"])
       s.add_dependency(%q<json_pure>, [">= 1.2.2"])
       s.add_dependency(%q<activesupport>, [">= 3.0.0.beta"])
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
     end
   else
     s.add_dependency(%q<thor>, [">= 0.13.4"])
     s.add_dependency(%q<rest-client>, [">= 1.4.1"])
     s.add_dependency(%q<json_pure>, [">= 1.2.2"])
     s.add_dependency(%q<activesupport>, [">= 3.0.0.beta"])
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
   end
 end
 

data/lib/couch.rb

@@ -1,4 +1,6 @@
+require 'rubygems'
 require 'yaml'
+require 'json'
 
 module Couch
   CONFIG_FILENAME = ".couchrc"
@@ -15,12 +17,12 @@ module Couch
     @config ||= YAML.load(File.open config_file)
   end
 
+  private
+
   def self.config_file
     File.join root, CONFIG_FILENAME
   end
 
-  private
-
   def self.find_root
     cwd = Dir.pwd
     return cwd if File.exists?(File.join(cwd, CONFIG_FILENAME))

data/lib/couch/actions/base.rb

@@ -1,6 +1,3 @@
-require 'couch'
-
-require 'rubygems'
 require 'thor/group'
 require 'active_support/inflector'
 
@@ -9,21 +6,9 @@ module Couch
     class Base < Thor::Group
       include Thor::Actions
 
-      class_option :database, :type => :string
-
       def self.banner
         "couch #{to_s.split('::').last.underscore}"
       end
-
-      private
-
-      def database
-        options[:database] || Couch.database
-      end
-
-      def url_for(id)
-        File.join database, id
-      end
     end
   end
 end

data/lib/couch/actions/pull.rb

@@ -1,47 +1,26 @@
-require 'couch/actions/net_base'
+require 'couch/actions/base'
+require 'couch/design_document'
+
+require "rest_client"
 
 module Couch
   module Actions
-    class Pull < NetBase
+    class Pull < Base
       add_runtime_options!
 
       def pull
-        id = mapper.doc["_id"]
-        url = url_for(id)
-
-        say "Pulling from %s..." % url
-
-        resp = RestClient.get url + "?attachments=true"
-        response = JSON.parse(resp.body)
-        map_doc(response)
-        rev = response["_rev"]
+        say "Pulling from %s" % DesignDocument.url
 
-        say "Checked out %s" % rev
-      rescue RestClient::ResourceNotFound
-        say "Error: Document %s does not exist!" % id
-      end
+        resp = RestClient.get DesignDocument.url(:attachments => true)
+        doc = DesignDocument.build_from_json(resp.body)
 
-      private
-
-      def map_doc(doc, dirname = destination_root)
-        doc.each do |key, value|
-          next if key == "_attachments"
-          filename = File.join(dirname, key)
-          if value.is_a?(String)
-            create_file "#{filename}.js", "#{value}\n"
-          else
-            Dir.mkdir(filename) unless File.directory?(filename)
-            map_doc value, File.join(dirname, key)
-          end
+        doc.write do |filename, content|
+          create_file filename, content
         end
-        map_doc_attachments(doc["_attachments"], dirname) if doc["_attachments"]
-      end
 
-      def map_doc_attachments(doc, dirname)
-        doc.each do |key, value|
-          filename = File.join(dirname, "_attachments", key)
-          create_file filename, value["data"].unpack("m")
-        end
+        say "Checked out %s" % doc.rev
+      rescue RestClient::ResourceNotFound
+        say "Error: Document %s does not exist!" % DesignDocument.id
       end
     end
   end

data/lib/couch/actions/push.rb

@@ -1,21 +1,22 @@
-require 'couch/actions/net_base'
+require 'couch/actions/base'
+require 'couch/design_document'
+
+require "rest_client"
 
 module Couch
   module Actions
-    class Push < NetBase
+    class Push < Base
       def create_database_unless_exists
-        RestClient.put database, nil
-        say "Created database %s" % database
+        RestClient.put DesignDocument.database, nil
+        say "Created database %s" % DesignDocument.database
       rescue RestClient::PreconditionFailed
       end
 
       def push
-        doc = mapper.doc
-        url = url_for(doc["_id"])
-
-        say "Pushing to %s..." % url
+        doc = DesignDocument.build_from_filesystem(destination_root)
+        say "Pushing to %s" % DesignDocument.url
 
-        resp = RestClient.put url, doc.to_json
+        resp = RestClient.put DesignDocument.url, doc.to_json
         response = JSON.parse(resp.body)
 
         if response["ok"]

data/lib/couch/actions/routes.rb

@@ -26,15 +26,15 @@ module Couch
       protected
 
       def attachment_url(file)
-        File.join(database, '_design', File.basename(database), File.basename(file))
+        File.join(Couch.database, '_design', File.basename(Couch.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'))
+        File.join(Couch.database, '_design', File.basename(Couch.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)
+        File.join(Couch.database, '_design', File.basename(Couch.database), '_show', File.basename(show, '.js'), id)
       end
     end
   end

data/lib/couch/design_document.rb

@@ -0,0 +1,228 @@
+require 'uri'
+
+module Couch
+  class DesignDocument
+    EXT_MIME_MAPPING = {
+      ".html" => "text/html",
+      ".js" => "text/javascript",
+      ".css" => "text/css",
+    }
+
+    # initialize with a hash
+    def initialize(hash = {})
+      @hash = hash
+    end
+
+    # returns the id of the design document
+    def id
+      @hash["_id"]
+    end
+
+    # returns the rev of the design document
+    def rev
+      @hash["_rev"]
+    end
+
+    # converts to json
+    def to_json
+      hash_with_injected_makros.to_json
+    end
+
+    # write to filesystem
+    def write(&block)
+      write_doc @hash, nil, block
+    end
+
+    class << self
+      # returns new design document object from filesystem
+      def build_from_filesystem(root)
+        new map(root)
+      end
+
+      # returns new design document object from json string
+      def build_from_json(json)
+        new reject_makros(JSON.parse(json))
+      end
+
+      # returns the database used to store design document
+      def database
+        @database ||= Couch.database
+      end
+
+      # returns the id for design document
+      def id
+        @id ||= File.read(File.join(Couch.root, '_id.js')).strip
+      end
+
+      # returns the url for design document
+      def url(options = {})
+        File.join(database, id) << build_options_string(options)
+      end
+
+      private
+
+      def reject_makros(doc)
+        # TODO: recursive walk libs
+        libs = doc["lib"]
+        return doc if libs.nil? || libs.empty?
+        # Attention: replace json makros first!
+        doc = reject_json_makros(doc, libs)
+        doc = reject_code_makros(doc, libs)
+      end
+
+      def reject_code_makros(doc, libs)
+        doc = doc.dup
+        doc.each do |key, value|
+          next if key == "lib"
+          if value.is_a?(String)
+            libs.each do |name, content|
+              # only substitute strings
+              next unless content.is_a?(String)
+              next unless value.include?(content.strip)
+              doc[key] = value.gsub(content.strip, "// !code #{name}.js")
+            end
+          elsif value.is_a?(Hash)
+            doc[key] = reject_code_makros(value, libs)
+          end
+        end
+        doc
+      end
+
+      def reject_json_makros(doc, libs)
+        doc.each do |key, value|
+          next if key == "lib"
+          if value.is_a?(String)
+            libs.each do |name, content|
+              # only substitute strings
+              next unless content.is_a?(String)
+              json = 'var %s = %s;' % [name.sub(/\..*$/, ''), content.to_json]
+              next unless value.include?(json)
+              doc[key] = value.gsub(json, "// !json #{name}")
+            end
+          elsif value.is_a?(Hash)
+            doc[key] = reject_json_makros(value, libs)
+          end
+        end
+        doc
+      end
+
+      def build_options_string(options)
+        return '' if options.empty?
+        options_array = []
+        options.each do |key, value|
+          options_array << URI.escape([key, value].join('='))
+        end
+        '?' + options_array.join("&")
+      end
+
+      def map(dirname, hash = {})
+        Dir.entries(dirname).each do |file|
+          next if file =~ /^\./
+          filename = File.join(dirname, file)
+          if file == "_attachments"
+            hash['_attachments'] = map_attachments(filename)
+          elsif File.directory?(filename)
+            hash[file] = map(filename)
+          elsif File.extname(filename) =~ /^\.(js|html)$/
+            # only .js and .html files are mapped
+            # but .js is stripped off the key
+            key = file.sub(/\.js$/, '')
+            hash[key] = File.read(filename).strip
+          end
+        end
+        hash
+      end
+
+      def map_attachments(dirname, hash = {}, keys = [])
+        Dir.entries(dirname).each do |file|
+          next if file =~ /^\./
+          filename = File.join(dirname, file)
+          base = keys + [file]
+          if File.directory?(filename)
+            map_attachments filename, hash, base
+          else
+            hash[base.join('/')] = {
+              "content_type" => mime_type(filename),
+              "data" => base64(File.read(filename)),
+            }
+          end
+        end
+        hash
+      end
+
+      # CouchDB needs base64 encodings without spaces
+      def base64(data)
+        [data].pack("m").gsub(/\s/,'')
+      end
+
+      # detect mime type from filename extension
+      def mime_type(filename)
+        ext = File.extname(filename)
+        EXT_MIME_MAPPING[ext] || 'text/plain'
+      end
+    end
+
+    private
+
+    def write_doc(doc, dirname, block)
+      doc.each do |key, value|
+        next if key == "_attachments"
+        filename = dirname ? File.join(dirname, key) : key.dup
+        if value.is_a?(String)
+          filename << ".js" unless File.extname(filename) == ".html"
+          block.call filename, "#{value}\n"
+        else
+          write_doc value, filename, block
+        end
+      end
+      write_attachments doc["_attachments"], dirname, block if doc["_attachments"]
+    end
+
+    def write_attachments(doc, dirname, block)
+      dirname = dirname ? File.join(dirname, "_attachments") : "_attachments"
+      
+      doc.each do |key, value|
+        next unless value["data"]
+
+        block.call File.join(dirname, key), value["data"].unpack("m")
+      end
+    end
+
+    def hash_with_injected_makros
+      hash = inject_code_makros(@hash)
+      inject_json_makros(hash)
+    end
+
+    def inject_code_makros(doc)
+      doc.each do |key, value|
+        doc[key] = if value.is_a?(String)
+                    value.gsub(/\/\/\s*!code.*$/) do |match|
+                      filename = match.sub(/^.*!code\s*(\S+).*$/, '\1')
+                      File.read(File.join(Couch.root, 'lib', filename)).strip
+                    end
+                  elsif value.is_a?(Hash)
+                    inject_code_makros(value)
+                  else
+                    value
+                  end
+      end
+      doc
+    end
+
+    def inject_json_makros(doc)
+      doc.each do |key, value|
+        doc[key] = if value.is_a?(String)
+                    value.gsub(/\/\/\s*!json.*$/) do |match|
+                      filename = match.sub(/^.*!json\s*(\S+).*$/, '\1')
+                      'var %s = %s;' % [filename.sub(/\..*$/, ''), File.read(File.join(Couch.root, 'lib', filename)).strip.to_json]
+                    end
+                  elsif value.is_a?(Hash)
+                    inject_json_makros(value)
+                  else
+                    value
+                  end
+      end
+      doc
+    end
+  end
+end

data/lib/couch/generators/application/application_generator.rb

@@ -15,22 +15,29 @@ module Couch::Generators
       copy_file "gitignore", ".gitignore" unless options[:skip_git]
       template "_id.js"
       copy_file "validate_doc_update.js"
-      empty_directory_with_gitkeep "lists"
-      empty_directory_with_gitkeep "shows"
-      empty_directory_with_gitkeep "updates"
-      empty_directory_with_gitkeep "views"
+      empty_directory "lists"
+      empty_directory "shows"
+      empty_directory "updates"
+      empty_directory "views"
     end
 
     def create_attachments_files
       empty_directory "_attachments"
       inside "_attachments" do
-        empty_directory_with_gitkeep "images"
-        empty_directory_with_gitkeep "javascripts"
+        empty_directory "images"
+        empty_directory "javascripts"
         directory "stylesheets"
         template "index.html"
       end
     end
 
+    def create_lib_files
+      empty_directory "lib"
+      inside "lib" do
+       copy_file "mustache/mustache.js", "mustache.js"
+      end
+    end
+
     protected
 
     def app_name

data/lib/couch/generators/base.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'thor/group'
 require 'active_support/inflector'
 
@@ -62,11 +61,6 @@ module Couch
           end
         end
       end
-
-      def empty_directory_with_gitkeep(destination, config = {})
-        empty_directory(destination, config)
-        create_file("#{destination}/.gitkeep") unless options[:skip_git]
-      end
     end
   end
 end

data/lib/couch/generators/named_base.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'thor/group'
 require 'active_support/inflector'
 

data/lib/couch/version.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Johannes J. Schmidt
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-09 00:00:00 +01:00
+date: 2010-03-10 00:00:00 +01:00
 default_executable: couch
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,20 +74,6 @@ dependencies:
         version: 3.0.0.beta
   type: :runtime
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 9
-        version: 1.2.9
-  type: :development
-  version_requirements: *id005
 description: With Couch you can easy build a standalone CouchDB application.
 email: schmidt@netzmerk.com
 executables: 
@@ -99,6 +85,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .gitignore
+- .gitmodules
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -106,7 +93,6 @@ 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
@@ -116,6 +102,7 @@ files:
 - lib/couch/commands/pull.rb
 - lib/couch/commands/push.rb
 - lib/couch/commands/routes.rb
+- lib/couch/design_document.rb
 - lib/couch/generators.rb
 - lib/couch/generators/application/USAGE
 - lib/couch/generators/application/application_generator.rb
@@ -142,11 +129,7 @@ files:
 - lib/couch/generators/view/USAGE
 - lib/couch/generators/view/templates/map.js
 - lib/couch/generators/view/view_generator.rb
-- lib/couch/mapper.rb
 - lib/couch/version.rb
-- spec/couch_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/jo/couch
 licenses: []
@@ -177,6 +160,5 @@ rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Standalone CouchDB Application Development Suite
-test_files: 
-- spec/spec_helper.rb
-- spec/couch_spec.rb
+test_files: []
+

data/lib/couch/actions/net_base.rb

@@ -1,21 +0,0 @@
-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/mapper.rb

@@ -1,64 +0,0 @@
-module Couch
-  class Mapper
-    MIME_TYPES = {
-      ".html" => "text/html",
-      ".js" => "text/javascript",
-      ".css" => "text/css",
-    }
-
-    def initialize(root)
-      raise "Root invalid" unless root && File.directory?(root)
-      @root = root
-    end
-
-    def doc
-      map @root
-    end
-
-    private
-
-    def map(dirname, hash = {})
-      Dir.entries(dirname).each do |file|
-        next if file =~ /^\./
-        filename = File.join(dirname, file)
-        if file == "_attachments"
-          hash['_attachments'] = map_attachments(filename)
-        elsif File.directory?(filename)
-          hash[file] = map(filename)
-        elsif File.extname(filename) == '.js'
-          # only .js files are mapped
-          key = file.sub(/\.js$/, '')
-          hash[key] = File.read(filename).strip
-        end
-      end
-      hash
-    end
-
-    def map_attachments(dirname, hash = {}, keys = [])
-      Dir.entries(dirname).each do |file|
-        next if file =~ /^\./
-        filename = File.join(dirname, file)
-        base = keys + [file]
-        if File.directory?(filename)
-          map_attachments filename, hash, base
-        else
-          hash[base.join('/')] = {
-            "content_type" => mime_type(filename),
-            "data" => base64(File.read(filename)),
-          }
-        end
-      end
-      hash
-    end
-
-    # CouchDB needs base64 encodings without spaces
-    def base64(data)
-      [data].pack("m").gsub(/\s/,'')
-    end
-
-    def mime_type(filename)
-      ext = File.extname(filename)
-      MIME_TYPES[ext] || 'text/plain'
-    end
-  end
-end

data/spec/couch_spec.rb

@@ -1,7 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "Couch" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
-  end
-end

data/spec/spec.opts

@@ -1 +0,0 @@
---color

data/spec/spec_helper.rb

@@ -1,9 +0,0 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'couch'
-require 'spec'
-require 'spec/autorun'
-
-Spec::Runner.configure do |config|
-  
-end