ninja-model 0.6.2 → 0.7.0

data/.gitignore

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

data/.rvmrc

@@ -0,0 +1 @@
+rvm use 1.9.2@ninja-model

data/Gemfile

@@ -1,2 +1,7 @@
 source "http://rubygems.org"
 gemspec
+
+group :test, :development do
+  gem 'yard'
+  gem 'simplecov', :require => false
+end

data/Guardfile

@@ -0,0 +1,19 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+  # Capybara request specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
+end
+

data/Rakefile

@@ -1,31 +1,21 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
+#!/usr/bin/env rake
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
 
-require 'rake'
-require 'rake/rdoctask'
 require 'rspec/core/rake_task'
+require 'yard'
 
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.verbose = false
-end
 
-desc 'Run specs with documentation format'
-RSpec::Core::RakeTask.new(:specd) do |t|
+RSpec::Core::RakeTask.new(:spec) do |t|
   t.verbose = false
-  t.rspec_opts = '--format d'
+  t.pattern = 'spec/**/*_spec.rb'
 end
 
-Rake::RDocTask.new do |r|
-  r.rdoc_dir = 'doc/html'
-  r.main = "README.md"
-  r.rdoc_files.include('README.md', 'lib/**/*.rb')
-  r.rdoc_files.exclude('lib/generators/**/*')
+YARD::Rake::YardocTask.new do |t|
+  t.options = ['--exclude', 'generators']
 end
 
-namespace :spec do
-  RSpec::Core::RakeTask.new(:rcov) do |t|
-    t.rcov = true
-    t.rcov_opts = %w{--text-report --sort coverage}
-    t.rcov_opts << %w{--exclude gems\/,spec\/}
-  end
-end
+Bundler::GemHelper.install_tasks

data/lib/ninja_model/associations/association_proxy.rb

@@ -1,4 +1,4 @@
-require 'active_record/associations/association_proxy'
+require 'active_record/associations/collection_proxy'
 
 module NinjaModel
   module Associations

data/lib/ninja_model/associations/has_many_association.rb

@@ -11,6 +11,8 @@ module NinjaModel
       def method_missing(method, *args)
         if @relation.respond_to?(method)
           @relation.send(method, *args)
+        elsif @relation.klass.respond_to?(method)
+          @relation.klass.send(method, *args)
         else
           super
         end

data/lib/ninja_model/attribute_methods.rb

@@ -4,8 +4,8 @@ module NinjaModel
     include ActiveModel::AttributeMethods
     include ActiveModel::Dirty
 
-    class_inheritable_accessor :model_attributes
-    self.model_attributes = []
+    #class_attribute :model_attributes
+    #self.model_attributes = []
     attribute_method_suffix('', '=', '_before_type_cast')
 
     class << self

data/lib/ninja_model/base.rb

@@ -32,10 +32,21 @@ module NinjaModel
 
     define_model_callbacks :initialize, :find, :touch, :only => :after
 
-    class_inheritable_accessor :default_scoping, :instance_writer => false
-    self.default_scoping = []
-
     class << self
+      def inherited(subclass)
+        subclass.class_attribute :model_attributes
+        if self.respond_to?(:model_attributes)
+          subclass.model_attributes = self.model_attributes.dup
+        else
+          subclass.model_attributes = []
+        end
+        subclass.class_attribute :default_scoping
+        if self.respond_to?(:default_scoping)
+          subclass.default_scoping = self.default_scoping.dup
+        else
+          subclass.default_scoping = []
+        end
+      end
 
       delegate :find, :first, :last, :all, :exists?, :to => :scoped
       delegate :where, :order, :limit, :to => :scoped
@@ -62,6 +73,10 @@ module NinjaModel
         self.default_scoping << build_finder_relation(options, default_scoping.pop)
       end
 
+      def current_scope
+        current_scoped_methods
+      end
+
       def current_scoped_methods
         last = scoped_methods.last
         last.is_a?(Proc) ? unscoped(&last) : last
@@ -78,6 +93,31 @@ module NinjaModel
         relation = scope.merge(relation) if scope
         relation
       end
+
+      def compute_type(type_name)
+        if type_name.match(/^::/)
+          # If the type is prefixed with a scope operator then we assume that
+          # the type_name is an absolute reference.
+          ActiveSupport::Dependencies.constantize(type_name)
+        else
+          # Build a list of candidates to search for
+          candidates = []
+          name.scan(/::|$/) { candidates.unshift "#{$`}::#{type_name}" }
+          candidates << type_name
+
+          candidates.each do |candidate|
+            begin
+              constant = ActiveSupport::Dependencies.constantize(candidate)
+              return constant if candidate == constant.to_s
+            rescue NameError => e
+              # We don't want to swallow NoMethodError < NameError errors
+              raise e unless e.instance_of?(NameError)
+            end
+          end
+
+          raise NameError, "uninitialized constant #{candidates.first}"
+        end
+      end
     end
 
     def attributes
@@ -90,6 +130,8 @@ module NinjaModel
 
     def initialize(attributes = nil)
       @attributes = attributes_from_model_attributes
+      @association_cache = {}
+      @aggregation_cache = {}
       @persisted = false
       @readonly = true
       @destroyed = false
@@ -115,6 +157,13 @@ module NinjaModel
       self
     end
 
+    def derive_class(association_id)
+      klass = association_id.to_s.camelize
+      klass = klass.singularize
+      compute_type(klass)
+    end
+
+
     private
 
     def populate_with_current_scope_attributes

data/lib/ninja_model/identity.rb

@@ -1,6 +1,6 @@
 module NinjaModel
   class Base
-    class_inheritable_accessor :primary_key
+    class_attribute :primary_key
     self.primary_key = :id
     undef_method(:id) if method_defined?(:id)
   end

data/lib/ninja_model/rails_ext/active_record.rb

@@ -4,14 +4,31 @@ module ActiveRecord
   class Base
     class << self
       def has_one_with_ninja_model(association_id, options = {})
-        if NinjaModel.ninja_model?(options[:class_name] || association_id)
-          ninja_proxy.handle_association(:has_one, association_id, options)
+        klass = options[:class_name] || association_id
+        klass = klass.to_s.camelize
+        klass = klass.singularize
+        klass = compute_type(klass)
+        if NinjaModel.ninja_model?(klass)
+          ninja_proxy.handle_association(:has_one, association_id, options.merge({:class_name => klass.name}))
         else
           has_one_without_ninja_model(association_id, options)
         end
       end
       alias_method_chain :has_one, :ninja_model
 
+      def has_many_with_ninja_model(association_id, options = {})
+        klass = options[:class_name] || association_id
+        klass = klass.to_s.camelize
+        klass = klass.singularize
+        klass = compute_type(klass)
+        if NinjaModel.ninja_model?(klass)
+          ninja_proxy.handle_association(:has_many, association_id, options.merge({:class_name => klass.name}))
+        else
+          has_many_without_ninja_model(association_id, options)
+        end
+      end
+      alias_method_chain :has_many, :ninja_model
+
       def reflect_on_association_with_ninja_model(association)
         if read_inheritable_attribute(:ninja_proxy) && ninja_proxy.proxy_klass.reflections.include?(association)
           ninja_proxy.proxy_klass.reflect_on_association(association)
@@ -47,8 +64,11 @@ module NinjaModel
   class Base
     class << self
       def has_one_with_active_record(association_id, options = {})
-        if ninja_model?(:has_one, options[:class_name] || association_id)
-          has_one_without_active_record(association_id, options)
+        klass = options[:class_name] || association_id
+        klass = klass.to_s.camelize
+        klass = compute_type(klass)
+        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)
         end
@@ -57,8 +77,11 @@ module NinjaModel
       alias_method_chain :has_one, :active_record
 
       def belongs_to_with_active_record(association_id, options = {})
-        if ninja_model?(:belongs_to, options[:class_name] || association_id)
-          belongs_to_without_active_record(association_id, options)
+        klass = options[:class_name] || association_id
+        klass = klass.to_s.camelize
+        klass = compute_type(klass)
+        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)
         end
