schema_associations 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 757e462b9762015289cb5f2fe1bbbf6bb1c566a4
-  data.tar.gz: 344a36f0f484b1c929e84f38a4c2c1daa9dbacbf
+  metadata.gz: 70205c74f75ca21daa67a8f61fe2d1d929c31190
+  data.tar.gz: 361d1fad6225d77f2a3c082a07ab455275c1c9d5
 SHA512:
-  metadata.gz: 67b28e20707ccac8c97fb0713face550b9c44adbca8102de6149c2fe8caf5326c389a5d9030df1f6ad23e0b3d43c3e1faf9db8d98c47ccd3d1adea67f142d118
-  data.tar.gz: 5d19049e8483c2751f48bb39bf2f09989185a80bfa8dc1d6536e79be60d1ceaab26f3dd5b8f91812d31f1f3cc3b6759a7a98f2896fd91f51c0a2014bbc3b5148
+  metadata.gz: 4404428e7c93f5afe933a10ff82dbed3c4b9dafb3bb9b9540559d24517c5e8bad1fd5a8299ef82f8e5a0f275ae11af617b0bb39051349470a42fa61cac196005
+  data.tar.gz: 6fc59f166f9732dfd794b844e631cf037c1afb8e944b308b2cba25df2538866a260598238239e9c8eb93f4d11c6d72fa470048a90b82d3a60f43631cef5f0fcc

data/.travis.yml

@@ -1,10 +1,11 @@
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
 gemfile:
   - gemfiles/Gemfile.rails-3.2
+  - gemfiles/Gemfile.rails-4.0
 notifications:
   recipients:
     - michal.lomnicki@gmail.com
     - ronen@barzel.org
+    - toby@ovod-everett.org

data/README.md

@@ -1,6 +1,6 @@
 # SchemaAssociations
 
-SchemaAssiciations is an ActiveRecord extension that keeps your model class
+SchemaAssociations is an ActiveRecord extension that keeps your model class
 definitions simpler and more DRY, by automatically defining associations based
 on the database schema.
 
@@ -68,7 +68,7 @@ SchemaAssociations::ActiveRecord#schema_associations, such as:
         schema_associations :concise_names => false
     end
 
-See the[SchemaAssociations::Confg](http://rubydoc.info/gems/schema_associations/SchemaAssociations/Config) for the available options.
+See the [SchemaAssociations::Confg RDOC](http://rubydoc.info/gems/schema_associations/SchemaAssociations/Config) for the available options.
 
 ### This seems cool, but I'm worried about too much automagic
 
@@ -318,12 +318,11 @@ use cases that you logged).
 ## Compatibility
 
 SchemaAssociations supports all combinations of:
-*   rails 3.2
-*   MRI ruby 1.9.2 or 1.9.3
 
+*   Rails 3.2 or rails 4.0
+*   MRI ruby 1.9.3 or 2.0.0
 
-Note: As of version 1.0.0, ruby 1.8.7 and rails < 3.2 are no longer supported.
- The last version to support them is 0.1.2
+Note: As of version 1.0.0, ruby 1.8.7 and rails < 3.2 are no longer supported.  As of version 1.2.0, ruby 1.9.2 is no longer supported.
 
 ## Installation
 
@@ -350,11 +349,15 @@ specific file or example (rather than running the full suite) you can do, e.g.
 
     $ ./runspecs [other options] --rspec -- spec/association_spec.rb -e 'base'
 
-If you're running ruby 1.9, code coverage results will be in
-coverage/index.html -- it should be at 100% coverage.
+Code coverage results will be in coverage/index.html -- it should be at 100% coverage.
 
 ## Release notes:
 
+### 1.2.0
+
+* Works with Rails 4, thanks to [@tovodeverett](https://github.com/tovodeverett)
+* Test against MRI ruby 2.0.0; no longer test against 1.9.2
+
 ### 1.1.0
 
 * New feature: `config.table_prefix_map`

data/gemfiles/Gemfile.rails-4.0

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+gemspec :path => File.expand_path('../..', __FILE__)
+gem "rails", "~> 4.0.0"

data/lib/schema_associations/active_record/associations.rb

@@ -10,7 +10,7 @@ module SchemaAssociations
         end
 
         def initialize_with_schema_associations(klass, *args)
-          klass.send :_load_schema_associations_associations
+          klass.send :_load_schema_associations_associations unless klass.nil?
           initialize_without_schema_associations(klass, *args)
         end
       end
@@ -134,13 +134,21 @@ module SchemaAssociations
             macro = :has_many
             name = names[:has_many]
             if connection.columns(referencing_table_name).any?{ |col| col.name == 'position' }
-              opts[:order] = :position
+              if ::ActiveRecord::VERSION::MAJOR.to_i < 4
+                opts[:order] = :position
+              else
+                scope_block = lambda { order :position }
+              end
             end
           end
         end
         if (_filter_association(macro, name) && !_method_exists?(name))
           logger.info "[schema_associations] #{self.name || self.table_name.classify}.#{macro} #{name.inspect}, #{opts.inspect[1...-1]}"
-          send macro, name, opts.dup
+          if ::ActiveRecord::VERSION::MAJOR.to_i < 4
+            send macro, name, opts.dup
+          else
+            send macro, name, scope_block, opts.dup
+          end
         end
       end
 

data/lib/schema_associations/version.rb

@@ -1,3 +1,3 @@
 module SchemaAssociations
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/runspecs

@@ -6,7 +6,7 @@ require 'shellwords'
 require 'tempfile'
 
 RUBY_VERSIONS = %W[1.9.3 2.0.0]
-RAILS_VERSIONS = %W[3.2]
+RAILS_VERSIONS = %W[3.2 4.0]
 
 o = OpenStruct.new
 o.ruby_versions = RUBY_VERSIONS
@@ -51,11 +51,28 @@ Combo = Struct.new(:ruby, :rails)
 
 combos = o.ruby_versions.product(o.rails_versions).map{|product| Combo.new(*product)}.select {|combo|
     case
-    when combo.rails >= "3.2" && combo.ruby <= "1.8.7" then false
+    when combo.rails >= "3.2" && combo.ruby <= "1.8.7" then false  # no longer happens, just keeping it as an example
     else true
     end
 }
 
+if system("which -s rvm")
+    # using rvm
+    def ruby_version_selector(ruby)
+        "rvm #{ruby} do"
+    end
+else
+    # using rbenv.  remove current version from path and current gem path
+    # so that forked shell will respect RBENV_VERSION variable
+    ENV['PATH'] = ENV['PATH'].split(':').reject{|dir| dir =~ %r{/rbenv/versions/}}.join(':')
+    ENV['GEM_PATH'] = nil
+
+    def ruby_version_selector(ruby)
+        @versions ||= `rbenv versions --bare`.split
+        version = @versions.select{|v| v.start_with? ruby}.last || abort("no ruby version '#{ruby}' installed in rbenv")
+        "RBENV_VERSION=#{version}"
+    end
+end
 
 GEMFILES_DIR = File.expand_path('../gemfiles', __FILE__)
 errs = []
@@ -74,7 +91,7 @@ combos.each_with_index do |combo, n|
               "bundle exec rake spec"
           end
 
-    command = %Q{BUNDLE_GEMFILE="#{File.join(GEMFILES_DIR, "Gemfile.rails-#{rails}")}" rvm #{ruby} do #{cmd} #{Shellwords.join(ARGV)}}
+    command = %Q{BUNDLE_GEMFILE="#{File.join(GEMFILES_DIR, "Gemfile.rails-#{rails}")}" #{ruby_version_selector(ruby)} #{cmd} #{Shellwords.join(ARGV)}}
 
     puts "\n\n*** ruby version #{ruby} - rails version #{rails}  [#{n+1} of #{combos.size}]\n\n#{command}"
 

data/schema_associations.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency("schema_plus")
-      
+  s.add_dependency("schema_plus", ">= 1.2.0")
+
   s.add_development_dependency("rake")
   s.add_development_dependency("rdoc")
   s.add_development_dependency("rspec")

data/spec/association_spec.rb

@@ -329,12 +329,36 @@ describe ActiveRecord::Base do
       )
       class HappyPost < ActiveRecord::Base ; self.table_name = 'wooga_posts' ; end
       class HappyComment < ActiveRecord::Base ; self.table_name = 'wooga_comments' ; end
-      Kernel.warn HappyPost.reflect_on_all_associations.inspect
+      # Kernel.warn HappyPost.reflect_on_all_associations.inspect
       HappyComment.reflect_on_association(:post).class_name.should == "HappyPost"
       HappyPost.reflect_on_association(:comments).class_name.should == "HappyComment"
     end
   end
 
+  context "without position" do
+    before(:each) do
+      create_tables(
+        "posts", {}, {},
+        "comments", {}, { :post_id => {} }
+      )
+      class Post < ActiveRecord::Base ; end
+      class Comment < ActiveRecord::Base ; end
+    end
+    it "should create unordered has_many association" do
+      reflection = Post.reflect_on_association(:comments)
+      reflection.should_not be_nil
+      reflection.macro.should == :has_many
+      reflection.options[:class_name].should == "Comment"
+      reflection.options[:foreign_key].should == "post_id"
+      reflection.options[:inverse_of].should == :post
+      if ::ActiveRecord::VERSION::MAJOR.to_i < 4
+        reflection.options[:order].should be_nil
+      else
+        reflection.scope.should be_nil
+      end
+    end
+  end
+
   context "with position" do
     before(:each) do
       create_tables(
@@ -351,7 +375,48 @@ describe ActiveRecord::Base do
       reflection.options[:class_name].should == "Comment"
       reflection.options[:foreign_key].should == "post_id"
       reflection.options[:inverse_of].should == :post
-      reflection.options[:order].to_s.should == "position"
+      if ::ActiveRecord::VERSION::MAJOR.to_i < 4
+        reflection.options[:order].to_s.should == "position"
+      else
+        reflection.scope.should_not be_nil
+        scope_tester = Object.new
+        expect(scope_tester).to receive(:order).with(:position)
+        scope_tester.instance_exec(&reflection.scope)
+      end
+    end
+  end
+
+  context "with scope that doesn't use include" do
+    before(:each) do
+      create_tables(
+        "posts", {}, {},
+        "comments", {}, { :post_id => {}, :position => {} }
+      )
+      class Post < ActiveRecord::Base ; end
+      class Comment < ActiveRecord::Base
+        scope :simple_scope, lambda { order(:id) }
+      end
+    end
+    it "should create viable scope" do
+      relation = Comment.simple_scope
+      expect { relation.to_a }.to_not raise_error
+    end
+  end
+
+  context "with scope that uses include" do
+    before(:each) do
+      create_tables(
+        "posts", {}, {},
+        "comments", {}, { :post_id => {}, :position => {} }
+      )
+      class Post < ActiveRecord::Base ; end
+      class Comment < ActiveRecord::Base
+        scope :simple_scope, lambda { order(:id).includes(:post) }
+      end
+    end
+    it "should create viable scope" do
+      relation = Comment.simple_scope
+      expect { relation.to_a }.to_not raise_error
     end
   end
 
@@ -552,11 +617,8 @@ describe ActiveRecord::Base do
       end
 
       it "should define associations before needed by relation" do
-        Post.joins(:comments).all
-        expect { Post.joins(:comments).all }.to_not raise_error
-
+        expect { Post.joins(:comments).to_a }.to_not raise_error
       end
-
     end
   end
 

data/spec/spec_helper.rb

@@ -1,8 +1,6 @@
-if RUBY_VERSION > "1.9"
-  require 'simplecov'
-  require 'simplecov-gem-adapter'
-  SimpleCov.start "gem"
-end
+require 'simplecov'
+require 'simplecov-gem-adapter'
+SimpleCov.start "gem"
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -27,4 +25,4 @@ def remove_all_models
     end
   end
 
-SimpleCov.command_name ActiveRecord::Base.connection.adapter_name if defined? SimpleCov
+SimpleCov.command_name "[Ruby #{RUBY_VERSION} - ActiveRecord #{::ActiveRecord::VERSION::STRING}]"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_associations
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: schema_plus
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -127,7 +127,7 @@ files:
 - README.md
 - Rakefile
 - gemfiles/Gemfile.rails-3.2
-- gemfiles/Gemfile.rails-3.2.lock
+- gemfiles/Gemfile.rails-4.0
 - init.rb
 - lib/schema_associations.rb
 - lib/schema_associations/active_record/associations.rb

data/gemfiles/Gemfile.rails-3.2.lock

@@ -1,118 +0,0 @@
-PATH
-  remote: /Users/ronen/github/schema_associations
-  specs:
-    schema_associations (1.0.1)
-      schema_plus
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.4)
-    diff-lcs (1.2.4)
-    erubis (2.7.0)
-    hike (1.2.2)
-    i18n (0.6.1)
-    journey (1.0.4)
-    json (1.8.0)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.23)
-    multi_json (1.7.4)
-    polyglot (0.3.3)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
-      bundler (~> 1.0)
-      railties (= 3.2.13)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.4)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    schema_plus (1.1.2)
-      rails (>= 3.2)
-      valuable
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-gem-adapter (1.0.1)
-      simplecov
-    simplecov-html (0.7.1)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
-    thor (0.18.1)
-    tilt (1.4.1)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-    valuable (0.9.8)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rails (~> 3.2.0)
-  rake
-  rdoc
-  rspec
-  schema_associations!
-  simplecov
-  simplecov-gem-adapter
-  sqlite3