soca 0.1.1 → 0.1.2

data/HISTORY

@@ -1,3 +1,10 @@
+== 0.1.2 [10-26-10]
+
+- Added mustache plugin for interpolating env and config data into static HTML
+  before push
+- soca purge deletes the design doc
+- Upgraded sammy to 0.6.2
+
 == 0.1.1 [10-04-10]
 
 - Fixed compass url (poswald)

data/Rakefile

@@ -17,6 +17,7 @@ begin
     gem.add_dependency 'thor', '~>0.14.0'
     gem.add_dependency 'jim', '~>0.2.3'
     gem.add_dependency 'compass', '~>0.10.5'
+    gem.add_dependency 'mustache', '~>0.11.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

data/lib/soca/cli.rb

@@ -172,6 +172,12 @@ module Soca
       end
     end
 
+    desc 'purge [ENV]', "deletes the design document for the database at ENV"
+    def purge(env = 'default')
+      push = pusher(env)
+      push.purge!
+    end
+
     private
     def appname
       @appname = options[:name] || File.basename(appdir)

data/lib/soca/plugin.rb

@@ -15,7 +15,7 @@ module Soca
       @pusher = pusher
     end
 
-    def run
+    def run(options = {})
       raise "you need to subclass plugin and provide your own logic, please"
     end
 

data/lib/soca/plugins/compass.rb

@@ -8,14 +8,15 @@ module Soca
 
       name 'compass'
 
-      def run
+      def run(options = {})
         Soca.logger.info "compiling compass"
         compass_from = File.join(app_dir, 'sass')
         compass_to   = File.join(app_dir, 'css')
         unless Soca.debug
-          options = {:logger => ::Compass::NullLogger.new}
+          options = {:logger => ::Compass::NullLogger.new}.merge(options)
         end
         compass = ::Compass::Compiler.new(app_dir, compass_from, compass_to, ::Compass.sass_engine_options.merge(options || {}))
+        Soca.logger.debug "compass: #{compass.inspect}"
         compass.run
       end
 

data/lib/soca/plugins/jim.rb

@@ -6,7 +6,7 @@ module Soca
 
       name 'jim'
 
-      def run
+      def run(options = {})
         jimfile = File.join(app_dir, 'Jimfile')
         ::Jim.logger = logger
         logger.debug "bundling js"

data/lib/soca/plugins/mustache.rb

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

data/lib/soca/pusher.rb

@@ -41,7 +41,7 @@ module Soca
     end
 
     def json
-      JSON.generate(build)
+      JSON.pretty_generate(build)
     end
 
     def db_url
@@ -90,6 +90,14 @@ module Soca
       run_hook_file!(:after_push)
     end
 
+    def purge!
+      get_current_revision
+      url = push_url
+      url += "?rev=#{revision}" if revision && revision.length > 0
+      logger.debug "deleting document at #{url}"
+      delete!(url)
+    end
+
     def compact!
       logger.debug "compacting #{db_url}"
       post!("#{db_url}/_compact")
@@ -110,10 +118,10 @@ module Soca
       end
     end
 
-    def plugin(plugin_name)
+    def plugin(plugin_name, options = {})
       require "soca/plugins/#{plugin_name}"
       p = Soca::Plugin.plugins[plugin_name].new(self)
-      p.run
+      p.run(options)
     end
 
     private
@@ -186,5 +194,12 @@ module Soca
       response
     end
 
+    def delete!(url)
+      logger.debug "DELETE #{url}"
+      response = Typhoeus::Request.delete(url)
+      logger.debug "Response: #{response.code} #{response.body[0..200]}"
+      response.code == 200 ? response.body : nil
+    end
+
   end
 end

data/lib/soca/templates/Jimfile

@@ -7,6 +7,6 @@
 sha1
 jquery 1.4.2
 jquery.couch 0.11
-sammy 0.6.1
+sammy 0.6.2
 sammy.couch 0.1.0
 js/app

data/lib/soca/templates/js/app.js