@@ -67,8 +90,11 @@ module NinjaModel
       alias_method_chain :belongs_to, :active_record
 
       def has_many_with_active_record(association_id, options = {})
-        if ninja_model?(:has_many, association_id)
-          has_many_without_active_record(association_id, options)
+        klass = options[:class_name] || association_id
+        klass = klass.to_s.camelize.singularize
+        klass = compute_type(klass)
+        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)
         end
@@ -120,6 +146,17 @@ module NinjaModel
           def self.column(name, sql_type = nil, default = nil)
             self.columns << ActiveRecord::ConnectionAdapters::Column.new(name, nil, sql_type.to_s, default)
           end
+
+          def self.columns_hash
+            h = {}
+            self.columns.each do |c|
+              h[c.name] = c
+            end
+            h
+          end
+          def self.column_defaults
+            self.columns_hash
+          end
         end
 
         @klass.model_attributes.each do |attr|
@@ -145,7 +182,7 @@ module NinjaModel
       private
 
       def derive_foreign_key
-        "#{@klass.name.underscore}_id".to_sym
+        "#{@klass.name.demodulize.underscore}_id".to_sym
       end
     end
 
@@ -163,7 +200,7 @@ module NinjaModel
           end
         end
 
-        @proxy_klass = active_record.parent.const_set("#{@klass.model_name}Proxy", Class.new(NinjaModel::Base))
+        @proxy_klass = active_record.parent.const_set("#{@klass.model_name.demodulize}Proxy", Class.new(NinjaModel::Base))
 
         @klass.columns_hash.each_pair do |k,v|
           @proxy_klass.send :attribute, k, v.type, v.default, @proxy_klass
@@ -188,7 +225,7 @@ module NinjaModel
       private
 
       def derive_foreign_key
-        "#{@klass.name.underscore}_id".to_sym
+        "#{@klass.name.demodulize.underscore}_id".to_sym
       end
     end
   end

data/lib/ninja_model/railtie.rb

@@ -7,7 +7,9 @@ module NinjaModel
       "NinjaModel::Adapters::AdapterManagement"
 
     initializer 'ninja_model.logger' do |app|
-      NinjaModel::set_logger(Rails.logger)
+      if NinjaModel.logger.nil?
+        NinjaModel::set_logger(Rails.logger)
+      end
     end
 
     initializer 'ninja_model_extend_active_record' do |app|
@@ -17,7 +19,7 @@ module NinjaModel
     end
 
     initializer 'ninja_model_load_specs' do |app|
-      config_path = File.join(app.paths.config.to_a.first, "ninja_model.yml")
+      config_path = File.join(app.paths['config'].to_a.first, "ninja_model.yml")
       if File.exists?(config_path)
         require 'erb'
         require 'yaml'

data/lib/ninja_model/reflection.rb

@@ -10,13 +10,6 @@ module NinjaModel
         reflection
       end
 
-      def ninja_model?(macro, association)
-        klass = association.to_s.camelize
-        klass = klass.singularize unless [:has_one, :belongs_to].include?(macro)
-        klass = klass.constantize
-        defined?(klass) && klass.ancestors.include?(NinjaModel::Base)
-      end
-
       def reflections
         read_inheritable_attribute(:reflections) || write_inheritable_attribute(:reflections, {})
       end
@@ -37,7 +30,7 @@ module NinjaModel
       attr_reader :ninja_model, :name, :macro, :options
 
       def klass
-        @klass ||= class_name.constantize
+        @klass ||= class_name.camelize.constantize
       end
 
       def class_name
@@ -71,6 +64,7 @@ module NinjaModel
 
       def primary_key_name
         @primary_key_name ||= options[:foreign_key] || derive_primary_key_name
+        @primary_key_name
       end
 
       def association_foreign_key
@@ -103,7 +97,7 @@ module NinjaModel
         elsif options[:as]
           "#{options[:as]}_id"
         else
-          ninja_model.name.foreign_key
+          ninja_model.name.demodulize.foreign_key
         end
       end
     end

data/lib/ninja_model/relation.rb

@@ -11,6 +11,8 @@ module NinjaModel
     attr_reader :klass, :loaded
 
     attr_accessor :ordering, :predicates, :limit_value, :offset_value
+    attr_accessor :default_scoped
+    alias :default_scoped? :default_scoped
 
     alias :loaded? :loaded
 
@@ -20,6 +22,7 @@ module NinjaModel
     def initialize(klass)
       @klass  = klass
       @loaded = false
+      @default_scoped = false
 
       SINGLE_VALUE_ATTRS.each do |v|
         instance_variable_set("@#{v}_value".to_sym, nil)
@@ -87,8 +90,8 @@ module NinjaModel
     def method_missing(method, *args, &block)
       if Array.method_defined?(method)
         to_a.send(method, *args, &block)
-      elsif @klass.scopes[method]
-        merge(@klass.send(method, *args, &block))
+      elsif @klass.singleton_class.respond_to?(method)
+        merge(@klass.singleton_class.send(method, *args, &block))
       elsif @klass.respond_to?(method)
         scoping { @klass.send(method, *args, &block) }
       else

data/lib/ninja_model/version.rb

@@ -1,3 +1,3 @@
 module NinjaModel
- VERSION = "0.6.2"
+ VERSION = "0.7.0"
 end

data/ninja-model.gemspec

@@ -18,11 +18,14 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency 'activerecord', '~> 3.0.3'
+  s.add_dependency 'activerecord',  '~> 3.1.0'
+  s.add_dependency 'rake',          '~> 0.9.2'
 
-  s.add_development_dependency 'rspec',     '~> 2.2.0'
-  s.add_development_dependency 'mocha',     '~> 0.9.8'
-  s.add_development_dependency 'rcov',      '~> 0.9.9'
-  s.add_development_dependency 'nokogiri',  '~> 1.4.4'
-  s.add_development_dependency 'autotest',  '~> 4.4.6'
+  s.add_development_dependency 'rspec',     	'~> 2.8.0'
+  s.add_development_dependency 'mocha',     	'~> 0.10.0'
+  s.add_development_dependency 'nokogiri', 		'~> 1.5.0'
+  s.add_development_dependency 'guard-rspec',	'~> 0.5.10'
+  s.add_development_dependency 'libnotify',		'~> 0.6.0'
+  s.add_development_dependency 'yard',          '~> 0.7.4'
+  s.add_development_dependency 'redcarpet',     '~> 2.0.0'
 end

data/spec/ninja_model/adapters/adapter_pool_spec.rb

@@ -59,24 +59,20 @@ describe NinjaModel::Adapters::AdapterPool do
   end
 
   describe 'clear_stale_cached_instances!' do
+    let(:thread) { mock('Thread') }
+    before { Thread.stubs(:list).returns([thread]) }
     it 'should reap any instances for dead threads' do
-      @thread = mock('Thread') do
-        stubs(:object_id).returns(Thread.current.object_id)
-        stubs(:alive?).returns(false)
-      end
-      Thread.stubs(:list).returns([@thread])
-      @inst = subject.instance
-      subject.expects(:checkin).with(@inst)
+      thread.stubs(:alive?).returns(false)
+      inst = subject.instance
+      subject.instance_variable_set("@assigned_instances".to_sym, {thread.object_id => inst})
+      subject.expects(:checkin).with(inst)
       subject.send :clear_stale_cached_instances!
     end
     it 'should not reap instances for live threads' do
-      @thread = mock('Thread') do
-        stubs(:object_id).returns(Thread.current.object_id)
-        stubs(:alive?).returns(true)
-      end
-      Thread.stubs(:list).returns([@thread])
-      @inst = subject.instance
-      subject.expects(:checkin).with(@inst).never
+      thread.stubs(:alive?).returns(true)
+      inst = subject.instance
+      subject.instance_variable_set("@assigned_instances".to_sym, {thread.object_id => inst})
+      subject.expects(:checkin).with(inst).never
       subject.send :clear_stale_cached_instances!
     end
   end

