couch 0.0.2 → 0.0.3

data/Rakefile

@@ -16,6 +16,7 @@ begin
     gem.add_dependency "thor", ">= 0.13.4"
     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 is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/couch.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{couch}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Johannes J. Schmidt"]
@@ -34,18 +34,25 @@ Gem::Specification.new do |s|
      "lib/couch/commands/generate.rb",
      "lib/couch/commands/pull.rb",
      "lib/couch/commands/push.rb",
-     "lib/couch/core_ext/string/inflections.rb",
      "lib/couch/generators.rb",
      "lib/couch/generators/application/USAGE",
      "lib/couch/generators/application/application_generator.rb",
      "lib/couch/generators/application/templates/README",
      "lib/couch/generators/application/templates/_attachments/index.html",
      "lib/couch/generators/application/templates/_attachments/stylesheets/application.css",
-     "lib/couch/generators/application/templates/_id",
+     "lib/couch/generators/application/templates/_id.js",
      "lib/couch/generators/application/templates/couchrc",
      "lib/couch/generators/application/templates/gitignore",
      "lib/couch/generators/application/templates/validate_doc_update.js",
      "lib/couch/generators/base.rb",
+     "lib/couch/generators/named_base.rb",
+     "lib/couch/generators/scaffold/USAGE",
+     "lib/couch/generators/scaffold/scaffold_generator.rb",
+     "lib/couch/generators/validation/USAGE",
+     "lib/couch/generators/validation/validation_generator.rb",
+     "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",
@@ -71,17 +78,20 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<thor>, [">= 0.13.4"])
       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/actions/base.rb

@@ -1,11 +1,11 @@
 require 'couch'
 require 'couch/mapper'
-require 'couch/core_ext/string/inflections'
 
 require 'rubygems'
 require "rest_client"
 require 'json'
 require 'thor/group'
+require 'active_support/core_ext/string/inflections'
 
 module Couch
   module Actions

data/lib/couch/actions/pull.rb

@@ -5,7 +5,7 @@ module Couch
     class Pull < Base
       add_runtime_options!
 
-      def pull_me
+      def pull
         id = mapper.doc["_id"]
         url = url_for(id)
 
@@ -28,7 +28,7 @@ module Couch
           next if key == "_attachments"
           filename = File.join(dirname, key)
           if value.is_a?(String)
-            create_file filename, value
+            create_file "#{filename}.js", "#{value}\n"
           else
             Dir.mkdir(filename) unless File.directory?(filename)
             map_doc value, File.join(dirname, key)

data/lib/couch/actions/push.rb

@@ -20,8 +20,8 @@ module Couch
 
         if response["ok"]
           rev = response["rev"]
-          File.open File.join(destination_root, "_rev"), "w" do |file|
-           file << rev
+          File.open File.join(destination_root, "_rev.js"), "w" do |file|
+           file << "#{rev}\n"
           end
 
           say "Pushed %s" % rev

data/lib/couch/generators.rb

@@ -18,10 +18,11 @@ module Couch
     def self.help(command = 'generate')
       path = File.expand_path("../generators/*/*_generator.rb", __FILE__)
       generators = Dir.glob(path)
+      generators.sort!
       generators.map! { |f| File.basename(f) }
       generators.map! { |n| n.sub!(/_generator\.rb$/, '')  }
-      longest_name = generators.map { |g| g.size }.sort.first
-      generators.map! { |g| "%s  # %s" % [g.ljust(longest_name), lookup(g).info] }
+      longest_name_size = generators.map { |g| g.size }.sort.last
+      generators.map! { |g| "%s  # %s" % [g.ljust(longest_name_size), lookup(g).info] }
 
       puts "Usage: couch #{command} GENERATOR [args] [options]"
       puts

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

@@ -2,10 +2,6 @@ module Couch::Generators
   class ApplicationGenerator < Base
     argument :app_path, :type => :string
 
-    class_option :skip_git, :type => :boolean, :aliases => "-G", :default => false,
-                            :desc => "Skip Git ignores and keeps"
-
-
     def create_root
       self.destination_root = File.expand_path(app_path, destination_root)
  
