autoforme 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec337a25a71c6c86396c93e659b5b0729d55a8a3
-  data.tar.gz: 3c0e80ddbfc27c16befd3d99c984eb417f0734ad
+  metadata.gz: 7a6b8a4263970ea2e5bf3a985b8b4628af73c5f3
+  data.tar.gz: b5cc0a111748da7426f12d748e6a6a675395cbf7
 SHA512:
-  metadata.gz: 9b6c976adf8f6a38e97efaec67e09fa174d189c15db3783e78c78d6f704741adf1ce69946fb921bf8bbe553c92c0f34d3ef958c7231eb8b6a737c3238fc55a03
-  data.tar.gz: d5e3c5310a07a87b64c0f311884bdb83bf9e46212030fbb9504c2380b920b4663fe1032e6671e92e47a32a9f9f76b68e2a8ce2a0ded87058cf2d5542861c539e
+  metadata.gz: e8c36b982a6d2df2caafb06e3c9514cf2a69a9369ca2beb44fe9550c9774f4734ec84bbdc8d59d35557a9139909194f8019291c9dc1b0bc8f6e797799c23b876
+  data.tar.gz: 47abfeb25954620e28aaadd6cc9f90958326f2009db8495e2a25f8deb58af93a06d10ac6abc7b9d29267bca9d2a534d0cb8c1416076dee95895d3c0354dc466f

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 0.5.4 (2014-01-06)
+
+* Qualify associated foreign key columns when searching, fixing issues when eager_graph is used on the model (jeremyevans)
+
 === 0.5.3 (2014-01-02)
 
 * Fix searching by associated object that uses autocompleting (jeremyevans)

data/lib/autoforme/models/sequel.rb

@@ -170,7 +170,7 @@ module AutoForme
                 ads = model_class.apply_filter(:association, request, ads)
               end
               primary_key = S.qualify(ref.associated_class.table_name, ref.primary_key)
-              ds = ds.where(ref[:key]=>ads.where(primary_key=>v).select(primary_key))
+              ds = ds.where(S.qualify(model.table_name, ref[:key])=>ads.where(primary_key=>v).select(primary_key))
             elsif column_type(c) == :string
               ds = ds.where(S.ilike(S.qualify(model.table_name, c), "%#{ds.escape_like(v.to_s)}%"))
             else

data/lib/autoforme/version.rb

@@ -1,6 +1,6 @@
 module AutoForme
   # Version constant, use <tt>AutoForme.version</tt> instead.
-  VERSION = '0.5.3'.freeze
+  VERSION = '0.5.4'.freeze
 
   # Returns the version as a frozen string (e.g. '0.1.0')
   def self.version

data/spec/associations_spec.rb

@@ -475,6 +475,104 @@ describe AutoForme do
   end
 end
 
+describe AutoForme do
+  before(:all) do
+    db_setup(:artists=>[[:name, :string], [:artist_id, :integer]], :albums=>[[:name, :string], [:artist_id, :integer, {:table=>:artists}]])
+    model_setup(:Artist=>[:artists, [[:one_to_many, :albums]]], :Album=>[:albums, [[:many_to_one, :artist]]])
+  end
+  after(:all) do
+    Object.send(:remove_const, :Album)
+    Object.send(:remove_const, :Artist)
+  end
+
+  it "should have basic many to one associations working" do
+    app_setup do
+      model Artist
+      model Album do
+        columns [:name, :artist]
+        eager_graph :artist
+        order :artist__name
+      end
+    end
+
+    visit("/Artist/new")
+    fill_in 'Name', :with=>'Artist1'
+    click_button 'Create'
+    fill_in 'Name', :with=>'Artist2'
+    click_button 'Create'
+
+    visit("/Album/new")
+    fill_in 'Name', :with=>'Album1'
+    click_button 'Create'
+
+    click_link 'Edit'
+    select 'Album1'
+    click_button 'Edit'
+    fill_in 'Name', :with=>'Album1b'
+    select 'Artist2'
+    click_button 'Update'
+
+    click_link 'Show'
+    select 'Album1'
+    click_button 'Show'
+    page.html.should =~ /Name.+Album1b/m
+    page.html.should =~ /Artist.+Artist2/m
+
+    click_link 'Search'
+    fill_in 'Name', :with=>'1b'
+    select 'Artist2'
+    click_button 'Search'
+    all('td').map{|s| s.text}.should == ["Album1b", "Artist2", "Show", "Edit", "Delete"]
+
+    click_link 'Album'
+    all('td').map{|s| s.text}.should == ["Album1b", "Artist2", "Show", "Edit", "Delete"]
+  end
+
+  it "should have basic many to one associations working" do
+    app_setup do
+      model Artist do
+        eager_graph :albums
+        order :albums__name
+      end
+      model Album do
+        columns [:name, :artist]
+      end
+    end
+
+    visit("/Artist/new")
+    fill_in 'Name', :with=>'Artist1'
+    click_button 'Create'
+    fill_in 'Name', :with=>'Artist2'
+    click_button 'Create'
+
+    visit("/Album/new")
+    fill_in 'Name', :with=>'Album1'
+    click_button 'Create'
+
+    click_link 'Edit'
+    select 'Album1'
+    click_button 'Edit'
+    fill_in 'Name', :with=>'Album1b'
+    select 'Artist2'
+    click_button 'Update'
+
+    click_link 'Show'
+    select 'Album1'
+    click_button 'Show'
+    page.html.should =~ /Name.+Album1b/m
+    page.html.should =~ /Artist.+Artist2/m
+
+    click_link 'Search'
+    fill_in 'Name', :with=>'1b'
+    select 'Artist2'
+    click_button 'Search'
+    all('td').map{|s| s.text}.should == ["Album1b", "Artist2", "Show", "Edit", "Delete"]
+
+    click_link 'Album'
+    all('td').map{|s| s.text}.should == ["Album1b", "Artist2", "Show", "Edit", "Delete"]
+  end
+end
+
 describe AutoForme do
   before(:all) do
     db_setup(:artists=>[[:name, :string]], :albums=>[[:name, :string], [:artist_id, :integer, {:table=>:artists}]])

