soca 0.2.0 → 0.3.0

data/Gemfile

@@ -3,15 +3,17 @@ source "http://rubygems.org"
 
 gem 'json', '~>1.4.6'
 gem 'mime-types', '~>1.16'
-gem 'typhoeus', '~>0.2'
+gem 'typhoeus', '~>0.2.4'
 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'
+gem 'compass', '~>0.11'
+gem 'mustache', '~>0.99'
+gem 'coffee-script', '~>2.2'
+
 group :development do
-    gem 'rake'
-    gem 'jeweler'
-    gem "shoulda", ">= 0"
-    gem "yard", ">= 0"
+  gem 'rake'
+  gem 'jeweler'
+end
+group :test do
+  gem "shoulda", ">= 0"
 end

data/Gemfile.lock

@@ -2,25 +2,30 @@ GEM
   remote: http://rubygems.org/
   specs:
     archive-tar-minitar (0.5.2)
-    coffee-script (2.1.3)
+    chunky_png (1.2.5)
+    coffee-script (2.2.0)
       coffee-script-source
-    coffee-script-source (1.0.1)
-    compass (0.10.6)
-      haml (>= 3.0.4)
+      execjs
+    coffee-script-source (1.1.2)
+    compass (0.11.5)
+      chunky_png (~> 1.2)
+      fssm (>= 0.2.7)
+      sass (~> 3.1)
     downlow (0.1.4)
       archive-tar-minitar (>= 0.5.2)
       rubyzip (>= 0.9.4)
+    execjs (1.2.9)
+      multi_json (~> 1.0)
     fakeweb (1.3.0)
-    fssm (0.2.5)
+    fssm (0.2.7)
     git (1.2.5)
-    haml (3.0.25)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
     jim (0.3.1)
-      downlow (~> 0.1.4)
       downlow (~> 0.1.3)
+      downlow (~> 0.1.4)
       fakeweb (>= 1.2.8)
       fssm
       fssm (~> 0.2.0)
@@ -31,44 +36,47 @@ GEM
       rake
       shoulda
       test-unit
-      thor (~> 0.14.4)
       thor
+      thor (~> 0.14.4)
       version_sorter (~> 1.1.0)
       version_sorter (~> 1.1.0)
       yajl-ruby
       yajl-ruby
     json (1.4.6)
-    leftright (0.9.0)
+    leftright (0.9.1)
+    metaclass (0.0.1)
     mime-types (1.16)
-    mocha (0.9.10)
-      rake
-    mustache (0.11.2)
-    rack (1.2.1)
-    rack-test (0.5.7)
+    mocha (0.10.0)
+      metaclass (~> 0.0.1)
+    multi_json (1.0.3)
+    mustache (0.99.4)
+    rack (1.3.3)
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rake (0.8.7)
+    rake (0.9.2)
     rubyzip (0.9.4)
+    sass (3.1.8)
     shoulda (2.11.3)
-    test-unit (2.1.2)
+    test-unit (2.4.0)
     thor (0.14.6)
-    typhoeus (0.2.0)
+    typhoeus (0.2.4)
+      mime-types
+      mime-types
     version_sorter (1.1.0)
