ninja-model 0.5.7 → 0.6.0

data/.gitignore

@@ -17,3 +17,4 @@ Gemfile.lock
 .bundle
 *.gem
 .rspec
+.rvmrc

data/lib/ninja_model/base.rb

@@ -90,10 +90,14 @@ module NinjaModel
 
     def initialize(attributes = nil)
       @attributes = attributes_from_model_attributes
-      self.attributes = attributes unless attributes.nil?
       @persisted = false
       @readonly = true
       @destroyed = false
+
+      populate_with_current_scope_attributes
+
+      self.attributes = attributes unless attributes.nil?
+
       result = yield self if block_given?
       _run_initialize_callbacks
       result
@@ -103,9 +107,21 @@ module NinjaModel
       @attributes = record.stringify_keys
       @readonly = @destroyed = false
       @persisted = true
+
+      populate_with_current_scope_attributes
+
       _run_find_callbacks
       _run_initialize_callbacks
       self
     end
+
+    private
+
+    def populate_with_current_scope_attributes
+      if scope = self.class.send(:current_scoped_methods)
+        create_with = scope.scope_for_create
+        create_with.each { |att, value| self.respond_to?(:"#{att}=") && self.send("#{att}=", value) } if create_with
+      end
+    end
   end
 end

data/lib/ninja_model/relation.rb

@@ -30,6 +30,12 @@ module NinjaModel
       end
     end
 
+    def new(*args, &block)
+      scoping { @klass.new(*args, &block) }
+    end
+
+    alias build new
+
     def to_a
       @records ||= begin
         records = @klass.adapter.read(self)
@@ -65,6 +71,17 @@ module NinjaModel
       to_a.inspect
     end
 
+    def scope_for_create
+      Hash[@predicates.find_all { |w|
+        w.respond_to?(:meth) && w.meth == :eq
+      }.map { |where|
+        [
+          where.attribute,
+          where.value
+        ]
+      }]
+    end
+
     protected
 
     def method_missing(method, *args, &block)

data/lib/ninja_model/version.rb

@@ -1,3 +1,3 @@
 module NinjaModel
- VERSION = "0.5.7"
+ VERSION = "0.6.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ninja-model
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 0
-  - 5
-  - 7
-  version: 0.5.7
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Josh Williams
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-21 00:00:00 -05:00
-default_executable: 
+date: 2011-10-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -181,7 +180,6 @@ files:
 - spec/spec_helper.rb
 - spec/support/active_model_lint.rb
 - spec/support/matchers/convert.rb
-has_rdoc: true
 homepage: http://github.com/t3hpr1m3/ninja-model.git
 licenses: []
 
@@ -211,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ninja-model
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Pseudo-ORM for Ruby
@@ -235,3 +233,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/active_model_lint.rb
 - spec/support/matchers/convert.rb
+has_rdoc: