soca 0.1.2 → 0.2.0

data/Gemfile

@@ -0,0 +1,17 @@
+# A sample Gemfile
+source "http://rubygems.org"
+
+gem 'json', '~>1.4.6'
+gem 'mime-types', '~>1.16'
+gem 'typhoeus', '~>0.2'
+gem 'thor', '~>0.14.0'
+gem 'jim', '~>0.3.1'
+gem 'compass', '~>0.10.5'
+gem 'mustache', '~>0.11.2'
+gem 'coffee-script', '~> 2.1.2'
+group :development do
+    gem 'rake'
+    gem 'jeweler'
+    gem "shoulda", ">= 0"
+    gem "yard", ">= 0"
+end

data/Gemfile.lock

@@ -0,0 +1,74 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    archive-tar-minitar (0.5.2)
+    coffee-script (2.1.3)
+      coffee-script-source
+    coffee-script-source (1.0.1)
+    compass (0.10.6)
+      haml (>= 3.0.4)
+    downlow (0.1.4)
+      archive-tar-minitar (>= 0.5.2)
+      rubyzip (>= 0.9.4)
+    fakeweb (1.3.0)
+    fssm (0.2.5)
+    git (1.2.5)
+    haml (3.0.25)
+    jeweler (1.5.2)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    jim (0.3.1)
+      downlow (~> 0.1.4)
+      downlow (~> 0.1.3)
+      fakeweb (>= 1.2.8)
+      fssm
+      fssm (~> 0.2.0)
+      jeweler
+      leftright
+      mocha
+      rack-test
+      rake
+      shoulda
+      test-unit
+      thor (~> 0.14.4)
+      thor
+      version_sorter (~> 1.1.0)
+      version_sorter (~> 1.1.0)
+      yajl-ruby
+      yajl-ruby
+    json (1.4.6)
+    leftright (0.9.0)
+    mime-types (1.16)
+    mocha (0.9.10)
+      rake
+    mustache (0.11.2)
+    rack (1.2.1)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rake (0.8.7)
+    rubyzip (0.9.4)
+    shoulda (2.11.3)
+    test-unit (2.1.2)
+    thor (0.14.6)
+    typhoeus (0.2.0)
+    version_sorter (1.1.0)
+    yajl-ruby (0.8.0)
+    yard (0.6.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  coffee-script (~> 2.1.2)
+  compass (~> 0.10.5)
+  jeweler
+  jim (~> 0.3.1)
+  json (~> 1.4.6)
+  mime-types (~> 1.16)
+  mustache (~> 0.11.2)
+  rake
+  shoulda
+  thor (~> 0.14.0)
+  typhoeus (~> 0.2)
+  yard

data/HISTORY

@@ -1,3 +1,15 @@
+== 0.2.0 [03-02-11]
+
+- Allow rewrite rules to be pushed with rewrites.js
+- Upgrade to jim 0.3.1 and the new Jimfile format
+- Added CoffeScript plugin and tools (rmetzler and andrzejsliwa)
+- Added python CouchApp style macros (!json, !code, etc) in the macro plugin (narkisr)
+- Added proper mapping for `index.html` in `config.js` for the `test/testapp` (karmi)
+- Fix for Thor swallowing --debug option (candlerb)
+- Show path matching in debug output (candlerb)
+- Make mapped_directories an array, for processing in order on ruby 1.8 (candlerb)
+- Upgraded to Sammy 0.6.3
+
 == 0.1.2 [10-26-10]
 
 - Added mustache plugin for interpolating env and config data into static HTML
@@ -13,4 +25,4 @@
 
 == 0.1.0 [09-26-10]
 
-- Initial Release
+- Initial Release

data/Rakefile

@@ -1,5 +1,7 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
-require 'lib/soca'
+require 'soca'
+require 'bundler'
+Bundler.require
 
 begin
   require 'jeweler'
@@ -13,11 +15,12 @@ begin
     gem.authors = ["Aaron Quint"]
     gem.add_dependency 'json', '~>1.4.6'
     gem.add_dependency 'mime-types', '~>1.16'
-    gem.add_dependency 'typhoeus', '~>0.1.31'
+    gem.add_dependency 'typhoeus', '~>0.2'
     gem.add_dependency 'thor', '~>0.14.0'
-    gem.add_dependency 'jim', '~>0.2.3'
+    gem.add_dependency 'jim', '~>0.3.1'
     gem.add_dependency 'compass', '~>0.10.5'
     gem.add_dependency 'mustache', '~>0.11.2'
+    gem.add_dependency 'coffee-script', '~> 2.1.2'
     gem.add_development_dependency "shoulda", ">= 0"
     gem.add_development_dependency "yard", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
@@ -47,7 +50,6 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
 
 task :default => :test
 

data/lib/soca.rb

@@ -7,7 +7,7 @@ require 'logger'
 $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__))))
 
 module Soca
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 
   class << self
     attr_accessor :debug

