fauxsql 0.1.1 → 0.1.2

data/Gemfile

@@ -0,0 +1,22 @@
+source :gemcutter
+
+git "git://github.com/rails/rails.git"
+gem "rake"
+gem "jeweler"
+gem "shoulda"
+gem "activesupport",     "~> 3.0.0.beta1", :require => "active_support"
+gem "data_objects",      "~> 0.10.1"
+gem "do_sqlite3"
+gem "dm-do-adapter",                       :git => "git://github.com/datamapper/dm-do-adapter.git"
+gem "dm-sqlite-adapter",                   :git => "git://github.com/datamapper/dm-sqlite-adapter.git"
+gem "dm-aggregates",                       :git => "git://github.com/datamapper/dm-aggregates.git"
+gem 'dm-migrations',                       :git => 'git://github.com/datamapper/dm-migrations.git'
+gem 'dm-timestamps',                       :git => 'git://github.com/datamapper/dm-timestamps.git'
+gem 'dm-transactions',                     :git => 'git://github.com/datamapper/dm-transactions.git'
+gem 'dm-types',                            :git => 'git://github.com/datamapper/dm-types.git'
+gem 'dm-validations',                      :git => 'git://github.com/datamapper/dm-validations.git'
+gem 'dm-aggregates',                       :git => 'git://github.com/datamapper/dm-aggregates.git'
+gem 'dm-constraints',                      :git => 'git://github.com/datamapper/dm-constraints.git'
+gem 'dm-observer',                         :git => 'git://github.com/datamapper/dm-observer.git'
+gem "dm-core",                             :git => "git://github.com/collin/dm-core.git", "branch" => "next"
+gem "datamapper"

data/Rakefile

@@ -41,8 +41,6 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
-
 task :default => :test
 
 require 'rake/rdoctask'

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/fauxsql.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fauxsql}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Collin Miller"]
@@ -19,17 +19,20 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     "Gemfile",
      "LICENSE",
      "README.rdoc",
      "Rakefile",
      "VERSION",
      "fauxsql.gemspec",
      "lib/fauxsql.rb",
-     "lib/fauxsql/attribute.rb",
      "lib/fauxsql/attribute_list.rb",
      "lib/fauxsql/attribute_map.rb",
+     "lib/fauxsql/attribute_wrapper.rb",
      "lib/fauxsql/dereferenced_attribute.rb",
      "lib/fauxsql/dsl.rb",
+     "lib/fauxsql/list_wrapper.rb",
+     "lib/fauxsql/map_wrapper.rb",
      "test/helper.rb",
      "test/test_fauxsql.rb"
   ]

data/lib/fauxsql.rb

@@ -6,9 +6,11 @@ require 'pathname'
 # Internal Libs
 root = Pathname.new(__FILE__).dirname.expand_path
 require root+'fauxsql/dereferenced_attribute'
-require root+'fauxsql/attribute'
 require root+'fauxsql/attribute_list'
 require root+'fauxsql/attribute_map'
+require root+'fauxsql/attribute_wrapper'
+require root+'fauxsql/map_wrapper'
+require root+'fauxsql/list_wrapper'
 require root+'fauxsql/dsl'
 module Fauxsql
   extend ActiveSupport::Concern
@@ -36,14 +38,16 @@ module Fauxsql
   # a Ruby Array. Except it uses Fauxsql's dereference and resolve strategy to
   # store members.
   def get_fauxsql_list(list_name)
-    fauxsql_attributes[list_name] or AttributeList.new(self, list_name)
+    list = fauxsql_attributes[list_name] || AttributeList.new
+    ListWrapper.new(list, self, list_name)
   end
 
   # Gets a reference to an AttributeMap object. AttributeMap quacks like
   # a Ruby Hash. Except it uses Fauxsql's dereference and resolve strategy to
   # store keys and values.  
   def get_fauxsql_map(map_name)
-    fauxsql_attributes[map_name] or AttributeMap.new(self, map_name)
+    map = fauxsql_attributes[map_name] || AttributeMap.new
+    MapWrapper.new(map, self,  map_name)
   end
 
   # When setting values, all attributes pass through this method.
@@ -51,7 +55,7 @@ module Fauxsql
   # See #resolve_fauxsql_attribute to see how attributes are read.
   def self.dereference_fauxsql_attribute(attribute)
     if attribute.is_a?(DataMapper::Resource)
-      DereferencedAttribute.new(attribute)
+      DereferencedAttribute.get(attribute)
     else
       attribute
     end

data/lib/fauxsql/attribute_list.rb

@@ -2,8 +2,6 @@ module Fauxsql
   # AttributeList is an Array that dereferences and resolves fauxsql attributes
   # when setting/reading members in the Array
   class AttributeList < Array
-    include Attribute
-    
     def <<(attribute)
       super Fauxsql.dereference_fauxsql_attribute(attribute)
     end

data/lib/fauxsql/attribute_map.rb

@@ -2,8 +2,6 @@ module Fauxsql
   # AttributeMap is an Hash that dereferences and resolves fauxsql attributes
   # when setting/reading members in the Hash
   class AttributeMap < Hash
-    include Attribute
-    
     # We dereference and resolve the key because in Ruby _any_ object
     # can be a hash key. Even a DataMapper record.
     def []= key, value
@@ -17,16 +15,37 @@ module Fauxsql
       Fauxsql.resolve_fauxsql_attribute super(real_key.hash)
     end
     
+    def each(&block)
+      super do |key, value|
+        yield(resolve_key(key), resolve_value(value))
+      end
+    end
+    
     # VERY VERY SPECIFIC to the marshal dump format.
     # Probably brittle.
     def keys
       super.map do |key|