@@ -17,7 +13,7 @@ module Couch::Generators
       template "couchrc", ".couchrc"
       copy_file "README"
       copy_file "gitignore", ".gitignore" unless options[:skip_git]
-      template "_id"
+      template "_id.js"
       copy_file "validate_doc_update.js"
       empty_directory_with_gitkeep "lists"
       empty_directory_with_gitkeep "shows"
@@ -44,10 +40,5 @@ module Couch::Generators
     def app_title
       @app_title ||= app_name.humanize
     end
-
-    def empty_directory_with_gitkeep(destination, config = {})
-      empty_directory(destination, config)
-      create_file("#{destination}/.gitkeep") unless options[:skip_git]
-    end
   end
 end

data/lib/couch/generators/base.rb

@@ -1,7 +1,6 @@
-require 'couch/core_ext/string/inflections'
-
 require 'rubygems'
 require 'thor/group'
+require 'active_support/inflector'
 
 module Couch
   module Generators
@@ -13,6 +12,9 @@ module Couch
 
       add_runtime_options!
 
+      class_option :skip_git, :type => :boolean, :aliases => "-G", :default => false,
+        :desc => "Skip Git ignores and keeps"
+
       # Automatically sets the source root based on the class name.
       #
       def self.source_root
@@ -60,6 +62,11 @@ 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

@@ -0,0 +1,23 @@
+require 'rubygems'
+require 'thor/group'
+require 'active_support/inflector'
+
+module Couch
+  module Generators
+    class NamedBase < Base
+      argument :name, :type => :string
+      argument :attributes, :type => :array, :default => []
+
+      protected
+
+      # force underscored and singularized model name
+      def model_name
+        @model_name ||= name.underscore.singularize
+      end
+
+      def pluralized_model_name
+        model_name.pluralize
+      end
+    end
+  end
+end

data/lib/couch/generators/scaffold/USAGE

@@ -0,0 +1,10 @@
+Description:
+    The 'scaffold' generator creates a scaffold skelet
+    with a default show function, list function
+    of the name and attributes you specify
+
+Example:
+    couch generate scaffold post title body
+
+    This generates a skeletal model post with a posts list view,
+    post show function and validation.

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

@@ -0,0 +1,21 @@
+require 'couch/generators/named_base'
+
+module Couch::Generators
+  class ScaffoldGenerator < NamedBase
+    def create_view_function
+      Couch::Generators.invoke "view", name, :behavior => behavior
+    end
+
+    def inject_validations
+      Couch::Generators.invoke "validation", [name] + attributes, :behavior => behavior
+    end
+
+    def create_list_function
+      say "list function generation not implemented yet"
+    end
+
+    def create_show_function
+      say "show function generation not implemented yet"
+    end
+  end
+end

data/lib/couch/generators/validation/USAGE

@@ -0,0 +1,9 @@
+Description:
+    The 'validation' generator creates a validation function
+    for the model name and attributes you specify
+
+Example:
+    couch generate validation post title body
+
+    This generates a skeletal model validation for post
+    with validations of presence for title and body

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

@@ -0,0 +1,29 @@
+require 'couch/generators/named_base'
+
+module Couch::Generators
+  class ValidationGenerator < NamedBase
+    def inject_validations
+      inject_into_file "validate_doc_update.js", model_validations, :after => "function (newDoc, oldDoc, userCtx) {\n"
+    end
+
+    protected
+
+    def model_validations
+      str = <<-STR
+  if(newDoc.type == '#{model_name}') {
+    // validations for #{model_name}
+      STR
+
+      attributes.each do |attribute|
+        str << <<-STR
+    if (typeof(newDoc['#{attribute}']) === 'undefined') {
+      throw({ forbidden: '#{attribute} is required' });
+    }
+        STR
+      end
+
+      str << "  }\n"
+      str
+    end
+  end
+end

data/lib/couch/generators/view/USAGE

@@ -0,0 +1,8 @@
+Description:
+    The 'view' generator creates a scaffold view function
+    for the name you specify
+
+Example:
+    couch generate view post
+
+    This generates a skeletal model post with a posts list view

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

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

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

@@ -0,0 +1,11 @@
+require 'couch/generators/named_base'
+
+module Couch::Generators
+  class ViewGenerator < NamedBase
+    def create_view_function
+      path = "views/#{pluralized_model_name}"
+      empty_directory path
+      template "map.js", "#{path}/map.js"
+    end
+  end
+end

data/lib/couch/mapper.rb

@@ -21,14 +21,15 @@ module Couch
       Dir.entries(dirname).each do |file|
         next if file =~ /^\./
         filename = File.join(dirname, file)
-        key = file.sub(/\.js$/, '')
-        hash[key] = if file == "_attachments"
-                      map_attachments(filename)
-                    elsif File.directory?(filename)
-                      map filename
-                    else
-                      File.read(filename).strip
-                    end
+        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

data/lib/couch/version.rb

@@ -1,3 +1,3 @@
 module Couch
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Johannes J. Schmidt
@@ -60,9 +60,24 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: activesupport
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
+        - beta
+        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 
@@ -72,7 +87,7 @@ dependencies:
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 description: With Couch you can easy build a standalone CouchDB application.
 email: schmidt@netzmerk.com
 executables: 
@@ -98,18 +113,25 @@ files:
 - lib/couch/commands/generate.rb
 - lib/couch/commands/pull.rb
 - lib/couch/commands/push.rb
-- lib/couch/core_ext/string/inflections.rb
 - lib/couch/generators.rb
 - lib/couch/generators/application/USAGE
 - lib/couch/generators/application/application_generator.rb
 - lib/couch/generators/application/templates/README
 - lib/couch/generators/application/templates/_attachments/index.html
 - lib/couch/generators/application/templates/_attachments/stylesheets/application.css
-- lib/couch/generators/application/templates/_id
+- lib/couch/generators/application/templates/_id.js
 - lib/couch/generators/application/templates/couchrc
 - lib/couch/generators/application/templates/gitignore
 - lib/couch/generators/application/templates/validate_doc_update.js
 - lib/couch/generators/base.rb
+- lib/couch/generators/named_base.rb
+- lib/couch/generators/scaffold/USAGE
+- lib/couch/generators/scaffold/scaffold_generator.rb
+- lib/couch/generators/validation/USAGE
+- lib/couch/generators/validation/validation_generator.rb
+- 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

data/lib/couch/core_ext/string/inflections.rb

@@ -1,50 +0,0 @@
-# String inflections define new methods on the String class to transform names for different purposes.
-# For instance, you can figure out the name of a database from the name of a class.
-#
-#   "ScaleScore".underscore # => "scale_score"
-
-class String
-  # +camelize+ converts strings to UpperCamelCase.
-  #
-  # +camelize+ will also convert '/' to '::' which is useful for converting paths to namespaces.
-  #
-  # Examples:
-  #   "scale_score".camelize        # => "ScaleScore"
-  #   "scale_score/errors".camelize # => "ScaleScore::Errors"
-  def camelize
-    self.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
-  end
-
-  # Makes an underscored, lowercase form from the expression in the string.
-  # 
-  # +underscore+ will also change '::' to '/' to convert namespaces to paths.
-  #
-  #   "ScaleScore".underscore        # => "scale_score"
-  #   "Couch::Generators".underscore # => couch/generators
-  def underscore
-    self.gsub(/::/, '/').
-      gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-      gsub(/([a-z\d])([A-Z])/,'\1_\2').
-      tr("-", "_").
-      downcase
-  end
-
-  # Capitalizes the first word and turns underscores into spaces.
-  # This is meant for creating pretty output.
-  #
-  # Examples:
-  #   "employee_salary" # => "Employee salary"
-  def humanize
-    self.gsub(/_/, " ").capitalize
-  end
-
-  # Create a class name
-  # Note that this returns a string and not a Class. (To convert to an actual class
-  # follow +classify+ with +constantize+.)
-  #
-  # Examples:
-  #   "post".classify        # => "Post"
-  def classify
-    self.camelize
-  end
-end