data/lib/soca/cli.rb

@@ -39,7 +39,7 @@ module Soca
       end
       self.appdir      = options[:appdir] || File.expand_path(Dir.pwd)
       self.config_file = options[:config]
-      self.debug       = options[:debug]
+      self.debug       = self.class.debugging || options[:debug]
       if debug
         Soca.debug = true
         logger.level = Logger::DEBUG
@@ -79,6 +79,7 @@ module Soca
       directory('db')
       template('Jimfile')
       template('index.html.erb', 'index.html')
+      template('rewrites.js.erb', 'rewrites.js')
       @dir_mappings = {
         "config.js"  => "",
         "index.html" => "_attachments/index.html",

data/lib/soca/plugins/coffeescript.rb

@@ -0,0 +1,43 @@
+require 'coffee-script'
+
+module Soca
+  module Plugins
+    class CoffeeScript < Soca::Plugin
+
+      name 'coffeescript'
+
+      # Run the coffeescript plugin.
+      # Available options:
+      #
+      # * :files - Run these files through CoffeeScript. Can be an array of patterns
+      #            or a single file. The default is '*.coffee'.
+      # * :vars - Additional variables to interpolate. By default the `env` and
+      #             `config` are interpolated.
+      #
+      def run(options = {})
+        file_patterns = options[:files] || '**/*.coffee'
+        files = Dir[*[file_patterns].flatten]
+        vars = {
+          :env => pusher.env,
+          :config => pusher.config
+        }.merge(options[:vars] || {})
+        Soca.logger.debug "CoffeeScript vars: #{vars.inspect}"
+
+        files.each do |file|
+          Soca.logger.debug "Running #{file} through CoffeeScript."
+          basename = File.basename(file)
+          dir      = File.dirname(file)
+          parts    = basename.split(/\./)
+          new_file = (parts.length > 2 ? parts[0..-2].join('.') : parts[0]) + ".js"
+
+          File.open(File.join(dir, new_file), 'w') do |f|
+            f << ::CoffeeScript.compile(File.read(file), vars)
+          end
+          Soca.logger.debug "Wrote to #{new_file}"
+
+        end
+      end
+
+    end
+  end
+end

data/lib/soca/plugins/macro.rb

@@ -0,0 +1,25 @@
+# see http://tinyurl.com/6ab5svl views in coucdb < 1.1.x does not allow require of modules therfor we need to use macors
+module Soca
+    module Plugins
+        class Macro < Soca::Plugin
+
+            name 'macro'
+
+            def run(options = {})
+                @pusher.document['views'].each do |view,code|
+                 ['map','reduce'].each{|part| macro_expand_on(part,code) if code[part]}
+                end
+            end
+
+            def macro_expand_on(part,code)
+             code[part] = code[part].split("\n").inject(" ") do |res,line|
+                if line =~ /\/\/ !code (.*)/
+                 res += "\n#{File.read($1)}\n"
+                else
+                 res += "#{line}\n"
+                end
+              end
+            end
+        end
+    end
+end

data/lib/soca/plugins/mustache.rb

@@ -27,7 +27,7 @@ module Soca
           basename = File.basename(file)
           dir      = File.dirname(file)
           parts    = basename.split(/\./)
-          new_file = parts.length > 2 ? parts[0..-2].join('.') : basename[0] + ".html"
+          new_file = parts.length > 2 ? parts[0..-2].join('.') : parts[0] + ".html"
           File.open(File.join(dir, new_file), 'w') do |f|
             f << ::Mustache.render(File.read(file), vars)
           end

data/lib/soca/pusher.rb

@@ -129,6 +129,7 @@ module Soca
       file_data = File.read(path)
       base_path = path.gsub(app_dir, '')
       if map = mapped_directories.detect {|k,v| k =~ base_path }
+        logger.debug "Matched #{path} against #{map.inspect}"
         if map[1]
           base_path = base_path.gsub(map[0], map[1])
         else
@@ -138,6 +139,8 @@ module Soca
       if base_path =~ /^_attachments/
         hash['_attachments'] ||= {}
         hash['_attachments'][base_path.gsub(/_attachments\//, '')] = make_attachment(path, file_data)
+      elsif base_path == 'rewrites.js'
+        hash['rewrites'] = JSON.parse(file_data)
       else
         parts = base_path.gsub(/^\//, '').gsub(/\.js$/, '').split('/')
         current_hash = hash
@@ -166,8 +169,7 @@ module Soca
 
     def mapped_directories
       return @mapped_directories if @mapped_directories
-      map = {}
-      config['mapDirectories'].collect {|k,v| map[/^#{k}/] = v }
+      map = config['mapDirectories'].collect {|k,v| [/^#{k}/, v] }
       @mapped_directories = map
     end
 
@@ -175,7 +177,11 @@ module Soca
       logger.debug "PUT #{url}"
       logger.debug "body: #{body[0..80]} ..."
       response = Typhoeus::Request.put(url, :body => body)
-      logger.debug "Response: #{response.code} #{response.body[0..200]}"
+      if response.success? || response.code == 412
+        logger.debug "Response: #{response.code} #{response.body[0..200]}"
+      else
+        logger.error "Response: #{response.code} #{response.body[0..200]}"
+      end
       response
     end
 

data/lib/soca/templates/Jimfile

@@ -1,12 +1,15 @@
-// bundled_path: js/default.js
-// compressed_path: js/production.js
-// vendor_dir: js/vendor
-
-/ start adding your requirements below:
-
-sha1
-jquery 1.4.2
-jquery.couch 0.11
-sammy 0.6.2
-sammy.couch 0.1.0
-js/app
+{
+  "bundle_dir": "js",
+  "compressed_suffix": ".min",
+  "vendor_dir": "js/vendor",
+  "bundles": {
+    "default": [
+      "sha1",
+      [ "jquery", "1.4.2" ],
+      [ "jquery.couch", "0.11" ],
+      [ "sammy", "0.6.3" ],
+      [ "sammy.couch", "0.1.0" ],
+      "js/app"
+    ]
+  }
+}

data/lib/soca/templates/hooks/before_build.rb

@@ -1,2 +1,3 @@
 # any pre build scripting or plugins should go here
+plugin 'coffeescript'
 plugin 'jim'

data/lib/soca/templates/js/vendor/{sammy-0.6.2.js → sammy-0.6.3.js}

@@ -1,5 +1,7 @@
 // name: sammy
-// version: 0.6.2
+// version: 0.6.3
+
+// Sammy.js / http://sammyjs.org
 
 (function($, window) {
 
@@ -12,9 +14,10 @@
       // borrowed from jQuery
       _isFunction = function( obj ) { return Object.prototype.toString.call(obj) === "[object Function]"; },
       _isArray = function( obj ) { return Object.prototype.toString.call(obj) === "[object Array]"; },
-      _decode = decodeURIComponent,
+      _decode = function( str ) { return decodeURIComponent(str.replace(/\+/g, ' ')); },
+      _encode = encodeURIComponent,
       _escapeHTML = function(s) {
-        return s.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
+        return String(s).replace(/&(?!\w+;)/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
       },
       _routeWrapper = function(verb) {
         return function(path, callback) { return this.route.apply(this, [verb, path, callback]); };
@@ -70,7 +73,7 @@
     }
   };
 
-  Sammy.VERSION = '0.6.2';
+  Sammy.VERSION = '0.6.3';
 
   // Add to the global logger pool. Takes a function that accepts an
   // unknown number of arguments and should print them or send them somewhere
@@ -140,8 +143,9 @@
     // Does not render functions.
     // For example. Given this Sammy.Object:
     //
-    //    var s = new Sammy.Object({first_name: 'Sammy', last_name: 'Davis Jr.'});
-    //    s.toHTML() //=> '<strong>first_name</strong> Sammy<br /><strong>last_name</strong> Davis Jr.<br />'
+    //     var s = new Sammy.Object({first_name: 'Sammy', last_name: 'Davis Jr.'});
+    //     s.toHTML()
+    //     //=> '<strong>first_name</strong> Sammy<br /><strong>last_name</strong> Davis Jr.<br />'
     //
     toHTML: function() {
       var display = "";
@@ -271,7 +275,7 @@
             current_location != Sammy.HashLocationProxy._last_location) {
             window.setTimeout(function() {
               $(window).trigger('hashchange', [true]);
-            }, 13);
+            }, 0);
           }
           Sammy.HashLocationProxy._last_location = current_location;
         };
@@ -318,18 +322,7 @@
 
     // An array of the default events triggered by the
     // application during its lifecycle
-    APP_EVENTS: ['run',
-                 'unload',
-                 'lookup-route',
-                 'run-route',
-                 'route-found',
-                 'event-context-before',
-                 'event-context-after',
-                 'changed',
-                 'error',
-                 'check-form-submission',
-                 'redirect',
-                 'location-changed'],
+    APP_EVENTS: ['run', 'unload', 'lookup-route', 'run-route', 'route-found', 'event-context-before', 'event-context-after', 'changed', 'error', 'check-form-submission', 'redirect', 'location-changed'],
 
     _last_route: null,
     _location_proxy: null,
@@ -364,8 +357,8 @@
     },
 
     // returns a jQuery object of the Applications bound element.
-    $element: function() {
-      return $(this.element_selector);
+    $element: function(selector) {
+      return selector ? $(this.element_selector).find(selector) : $(this.element_selector);
     },
 
     // `use()` is the entry point for including Sammy plugins.
@@ -376,7 +369,7 @@
     // Any additional arguments are passed to the app function sequentially.
     //
     // For much more detail about plugins, check out:
-    // http://code.quirkey.com/sammy/doc/plugins.html
+    // [http://sammyjs.org/docs/plugins](http://sammyjs.org/docs/plugins)
     //
     // ### Example
     //
@@ -464,7 +457,8 @@
     },
 
     // `route()` is the main method for defining routes within an application.
-    // For great detail on routes, check out: http://code.quirkey.com/sammy/doc/routes.html
+    // For great detail on routes, check out:
+    // [http://sammyjs.org/docs/routes](http://sammyjs.org/docs/routes)
     //
     // This method also has aliases for each of the different verbs (eg. `get()`, `post()`, etc.)
     //
@@ -551,16 +545,16 @@
     //
     // ### Example
     //
-    //    var app = $.sammy(function() {
+    //      var app = $.sammy(function() {
     //
-    //      this.mapRoutes([
-    //          ['get', '#/', function() { this.log('index'); }],
-    //          // strings in callbacks are looked up as methods on the app
-    //          ['post', '#/create', 'addUser'],
-    //          // No verb assumes 'any' as the verb
-    //          [/dowhatever/, function() { this.log(this.verb, this.path)}];
-    //        ]);
-    //    })
+    //        this.mapRoutes([
+    //            ['get', '#/', function() { this.log('index'); }],
+    //            // strings in callbacks are looked up as methods on the app
+    //            ['post', '#/create', 'addUser'],
+    //            // No verb assumes 'any' as the verb
+    //            [/dowhatever/, function() { this.log(this.verb, this.path)}];
+    //          ]);
+    //      });
     //
     mapRoutes: function(route_array) {
       var app = this;
@@ -583,8 +577,6 @@
     // * Events are not actually bound until the application is started with `run()`
     // * callbacks are evaluated within the context of a Sammy.EventContext
     //
-    // See http://code.quirkey.com/sammy/docs/events.html for more info.
-    //
     bind: function(name, data, callback) {
       var app = this;
       // build the callback
@@ -745,20 +737,20 @@
     //
     // ### Example
     //
-    //    var app = $.sammy(function() {
+    //     var app = $.sammy(function() {
     //
-    //      helpers({
-    //        upcase: function(text) {
-    //         return text.toString().toUpperCase();
-    //        }
-    //      });
+    //       helpers({
+    //         upcase: function(text) {
+    //          return text.toString().toUpperCase();
+    //         }
+    //       });
     //
-    //      get('#/', function() { with(this) {
-    //        // inside of this context I can use the helpers
-    //        $('#main').html(upcase($('#main').text());
-    //      }});
+    //       get('#/', function() { with(this) {
+    //         // inside of this context I can use the helpers
+    //         $('#main').html(upcase($('#main').text());
+    //       }});
     //
-    //    });
+    //     });
     //
     //
     // ### Arguments
@@ -805,8 +797,8 @@
     //
     // ### Example
     //
-    //    var app = $.sammy(function() { ... }); // your application
-    //    $(function() { // document.ready
+    //     var app = $.sammy(function() { ... }); // your application
+    //     $(function() { // document.ready
     //        app.run();
     //     });
     //
@@ -1101,19 +1093,19 @@
     //
     // ### Example
     //
-    //    var app = $.sammy(function() {
+    //      var app = $.sammy(function() {
+    //
+    //        // implements a 'fade out'/'fade in'
+    //        this.swap = function(content) {
+    //          this.$element().hide('slow').html(content).show('slow');
+    //        }
     //
-    //      // implements a 'fade out'/'fade in'
-    //      this.swap = function(content) {
-    //        this.$element().hide('slow').html(content).show('slow');
-    //      }
+    //        get('#/', function() {
+    //          this.partial('index.html.erb') // will fade out and in
+    //        });
     //
-    //      get('#/', function() {
-    //        this.partial('index.html.erb') // will fade out and in
     //      });
     //
-    //    });
-    //
     swap: function(content) {
       return this.$element().html(content);
     },
@@ -1178,6 +1170,7 @@
       $_method = $form.find('input[name="_method"]');
       if ($_method.length > 0) { verb = $_method.val(); }
       if (!verb) { verb = $form[0].getAttribute('method'); }
+      if (!verb || verb == '') { verb = 'get'; }
       return $.trim(verb.toString().toLowerCase());
     },
 
@@ -1187,10 +1180,9 @@
       $form = $(form);
       path  = $form.attr('action');
       verb  = this._getFormVerb($form);
-      if (!verb || verb == '') { verb = 'get'; }
       this.log('_checkFormSubmission', $form, path, verb);
       if (verb === 'get') {
-        this.setLocation(path + '?' + $form.serialize());
+        this.setLocation(path + '?' + this._serializeFormParams($form));
         returned = false;
       } else {
         params = $.extend({}, this._parseFormParams($form));
@@ -1199,6 +1191,23 @@
       return (typeof returned == 'undefined') ? false : returned;
     },
 
+    _serializeFormParams: function($form) {
+       var queryString = "",
+         fields = $form.serializeArray(),
+         i;
+       if (fields.length > 0) {
+         queryString = this._encodeFormPair(fields[0].name, fields[0].value);
+         for (i = 1; i < fields.length; i++) {
+           queryString = queryString + "&" + this._encodeFormPair(fields[i].name, fields[i].value);
+         }
+       }
+       return queryString;
+    },
+
+    _encodeFormPair: function(name, value){
+      return _encode(name) + "=" + _encode(value);
+    },
+
     _parseFormParams: function($form) {
       var params = {},
           form_fields = $form.serializeArray(),
@@ -1217,7 +1226,7 @@
         pairs = parts[1].split('&');
         for (i = 0; i < pairs.length; i++) {
           pair = pairs[i].split('=');
-          params = this._parseParamPair(params, _decode(pair[0]), _decode(pair[1]));
+          params = this._parseParamPair(params, _decode(pair[0]), _decode(pair[1] || ""));
         }
       }
       return params;
@@ -1326,7 +1335,7 @@
           if (returned !== false) {
             context.next(returned);
           }
-        }, 13);
+        }, 0);
       }
       return this;
     },
@@ -1460,7 +1469,6 @@
       if (_isFunction(location) && !data) {
         return this.then(location);
       } else {
-        if (!data && this.content) { data = this.content; }
         return this.load(location)
                    .interpolate(data, location)
                    .then(callback);
@@ -1479,12 +1487,12 @@
     // asynchronous functions into the queue. The content passed to the
     // callback is passed as `content` to the next item in the queue.
     //
-    // === Example
+    // ### Example
     //
-    //        this.send($.getJSON, '/app.json')
-    //            .then(function(json) {
-    //              $('#message).text(json['message']);
-    //            });
+    //     this.send($.getJSON, '/app.json')
+    //         .then(function(json) {
+    //           $('#message).text(json['message']);
+    //          });
     //
     //
     send: function() {
@@ -1623,17 +1631,17 @@
   //
   // ### Example
   //
-  //  $.sammy(function() {
-  //    // The context here is this Sammy.Application
-  //    this.get('#/:name', function() {
-  //      // The context here is a new Sammy.EventContext
-  //      if (this.params['name'] == 'sammy') {
-  //        this.partial('name.html.erb', {name: 'Sammy'});
-  //      } else {
-  //        this.redirect('#/somewhere-else')
-  //      }
-  //    });
-  //  });
+  //       $.sammy(function() {
+  //         // The context here is this Sammy.Application
+  //         this.get('#/:name', function() {
+  //           // The context here is a new Sammy.EventContext
+  //           if (this.params['name'] == 'sammy') {
+  //             this.partial('name.html.erb', {name: 'Sammy'});
+  //           } else {
+  //             this.redirect('#/somewhere-else')
+  //           }
+  //         });
+  //       });
   //
   // Initialize a new EventContext
   //
@@ -1660,7 +1668,7 @@
 
     // A shortcut to the app's `$element()`
     $element: function() {
-      return this.app.$element();
+      return this.app.$element(_makeArray(arguments).shift());
     },
 
     // Look up a templating engine within the current app and context.
@@ -1678,7 +1686,7 @@
       // if path is actually an engine function just return it
       if (_isFunction(engine)) { return engine; }
       // lookup engine name by path extension
-      engine = engine.toString();
+      engine = (engine || context.app.template_engine).toString();
       if ((engine_match = engine.match(/\.([^\.]+)$/))) {
         engine = engine_match[1];
       }