-        if key.match(/^.+Fauxsql::DereferencedAttribute.+@klass.+@lookup_key.+$/)
-          Fauxsql::DereferencedAttribute.load(key)
-        else
-          key
-        end
+        resolve_key(key)
+      end
+    end
+        
+    def resolve_key(key)
+      if key.respond_to?(:match) && key.match(/^.+Fauxsql::DereferencedAttribute.+@klass.+@lookup_key.+$/)
+        Fauxsql.resolve_fauxsql_attribute Fauxsql::DereferencedAttribute.load(key)
+      else
+        key
       end
     end
+    
+    def resolve_value(value)
+      Fauxsql.resolve_fauxsql_attribute value
+    end
+    
+    def eql?(other)
+      return false
+      raise [self, other.inspect].inspect
+    end
+    
+    
   end
 end

data/lib/fauxsql/attribute_wrapper.rb

@@ -0,0 +1,20 @@
+module Fauxsql
+  class AttributeWrapper
+    extend ActiveSupport::Concern
+    attr_reader:attribute
+    attr_reader:record
+    attr_reader:name
+    
+    def initialize(attribute, record, name)
+      @attribute, @record, @name = attribute, record, name
+      @record.fauxsql_attributes[name] ||= attribute
+    end
+
+    def dirty!
+      record.attribute_set(:fauxsql_attributes, record.fauxsql_attributes.dup)
+      value = yield
+      record.attribute_set(:fauxsql_attributes, record.fauxsql_attributes)
+      value
+    end
+  end
+end

data/lib/fauxsql/dereferenced_attribute.rb

@@ -4,6 +4,7 @@ module Fauxsql
   # DataMapper::Resource object is given. This way only the class and the 
   # primary key are stored.
   class DereferencedAttribute
+    @@identity_map = {}
     def initialize(attribute)
       @klass      = attribute.class
       @lookup_key = attribute.key
@@ -18,6 +19,10 @@ module Fauxsql
     end
     alias hash dump
     
+    def self.get(attribute)
+      @@identity_map[attribute] ||= new(attribute)
+    end
+    
     def self.load(dump)
       Marshal.load(dump)
     end

data/lib/fauxsql/list_wrapper.rb

@@ -0,0 +1,12 @@
+require "active_support/dependencies"
+require "active_support/core_ext/module/delegation"
+module Fauxsql
+  class ListWrapper < AttributeWrapper
+    alias list attribute
+    delegate :[], :==, :<<, :first, :last, :equals, :map_resolved, :to => :list
+    
+    def <<(item)
+      dirty! { list << item }
+    end
+  end
+end

data/lib/fauxsql/map_wrapper.rb

@@ -0,0 +1,12 @@
+require "active_support/dependencies"
+require "active_support/core_ext/module/delegation"
+module Fauxsql
+  class MapWrapper < AttributeWrapper
+    alias map attribute
+    delegate :[], :each, :keys, :resolve_key, :resolve_value, :to => :map
+    
+    def []=(key, value)
+      dirty! { map[key] = value }
+    end
+  end
+end

data/test/test_fauxsql.rb

@@ -55,7 +55,7 @@ class TestFauxsql < Test::Unit::TestCase
       @faux.things << :hello
       @faux.things << :goodbye
       reload
-      assert_equal [:hello, :goodbye], @faux.things
+      assert @faux.things == [:hello, :goodbye]
     end
     
     should "persist maps" do
@@ -119,9 +119,37 @@ class TestFauxsql < Test::Unit::TestCase
       simple1 = SimpleKey.create
       simple2 = SimpleKey.create
       @faux.dictionary[simple1] = simple2
-      assert_equal Fauxsql::DereferencedAttribute, @faux.dictionary.keys.first.class
+      assert_equal SimpleKey, @faux.dictionary.keys.first.class
       reload
       assert_equal simple2, @faux.dictionary[simple1]
     end
+    
+    should "give records as keys/values when calling #each" do
+      simple1 = SimpleKey.create
+      simple2 = SimpleKey.create
+      @faux.dictionary[simple1] = simple2
+      reload
+      @faux.dictionary.each do |key, value|
+        assert_equal simple1, key
+        assert_equal simple2, value
+      end
+    end
+    
+    should "not choke on normal values in hash when calling #each" do
+      simple1 = SimpleKey.create
+      @faux.dictionary[simple1] = 33
+      reload
+      @faux.dictionary.each{|key, value| }
+      assert true, "choked on normal values in #each"
+    end
+    
+    should "persist changes to maps" do
+      simple1 = SimpleKey.create
+      @faux.dictionary[simple1] = 33
+      reload
+      @faux.dictionary[simple1] = 50
+      reload
+      assert_equal 50, @faux.dictionary[simple1]
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Collin Miller
@@ -79,17 +79,20 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
 - fauxsql.gemspec
 - lib/fauxsql.rb
-- lib/fauxsql/attribute.rb
 - lib/fauxsql/attribute_list.rb
 - lib/fauxsql/attribute_map.rb
+- lib/fauxsql/attribute_wrapper.rb
 - lib/fauxsql/dereferenced_attribute.rb
 - lib/fauxsql/dsl.rb
+- lib/fauxsql/list_wrapper.rb
+- lib/fauxsql/map_wrapper.rb
 - test/helper.rb
 - test/test_fauxsql.rb
 has_rdoc: true

data/lib/fauxsql/attribute.rb

@@ -1,10 +0,0 @@
-module Fauxsql
-  # Attribute is a mixin for AttributeList and AttributeMap classes.
-  # It should be mixed into classes that inherit standard Ruby data structures
-  module Attribute
-    def initialize(record, name)
-      super() # explicitly super without arguments to preserve base behavior
-      record.fauxsql_attributes[name] = self
-    end
-  end
-end