veneer 0.1.0 → 0.1.1

data/.gitignore

@@ -3,3 +3,4 @@
 coverage
 rdoc
 pkg
+*.gem

data/README.textile

@@ -1,7 +1,11 @@
 h1. veneer
 
-Veneer is an interface that sits above Data Sources.
-It differs from ActiveModel in that it doesn't require errors or validations or anything like that.
+Veneer is an interface that sits above Data Sources.  A data source may be an ORM like ActiveRecord or DataMapper, or it could be a document store like MongoMapper or even just an storage like Moneta.
+
+Veneer aims to provide plugin authors with a consistant interface to any of these libraries so that plugins, engines, stacks and gems may be used across data store types.  Reusable code FTW!
+
+It differs from ActiveModel in that it doesn't provide any validation support, serialization, callbacks, state machine or anything like that.  Veneer is intended to work with ActiveModel to provide a data store independant interface to create reusable code.
+
 Veneer instead aims to provide a simple interface for
  * querying
  * creating
@@ -20,7 +24,7 @@ obj.save
 obj = Veneer(MyModel).create(:some => "attribute")
 </code></pre>
 
-There are also version that will raise exceptions
+There are also version that will raise an exception if it could not save
 
 <pre><code>obj = Veneer(MyModel).new(:some => "attribute").save!
 
@@ -44,7 +48,7 @@ Veneer lets you query models with a simple interface.  Only simple queries are s
 
 You can query a single object, or multiple objects.
 
-<pre><code>Veneer(MyModel).all(:conditions => {:name => "foo"})
+<pre><code>Veneer(MyModel).first(:conditions => {:name => "foo"})
 
 Veneer(MyModel).all(:conditions => {"age gte" => 18}, :limit => 5)
 </code></pre>
@@ -112,7 +116,7 @@ h2. Current Support
 
 Veneer currently has built in support for ActiveRecord and DataMapper.
 
-Veneer works on a VeneerInterface inner module though so you can easily impelment you're adapter without requireing it to be in the veneer repo (although pull requests are welcome)
+Veneer works on a VeneerInterface inner module though so you can easily impelment your adapter without requiring it to be in the veneer repo (although pull requests are welcome)
 
 To use DataMapper or ActiveRecord
 

data/Rakefile

@@ -20,22 +20,6 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-#require 'spec/rake/spectask'
-#Spec::Rake::SpecTask.new(:spec) do |spec|
-#  spec.libs << 'lib' << 'spec'
-#  spec.spec_files = FileList['spec/**/*_spec.rb']
-#end
-#
-#Spec::Rake::SpecTask.new(:rcov) do |spec|
-#  spec.libs << 'lib' << 'spec'
-#  spec.pattern = 'spec/**/*_spec.rb'
-#  spec.rcov = true
-#end
-#
-#task :spec => :check_dependencies
-#
-#task :default => :spec
-
 task :default => [:test_units]
 require 'rake/testtask'
 desc "Run test suite."

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/veneer.rb

@@ -1,4 +1,6 @@
-require 'active_support/core_ext/hash'
+require 'hashie'
+require 'dirge'
+
 $:.unshift File.expand_path(File.join(File.dirname(__FILE__), "lib"))
 
 require 'veneer/core_ext/kernel'

data/lib/veneer/adapters/active_record.rb

@@ -0,0 +1 @@
+require ~'./activerecord'

data/lib/veneer/adapters/activerecord/class_wrapper.rb

@@ -74,17 +74,6 @@ module ActiveRecord
         end
       end # ClassWrapper
 
-      class InstanceWrapper < Veneer::Base::InstanceWrapper
-        def save!
-          instance.save!
-        rescue ActiveRecord::RecordInvalid => e
-          raise ::Veneer::Errors::NotSaved
-        end
-
-        def save
-          instance.save
-        end
-      end # InstanceWrapper
     end
   end
 end

data/lib/veneer/adapters/activerecord/instance_wrapper.rb

@@ -5,6 +5,16 @@ module ActiveRecord
         def update(attributes = {})
           instance.update_attributes(attributes)
         end
