ardm 0.2.4 → 0.2.5

data/lib/ardm/active_record/associations.rb

@@ -54,6 +54,12 @@ module Ardm
       end
 
       module ClassMethods
+        # The reflections returned here don't look like datamapper relationships.
+        # @todo improve this if needed with a wrapper
+        def relationships
+          reflections
+        end
+
         def dump_associations_hash(options)
           options.inject({}) do |new_attrs, (key, value)|
             if reflection = reflect_on_association(key.to_sym)

data/lib/ardm/active_record/base.rb

@@ -6,6 +6,7 @@ require 'ardm/active_record/finalize'
 require 'ardm/active_record/hooks'
 require 'ardm/active_record/is'
 require 'ardm/active_record/inheritance'
+require 'ardm/active_record/persistence'
 require 'ardm/active_record/property'
 require 'ardm/active_record/query'
 require 'ardm/active_record/repository'
@@ -41,6 +42,7 @@ module Ardm
       include Ardm::ActiveRecord::Dirty
       include Ardm::ActiveRecord::Is
       include Ardm::ActiveRecord::Inheritance
+      include Ardm::ActiveRecord::Persistence
       include Ardm::ActiveRecord::Property
       include Ardm::ActiveRecord::Query
       include Ardm::ActiveRecord::Repository

data/lib/ardm/active_record/persistence.rb

@@ -0,0 +1,70 @@
+require 'active_support/concern'
+
+module Ardm
+  module ActiveRecord
+    module Persistence
+      extend ActiveSupport::Concern
+
+      included do
+        class_attribute :raise_on_save_failure, instance_accessor: true
+        self.raise_on_save_failure = false
+      end
+
+      module ClassMethods
+        def update(*a)
+          options = dump_properties_hash(a.first)
+          options = dump_associations_hash(options)
+          assert_valid_attributes(options)
+          update_all(options) != 0
+        end
+
+        def update!(*a)
+          options = dump_properties_hash(a.first)
+          options = dump_associations_hash(options)
+          assert_valid_attributes(options)
+          update_all(options) != 0
+        end
+
+        def destroy(*a)
+          destroy_all
+        end
+
+        def destroy!(*a)
+          delete_all
+        end
+      end
+
+      def destroy
+        self.class.delete(self.send(self.class.primary_key))
+      end
+
+      def new?
+        new_record?
+      end
+
+      def saved?
+        !new_record?
+      end
+
+      def save_self(*args)
+        save(*args)
+      end
+
+      def save!(*args)
+        save(*args) || (raise_on_save_failure && raise(Ardm::SaveFailureError, "Save Failed"))
+      end
+
+      def update(*a)
+        if a.size == 1
+          update_attributes(*a)
+        else
+          super
+        end
+      end
+
+      def update!(*a)
+        update_attributes!(*a)
+      end
+    end
+  end
+end

data/lib/ardm/active_record/property.rb

@@ -87,6 +87,19 @@ module Ardm
           @properties ||= PropertySet.new
         end
 
+        def timestamps(at=:at)
+          case at
+          when :at
+            property :created_at, DateTime
+            property :updated_at, DateTime
+          when :on
+            property :created_on, Date
+            property :updated_on, Date
+          else
+            raise ArgumentError, "Unknown argument: timestamps(#{at.inspect})"
+          end
+        end
+
         def initialize_attributes(attributes, options = {})
           super(attributes, options)
 
@@ -306,6 +319,18 @@ module Ardm
         end
       end
 
+      def assign_attributes(attrs, *a)
+        new_attrs = attrs.inject({}) do |memo,(name,value)|
+          if property = self.class.properties[name]
+            memo[property.field] = property.typecast(value)
+          else
+            memo[name] = value
+          end
+          memo
+        end
+        super new_attrs, *a
+      end
+
       # Retrieve the key(s) for this resource.
       #
       # This always returns the persisted key value,

data/lib/ardm/active_record/query.rb

@@ -26,6 +26,10 @@ module Ardm
       end
 
       module ClassMethods
+        def execute_sql(sql)
+          connection.execute(sql)
+        end
+
         # hook into query engine in the most general way possible
         def expand_hash_conditions_for_aggregates(options)
           complex, simple = options.partition {|k,v| Ardm::Query::Operator === k }

data/lib/ardm/active_record/record.rb

@@ -9,15 +9,6 @@ module Ardm
 
       self.abstract_class = true
 
-      class_attribute :raise_on_save_failure
-      self.raise_on_save_failure = false
-
-      JSON = Json
-
-      def self.execute_sql(sql)
-        connection.execute(sql)
-      end
-
       def self.property(property_name, property_type, options={})
         prop = super
         begin
@@ -29,89 +20,6 @@ module Ardm
         end
         prop
       end
-
-      # no-op in active record
-      def self.timestamps(at=:at)
-        case at
-        when :at
-          property :created_at, DateTime
-          property :updated_at, DateTime
-        when :on
-          property :created_on, Date
-          property :updated_on, Date
-        else
-          raise ArgumentError, "Unknown argument: timestamps(#{at.inspect})"
-        end
-      end
-
-      # The reflections returned here don't look like datamapper relationships.
-      # @todo improve this if needed with a wrapper
-      def self.relationships
-        reflections
-      end
-
-      def self.update(*a)
-        options = dump_properties_hash(a.first)
-        options = dump_associations_hash(options)
-        assert_valid_attributes(options)
-        update_all(options) != 0
-      end
-
-      def self.update!(*a)
-        options = dump_properties_hash(a.first)
-        options = dump_associations_hash(options)
-        assert_valid_attributes(options)
-        update_all(options) != 0
-      end
-
-      def self.destroy(*a)
-        destroy_all
-      end
-
-      def self.destroy!(*a)
-        delete_all
-      end
-
-      def destroy
-        self.class.delete(self.send(self.class.primary_key))
-      end
-
-      def new?
-        new_record?
-      end
-
-      def saved?
-        !new_record?
-      end
-
-      def save_self(*args)
-        save(*args)
-      end
-
-      def save!(*args)
-        save(*args) || (raise_on_save_failure && raise(Ardm::SaveFailureError, "Save Failed"))
-      end
-
-      def update(*a)
-        if a.size == 1
-          update_attributes(*a)
-        else
-          super
-        end
-      end
-
-      def update!(*a)
-        update_attributes!(*a)
-      end
-
-      #active record internals for detecting if this method should exist as an attribute
-      #if attribute_method_matcher(:open)
-      #  def open
-      #    read_attribute(:open)
-      #    #attribute_missing(match, *args, &block)
-      #  end
-      #end
-
     end
   end
 end

data/lib/ardm/active_record/relation.rb

@@ -32,15 +32,15 @@ module Ardm
           end
 
           def first_or_create(attributes = nil, options = {}, &block)
-            first(attributes) || create(attributes, options, &block)
+            all(attributes).first || all(attributes).create(options, &block)
           end
 
           def first_or_create!(attributes = nil, options = {}, &block)
-            first(attributes) || create!(attributes, options, &block)
+            all(attributes).first || all(attributes).create!(options, &block)
           end
 
           def first_or_initialize(attributes = nil, options = {}, &block)
-            first(attributes) || create(attributes, options, &block)
+            all(attributes).first || all(attributes).create(options, &block)
           end
         end
       end
@@ -62,7 +62,7 @@ module Ardm
       # 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
       # methods that act more like the datamapper finders.
-      def apply_finder_options(options)
+      def apply_finder_options(options, *args)
         relation = clone
         return relation if options.nil?
 

data/lib/ardm/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ardm
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -193,6 +193,7 @@ files:
 - lib/ardm/active_record/inheritance.rb
 - lib/ardm/active_record/is.rb
 - lib/ardm/active_record/is/state_machine.rb
+- lib/ardm/active_record/persistence.rb
 - lib/ardm/active_record/predicate_builder.rb
 - lib/ardm/active_record/predicate_builder/array_handler.rb
 - lib/ardm/active_record/predicate_builder/rails3.rb
@@ -275,7 +276,6 @@ files:
 - lib/ardm/support/subject_set.rb
 - lib/ardm/version.rb
 - spec/ardm/datamapper_constants_spec.rb
-- spec/ardm/record_forwarding_spec.rb
 - spec/fixtures/api_user.rb
 - spec/fixtures/article.rb
 - spec/fixtures/bookmark.rb

data/spec/ardm/record_forwarding_spec.rb

@@ -1,20 +0,0 @@
-require 'spec_helper'
-require 'ardm/data_mapper/record'
-
-describe Ardm::DataMapper::Record do
-  it 'responds to finalize' do
-    expect(described_class.respond_to?(:finalize)).to be_truthy
-  end
-
-  it 'responds to repository' do
-    expect(described_class.respond_to?(:repository)).to be_truthy
-  end
-
-  it 'responds to logger' do
-    expect(described_class.respond_to?(:logger)).to be_truthy
-  end
-
-  it 'responds to logger=' do
-    expect(described_class.respond_to?(:logger=)).to be_truthy
-  end
-end