@@ -4,5 +4,4 @@ class ActivecouchModelGenerator < Rails::Generator::NamedBase m.template 'model.rb', File.join('app', 'models', "#{class_name.underscore}.rb") end end - end \ No newline at end of file generators/activecouch_model/activecouch_model_generator.rb @@ -5,6 +5,8 @@ module ActiveCouch class Exporter class << self # Class methods def export(site, view, opts = {}) + existing_view = {} + if view.name.nil? || (view.database.nil? && opts[:database].nil?) raise ActiveCouch::ViewError, "Both the name and the database need to be defined in your view" end @@ -12,9 +14,12 @@ module ActiveCouch # as an option to the export method database_name = view.database || opts[:database] conn = Connection.new(site) - # view for a view with name 'by_name' and database 'activecouch_test' should be PUT to + # The view function for a view with name 'by_name' and database 'activecouch_test' should be PUT to # http://#{host}:#{port}/activecouch_test/_design/by_name. - response = conn.put("/#{database_name}/_design/#{view.name}", view.to_json) + if(view_json = exists?(site, "/#{database_name}/_design/#{view.name}")) + existing_view = JSON.parse(view_json) + end + response = conn.put("/#{database_name}/_design/#{view.name}", view.to_json(existing_view)) case response.code when '201' true # 201 = success @@ -23,10 +28,33 @@ module ActiveCouch end end + def delete(site, view, opts = {}) + rev = nil + + if view.name.nil? || (view.database.nil? && opts[:database].nil?) + raise ActiveCouch::ViewError, "Both the name and the database need to be defined in your view" + end + # If the database is not defined in the view, it can be supported + # as an option to the export method + database_name = view.database || opts[:database] + conn = Connection.new(site) + if(view_json = exists?(site, "/#{database_name}/_design/#{view.name}")) + rev = JSON.parse(view_json)['_rev'] + end + # The view function for a view with name 'by_name' and database 'activecouch_test' should be PUT to + # http://#{host}:#{port}/activecouch_test/_design/by_name. + response = conn.delete("/#{database_name}/_design/#{view.name}?rev=#{rev}") + if response.code =~ /20[0,2]/ + true # 201 = success + else + raise ActiveCouch::ViewError, "Error deleting view - got HTTP response #{response.code}" + end + end + def exists?(site, name) conn = Connection.new(site) response = conn.get("/#{name}") - true + response rescue ActiveCouch::ResourceNotFound false end lib/active_couch/views/exporter.rb @@ -37,9 +37,10 @@ module ActiveCouch @attrs = attrs unless attrs.nil? || !attrs.is_a?(Array) end - def to_json - results_hash = { "_id" => "_design/#{@name}", "language" => view_language } - results_hash["views"] = view_function + def to_json(existing_view = {}) + results_hash = { "_id" => "_design/#{@name}", "language" => view_language } + results_hash.merge!(existing_view) + results_hash['views'] = view_function # Returns the JSON format for the function results_hash.to_json end lib/active_couch/views/view.rb @@ -18,7 +18,7 @@ describe ActiveCouch::Exporter, "#export (that actually connects to a CouchDB se ActiveCouch::Exporter.delete_database('http://localhost:5984/', 'ac_test_3') end - it "should be able to create a permanent view when sent the migrate method" do + it "should be able to create a permanent view when sent the export method" do ActiveCouch::Exporter.export('http://localhost:5984', ByFace).should == true # This is the view document. To actually query this particular view, the URL to be used # is http://#{host}:#{port}/ac_test_1/_view/by_face/by_face @@ -28,7 +28,7 @@ describe ActiveCouch::Exporter, "#export (that actually connects to a CouchDB se end end -describe ActiveCouch::Exporter, "#migrate with site and migration" do +describe ActiveCouch::Exporter, "#export with site and migration" do before(:all) do class ByFace < ActiveCouch::View define :for_db => 'test_db' do spec/exporter/export_spec.rb @@ -3,8 +3,7 @@ if defined? RAILS_ENV end namespace :activecouch do - desc "Set of tools for making Ruby On Rails play nice with CouchDB" - + desc "Creates a database in CouchDB" task :create_db do unless (database = ENV['db']).nil? site = YAML::load(File.open(File.join(Rails.root, 'config', 'activecouch.yml')))[Rails.env]['site'] @@ -20,6 +19,7 @@ namespace :activecouch do end end + desc "Deletes a database from CouchDB" task :delete_db do unless (database = ENV['db']).nil? site = YAML::load(File.open(File.join(Rails.root, 'config', 'activecouch.yml')))[Rails.env]['site'] @@ -34,7 +34,8 @@ namespace :activecouch do puts "You need to specify a database. Usage: rake activecouch:delete_db db=<database_name>" end end - + + desc "Saves a view in CouchDB" task :save_view do unless (view_name = ENV['view']).nil? site = YAML::load(File.open(File.join(Rails.root, 'config', 'activecouch.yml')))[Rails.env]['site'] @@ -55,11 +56,11 @@ namespace :activecouch do unless (view_name = ENV['view']).nil? site = YAML::load(File.open(File.join(Rails.root, 'config', 'activecouch.yml')))[Rails.env]['site'] unless(view = Object.const_get(view_name)).nil? - saved = ActiveCouch::Exporter.export(site, view) - if saved - puts "View exported successfully" + deleted = ActiveCouch::Exporter.delete(site, view) + if deleted + puts "View deleted successfully" else - puts "There was an error in the export. Please check your CouchDB logs" + puts "There was an error in the deletion of the view. Please check your CouchDB logs" end else puts "Have you defined your view? Use ./script/generate activecouch_view ViewName from the root of your Rails app" tasks/activecouch.rake 4fd3a77bcc917dd479861721506d7dd68a1d6e3e Arun Thampi arun@Macintosh.(none) http://github.com/arunthampi/activecouch/commit/24c26442decf5f57d36114f05396b9889ed1aba6 24c26442decf5f57d36114f05396b9889ed1aba6 2008-10-21T20:58:19-07:00 2008-10-21T20:58:19-07:00 Make the exporter view over-write existing views. Deleting views also work. Specs in the works 02d969f6eff422717c0acf0bc1c2e3e60faf2296 Arun Thampi arun@Macintosh.(none)