data/spec/sequel_spec_helper.rb

@@ -1,8 +1,14 @@
 require 'rubygems'
 require 'sequel'
 require 'logger'
+require 'rspec/version'
 
 RSpec.configure do |c|
+  if RSpec::Version::STRING >= '2.11.0'
+    c.expect_with :rspec do |c1|
+      c1.syntax = :should
+    end
+  end
   c.around(:each) do |example|
     if db
       db.transaction(:rollback=>:always){example.run}

data/spec/unit_spec.rb

@@ -132,65 +132,65 @@ describe AutoForme do
   end
 
   it "should handle supported_actions lookup" do
-    model.supported_action?(:new, nil).should be_true
-    model.supported_action?(:edit, nil).should be_true
-    model.supported_action?(:search, nil).should be_true
+    model.supported_action?(:new, nil).should == true
+    model.supported_action?(:edit, nil).should == true
+    model.supported_action?(:search, nil).should == true
     framework.supported_actions [:new, :search]
-    model.supported_action?(:new, nil).should be_true
-    model.supported_action?(:edit, nil).should be_false
-    model.supported_action?(:search, nil).should be_true
+    model.supported_action?(:new, nil).should == true
+    model.supported_action?(:edit, nil).should == false
+    model.supported_action?(:search, nil).should == true
     framework.supported_actions{|mod, req| req ? [:new] : []}
-    model.supported_action?(:new, nil).should be_false
-    model.supported_action?(:new, true).should be_true
+    model.supported_action?(:new, nil).should == false
+    model.supported_action?(:new, true).should == true
     model.supported_actions [:edit, :search]
-    model.supported_action?(:new, nil).should be_false
-    model.supported_action?(:edit, nil).should be_true
-    model.supported_action?(:search, nil).should be_true
+    model.supported_action?(:new, nil).should == false
+    model.supported_action?(:edit, nil).should == true
+    model.supported_action?(:search, nil).should == true
     model.supported_actions{|req| req ? [:new] : []}
-    model.supported_action?(:new, nil).should be_false
-    model.supported_action?(:new, true).should be_true
+    model.supported_action?(:new, nil).should == false
+    model.supported_action?(:new, true).should == true
   end
 
   it "should handle mtm_associations lookup" do
-    model.supported_mtm_edit?('foos', nil).should be_false
-    model.supported_mtm_edit?('bars', nil).should be_false
+    model.supported_mtm_edit?('foos', nil).should == false
+    model.supported_mtm_edit?('bars', nil).should == false
     framework.mtm_associations [:foos]
-    model.supported_mtm_edit?('foos', nil).should be_true
-    model.supported_mtm_edit?('bars', nil).should be_false
+    model.supported_mtm_edit?('foos', nil).should == true
+    model.supported_mtm_edit?('bars', nil).should == false
     framework.mtm_associations{|mod, req| req ? [:foos] : [:bars]}
