ardm 0.1.0 → 0.2.0

data/.ruby-version

@@ -0,0 +1 @@
+1.9.3

data/Gemfile

@@ -3,10 +3,22 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'pry'
+gem 'pry-nav'
+gem 'awesome_print'
 
 group :test do
   gem 'sqlite3'
-  gem 'activerecord', '~> 3.2'
+  gem 'activerecord', '~> 4.0.0'
   gem 'addressable'
-  gem 'database_cleaner'
+  gem 'database_cleaner', git: "git://github.com/lanej/database_cleaner.git", branch: "datamapper-fix"
+  gem 'rspec-its'
+end
+
+group :datamapper do
+  gem 'dm-core', '~> 1.2'
+  gem 'dm-sqlite-adapter', '~> 1.2'
+  gem 'dm-types', '~> 1.2', git: "git://github.com/engineyard/dm-types.git", branch: "1.2-multijson"
+  gem 'dm-validations', '~> 1.2'
+  gem 'dm-transactions', '~> 1.2'
+  gem 'dm-migrations', '~> 1.2'
 end

data/ardm.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = [ "lib" ]
   gem.version       = Ardm::VERSION
 
-  gem.add_runtime_dependency('activesupport', '>= 3.2')
+  gem.add_runtime_dependency('activesupport', '>= 3.2', '< 4.1')
   gem.add_runtime_dependency('bcrypt-ruby',   '~> 3.0.0')
   gem.add_runtime_dependency('fastercsv',     '~> 1.5.4')
   gem.add_runtime_dependency('multi_json',    '> 1.3.2')

data/lib/ardm.rb

@@ -44,6 +44,14 @@ module Ardm
     yield if block_given? && active_record?
   end
 
+  def self.rails3?
+    self.active_record? && ::ActiveRecord::VERSION::STRING >= "3.0" && ::ActiveRecord::VERSION::STRING <= "4.0"
+  end
+
+  def self.rails4?
+    self.active_record? && !self.rails3?
+  end
+
   # Yield if Ardm has loaded DataMapper ORM.
   #
   # @api public

data/lib/ardm/active_record.rb

@@ -40,11 +40,6 @@ module Ardm
   end
 end
 
-
-#::ActiveRecord::Base.class_eval do
-#  include Ardm::ActiveRecord::Base
-#end
-
 ::ActiveRecord::Relation.class_eval do
   include Ardm::ActiveRecord::Relation
 end

data/lib/ardm/active_record/associations.rb

@@ -1,4 +1,4 @@
-require 'active_support/concern'
+
 
 module Ardm
   module ActiveRecord
@@ -33,14 +33,20 @@ module Ardm
           ar[:foreign_key] = property.field
         end
 
-        if (conditions = ar.slice!(*keep)).any?
-          ar[:conditions] = conditions
+        if Ardm.rails3?
+          if (conditions = ar.slice!(*keep)).any?
+            ar[:conditions] = conditions
+          end
+          [ar]
+        else
+          block = if (conditions = ar.slice!(*keep)).any?
+                    lambda { where(conditions) }
+                  end
+          [block, ar].compact
         end
-        ar
       end
 
       module ClassMethods
-
         def dump_associations_hash(options)
           options.inject({}) do |new_attrs, (key, value)|
             if reflection = reflect_on_association(key.to_sym)
@@ -73,9 +79,13 @@ module Ardm
           options.delete(:default)
           options.delete(:required)
           opts = Ardm::ActiveRecord::Associations.convert_options(self, options)
-          super field, opts
+          super field, *opts
           assoc = reflect_on_association(field)
-          property assoc.foreign_key, assoc.klass.key.first.class
+          Ardm::ActiveRecord::Record.on_finalize << lambda do
+            self.class_eval do
+              property assoc.foreign_key, assoc.klass.key.first.class, key: false
+            end
+          end
           nil
         end
 
@@ -97,9 +107,16 @@ module Ardm
           options[:order] = Ardm::ActiveRecord::Query.order(self, options[:order]) if options[:order]
           opts = Ardm::ActiveRecord::Associations.convert_options(self, options, :through, :order)
 
-          case count
-          when 1      then has_one  name, opts
-          when "many" then has_many name, opts
+          if Ardm.rails3?
+            case count
+            when 1      then has_one  name, *opts
+            when "many" then has_many name, *opts
+            end
+          else
+            case count
+            when 1      then has_one  name, *opts
+            when "many" then has_many name, *opts
+            end
           end
         end
 

data/lib/ardm/active_record/predicate_builder/rails4.rb

@@ -58,19 +58,26 @@ module Ardm
                 end
               else
                 if Ardm::Query::Operator === column
-                  column = column.target.to_s
                   operator = column.operator
+                  target_column = column.target.to_s
                 else
-                  column = column.to_s
+                  target_column = column.to_s
                   operator = nil
                 end
 
-                if column.include?('.')
-                  table_name, column = column.split('.', 2)
+                if target_column.include?('.')
+                  table_name, target_column = target_column.split('.', 2)
                   table = Arel::Table.new(table_name, default_table.engine)
                 end
 