-    yajl-ruby (0.8.0)
-    yard (0.6.4)
+    yajl-ruby (1.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  coffee-script (~> 2.1.2)
-  compass (~> 0.10.5)
+  coffee-script (~> 2.2)
+  compass (~> 0.11)
   jeweler
   jim (~> 0.3.1)
   json (~> 1.4.6)
   mime-types (~> 1.16)
-  mustache (~> 0.11.2)
+  mustache (~> 0.99)
   rake
   shoulda
   thor (~> 0.14.0)
-  typhoeus (~> 0.2)
-  yard
+  typhoeus (~> 0.2.4)

data/HISTORY

@@ -1,3 +1,19 @@
+== 0.3.0 [01-21-12]
+
+* Big release with a lot of breaking changes
+
+- New plugin architecture: Instead of including plugins in hooks, plugins define their own hook methods like `before_build`.
+  See: https://github.com/quirkey/soca/tree/master/lib/soca/plugin
+  Plugins are then activated/included by creating an array of ordered plugins in the config.json
+  See: https://github.com/quirkey/soca/blob/master/test/testapp/config.js#L12
+- New HAML plugin [ Eric Wollesen ]
+- Write json-files as json into the document [ Niko Uphoff ]
+- Allow https in env db_url [Alexis Hildebrandt]
+- Optionally configure sass and css directories in compass plugin [ Neal Clark ]
+- Macro should play nice with built-in reduce functions [ Gabor Ratky ]
+- added a new flag to config.js called {"not_design": true} to allow non-design documents to be autopushed. [Kevin Malakoff]
+- Read files in using binread rather than read.  Otherwise binary attachments such as images get totally screwed. [Pete Bacon Darwin]
+
 == 0.2.0 [03-02-11]
 
 - Allow rewrite rules to be pushed with rewrites.js

data/Rakefile

@@ -15,12 +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.2'
+    gem.add_dependency 'typhoeus', '~>0.2.4'
     gem.add_dependency 'thor', '~>0.14.0'
     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_dependency 'compass', '~>0.12'
+    gem.add_dependency 'mustache', '~>0.99'
+    gem.add_dependency 'coffee-script', '~> 2.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.rb

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

data/lib/soca/plugin.rb

@@ -1,6 +1,7 @@
 module Soca
   class Plugin
     attr_reader :pusher
+    attr_accessor :options
 
     def self.name(plugin_name)
       @@plugins ||= {}
@@ -11,12 +12,9 @@ module Soca
       @@plugins ||= {}
     end
 
-    def initialize(pusher)
+    def initialize(pusher, options = {})
       @pusher = pusher
-    end
-
-    def run(options = {})
-      raise "you need to subclass plugin and provide your own logic, please"
+      @options = options
     end
 
     def logger

data/lib/soca/plugins/coffeescript.rb

@@ -14,7 +14,7 @@ module Soca
       # * :vars - Additional variables to interpolate. By default the `env` and
       #             `config` are interpolated.
       #
-      def run(options = {})
+      def before_build
         file_patterns = options[:files] || '**/*.coffee'
         files = Dir[*[file_patterns].flatten]
         vars = {
@@ -30,11 +30,11 @@ module Soca
           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|
+          output_dir = options[:output_dir] || dir
+          File.open(File.join(output_dir, new_file), 'w') do |f|
             f << ::CoffeeScript.compile(File.read(file), vars)
           end
           Soca.logger.debug "Wrote to #{new_file}"
-
         end
       end
 

data/lib/soca/plugins/compass.rb

@@ -8,18 +8,26 @@ module Soca
 
       name 'compass'
 
-      def run(options = {})
+      def before_build
         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}.merge(options)
+          options = {:logger => ::Compass::NullLogger.new}.merge(self.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
 
+      private
+      def compass_from
+        options.has_key?(:from) ? File.join(app_dir, options[:from]) : File.join(app_dir, 'sass')
+      end
+
+      def compass_to
+        options.has_key?(:to) ? File.join(app_dir, options[:to]) : File.join(app_dir, 'css')
+      end
     end
   end
 end

data/lib/soca/plugins/haml.rb

@@ -0,0 +1,35 @@
+require 'haml'
+
+module Soca
+  module Plugins
+    class Haml < Soca::Plugin
+
+      name 'haml'
+
+      def before_build
+        Dir[File.join(haml_from, "**/*.haml")].each do |file|
+          Soca.logger.debug "Running #{file} through Haml."
+          basename = File.basename(file, ".haml")
+          dir      = File.dirname(file).sub(/^#{haml_from}/, haml_to)
+          new_file = basename + ".html"
+          FileUtils.mkdir_p(dir) unless File.exists?(dir)
+
+          File.open(File.join(dir, new_file), 'w') do |f|
+            f << ::Haml::Engine.new(File.read(file)).render
+          end
+          Soca.logger.debug "Wrote to #{File.join(dir, new_file)}"
+        end
+      end
+
+      private
+      def haml_from
+        options.has_key?(:from) ? File.join(app_dir, options[:from]) : File.join(app_dir, 'haml')
+      end
+
+      def haml_to
+        options.has_key?(:to) ? File.join(app_dir, options[:to]) : File.join(app_dir, '')
+      end
+
+    end
+  end
+end

data/lib/soca/plugins/jim.rb

@@ -6,11 +6,13 @@ module Soca
 
       name 'jim'
 
-      def run(options = {})
+      def before_build
         jimfile = File.join(app_dir, 'Jimfile')
         ::Jim.logger = logger
         logger.debug "bundling js"
         bundler = ::Jim::Bundler.new(File.read(jimfile), ::Jim::Index.new(app_dir))
+        # set the base dir relative to the app
+        bundler.bundle_dir = app_dir + bundler.bundle_dir
         bundler.bundle!
       end
 

data/lib/soca/plugins/macro.rb

@@ -1,25 +1,29 @@
-# see http://tinyurl.com/6ab5svl views in coucdb < 1.1.x does not allow require of modules therfor we need to use macors
+# see http://tinyurl.com/6ab5svl views in coucdb < 1.1.x
+# does not allow you to require modules so we can use couchapp
+# style macros instead
 module Soca
-    module Plugins
-        class Macro < Soca::Plugin
+  module Plugins
+    class Macro < Soca::Plugin
 
-            name 'macro'
+      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
+      def before_push
+        @pusher.document['views'].each do |view,code|
+          ['map','reduce'].each{|part| macro_expand_on(part,code) if code[part]}
         end
+      end
+
+      private
+      def macro_expand_on(part,code)
+       code[part] = code[part].split("\n").inject(" ") do |res,line|
+          if line =~ /\/\/ !code (.*)/
+           res += "\n#{File.read(File.join(pusher.app_dir, $1))}\n"
+          else
+           res += "#{line}\n"
+          end
+        end.strip
+      end
+
     end
+  end
 end

data/lib/soca/plugins/mustache.rb

@@ -14,7 +14,7 @@ module Soca
       # * :vars - Additional variables to interpolate. By default the `env` and
       #             `config` are interpolated.
       #
-      def run(options = {})
+      def before_build
         file_patterns = options[:files] || '*.mustache'
         files = Dir[*[file_patterns].flatten]
         vars = {

data/lib/soca/pusher.rb

@@ -30,13 +30,13 @@ module Soca
 
     def build
       @document = {}
-      run_hook_file!(:before_build)
+      run_hooks!(:before_build)
       logger.debug "building app JSON"
       Dir.glob(app_dir + '**/**') do |path|
         next if File.directory?(path)
         @document = map_file(path, @document)
       end
-      run_hook_file!(:after_build)
+      run_hooks!(:after_build)
       @document
     end
 
@@ -45,7 +45,7 @@ module Soca
     end
 
     def db_url
-      if env =~ /^http\:\/\// # the env is actual a db_url
+      if env =~ /^https?\:\/\// # the env is actual a db_url
         env
       else
         env_config = config['couchapprc']['env'][env]
@@ -56,7 +56,7 @@ module Soca
 
     def push_url
       raise "no app id specified in config" unless config['id']
-      "#{db_url}/_design/#{config['id']}"
+      config['not_design'] ? "#{db_url}/#{config['id']}" : "#{db_url}/_design/#{config['id']}"
     end
 
     def app_url
@@ -81,13 +81,13 @@ module Soca
     def push!
       create_db!
       build
-      run_hook_file!(:before_push)
+      run_hooks!(:before_push)
       get_current_revision
       document['_rev'] = revision if revision
       post_body = JSON.generate(document)
       logger.debug "pushing document to #{push_url}"
       put!(push_url, post_body)
-      run_hook_file!(:after_push)
+      run_hooks!(:after_push)
     end
 
     def purge!
@@ -107,6 +107,11 @@ module Soca
       Soca.logger
     end
 
+    def run_hooks!(hook)
+      run_hook_file!(hook)
+      run_plugin_hooks!(hook)
+    end
+
     def run_hook_file!(hook)
       hook_file_path = File.join(app_dir, 'hooks', "#{hook}.rb")
       if File.readable? hook_file_path
@@ -118,15 +123,33 @@ module Soca
       end
     end
 
-    def plugin(plugin_name, options = {})
-      require "soca/plugins/#{plugin_name}"
-      p = Soca::Plugin.plugins[plugin_name].new(self)
-      p.run(options)
+    def run_plugin_hooks!(hook)
+      plugins.each do |plugin_name, plugin|
+        if plugin.respond_to?(hook)
+          plugin.send(hook)
+        end
+      end
+    end
+
+    def plugins
+      return @plugins if @plugins
+      if config['plugins']
+        @plugins = config['plugins'].map do |plugin_config|
+          plugin_name, plugin_options = [plugin_config].flatten
+          require "soca/plugins/#{plugin_name}"
+          plugin_options ||= {}
+          plugin_options.each {|k, v| plugin_options[k.to_sym] = v }
+          [plugin_name, Soca::Plugin.plugins[plugin_name].new(self, plugin_options)]
+        end
+      else
+        @plugins = []
+      end
+      @plugins
     end
 
     private
     def map_file(path, hash)
-      file_data = File.read(path)
+      file_data = File.binread(path)
       base_path = path.gsub(app_dir, '')
       if map = mapped_directories.detect {|k,v| k =~ base_path }
         logger.debug "Matched #{path} against #{map.inspect}"
@@ -147,7 +170,11 @@ module Soca
         while !parts.empty?
           part = parts.shift
           if parts.empty?
-            current_hash[part] = file_data
+            if part =~ /.json$/
+              current_hash[part.gsub(/.json$/, '')] = JSON.parse(file_data)
+            else
+              current_hash[part] = file_data
+            end
           else
             current_hash[part] ||= {}
             current_hash = current_hash[part]