ninja-model 0.7.3 → 0.8.0

data/lib/ninja_model/base.rb

@@ -14,6 +14,7 @@ require 'active_record/aggregations'
 
 module NinjaModel
   class Base
+    include Callbacks
     include AttributeMethods
     include Identity
     include Persistence

data/lib/ninja_model/callbacks.rb

@@ -1,5 +1,9 @@
 module NinjaModel
-  class Base
-    extend ActiveModel::Callbacks
+  module Callbacks
+    extend ActiveSupport::Concern
+
+    included do
+      extend ActiveModel::Callbacks
+    end
   end
 end

data/lib/ninja_model/persistence.rb

@@ -1,61 +1,64 @@
 module NinjaModel
-  class Base
-    define_model_callbacks :save, :create, :update, :destroy
-  end
-
   module Persistence
+    extend ActiveSupport::Concern
 
-    def save(*)
-      run_callbacks :save do
-        result = new_record? ? create : update
-        changed_attributes.clear if result
-        result
-      end
+    included do
+      define_model_callbacks :save, :create, :update, :destroy
     end
 
-    def create
-      run_callbacks :create do
-        if self.class.adapter.create(self)
-          @persisted = true
+    module InstanceMethods
+      def save(*)
+        run_callbacks :save do
+          result = new_record? ? create : update
+          changed_attributes.clear if result
+          result
         end
-        @persisted
       end
-    end
 
-    def update
-      run_callbacks :update do
-        self.class.adapter.update(self)
+      def create
+        run_callbacks :create do
+          if self.class.adapter.create(self)
+            @persisted = true
+          end
+          @persisted
+        end
       end
-    end
 
-    def new_record?
-      !@persisted
-    end
+      def update
+        run_callbacks :update do
+          self.class.adapter.update(self)
+        end
+      end
 
-    def destroyed?
-      @destroyed
-    end
+      def new_record?
+        !@persisted
+      end
 
-    def persisted?
-      @persisted && !destroyed?
-    end
+      def destroyed?
+        @destroyed
+      end
+
+      def persisted?
+        @persisted && !destroyed?
+      end
 
-    def destroy
-      run_callbacks :destroy do
-        if self.class.adapter.destroy(self)
-          @destroyed = true
+      def destroy
+        run_callbacks :destroy do
+          if self.class.adapter.destroy(self)
+            @destroyed = true
+          end
+          @destroyed
         end
-        @destroyed
       end
-    end
 
-    def reload
-      self.class.adapter.reload(self)
-    end
+      def reload
+        self.class.adapter.reload(self)
+      end
 
-    def update_attributes(attributes)
-      self.attributes = attributes
-      save
+      def update_attributes(attributes)
+        self.attributes = attributes
+        save
+      end
     end
   end
 end

data/lib/ninja_model/rails_ext/active_record.rb

@@ -70,7 +70,9 @@ module NinjaModel
         if NinjaModel.ninja_model?(klass)
           has_one_without_active_record(association_id, options.merge(:class_name => klass.name.underscore))
         else
-          proxy.handle_association(:has_one, association_id, options)
+          reflection = proxy.handle_association(:has_one, association_id, options)
+          write_inheritable_hash :reflections, association_id => reflection
+          reflection
         end
       end
 
@@ -83,7 +85,9 @@ module NinjaModel
         if NinjaModel.ninja_model?(klass)
           belongs_to_without_active_record(association_id, options.merge(:class_name => klass.name.underscore))
         else
-          proxy.handle_association(:belongs_to, association_id, options)
+          reflection = proxy.handle_association(:belongs_to, association_id, options)
+          write_inheritable_hash :reflections, association_id => reflection
+          reflection
         end
       end
 
@@ -96,12 +100,24 @@ module NinjaModel
         if NinjaModel.ninja_model?(klass)
           has_many_without_active_record(association_id, options.merge(:class_name => klass.name.underscore))
         else
-          proxy.handle_association(:has_many, association_id, options)
+          reflection = proxy.handle_association(:has_many, association_id, options)
+          write_inheritable_hash :reflections, association_id => reflection
+          reflection
         end
       end
 
       alias_method_chain :has_many, :active_record
 
+      def reflect_on_association_with_active_record(association_id)
+        if read_inheritable_attribute(:proxy) && proxy.proxy_klass.reflections.include?(association_id)
+          proxy.proxy_klass.reflect_on_association(association_id)
+        else
+          reflect_on_association_without_active_record(association_id)
+        end
+      end
+
+      alias_method_chain :reflect_on_association, :active_record
+
       def proxy
         read_inheritable_attribute(:proxy) || write_inheritable_attribute(:proxy, Associations::ActiveRecordProxy.new(self))
       end
@@ -126,6 +142,7 @@ module NinjaModel
 
   module Associations
     class ActiveRecordProxy
+      attr_reader :proxy_klass
       def initialize(ninja_model)
         @klass = ninja_model
         @klass.class_eval do

data/lib/ninja_model/validation.rb

@@ -1,15 +1,15 @@
 module NinjaModel
-  class Base
-    include ActiveModel::Validations
-    define_model_callbacks :validation
-  end
 
   module Validation
+    extend ActiveSupport::Concern
+
+    included do
+      include ActiveModel::Validations
+      define_model_callbacks :validation
+    end
 
     def save(options={})
-      run_callbacks :validation do
-        valid?(options.is_a?(Hash) ? options[:context] : nil) ? super : false
-      end
+      perform_validations(options) ? super : false
     end
 
     def valid?(context = nil)
@@ -17,5 +17,12 @@ module NinjaModel
       output = super(context)
       errors.empty? && output
     end
+
+    protected
+
+    def perform_validations(options)
+      perform_validation = options[:validate] != false
+      perform_validation ? valid?(options[:context]) : true
+    end
   end
 end

data/lib/ninja_model/version.rb

@@ -1,3 +1,3 @@
 module NinjaModel
- VERSION = "0.7.3"
+ VERSION = "0.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ninja-model
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000Z
+date: 2012-02-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &13910660 !ruby/object:Gem::Requirement
+  requirement: &9709260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *13910660
+  version_requirements: *9709260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &13909960 !ruby/object:Gem::Requirement
+  requirement: &9708520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *13909960
+  version_requirements: *9708520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13909200 !ruby/object:Gem::Requirement
+  requirement: &9705000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *13909200
+  version_requirements: *9705000
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &13908580 !ruby/object:Gem::Requirement
+  requirement: &9704320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *13908580
+  version_requirements: *9704320
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &13907940 !ruby/object:Gem::Requirement
+  requirement: &9703640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *13907940
+  version_requirements: *9703640
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &13907120 !ruby/object:Gem::Requirement
+  requirement: &9702980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.5.10
   type: :development
   prerelease: false
-  version_requirements: *13907120
+  version_requirements: *9702980
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &13906300 !ruby/object:Gem::Requirement
+  requirement: &9702340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *13906300
+  version_requirements: *9702340
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &13905640 !ruby/object:Gem::Requirement
+  requirement: &9701740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.7.4
   type: :development
   prerelease: false
-  version_requirements: *13905640
+  version_requirements: *9701740
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &13899780 !ruby/object:Gem::Requirement
+  requirement: &9701160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +109,7 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *13899780
+  version_requirements: *9701160
 description: Pseudo-ORM for Ruby/Rails with an ActiveRecord-like interface
 email: theprime@codingprime.com
 executables: []
@@ -190,7 +190,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3063035657045402617
+      hash: -1070647489390734539
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3063035657045402617
+      hash: -1070647489390734539
 requirements: []
 rubyforge_project: ninja-model
 rubygems_version: 1.8.10