data/spec/ninja_model/base_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe NinjaModel::Base do
+  class LintTester < NinjaModel::Base; end
+  subject { LintTester.new }
   it_should_behave_like "ActiveModel"
   before {
     @klass = Class.new(NinjaModel::Base)

data/spec/ninja_model/reflection_spec.rb

@@ -12,11 +12,6 @@ describe NinjaModel::Reflection do
   subject { ReflectionModel }
   it { should respond_to(:create_reflection) }
 
-  describe 'ninja_model?' do
-    specify { NinjaModel::Base.ninja_model?(:has_one, :bare_model).should be_false }
-    specify { NinjaModel::Base.ninja_model?(:has_one, :reflection_model).should be_true }
-  end
-
   describe 'create_reflection' do
     it 'should store the reflections on the class' do
       @klass = Class.new(NinjaModel::Base)

data/spec/ninja_model_spec.rb

@@ -4,8 +4,10 @@ describe NinjaModel do
   it { NinjaModel.should respond_to(:logger) }
 
   it 'should accept a logger' do
+    orig_logger = NinjaModel.logger
     logger = mock('logger')
     NinjaModel.set_logger(logger)
     NinjaModel.logger.should eql(logger)
+    NinjaModel.set_logger(orig_logger)
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,10 @@
-require 'bundler/setup'
-Bundler.require(:default)
+require 'simplecov'
+SimpleCov.start do
+  add_filter 'spec'
+end
+#Bundler.require(:default)
 require 'rspec/core'
+require 'ninja-model'
 
 Dir[File.join(File.expand_path('../', __FILE__), 'support/**/*.rb')].each { |f| require f }
 

metadata

@@ -1,129 +1,125 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ninja-model
-version: !ruby/object:Gem::Version 
-  hash: 3
+version: !ruby/object:Gem::Version
+  version: 0.7.0
   prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 2
-  version: 0.6.2
 platform: ruby
-authors: 
+authors:
 - Josh Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-01 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-08 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
+  requirement: &18010860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *18010860
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &18009460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 0
-        - 3
-        version: 3.0.3
+      - !ruby/object:Gem::Version
+        version: 0.9.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *18009460
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &18008360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        - 0
-        version: 2.2.0
+      - !ruby/object:Gem::Version
+        version: 2.8.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *18008360
+- !ruby/object:Gem::Dependency
   name: mocha
+  requirement: &18007400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *18007400
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &18006220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 9
-        - 8
-        version: 0.9.8
+      - !ruby/object:Gem::Version
+        version: 1.5.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *18006220
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &18005500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 0
-        - 9
-        - 9
-        version: 0.9.9
+      - !ruby/object:Gem::Version
+        version: 0.5.10
+  type: :development
+  prerelease: false
+  version_requirements: *18005500
+- !ruby/object:Gem::Dependency
+  name: libnotify
+  requirement: &18004480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *18004480
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &17959740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 4
-        - 4
-        version: 1.4.4
+      - !ruby/object:Gem::Version
+        version: 0.7.4
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: autotest
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *17959740
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: &17958800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 35
-        segments: 
-        - 4
-        - 4
-        - 6
-        version: 4.4.6
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: *17958800
 description: Pseudo-ORM for Ruby/Rails with an ActiveRecord-like interface
 email: theprime@codingprime.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .rvmrc
 - Gemfile
+- Guardfile
 - README.md
 - Rakefile
 - autotest/discover.rb
@@ -182,38 +178,35 @@ files:
 - spec/support/matchers/convert.rb
 homepage: http://github.com/t3hpr1m3/ninja-model.git
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1842853919456186236
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 1842853919456186236
 requirements: []
-
 rubyforge_project: ninja-model
-rubygems_version: 1.7.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Pseudo-ORM for Ruby
-test_files: 
+test_files:
 - spec/ninja_model/adapters/abstract_adapter_spec.rb
 - spec/ninja_model/adapters/adapter_manager_spec.rb
 - spec/ninja_model/adapters/adapter_pool_spec.rb