-    model.supported_mtm_edit?('foos', nil).should be_false
-    model.supported_mtm_edit?('bars', nil).should be_true
-    model.supported_mtm_edit?('foos', true).should be_true
-    model.supported_mtm_edit?('bars', true).should be_false
+    model.supported_mtm_edit?('foos', nil).should == false
+    model.supported_mtm_edit?('bars', nil).should == true
+    model.supported_mtm_edit?('foos', true).should == true
+    model.supported_mtm_edit?('bars', true).should == false
     model.mtm_associations ['bars']
-    model.supported_mtm_edit?('foos', nil).should be_false
-    model.supported_mtm_edit?('bars', nil).should be_true
+    model.supported_mtm_edit?('foos', nil).should == false
+    model.supported_mtm_edit?('bars', nil).should == true
     model.mtm_associations{|req| req ? ['foos'] : ['bars']}
-    model.supported_mtm_edit?('foos', nil).should be_false
-    model.supported_mtm_edit?('bars', nil).should be_true
-    model.supported_mtm_edit?('foos', true).should be_true
-    model.supported_mtm_edit?('bars', true).should be_false
+    model.supported_mtm_edit?('foos', nil).should == false
+    model.supported_mtm_edit?('bars', nil).should == true
+    model.supported_mtm_edit?('foos', true).should == true
+    model.supported_mtm_edit?('bars', true).should == false
   end
 
   it "should handle inline_mtm_associations lookup" do
-    model.supported_mtm_update?('foos', nil).should be_false
-    model.supported_mtm_update?('bars', nil).should be_false
+    model.supported_mtm_update?('foos', nil).should == false
+    model.supported_mtm_update?('bars', nil).should == false
     framework.inline_mtm_associations [:foos]
-    model.supported_mtm_update?('foos', nil).should be_true
-    model.supported_mtm_update?('bars', nil).should be_false
+    model.supported_mtm_update?('foos', nil).should == true
+    model.supported_mtm_update?('bars', nil).should == false
     framework.inline_mtm_associations{|mod, req| req ? [:foos] : [:bars]}
-    model.supported_mtm_update?('foos', nil).should be_false
-    model.supported_mtm_update?('bars', nil).should be_true
-    model.supported_mtm_update?('foos', true).should be_true
-    model.supported_mtm_update?('bars', true).should be_false
+    model.supported_mtm_update?('foos', nil).should == false
+    model.supported_mtm_update?('bars', nil).should == true
+    model.supported_mtm_update?('foos', true).should == true
+    model.supported_mtm_update?('bars', true).should == false
     model.inline_mtm_associations ['bars']
-    model.supported_mtm_update?('foos', nil).should be_false
-    model.supported_mtm_update?('bars', nil).should be_true
+    model.supported_mtm_update?('foos', nil).should == false
+    model.supported_mtm_update?('bars', nil).should == true
     model.inline_mtm_associations{|req| req ? ['foos'] : ['bars']}
-    model.supported_mtm_update?('foos', nil).should be_false
-    model.supported_mtm_update?('bars', nil).should be_true
-    model.supported_mtm_update?('foos', true).should be_true
-    model.supported_mtm_update?('bars', true).should be_false
+    model.supported_mtm_update?('foos', nil).should == false
+    model.supported_mtm_update?('bars', nil).should == true
+    model.supported_mtm_update?('foos', true).should == true
+    model.supported_mtm_update?('bars', true).should == false
   end
 
   it "should handle association_links lookup" do
@@ -206,17 +206,17 @@ describe AutoForme do
   end
 
   it "should handle lazy_load_association_links lookup" do
-    model.lazy_load_association_links?(:show, nil).should be_false
+    model.lazy_load_association_links?(:show, nil).should == false
     framework.lazy_load_association_links true
-    model.lazy_load_association_links?(:show, nil).should be_true
+    model.lazy_load_association_links?(:show, nil).should == true
     framework.lazy_load_association_links{|mod, type, req| req > 2}
-    model.lazy_load_association_links?(:show, 1).should be_false
-    model.lazy_load_association_links?(:show, 3).should be_true
+    model.lazy_load_association_links?(:show, 1).should == false
+    model.lazy_load_association_links?(:show, 3).should == true
     model.lazy_load_association_links false
-    model.lazy_load_association_links?(:show, nil).should be_false
+    model.lazy_load_association_links?(:show, nil).should == false
     model.lazy_load_association_links{|type, req| req > 2}
-    model.lazy_load_association_links?(:show, 1).should be_false
-    model.lazy_load_association_links?(:show, 3).should be_true
+    model.lazy_load_association_links?(:show, 1).should == false
+    model.lazy_load_association_links?(:show, 3).should == true
   end
 
   it "should handle form_attributes lookup" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoforme
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-02 00:00:00.000000000 Z
+date: 2014-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forme