autoforme 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c90629ac93941ca426fb8db3fbb83618a367330c
-  data.tar.gz: 756db19ef87d030d8c4d233521f20b8a18bfbb31
+  metadata.gz: 38de0a66935c0a09e6b2e4302fad7860f051aa35
+  data.tar.gz: 1fd338240c95d55401ea5e44f0c949f575fdad7b
 SHA512:
-  metadata.gz: 5f879772b9cefac7eef9cc136510e7fa1e2297ba4ce6dec115b23c5acaf6f6b1835c94e092ea460ec5c5de05d855ae975b040a3771991c84e3affd072f450a39
-  data.tar.gz: 3509bedb63c7ee892a4e6cf077aa4ea4175a0013a27ecb8a88cc17fe0edf642b4328455a667d9b275d9a0e07196d49323a5340eab8d5e6899811eda509793501
+  metadata.gz: 97edee23d620a6e9854f6a7c105909687b80d31a71e6bcfcf2bb98cae1244a592b622ebe7a5c791169c41f5e37bf06e28b07c371c41a2e27a82a31927b6737b5
+  data.tar.gz: 08356511c1ae30e5c8db04b8ab8e95ecb57a475b2fa0a56fd5f9ccba549ccfd3b7791007e4df766011e6d77dcda7a4d75dd5321c1653eaad416bc6c271af43b3

data/CHANGELOG

@@ -1,3 +1,13 @@
+=== 0.5.2 (2013-12-18)
+
+* Use default empty option when picking a many to many association to edit (jeremyevans)
+
+* Don't force user to pick many to many association to edit if only one choice is available (jeremyevans)
+
+* Don't show many to many edit link for models without many to many associations (jeremyevans)
+
+* Quailfy columns when searching, fixing issues when eager_graph is used on the model (jeremyevans)
+
 === 0.5.1 (2013-12-17)
 
 * Show header with display name for current object on mtm edit page (jeremyevans)

data/lib/autoforme/action.rb

@@ -426,7 +426,13 @@ module AutoForme
     def handle_mtm_edit
       if id = request.id
         obj = model.with_pk(:edit, request, request.id)
-        if assoc = params_association
+        unless assoc = params_association
+          options = model.mtm_association_select_options(request)
+          if options.length == 1
+            assoc = options.first
+          end
+        end
+        if assoc
           page do
             t = "<h2>Edit #{humanize(assoc)} for #{h model.object_display_name(type, request, obj)}</h2>"
             t << Forme.form(obj, form_attributes(:action=>url_for("mtm_update/#{model.primary_key_value(obj)}?association=#{assoc}")), form_opts) do |f|
@@ -446,7 +452,7 @@ module AutoForme
         else
           page do
             Forme.form(form_attributes(:action=>"mtm_edit/#{model.primary_key_value(obj)}"), form_opts) do |f|
-              f.input(:select, :options=>model.mtm_association_select_options(request), :name=>'association', :id=>'association', :label=>'Association')
+              f.input(:select, :options=>options, :name=>'association', :id=>'association', :label=>'Association', :add_blank=>true)
               f.button(:value=>'Edit', :class=>'btn btn-primary')
             end
           end

data/lib/autoforme/model.rb

@@ -49,7 +49,13 @@ module AutoForme
 
     # Whether the given type of action is supported for this model.
     def supported_action?(type, request)
-      (handle_proc(supported_actions || framework.supported_actions_for(model, request), request) || DEFAULT_SUPPORTED_ACTIONS).include?(type)
+      v = (handle_proc(supported_actions || framework.supported_actions_for(model, request), request) || DEFAULT_SUPPORTED_ACTIONS).include?(type)
+      if v && type == :mtm_edit
+        assocs = mtm_association_select_options(request)
+        assocs && !assocs.empty?
+      else
+        v
+      end
     end
 
     # An array of many to many association symbols to handle via a separate mtm_edit page.

data/lib/autoforme/models/sequel.rb

@@ -172,9 +172,9 @@ module AutoForme
               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))
             elsif column_type(c) == :string
-              ds = ds.where(S.ilike(c, "%#{ds.escape_like(v.to_s)}%"))
+              ds = ds.where(S.ilike(S.qualify(model.table_name, c), "%#{ds.escape_like(v.to_s)}%"))
             else
-              ds = ds.where(c=>v.to_s)
+              ds = ds.where(S.qualify(model.table_name, c)=>v.to_s)
             end
           end
         end

data/lib/autoforme/version.rb

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

data/spec/mtm_spec.rb

@@ -10,6 +10,18 @@ describe AutoForme do
     Object.send(:remove_const, :Artist)
   end
 
+  it "should not show MTM link if there are no many to many associations" do
+    app_setup do
+      model Artist
+      model Album
+    end
+
+    visit("/Artist/browse")
+    page.html.should_not =~ /MTM/
+    visit("/Artist/mtm_edit")
+    page.html.should =~ /Unhandled Request/
+  end
+
   it "should have basic many to many association editing working" do
     app_setup do
       model Artist do
@@ -28,9 +40,6 @@ describe AutoForme do
     select("Artist1")
     click_button "Edit"
 