@@ -1,7 +1,7 @@
 (function($) {
 
   var app = $.sammy('#container', function() {
-
+    this.use('Couch');
 
   });
 

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

@@ -1,5 +1,5 @@
 // name: sammy
-// version: 0.6.1
+// version: 0.6.2
 
 (function($, window) {
 
@@ -70,7 +70,7 @@
     }
   };
 
-  Sammy.VERSION = '0.6.1';
+  Sammy.VERSION = '0.6.2';
 
   // Add to the global logger pool. Takes a function that accepts an
   // unknown number of arguments and should print them or send them somewhere
@@ -91,9 +91,9 @@
   };
 
   if (typeof window.console != 'undefined') {
-    if (_isFunction(console.log.apply)) {
+    if (_isFunction(window.console.log.apply)) {
       Sammy.addLogger(function() {
-        window.console.log.apply(console, arguments);
+        window.console.log.apply(window.console, arguments);
       });
     } else {
       Sammy.addLogger(function() {
@@ -318,7 +318,18 @@
 
     // 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'],
+    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,
@@ -1153,9 +1164,9 @@
       // get current location
       location = this.getLocation();
       // compare to see if hash has changed
-      if (location != this.last_location) {
+      if (!this.last_location || this.last_location[0] != 'get' || this.last_location[1] != location) {
         // reset last location
-        this.last_location = location;
+        this.last_location = ['get', location];
         // lookup route for current hash
         returned = this.runRoute('get', location);
       }
@@ -1261,7 +1272,7 @@
     this.waiting          = false;
   };
 
-  $.extend(Sammy.RenderContext.prototype, {
+  Sammy.RenderContext.prototype = $.extend({}, Sammy.Object.prototype, {
 
     // The "core" of the `RenderContext` object, adds the `callback` to the
     // queue. If the context is `waiting` (meaning an async operation is happening)
@@ -1310,7 +1321,7 @@
         this.callbacks.push(callback);
       } else {
         this.wait();
-        setTimeout(function() {
+        window.setTimeout(function() {
           var returned = callback.apply(context, [context.content, context.previous_content]);
           if (returned !== false) {
             context.next(returned);
@@ -1761,7 +1772,7 @@
         to = args[0];
       }
       this.trigger('redirect', {to: to});
-      this.app.last_location = this.path;
+      this.app.last_location = [this.verb, this.path];
       this.app.setLocation(to);
       if (current_location == to) {
         this.app.trigger('location-changed');

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.1'
+  VERSION = '0.1.2'
 
   class << self
     attr_accessor :debug

data/soca.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{soca}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Quint"]
-  s.date = %q{2010-10-04}
+  s.date = %q{2010-10-26}
   s.default_executable = %q{soca}
   s.description = %q{soca is a different way of writing apps for CouchDB. The structure is up to you.}
   s.email = %q{aaron@quirkey.com}
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
      "lib/soca/plugin.rb",
      "lib/soca/plugins/compass.rb",
      "lib/soca/plugins/jim.rb",
+     "lib/soca/plugins/mustache.rb",
      "lib/soca/pusher.rb",
      "lib/soca/templates/Jimfile",
      "lib/soca/templates/config.js.erb",
@@ -42,7 +43,7 @@ Gem::Specification.new do |s|
      "lib/soca/templates/js/app.js",
      "lib/soca/templates/js/vendor/jquery-1.4.2.js",
      "lib/soca/templates/js/vendor/jquery.couch-0.11.js",
-     "lib/soca/templates/js/vendor/sammy-0.6.1.js",
+     "lib/soca/templates/js/vendor/sammy-0.6.2.js",
      "lib/soca/templates/js/vendor/sammy.couch-0.1.0.js",
      "lib/soca/templates/js/vendor/sha1.js",
      "soca.gemspec",
@@ -87,6 +88,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<thor>, ["~> 0.14.0"])
       s.add_runtime_dependency(%q<jim>, ["~> 0.2.3"])
       s.add_runtime_dependency(%q<compass>, ["~> 0.10.5"])
+      s.add_runtime_dependency(%q<mustache>, ["~> 0.11.2"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
     else
@@ -96,6 +98,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<thor>, ["~> 0.14.0"])
       s.add_dependency(%q<jim>, ["~> 0.2.3"])
       s.add_dependency(%q<compass>, ["~> 0.10.5"])
+      s.add_dependency(%q<mustache>, ["~> 0.11.2"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
     end
@@ -106,6 +109,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<thor>, ["~> 0.14.0"])
     s.add_dependency(%q<jim>, ["~> 0.2.3"])
     s.add_dependency(%q<compass>, ["~> 0.10.5"])
+    s.add_dependency(%q<mustache>, ["~> 0.11.2"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: soca
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Aaron Quint
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 -07:00
+date: 2010-10-26 00:00:00 -07:00
 default_executable: soca
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -114,9 +114,25 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: mustache
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 0
+        - 11
+        - 2
+        version: 0.11.2
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -126,11 +142,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -140,7 +156,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 description: soca is a different way of writing apps for CouchDB. The structure is up to you.
 email: aaron@quirkey.com
 executables: 
@@ -163,6 +179,7 @@ files:
 - lib/soca/plugin.rb
 - lib/soca/plugins/compass.rb
 - lib/soca/plugins/jim.rb
+- lib/soca/plugins/mustache.rb
 - lib/soca/pusher.rb
 - lib/soca/templates/Jimfile
 - lib/soca/templates/config.js.erb
@@ -174,7 +191,7 @@ files:
 - lib/soca/templates/js/app.js
 - lib/soca/templates/js/vendor/jquery-1.4.2.js
 - lib/soca/templates/js/vendor/jquery.couch-0.11.js
-- lib/soca/templates/js/vendor/sammy-0.6.1.js
+- lib/soca/templates/js/vendor/sammy-0.6.2.js
 - lib/soca/templates/js/vendor/sammy.couch-0.1.0.js
 - lib/soca/templates/js/vendor/sha1.js
 - soca.gemspec