dolly 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c328e5ad0719b1db86b04f3cb37790d29f7b330
-  data.tar.gz: 710b77307925c6fd69c21f99be59dee024234630
+  metadata.gz: 018a9bd659e968422dd5b822ebfc43dd72838307
+  data.tar.gz: 645e49f46d0e2246e12501e69c39a154d73e8885
 SHA512:
-  metadata.gz: 9ff41bdf9958889496959bc89bec947da7f560c9e9fa008eb19c090015c2bf47bc4e53b0cd872980556b6def40f4fd8884676f86985fbad71c82cf73ee786529
-  data.tar.gz: cda3d78ac23fc53cefa290c1cc75d7542ea1254501d58b8401f672490654661967db4d84a5b6173860dce7258e0878e40026bb7ef0911bb2d893fcbf39f4ed13
+  metadata.gz: 8996310eaabdf5dfbbb50e8eebc8b4a98a3fcea0cbf723da3919e948341ed555163a4def8c0f8b599580890fcda11f02ed30f559fc572bfed3a663b25ade8c52
+  data.tar.gz: bda2f0a5b092e2975b2ec0d3be5ed23a19b2bb1115c52cf0bc443743a1574ee18611e09c1eb48d017a319aacf5eadf86eb970a9e5fcfc21d7f8c3a6288c83c06

data/lib/dolly/query.rb

@@ -61,6 +61,10 @@ module Dolly
         database.get doc, options
       end
 
+      def raw_view doc, view, opts = {}
+        JSON.parse database.get "_design/#{doc}/_view/#{view}", opts
+      end
+
       def timestamps!
         %i/created_at updated_at/.each do |method|
           define_method(method){ @doc[method.to_s] ||= DateTime.now }

data/lib/dolly/version.rb

@@ -1,3 +1,3 @@
 module Dolly
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

data/lib/tasks/db.rake

@@ -7,51 +7,51 @@ namespace :db do
 
   desc "Will update design document with what is on db/designs/*.coffee"
   task design: :environment do
-    path = File.join Rails.root, 'db', 'designs'
-    files = Dir.glob("#{path}/*.coffee")
-    views = {}
-    filters = {}
+    design_dir = Rails.root.join 'db', 'designs'
+    files = Dir.glob File.join design_dir, '**', '*.coffee'
+    data = {}
 
     files.each do |filename|
+      parts = filename[design_dir.to_s.length+1..-1].split '/'
+      design_doc_name = parts.count == 1 ? Dolly::Document.design_doc : "_design/#{parts.first}"
+
       name, key  = File.basename(filename).sub(/.coffee/i, '').split(/\./)
       key ||= 'map'
-      data = File.read filename
+      source = File.read filename
+
+      vd = data[design_doc_name] ||= { 'views' => {}, 'filters' => {} }
 
       if key == 'filter'
-        filters[name] ||= data
+        vd['filters'][name] = source
       else
-        views[name] ||= {}
-        views[name][key] = data
+        v = vd['views'][name] ||= {}
+        v[key] = source
       end
     end
 
-    view_doc = {
-      '_id' => Dolly::Document.design_doc,
-      'language' => 'coffeescript',
-      'views' => views,
-      'filters' => filters
-    }
+    data.each do |design_doc_name, view_doc|
+      view_doc.merge!( '_id' => design_doc_name, 'language' => 'coffeescript')
 
-    begin
-      hash_doc = JSON::parse Dolly::Document.database.get(view_doc["_id"]).parsed_response
+      begin
+        hash_doc = JSON::parse Dolly::Document.database.get(view_doc["_id"]).parsed_response
 
-      rev = hash_doc.delete('_rev')
+        rev = hash_doc.delete('_rev')
 
-      if hash_doc == view_doc
-        puts 'everything up to date'
-      else
-        view_doc["_rev"] = rev
-        view_doc["views"].merge!(hash_doc['views'])
-        puts 'updating design document'
+        if hash_doc == view_doc
+          puts 'everything up to date'
+        else
+          view_doc["_rev"] = rev
+          puts "Updating #{design_doc_name}"
+          will_save = true
+        end
+
+      rescue Dolly::ResourceNotFound
+        puts "Creating design doc: #{design_doc_name}"
         will_save = true
       end
 
-    rescue Dolly::ResourceNotFound
-      puts 'creating design document'
-      will_save = true
+      Dolly::Document.database.put design_doc_name, view_doc.to_json if will_save
     end
-
-    Dolly::Document.database.put Dolly::Document.design_doc, view_doc.to_json if will_save
   end
 
 end