-                queries.concat expand(klass, table, column, value)
+                query = expand(klass, table, target_column, value)
+                # TODO make nicer
+                if [:not_eq, :not_in].include?(operator)
+                  # Logical not factorization !(a && b) == (!a || !b)
+                  query.map! &:not
+                  query = [query.inject { |composite, predicate| composite.or(predicate) }]
+                end
+                queries.concat query
               end
             end
 

data/lib/ardm/active_record/property.rb

@@ -212,7 +212,7 @@ module Ardm
 
         def set_primary_key_for(property)
           if property.key? || property.serial?
-            self.primary_key = property.name
+            self.primary_key ||= property.name
           end
         end
 
@@ -223,7 +223,6 @@ module Ardm
           return if property.key? || property.serial? # let AR do it
           name                   = property.name.to_s
           reader_visibility      = property.reader_visibility
-          instance_variable_name = property.instance_variable_name
           property_module.module_eval <<-RUBY, __FILE__, __LINE__ + 1
             #{reader_visibility}
             def #{name}
@@ -254,7 +253,7 @@ module Ardm
           property_module.module_eval <<-RUBY, __FILE__, __LINE__ + 1
             #{writer_visibility}
             def #{writer_name}(value)
-              attribute_set(#{name.inspect}, value)
+              attribute_set(:#{name}, value)
             end
           RUBY
         end
@@ -328,6 +327,8 @@ module Ardm
 
         # only memoize a valid key
         @_key = key if model_key.valid?(key)
+
+        key
       end
 
       # Gets this instance's Model's properties

data/lib/ardm/active_record/record.rb

@@ -21,8 +21,8 @@ module Ardm
       def self.property(property_name, property_type, options={})
         prop = super
         begin
-        attr_accessible prop.name
-        attr_accessible prop.field
+          attr_accessible prop.name
+          attr_accessible prop.field
         rescue => e
           puts "WARNING: Error silenced. FIXME before release.\n#{e}" unless $attr_accessible_warning
           $attr_accessible_warning = true
@@ -72,6 +72,10 @@ module Ardm
         delete_all
       end
 
+      def destroy
+        self.class.delete(self.send(self.class.primary_key))
+      end
+
       def new?
         new_record?
       end
@@ -80,12 +84,12 @@ module Ardm
         !new_record?
       end
 
-      def save_self(*)
-        save
+      def save_self(*args)
+        save(*args)
       end
 
-      def save
-        super || (raise_on_save_failure && raise(Ardm::SaveFailureError, "Save Failed"))
+      def save!(*args)
+        save(*args) || (raise_on_save_failure && raise(Ardm::SaveFailureError, "Save Failed"))
       end
 
       def update(*a)

data/lib/ardm/active_record/relation.rb

@@ -57,7 +57,7 @@ module Ardm
       #end
 
       VALID_FIND_OPTIONS = [ :conditions, :include, :joins, :limit, :offset, :extend,
-        :order, :select, :readonly, :group, :having, :from, :lock ]
+                             :order, :select, :readonly, :group, :having, :from, :lock ]
 
       # We used to just patch this, like above, but we need to copy it over
       # completely for rails4 since it no longer supports the old style finder
@@ -76,7 +76,72 @@ module Ardm
           relation = relation.send(finder, finders[finder])
         end
 
-        relation = relation.where(conditions)           if conditions.any?
+        conditions.each do |key, value|
+          if assoc = relation.reflect_on_association(key)
+            conditions.delete(key)
+            # strip out assocations
+            case assoc.macro
+            when :belongs_to
+              id = value.is_a?(Hash) ? value.with_indifferent_access[:id] : value
+              relation = if value.is_a?(::ActiveRecord::Relation)
+                           if value.values.empty?
+                             relation.where.not(assoc.foreign_key => nil)
+                           else
+                             relation.where(assoc.foreign_key => value)
+                           end
+                         else
+                           relation.where(assoc.foreign_key => id)
+                         end
+            when :has_one
+              foreign_class = assoc.options[:class_name].constantize
+              foreign_key   = assoc.foreign_key
+              parent_key    = assoc.options[:child_key] || klass.primary_key
+
+              if value.is_a?(::Array) && value.empty?
+                # @fixme: dm basically no-ops cause it knows you are stupid
+                return klass.where(klass.primary_key => nil)
+              end
+
+              relation = if value.is_a?(::ActiveRecord::Base)
+                           relation.where(parent_key => value.send(assoc.foreign_key))
+                         elsif value.is_a?(::ActiveRecord::Relation)
+                           relation.where(parent_key => value.select(foreign_key))
+                         elsif value.nil?
+                           relation.where.not(parent_key => foreign_class.select(foreign_key).where.not(foreign_key => value))
+                         else
+                           relation.where(parent_key => foreign_class.select(foreign_key).where(value))
+                         end
+            when :has_many
+              foreign_class = assoc.options[:class_name].constantize
+              foreign_key   = assoc.foreign_key
+              parent_key    = assoc.options[:child_key] || klass.primary_key
+
+              relation = if value.is_a?(::ActiveRecord::Relation)
+                           relation.where(foreign_key => value)
+                         else
+                           relation.where(parent_key => foreign_class.select(foreign_class.primary_key).where.not(foreign_key => value))
+                         end
+            else
+              raise("unknown: #{assoc.inspect}")
+            end
+          end
+        end
+
+        processed_conditions = {}
+
+        conditions.each do |key, value|
+          key = key.is_a?(Ardm::Property) ? key.name : key
+
+          case key
+          when String, Symbol then
+            processed_conditions[key] = value
+          when Ardm::Query::Operator then
+            relation = key.to_arel(self, value).scope
+          else raise "unknown key: #{key.inspect} #{value.inspect}"
+          end
+        end
+
+        relation = relation.where(processed_conditions) if processed_conditions.any?
         relation = relation.where(finders[:conditions]) if options.has_key?(:conditions)
         relation = relation.includes(finders[:include]) if options.has_key?(:include)
         relation = relation.extending(finders[:extend]) if options.has_key?(:extend)

data/lib/ardm/data_mapper.rb

@@ -4,4 +4,6 @@ module Ardm
   Record = Ardm::DataMapper::Record
   SaveFailureError = ::DataMapper::SaveFailureError
   RecordNotFound = ::DataMapper::ObjectNotFoundError
+  Property = ::DataMapper::Property
+  Collection = ::DataMapper::Collection
 end

data/lib/ardm/data_mapper/record.rb

@@ -1,34 +1,31 @@
-require 'awsm/resource'
+require 'active_support/concern'
+require 'dm-core'
 
 module Ardm
   module DataMapper
-    module Record
-      extend ActiveSupport::Concern
+    class Record
+      extend Forwardable
 
-      module ClassMethods
-        extend Forwardable
-
-        def inherited(base)
-          base.send(:include, DataMapper::Resource)
-          #base.send(:extend, DataMapper::CollectionRaise)
+      def self.inherited(base)
+        base.send(:include, ::DataMapper::Resource)
+      end
 
-          unless %w[Alert Association Nonce Account::Cancellation::Handler].include?(base.name)
-            base.timestamps :at
-          end
-        end
+      def self.finalize
+        ::DataMapper.finalize
+      end
 
-        def_delegators :datamapper, :repository, :finalize, :logger, :logger=
-        def datamapper() DataMapper end
+      def self.alias_attribute(new, old)
+        alias_method new, old
+      end
 
-        def alias_attribute(new, old)
-          alias_method new, old
-        end
+      def self.attr_accessible(*attrs)
+      end
 
-        def attr_accessible(*attrs)
-        end
+      def self.abstract_class=(val)
+      end
 
-        def abstract_class=(val)
-        end
+      def self.table_name=(name)
+        self.storage_names[:default] = name
       end
     end
   end

data/lib/ardm/property/support/paranoid_base.rb

@@ -41,7 +41,7 @@ module Ardm
 
         # @api public
         def with_deleted(&block)
-          with_deleted_scope = self.scoped.with_default_scope
+          with_deleted_scope = self.all.with_default_scope
           paranoid_scopes.each do |cond|
             with_deleted_scope.where_values.delete(cond)
           end

data/lib/ardm/query/expression.rb

@@ -7,20 +7,11 @@ module Ardm
         new(relation, target, value).scope
       end
 
-      def initialize(relation, target, value)
+      def initialize(relation, target, operator, value)
         @relation   = relation
         @value      = value
-
-        case target
-        when Ardm::Query::Operator
-          @target   = target.target
-          @operator = target.operator
-        when Symbol, String
-          @target = target
-          @operator = :eq
-        else
-          raise ArgumentError, "Unknown target #{target.inspect} in Expresion"
-        end
+        @target     = target
+        @operator   = operator
       end
 
       def resolved_target
@@ -54,14 +45,13 @@ module Ardm
           if association.macro == :belongs_to
             association.foreign_key.to_sym
           else
-            $stderr.puts "WARNING: #{association.macro} based queries not yet supported?"
-            association.primary_key.to_sym
+            association.klass.primary_key.to_sym
           end
         end
       end
 
       def arel_operator
-        value.respond_to?(:to_ary) ? operator.for_array : operator
+        value.respond_to?(:to_ary) ? operator.for_array : operator.operator
       end
 
       def arel_value(val = value)

data/lib/ardm/query/operator.rb

@@ -7,7 +7,7 @@ module Ardm
       OPERATORS = {
         # DM      => ARel
         :eql      => :eq,
-        :not      => :not,
+        :not      => :not_eq,
         :in       => :in,
         :gt       => :gt,
         :gte      => :gteq,
@@ -47,8 +47,8 @@ module Ardm
         FOR_ARRAY[operator]
       end
 
-      def to_arel(arel_table, value)
-        Ardm::Query::Expression.new(arel_table, target, operator, value)
+      def to_arel(relation, value)
+        Ardm::Query::Expression.new(relation, target, self, value)
       end
 
       private