ardm 0.2.5 → 0.2.6

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+
+rvm:
+- 1.9.3
+- 2.0
+- 2.2
+
+script: bundle exec rake
+
+notifications:
+  email: false

data/Gemfile

@@ -10,7 +10,7 @@ group :test do
   gem 'sqlite3'
   gem 'activerecord', '~> 4.0.0'
   gem 'addressable'
-  gem 'database_cleaner', git: "git://github.com/lanej/database_cleaner.git", branch: "datamapper-fix"
+  gem 'database_cleaner'
   gem 'rspec-its'
 end
 

data/lib/ardm.rb

@@ -1,3 +1,5 @@
+require 'ardm/deprecation'
+
 module Ardm
   NotImplemented = Class.new(RuntimeError)
 

data/lib/ardm/active_record/associations.rb

@@ -5,19 +5,6 @@ module Ardm
     module Associations
       extend ActiveSupport::Concern
 
-      def assign_attributes(attrs, *a)
-        new_attrs = attrs.inject({}) do |memo,(k,v)|
-          if assoc = self.class.reflect_on_association(k)
-            memo[assoc.foreign_key] = v && v.send(v.class.primary_key)
-          else
-            memo[k] = v
-          end
-          memo
-        end
-        super new_attrs, *a
-      end
-
-
       # Convert options from DM style to AR style.
       #
       # Keep any unknown keys to use as conditions.
@@ -27,6 +14,7 @@ module Ardm
         ar = options.dup
         ar[:class_name]  = ar.delete(:model)      if ar[:model]
         ar[:foreign_key] = ar.delete(:child_key)  if ar[:child_key]
+        ar[:source]      = ar.delete(:via)        if ar[:via]
         ar[:foreign_key] = ar[:foreign_key].first if ar[:foreign_key].respond_to?(:to_ary)
 
         if ar[:foreign_key] && property = klass.properties[ar[:foreign_key]]
@@ -93,10 +81,12 @@ module Ardm
           options.delete(:required)
           opts = Ardm::ActiveRecord::Associations.convert_options(self, options)
           super field, *opts
-          assoc = reflect_on_association(field)
-          Ardm::ActiveRecord::Record.on_finalize << lambda do
-            self.class_eval do
-              property assoc.foreign_key, assoc.klass.key.first.class, key: false
+          klass = self
+          Ardm::ActiveRecord::Finalize.on_finalize do
+            assoc = reflect_on_association(field)
+            klass.class_eval do
+              # @todo String is a hack... hoping AR can convert strings to integers during save for integer keys.
+              property assoc.foreign_key, assoc.primary_key_column.sql_type == "Integer" ? Integer : String, key: false
             end
           end
           nil
@@ -118,18 +108,11 @@ module Ardm
           end
 
           options[:order] = Ardm::ActiveRecord::Query.order(self, options[:order]) if options[:order]
-          opts = Ardm::ActiveRecord::Associations.convert_options(self, options, :through, :order)
+          opts = Ardm::ActiveRecord::Associations.convert_options(self, options, :through, :order, :source)
 
-          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
+          case count
+          when 1      then has_one  name, *opts
+          when "many" then has_many name, *opts
           end
         end
 

data/lib/ardm/active_record/persistence.rb

@@ -46,8 +46,16 @@ module Ardm
         !new_record?
       end
 
-      def save_self(*args)
-        save(*args)
+      def save_self(run_callbacks=true)
+        save(run_callbacks)
+      end
+
+      def save(run_callbacks=true)
+        unless run_callbacks
+          raise Ardm::NotImplemented, "ActiveRecord doesn't support saving without callbacks"
+        end
+
+        super() # no args!
       end
 
       def save!(*args)

data/lib/ardm/active_record/relation.rb

@@ -9,6 +9,8 @@ module Ardm
       included do
         alias_method :destory_without_ardm, :destroy
         alias_method :update_without_ardm, :update
+        alias_method :first_without_ardm, :first
+        alias_method :first_without_ardm!, :first!
 
         # we need to overrite the implementation in the class
         class_eval do
@@ -31,6 +33,22 @@ module Ardm
             end
           end
 
+          def first(*args)
+            if args.any?
+              all(*args).first_without_ardm
+            else
+              first_without_ardm
+            end
+          end
+
+          def first!(*args)
+            if args.any?
+              all(*args).first_without_ardm!
+            else
+              first_without_ardm!
+            end
+          end
+
           def first_or_create(attributes = nil, options = {}, &block)
             all(attributes).first || all(attributes).create(options, &block)
           end
@@ -45,6 +63,12 @@ module Ardm
         end
       end
 
+      def method_missing(meth, *a, &b)
+        super
+      rescue => e
+        raise NoMethodError, "Relation chain? #{self}.#{meth}\n#{e}"
+      end
+
       def all(options={})
         apply_finder_options(options)
       end

data/lib/ardm/data_mapper.rb

@@ -1,3 +1,4 @@
+require 'ardm'
 require 'ardm/data_mapper/record'
 
 module Ardm

data/lib/ardm/data_mapper/collection.rb

@@ -0,0 +1,18 @@
+DataMapper::Collection.class_eval do
+
+  alias_method :old_delegate_to_relationship, :delegate_to_relationship
+
+  def delegate_to_relationship(relationship, query = nil)
+    Ardm::Deprecation.warn("Relation chain #{model.name}.#{relationship.name}")
+    old_delegate_to_relationship(relationship, query)
+  end
+
+  def includes(*)
+    self
+  end
+
+  def references(*)
+    self
+  end
+end
+

data/lib/ardm/data_mapper/record.rb

@@ -1,5 +1,6 @@
 require 'active_support/concern'
 require 'dm-core'
+require 'ardm/data_mapper/collection'
 
 module Ardm
   module DataMapper

data/lib/ardm/deprecation.rb

@@ -0,0 +1,24 @@
+module Ardm
+  module Deprecation
+    def self.deprecations
+      @deprecations ||= begin
+                          at_exit { print_deprecations }
+                          {}
+                        end
+    end
+
+    def self.print_deprecations
+      $stderr.puts 'Deprecations by count:'
+      $stderr.puts deprecations.sort_by { |_,v| -v }.map { |message, count| "[%5d] %s" % [count, message] }
+    end
+
+    def self.warn(message)
+      message = "DEPRECATED: #{message} at #{caller[2].sub(Rails.root.to_s,'')}"
+      deprecations[message] ||= 0
+      deprecations[message] += 1
+      if deprecations[message] == 1
+        $stderr.puts message
+      end
+    end
+  end
+end

data/lib/ardm/version.rb

@@ -1,3 +1,3 @@
 module Ardm
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ardm
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -174,6 +174,7 @@ extra_rdoc_files:
 files:
 - .gitignore
 - .ruby-version
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -208,7 +209,9 @@ files:
 - lib/ardm/active_record/storage_names.rb
 - lib/ardm/active_record/validations.rb
 - lib/ardm/data_mapper.rb
+- lib/ardm/data_mapper/collection.rb
 - lib/ardm/data_mapper/record.rb
+- lib/ardm/deprecation.rb
 - lib/ardm/env.rb
 - lib/ardm/property.rb
 - lib/ardm/property/api_key.rb