+
+        def save!
+          instance.save!
+        rescue ActiveRecord::RecordInvalid => e
+          raise ::Veneer::Errors::NotSaved
+        end
+
+        def save
+          instance.save
+        end
       end # InstanceWrapper
     end # VeneerInterface
   end # Base

data/lib/veneer/adapters/data_mapper.rb

@@ -0,0 +1 @@
+require ~'./datamapper'

data/lib/veneer/adapters/mongomapper.rb

@@ -0,0 +1,3 @@
+require ~'./mongomapper/class_wrapper'
+require ~'./mongomapper/instance_wrapper'
+

data/lib/veneer/adapters/mongomapper/class_wrapper.rb

@@ -0,0 +1,55 @@
+module MongoMapper
+  module Document
+    module VeneerInterface
+      class ClassWrapper < Veneer::Base::ClassWrapper
+        def new(opts = {})
+          ::Kernel::Veneer(klass.new(opts))
+        end
+
+        def destroy_all
+          klass.destroy_all
+        end
+
+        def find_first(conditional)
+          opts = conditional_to_mongo_opts(conditional)
+          klass.first(opts)
+        end
+
+        def find_many(conditional)
+          opts = conditional_to_mongo_opts(conditional)
+          klass.all(opts)
+        end
+
+        private
+        def conditional_to_mongo_opts(c)
+          opts = {}
+          opts[:limit]  = c.limit if c.limit
+          opts[:offset] = c.offset if c.offset
+
+          unless c.order.blank?
+            opts[:order] = c.order.inject([]) do |ary, cnd|
+              ary << "#{cnd.field} #{cnd.direction}"
+            end.join(",")
+          end
+
+          unless c.conditions.blank?
+            cnds = c.conditions.inject({}) do |hsh, c|
+              case c.operator
+              when :eql
+                hsh[c.field] = c.value
+              when :not
+                hsh[c.field] = {"$ne" => c.value}
+              when :gt, :gte, :lt, :lte, :in
+                hsh[c.field] = {"$#{c.operator}" => c.value}
+              end
+              ::STDOUT.puts hsh.inspect
+              hsh
+            end
+            opts[:conditions] = cnds
+          end
+          opts
+        end
+      end
+    end
+  end
+end

data/lib/veneer/adapters/mongomapper/instance_wrapper.rb

@@ -0,0 +1,13 @@
+module MongoMapper
+  module Document
+    module VeneerInterface
+      class InstanceWrapper < ::Veneer::Base::InstanceWrapper
+        def save!
+          instance.save!
+        rescue
+          raise ::Veneer::Errors::NotSaved
+        end
+      end
+    end
+  end
+end

data/lib/veneer/base/conditional.rb

@@ -7,8 +7,8 @@ module Veneer
 
     attr_reader :options
     def initialize(opts)
-      @options = HashWithIndifferentAccess.new(opts || {})
-      odr = Array.new([@options.delete(:order)].flatten.compact)
+      @options = Hashie::Mash.new(opts || {})
+      odr = [@options.delete("order")].flatten.compact
       @ordering = odr.nil? || odr.empty? ? [] : begin
         odr.map do |order|
           field, direction = order.split(" ")

data/test/macros/class_wrapper/find_macro.rb

@@ -27,12 +27,19 @@ class Test::Unit::TestCase
       end
 
       should "implement order" do
-        result = Veneer(@klass).find_many(Veneer::Conditional.from_hash(:order => "order_field1"))
+        result = Veneer(@klass).find_many(Veneer::Conditional.from_hash(:order => "order_field1 asc"))
         raw = result.map{|i| i.order_field1 }.compact
-        sorted = raw.sort.reverse
+        sorted = raw.sort
         assert_equal raw, sorted
       end
 
+      should "implement asc and desc order as opposites" do
+        result_asc  = Veneer(@klass).find_many(Veneer::Conditional.from_hash(:order => "order_field1 asc")).map{|o| o.order_field1}
+        result_desc = Veneer(@klass).find_many(Veneer::Conditional.from_hash(:order => "order_field1 desc")).map{|o| o.order_field1}
+
+        assert_equal result_asc, result_desc.reverse
+      end
+
       should "implement order decending" do
         result = Veneer(@klass).find_many(Veneer::Conditional.from_hash(:order => "order_field1 desc"))
         raw = result.map{|i| i.order_field1 }.compact