-    select("albums")
-    click_button "Edit"
-
     find('h2').text.should == 'Edit Albums for Artist1'
     all('select')[0].all('option').map{|s| s.text}.should == ["Album1", "Album2", "Album3"]
     all('select')[1].all('option').map{|s| s.text}.should == []
@@ -70,9 +79,6 @@ describe AutoForme do
     select("Artist1")
     click_button "Edit"
 
-    select("albums")
-    click_button "Edit"
-
     all('select')[0].all('option').map{|s| s.text}.should == []
     fill_in "Associate With", :with=>a1.id
     click_button "Update"
@@ -213,9 +219,6 @@ describe AutoForme do
     select("Artist1")
     click_button "Edit"
 
-    select("albums")
-    click_button "Edit"
-
     all('select')[0].all('option').map{|s| s.text}.should == ["Album1", "Album2", "Album3"]
     all('select')[1].all('option').map{|s| s.text}.should == []
     select("Album1", :from=>"Associate With")
@@ -253,8 +256,6 @@ describe AutoForme do
     visit("/Artist/mtm_edit")
     select("Artist1")
     click_button "Edit"
-    select("albums")
-    click_button "Edit"
 
     all('select')[0].all('option').map{|s| s.text}.should == ["B1", "E1"]
     all('select')[1].all('option').map{|s| s.text}.should == []
@@ -279,8 +280,6 @@ describe AutoForme do
     visit('/Artist/mtm_edit')
     select("Artist1")
     click_button "Edit"
-    select("albums")
-    click_button "Edit"
     select("E1", :from=>"Associate With")
     Album.where(:name=>'E1').update(:name=>'Y1')
     proc{click_button "Update"}.should raise_error(Sequel::NoMatchingRow)
@@ -288,8 +287,6 @@ describe AutoForme do
     visit('/Artist/mtm_edit')
     select("Artist1")
     click_button "Edit"
-    select("albums")
-    click_button "Edit"
     all('select')[0].all('option').map{|s| s.text}.should == []
     all('select')[1].all('option').map{|s| s.text}.should == []
   end
@@ -314,9 +311,6 @@ describe AutoForme do
     select("Artist1")
     click_button "Edit"
 
-    select("albums")
-    click_button "Edit"
-
     check "Album12"
     click_button "Update"
     Artist.first.albums.map{|x| x.name}.should == %w'Album1'
@@ -332,3 +326,55 @@ describe AutoForme do
     check "Album3Album3"
   end
 end
+
+describe AutoForme do
+  before(:all) do
+    db_setup(:artists=>[[:name, :string]], :albums=>[[:name, :string]], :albums_artists=>[[:album_id, :integer, {:table=>:albums}], [:artist_id, :integer, {:table=>:artists}]])
+    model_setup(:Artist=>[:artists, [[:many_to_many, :albums]], [[:many_to_many, :other_albums, {:clone=>:albums}]]], :Album=>[:albums, [[:many_to_many, :artists]]])
+  end
+  after(:all) do
+    Object.send(:remove_const, :Album)
+    Object.send(:remove_const, :Artist)
+  end
+
+  it "should have basic many to many association editing working" do
+    app_setup do
+      model Artist do
+        mtm_associations [:albums, :other_albums]
+      end
+      model Album
+    end
+
+    Artist.create(:name=>'Artist1')
+    Album.create(:name=>'Album1')
+    Album.create(:name=>'Album2')
+    Album.create(:name=>'Album3')
+
+    visit("/Artist/mtm_edit")
+    page.find('title').text.should == 'Artist - Many To Many Edit'
+    select("Artist1")
+    click_button "Edit"
+
+    select('albums')
+    click_button "Edit"
+
+    find('h2').text.should == 'Edit Albums for Artist1'
+    all('select')[0].all('option').map{|s| s.text}.should == ["Album1", "Album2", "Album3"]
+    all('select')[1].all('option').map{|s| s.text}.should == []
+    select("Album1", :from=>"Associate With")
+    click_button "Update"
+    page.html.should =~ /Updated albums association for Artist/
+    Artist.first.albums.map{|x| x.name}.should == %w'Album1'
+
+    all('select')[0].all('option').map{|s| s.text}.should == ["Album2", "Album3"]
+    all('select')[1].all('option').map{|s| s.text}.should == ["Album1"]
+    select("Album2", :from=>"Associate With")
+    select("Album3", :from=>"Associate With")
+    select("Album1", :from=>"Disassociate From")
+    click_button "Update"
+    Artist.first.refresh.albums.map{|x| x.name}.should == %w'Album2 Album3'
+
+    all('select')[0].all('option').map{|s| s.text}.should == ["Album1"]
+    all('select')[1].all('option').map{|s| s.text}.should == ["Album2", "Album3"]
+  end
+end

data/spec/sinatra_spec_helper.rb

@@ -12,6 +12,9 @@ class AutoFormeSpec::App < Sinatra::Base
   register Sinatra::Flash
   use Rack::Csrf
 
+  not_found do
+    'Unhandled Request'
+  end
   get '/session/set' do
     session.merge!(params)
     ''

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoforme
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forme
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement