@@ -18,4 +18,4 @@ nbproject .DS_Store rspec_report.html *.swp -_Yardoc \ No newline at end of file +_Yardoc .gitignore @@ -1,22 +1,22 @@ -Copyright (c) 2007 Sam Smoot - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to deal in the Software without -restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following -conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file +Copyright (c) 2007 Sam Smoot + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. MIT-LICENSE @@ -7,5 +7,3 @@ Including: * Migrations * Validations - - README @@ -1,4 +1,4 @@ dm-couchdb-adapter ================== -A DataMapper adapter for CouchDB \ No newline at end of file +A DataMapper adapter for CouchDB adapters/dm-couchdb-adapter/README @@ -14,10 +14,10 @@ end module DataMapper module Resource - + def to_json(dirty = false) - - doc = (dirty ? self.dirty_attributes : self.class.properties).map do |property| + + doc = (dirty ? self.dirty_attributes : self.class.properties).map do |property| [property.field, instance_variable_get(property.instance_variable_name)] end @@ -30,7 +30,7 @@ end module DataMapper module Adapters class CouchdbAdapter < AbstractAdapter - + def create(repository, resource) result = http_post("/#{resource.class.storage_name(name)}/", resource.to_json(true)) resource.instance_variable_set("@rev", result["rev"]) @@ -44,30 +44,30 @@ module DataMapper false end end - + def read(repository, resource, key) properties = resource.properties(repository.name).defaults properties_with_indexes = Hash[*properties.zip((0...properties.length).to_a).flatten] set = Collection.new(repository, resource, properties_with_indexes) - + doc = http_get("/#{resource.storage_name(name)}/#{key}") set.load(properties.map { |property| typecast(property.type, doc[property.field.to_s]) }) - + set.first end - + def delete(repository, resource) key = resource.class.key(name).map { |property| resource.instance_variable_get(property.instance_variable_name) } result = http_delete("/#{resource.class.storage_name(name)}/#{key}?rev=#{resource.rev}") return result["ok"] end - + def update(repository, resource) key = resource.class.key(name).map { |property| resource.instance_variable_get(property.instance_variable_name) } result = http_put("/#{resource.class.storage_name(name)}/#{key}", resource.to_json) - + if result["ok"] - + key = resource.class.key(name) resource.instance_variable_set(key.first.instance_variable_name, result["id"]) resource.instance_variable_set("@rev", result["rev"]) @@ -76,12 +76,12 @@ module DataMapper false end end - + def read_set(repository, query) doc = request do |http| http.request(build_javascript_request(query)) end - + populate_set(repository, query.model, query.fields, doc["rows"]) end @@ -90,30 +90,30 @@ module DataMapper doc = http_get("/#{resource.storage_name(name)}/_view/#{resource.storage_name(name)}/#{proc_name}") populate_set(repository, resource, properties, doc["rows"]) end - + def populate_set(repository, resource, properties, docs) properties_with_indexes = Hash[*properties.zip((0...properties.length).to_a).flatten] set = Collection.new(repository, resource, properties_with_indexes) - + docs.each do |doc| set.load(properties.map { |property| typecast(property.type, doc["value"][property.field.to_s]) }) end - + set end def delete_set(repository, query) raise NotImplementedError end - + private - + def normalize_uri(uri_or_options) uri_or_options = URI.parse(uri_or_options) if String === uri_or_options uri_or_options.scheme = "http" uri_or_options end - + def typecast(type, value) return value if value.nil? case type.to_s @@ -123,19 +123,19 @@ module DataMapper else value end end - + def build_javascript_request(query) - + if query.order.empty? key = "null" else key = query.order.map { |order| "doc.#{order.property.field}" }.join(", ") key = "[#{key}]" end - + request = Net::HTTP::Post.new("/#{query.model.storage_name(name)}/_temp_view") request["content-type"] = "text/javascript" - + if query.conditions.empty? request.body = "function(doc) { map(#{key}, doc); }" else @@ -155,7 +155,7 @@ module DataMapper end request end - + def like_operator(value) case value when Regexp then value = value.source @@ -168,23 +168,23 @@ module DataMapper end return ".match(/#{value}/)" end - + def http_put(uri, data = nil) request { |http| http.put(uri, data) } end - + def http_post(uri, data) request { |http| http.post(uri, data) } end - + def http_get(uri) request { |http| http.get(uri) } end - + def http_delete(uri) request { |http| http.delete(uri) } end - + def request(parse_result = true, &block) res = nil Net::HTTP.start(@uri.host, @uri.port) do |http| @@ -192,7 +192,7 @@ module DataMapper end JSON.parse(res.body) if parse_result end - + end end -end \ No newline at end of file +end adapters/dm-couchdb-adapter/lib/couchdb_adapter.rb @@ -1,24 +1,24 @@ # This provides a mechanism for accessing stored and indexed views # in the CouchDB database. -# +# # Here's a sample model: -# +# # class User # include DataMapper::Resource -# +# # property :id, String, :key => true, :field => :_id # property :rev, String, :field => :_rev -# +# # view :by_name # end -# +# # And here's the DM code to generate the view: # # view = Net::HTTP::Put.new("/users/_design/users") # /model_name/_design/model_name # view["content-type"] = "text/javascript" -# view.body = { -# "language" => "text/javascript", -# "views" => { +# view.body = { +# "language" => "text/javascript", +# "views" => { # # this filters out non-records, such as this # # _design document # "by_name" => "function(doc) { if(doc._id.charAt(0) != '_') { map(doc.name, doc); } }" @@ -27,7 +27,7 @@ # @adapter.send(:request, false) do |http| # http.request(view) # end -# +# module DataMapper class Repository @@ -49,16 +49,16 @@ end module DataMapper class View - + attr_reader :model, :name - + def initialize(model, name) @model = model @name = name - + create_getter end - + def create_getter @model.class_eval <<-EOS, __FILE__, __LINE__ def self.#{@name}(repository_name = self.repository.name) @@ -66,15 +66,15 @@ module DataMapper end EOS end - + end end module DataMapper module Resource - + module ClassMethods - + def view(name) @views ||= Hash.new { |h,k| h[k] = {} } proc = View.new(self, name) @@ -87,4 +87,4 @@ module DataMapper end end end -end \ No newline at end of file +end adapters/dm-couchdb-adapter/lib/couchdb_views.rb @@ -3,7 +3,7 @@ require Pathname(__FILE__).dirname.parent.expand_path + 'lib/couchdb_adapter' class User include DataMapper::Resource - + def self.default_repository_name :couchdb end @@ -11,14 +11,14 @@ class User # required for CouchDB property :id, String, :key => true, :field => :_id property :rev, String, :field => :_rev - + # regular properties property :name, String property :age, Integer property :wealth, Float property :created_at, DateTime property :created_on, Date - + # creates methods for accessing stored/indexed views in the CouchDB database view :by_name view :by_age @@ -32,17 +32,17 @@ describe "DataMapper::Adapters::CouchdbAdapter" do @adapter.send(:http_put, "/users/") create_procedures end - + after :all do @adapter.send(:http_delete, "/users/") end - + it "should create a record" do user = new_user user.save.should == true user.id.should_not == nil end - + it "should get a record" do created_user = new_user created_user.save @@ -51,7 +51,7 @@ describe "DataMapper::Adapters::CouchdbAdapter" do user.name.should == "Jamie" user.age.should == 67 end - + it "should update a record" do created_user = new_user created_user.save @@ -63,28 +63,28 @@ describe "DataMapper::Adapters::CouchdbAdapter" do user.age.should == created_user.age user.id.should == created_user.id end - + it "should destroy a record" do created_user = new_user created_user.save created_user.destroy.should == true end - + it "should get all records" do User.all.size.should == 3 end - + it "should get records by eql matcher" do new_user(:name => "John", :age => 50).save User.all(:name => "John").size.should == 1 User.all(:age => 50).size.should == 1 User.all(:wealth => 11.5).size.should == 4 end - + it "should get records by not matcher" do User.all(:age.not => 50).size.should == 3 end - + it "should get records by gt matcher" do User.all(:age.gt => 50).size.should == 3 end @@ -92,26 +92,26 @@ describe "DataMapper::Adapters::CouchdbAdapter" do it "should get records by gte matcher" do User.all(:age.gte => 50).size.should == 4 end - + it "should get records by lt matcher" do User.all(:age.lt => 50).size.should == 0 end - + it "should get records by lte matcher" do User.all(:age.lte => 50).size.should == 1 end - + it "should get records by the like matcher" do User.all(:name.like => "Jo").size.should == 0 User.all(:name.like => "Jo%").size.should == 1 User.all(:name.like => /^Jam/).size.should == 2 end - + it "should get records with multiple matchers" do new_user(:name => "John", :age => 30).save User.all(:name => "John", :age.lt => 50).size.should == 1 end - + it "should order records" do new_user(:name => "Aaron", :age => 30).save new_user(:name => "Aaron").save @@ -121,34 +121,34 @@ describe "DataMapper::Adapters::CouchdbAdapter" do users[0].age.should == 30 users[1].age.should == 67 end - + it "should handle DateTime" do user = new_user user.save time = user.created_at User[user.id].created_at.should == time end - + it "should handle Date" do user = new_user user.save date = user.created_on User[user.id].created_on.should == date end - + it "should be able to call stored views" do - + User.by_name.first.should == User.all(:order => [:name]).first User.by_age.first.should == User.all(:order => [:age]).first - + end - + def create_procedures view = Net::HTTP::Put.new("/users/_design/users") view["content-type"] = "text/javascript" - view.body = { - "language" => "text/javascript", - "views" => { + view.body = { + "language" => "text/javascript", + "views" => { "by_name" => "function(doc) { if(doc._id.charAt(0) != '_') { map(doc.name, doc); } }", "by_age" => "function(doc) { if(doc._id.charAt(0) != '_') { map(doc.age, doc); } }" } @@ -157,11 +157,11 @@ describe "DataMapper::Adapters::CouchdbAdapter" do http.request(view) end end - + def new_user(options = {}) default_options = { :name => "Jamie", :age => 67, :wealth => 11.5 } default_options.merge!(options) User.new(default_options) end - -end \ No newline at end of file + +end adapters/dm-couchdb-adapter/spec/couchdb_adapter_spec.rb @@ -10,21 +10,21 @@ describe "DataMapper::View" do property :open, TrueClass end end - + it "should have a view method" do Zoo.should respond_to(:view) end - + it "should store a view when called" do Zoo.view :by_name Zoo.views.keys.should include(:by_name) end - + it "should initialize a new Procedure instance" do proc = Zoo.view :by_name_desc proc.should be_an_instance_of(DataMapper::View) end - + it "should create a getter method" do Zoo.view :open Zoo.should respond_to(:open) @@ -41,4 +41,4 @@ describe "DataMapper::Adapters::AbstractAdapter" do it "should have a view method" do DataMapper::Adapters::AbstractAdapter.instance_methods.should include("view") end -end \ No newline at end of file +end adapters/dm-couchdb-adapter/spec/couchdb_view_spec.rb 73da8be053bc188427d6a9efe1607cc31ddffd2f Alex Coles alexbcoles@mac.com http://github.com/digitalhobbit/dm-more/commit/ad1c629010118b42bbf9e83d9709f34078aec5ee ad1c629010118b42bbf9e83d9709f34078aec5ee 2008-05-13T05:07:43-07:00 2008-05-13T05:07:43-07:00 Whitespace cleanup a1d380499e2d494957f6e15bd506456964f0bbd0 Alex Coles alexbcoles@mac.com