@@ -83,9 +90,9 @@ class Test::Unit::TestCase
 
         should "implement gte conditions" do
           total = Veneer(@klass).find_many(Veneer::Conditional.from_hash({}))
-          expected = total.select{|i| !i.order_field1.nil? && i.order_field1 >= 3}
-          result = Veneer(@klass).find_many(Veneer::Conditional.from_hash(:conditions => {"order_field1 gte" => 3}))
-          assert_equal 3, result.size
+          expected = total.select{|i| !i.order_field1.nil? && i.order_field1 >= 3}.map{|i| i.order_field1}
+          result = Veneer(@klass).find_many(Veneer::Conditional.from_hash(:conditions => {"order_field1 gte" => 3})).map{|o| o.order_field1}
+          assert_equal expected, result
         end
 
         should "implement :lt condition" do

data/test/veneer/adapters/mongomapper/class_wrapper_test.rb

@@ -0,0 +1,22 @@
+require File.join(File.dirname(__FILE__), "..", "..", "..", "test_helper")
+require ~"./mongomapper_setup"
+
+module Veneer
+  module Test
+    class MongoMapperClassWrapper < ::Test::Unit::TestCase
+      context "MongoMapper Veneer Adapter" do
+        setup do
+          @klass =  MongoFoo
+          @valid_attributes     = {:name => "foo"}
+          @invalid_attributes   = {:name => "invalid"}
+        end
+
+        veneer_should_have_the_required_veneer_constants
+        veneer_should_implement_create_with_valid_attributes
+        veneer_should_impelement_destroy_all
+        veneer_should_implement_create_with_invalid_attributes
+        veneer_should_implement_find
+      end
+    end
+  end
+end

data/test/veneer/adapters/mongomapper/instance_wrapper_test.rb

@@ -0,0 +1,21 @@
+require File.join(File.dirname(__FILE__), "..", "..", "..", "test_helper")
+require File.join(File.dirname(__FILE__), "mongomapper_setup")
+
+module Veneer
+  module Test
+    class MongoMapperInstanceWrapper < ::Test::Unit::TestCase
+      context "MongoMapper Veneer Adapter" do
+        setup do
+          @klass = MongoFoo
+          @valid_attributes   = {:name => "foo"}
+          @invalid_attributes = {:name => "invalid"}
+        end
+
+        veneer_should_implement_new_record?
+        veneer_should_implement_save
+        veneer_should_implement_save!
+        veneer_should_implement_destroy
+      end
+    end
+  end
+end

data/test/veneer/adapters/mongomapper/mongomapper_setup.rb

@@ -0,0 +1,20 @@
+require 'mongomapper'
+
+require 'veneer/adapters/mongomapper'
+
+MongoMapper.connection = Mongo::Connection.new('127.0.0.1', 27017)
+MongoMapper.database = 'veneer_test'
+
+class MongoFoo
+  include MongoMapper::Document
+
+  key :name,          String
+  key :order_field1,  Integer
+
+  validate_on_create :check_name
+
+  def check_name
+    errors.add(:name, "may not be invalid") if name == "invalid"
+  end
+end
+

data/veneer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{veneer}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Neighman"]
-  s.date = %q{2009-11-03}
+  s.date = %q{2009-12-05}
   s.description = %q{Veneer provides basic querying, saving, deleteing and creating of data stores.}
   s.email = %q{has.sox@gmail.com}
   s.extra_rdoc_files = [
@@ -25,12 +25,17 @@ Gem::Specification.new do |s|
      "VERSION",
      "datamapper_setup.rb",
      "lib/veneer.rb",
+     "lib/veneer/adapters/active_record.rb",
      "lib/veneer/adapters/activerecord.rb",
      "lib/veneer/adapters/activerecord/class_wrapper.rb",
      "lib/veneer/adapters/activerecord/instance_wrapper.rb",
+     "lib/veneer/adapters/data_mapper.rb",
      "lib/veneer/adapters/datamapper.rb",
      "lib/veneer/adapters/datamapper/class_wrapper.rb",
      "lib/veneer/adapters/datamapper/instance_wrapper.rb",
+     "lib/veneer/adapters/mongomapper.rb",
+     "lib/veneer/adapters/mongomapper/class_wrapper.rb",
+     "lib/veneer/adapters/mongomapper/instance_wrapper.rb",
      "lib/veneer/base/class_wrapper.rb",
      "lib/veneer/base/conditional.rb",
      "lib/veneer/base/instance_wrapper.rb",
@@ -52,6 +57,9 @@ Gem::Specification.new do |s|
      "test/veneer/adapters/datamapper/class_wrapper_test.rb",
      "test/veneer/adapters/datamapper/datamapper_setup.rb",
      "test/veneer/adapters/datamapper/instance_wrapper_test.rb",
+     "test/veneer/adapters/mongomapper/class_wrapper_test.rb",
+     "test/veneer/adapters/mongomapper/instance_wrapper_test.rb",
+     "test/veneer/adapters/mongomapper/mongomapper_setup.rb",
      "test/veneer/base/conditonal_test.rb",
      "test/veneer/proxy_test.rb",
      "veneer.gemspec"
@@ -78,6 +86,9 @@ Gem::Specification.new do |s|
      "test/veneer/adapters/datamapper/class_wrapper_test.rb",
      "test/veneer/adapters/datamapper/datamapper_setup.rb",
      "test/veneer/adapters/datamapper/instance_wrapper_test.rb",
+     "test/veneer/adapters/mongomapper/class_wrapper_test.rb",
+     "test/veneer/adapters/mongomapper/instance_wrapper_test.rb",
+     "test/veneer/adapters/mongomapper/mongomapper_setup.rb",
      "test/veneer/base/conditonal_test.rb",
      "test/veneer/proxy_test.rb"
   ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: veneer
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-03 00:00:00 +11:00
+date: 2009-12-05 00:00:00 +11:00
 default_executable: 
 dependencies: []
 
@@ -31,12 +31,17 @@ files:
 - VERSION
 - datamapper_setup.rb
 - lib/veneer.rb
+- lib/veneer/adapters/active_record.rb
 - lib/veneer/adapters/activerecord.rb
 - lib/veneer/adapters/activerecord/class_wrapper.rb
 - lib/veneer/adapters/activerecord/instance_wrapper.rb
+- lib/veneer/adapters/data_mapper.rb
 - lib/veneer/adapters/datamapper.rb
 - lib/veneer/adapters/datamapper/class_wrapper.rb
 - lib/veneer/adapters/datamapper/instance_wrapper.rb
+- lib/veneer/adapters/mongomapper.rb
+- lib/veneer/adapters/mongomapper/class_wrapper.rb
+- lib/veneer/adapters/mongomapper/instance_wrapper.rb
 - lib/veneer/base/class_wrapper.rb
 - lib/veneer/base/conditional.rb
 - lib/veneer/base/instance_wrapper.rb
@@ -58,6 +63,9 @@ files:
 - test/veneer/adapters/datamapper/class_wrapper_test.rb
 - test/veneer/adapters/datamapper/datamapper_setup.rb
 - test/veneer/adapters/datamapper/instance_wrapper_test.rb
+- test/veneer/adapters/mongomapper/class_wrapper_test.rb
+- test/veneer/adapters/mongomapper/instance_wrapper_test.rb
+- test/veneer/adapters/mongomapper/mongomapper_setup.rb
 - test/veneer/base/conditonal_test.rb
 - test/veneer/proxy_test.rb
 - veneer.gemspec
@@ -105,5 +113,8 @@ test_files:
 - test/veneer/adapters/datamapper/class_wrapper_test.rb
 - test/veneer/adapters/datamapper/datamapper_setup.rb
 - test/veneer/adapters/datamapper/instance_wrapper_test.rb
+- test/veneer/adapters/mongomapper/class_wrapper_test.rb
+- test/veneer/adapters/mongomapper/instance_wrapper_test.rb
+- test/veneer/adapters/mongomapper/mongomapper_setup.rb
 - test/veneer/base/conditonal_test.rb
 - test/veneer/proxy_test.rb