autoforme 1.4.0 → 1.5.0

data/spec/mtm_spec.rb

@@ -17,9 +17,47 @@ describe AutoForme do
     end
 
     visit("/Artist/browse")
-    page.html.wont_match /MTM/
+    page.html.wont_include 'MTM'
     visit("/Artist/mtm_edit")
-    page.html.must_match /Unhandled Request/
+    page.html.must_include 'Unhandled Request'
+  end
+
+  it "should have working Model#associated_object_display_name" do
+    mod = nil
+    app_setup do
+      model Artist
+      model Album do
+        mod = self
+      end
+    end
+
+    mod.associated_object_display_name(:artist, nil, Artist.load(:name=>'a')).must_equal 'a'
+  end
+
+  it "should have Model#associated_object_display_name respect :name_method column option" do
+    mod = nil
+    app_setup do
+      model Artist
+      model Album do
+        column_options :artist=>{:name_method=>:id}
+        mod = self
+      end
+    end
+
+    mod.associated_object_display_name(:artist, nil, Artist.load(:id=>1)).must_equal 1
+  end
+
+  it "should have Model#associated_object_display_name raise Error if not valid" do
+    mod = nil
+    app_setup do
+      model Artist
+      model Album do
+        column_options :artist=>{:name_method=>Object.new}
+        mod = self
+      end
+    end
+
+    proc{mod.associated_object_display_name(:artist, nil, Artist.load(:name=>'a'))}.must_raise AutoForme::Error
   end
 
   it "should have basic many to many association editing working" do
@@ -46,7 +84,7 @@ describe AutoForme do
     page.all('select')[1].all('option').map{|s| s.text}.must_equal []
     select("Album1", :from=>"Associate With")
     click_button "Update"
-    page.html.must_match /Updated albums association for Artist/
+    page.html.must_include 'Updated albums association for Artist'
     Artist.first.albums.map{|x| x.name}.must_equal %w'Album1'
 
     page.all('select')[0].all('option').map{|s| s.text}.must_equal ["Album2", "Album3"]
@@ -83,7 +121,7 @@ describe AutoForme do
     page.all('select')[0].all('option').map{|s| s.text}.must_equal []
     fill_in "Associate With", :with=>a1.id
     click_button "Update"
-    page.html.must_match /Updated albums association for Artist/
+    page.html.must_include 'Updated albums association for Artist'
     Artist.first.albums.map{|x| x.name}.must_equal %w'Album1'
 
     page.all('select')[0].all('option').map{|s| s.text}.must_equal ["Album1"]
@@ -92,6 +130,19 @@ describe AutoForme do
     click_button "Update"
     Artist.first.refresh.albums.map{|x| x.name}.must_equal %w'Album2'
 
+    visit "/Artist/autocomplete/albums?type=association&q=Album"
+    page.body.must_match(/#{a1.id} - Album1\n#{a2.id} - Album2\n#{a3.id} - Album3/m)
+
+    visit "/Artist/autocomplete/albums?type=association&q=3"
+    page.body.wont_match(/#{a1.id} - Album1\n#{a2.id} - Album2\n#{a3.id} - Album3/m)
+    page.body.must_match(/#{a3.id} - Album3/m)
+
+    visit "/Artist/autocomplete/albums?type=association&exclude=#{Artist.first.id}&q=Album"
+    page.body.must_match(/#{a1.id} - Album1\n#{a3.id} - Album3/m)
+
+    visit("/Artist/mtm_edit")
+    select("Artist1")
+    click_button "Edit"
     page.all('select')[0].all('option').map{|s| s.text}.must_equal ["Album2"]
     select("Album2", :from=>"Disassociate From")
     click_button "Update"
@@ -117,7 +168,7 @@ describe AutoForme do
     click_button "Edit"
     select 'Album1'
     click_button 'Add'
-    page.html.must_match /Updated albums association for Artist/
+    page.html.must_include 'Updated albums association for Artist'
     Artist.first.albums.map{|x| x.name}.must_equal %w'Album1'
 
     select 'Album2'
@@ -152,7 +203,7 @@ describe AutoForme do
     click_button "Edit"
     fill_in 'Albums', :with=>a1.id.to_s
     click_button 'Add'
-    page.html.must_match /Updated albums association for Artist/
+    page.html.must_include 'Updated albums association for Artist'
     Artist.first.albums.map{|x| x.name}.must_equal %w'Album1'
 
     fill_in 'Albums', :with=>a2.id.to_s
@@ -167,6 +218,32 @@ describe AutoForme do
     Artist.first.refresh.albums.map{|x| x.name}.sort.must_equal %w'Album2 Album3'
   end
 
+  it "should have inline many to many association editing working with xhr" do
+    app_setup do
+      model Artist do
+        inline_mtm_associations do |req|
+          def req.xhr?; action_type == 'mtm_update' end
+          :albums
+        end
+      end
+      model Album
+    end
+
+    Artist.create(:name=>'Artist1')
+    album = Album.create(:name=>'Album1')
+
+    visit("/Artist/edit")
+    select("Artist1")
+    click_button "Edit"
+    select 'Album1'
+    click_button 'Add'
+    Artist.first.albums.map{|x| x.name}.must_equal %w'Album1'
+
+    click_button 'Remove'
+    Artist.first.refresh.albums.map{|x| x.name}.must_equal []
+    page.body.must_equal "<option value=\"#{album.id}\">Album1</option>"
+  end
+
   it "should have working many to many association links on show and edit pages" do
     app_setup do
       model Artist do
@@ -185,7 +262,7 @@ describe AutoForme do
     click_link 'Edit'
     select 'Artist1'
     click_button 'Edit'
-    page.html.wont_match /Albums/
+    page.html.wont_include 'Albums'
 
     visit("/Album/new")
     fill_in 'Name', :with=>'Album1'
@@ -201,7 +278,7 @@ describe AutoForme do
     click_button 'Show'
     click_link 'Artist1'
     page.current_path.must_match %r{Artist/show/\d+}
-    page.html.wont_match /Albums/
+    page.html.wont_include 'Albums'
   end
 
   it "should have many to many association editing working when associated class is not using autoforme" do
@@ -364,7 +441,7 @@ describe AutoForme do
     page.all('select')[1].all('option').map{|s| s.text}.must_equal []
     select("Album1", :from=>"Associate With")
     click_button "Update"
-    page.html.must_match /Updated albums association for Artist/
+    page.html.must_include 'Updated albums association for Artist'
     Artist.first.albums.map{|x| x.name}.must_equal %w'Album1'
 
     page.all('select')[0].all('option').map{|s| s.text}.must_equal ["Album2", "Album3"]

data/spec/rails_spec_helper.rb

@@ -55,7 +55,7 @@ HTML
       end.inspect
       config.active_support.deprecation = :stderr
       config.middleware.delete(ActionDispatch::ShowExceptions)
-      config.middleware.delete("Rack::Lock")
+      config.middleware.delete(Rack::Lock)
       config.secret_key_base = 'foo'
       config.eager_load = true
       initialize!

data/spec/roda_spec.rb

@@ -0,0 +1,72 @@
+require './spec/spec_helper'
+
+describe AutoForme do
+  before(:all) do
+    db_setup(:artists=>[[:name, :string]])
+    model_setup(:Artist=>[:artists])
+  end
+  after(:all) do
+    Object.send(:remove_const, :Artist)
+  end
+
+  it "should have basic functionality working in Roda subclass" do
+    app_setup(Artist)
+    self.app = Class.new(app)
+    visit("/Artist/new")
+    page.title.must_equal 'Artist - New'
+    fill_in 'Name', :with=>'TestArtistNew'
+    click_button 'Create'
+    page.html.must_include 'Created Artist'
+    page.current_path.must_equal '/Artist/new'
+
+    click_link 'Show'
+    page.title.must_equal 'Artist - Show'
+    click_button 'Show'
+    select 'TestArtistNew'
+    click_button 'Show'
+    page.html.must_match(/Name.+TestArtistNew/m)
+
+    click_link 'Edit'
+    page.title.must_equal 'Artist - Edit'
+    click_button 'Edit'
+    select 'TestArtistNew'
+    click_button 'Edit'
+    fill_in 'Name', :with=>'TestArtistUpdate'
+    click_button 'Update'
+    page.html.must_include 'Updated Artist'
+    page.html.must_match(/Name.+TestArtistUpdate/m)
+    page.current_path.must_match %r{/Artist/edit/\d+}
+
+    click_link 'Search'
+    page.title.must_equal 'Artist - Search'
+    fill_in 'Name', :with=>'Upd'
+    click_button 'Search'
+    page.all('table').first['id'].must_equal 'autoforme_table'
+    page.all('th').map{|s| s.text}.must_equal ['Name', 'Show', 'Edit', 'Delete']
+    page.all('td').map{|s| s.text}.must_equal ["TestArtistUpdate", "Show", "Edit", "Delete"]
+    click_link 'CSV Format'
+    page.body.must_equal "Name\nTestArtistUpdate\n"
+
+    visit("/Artist/browse")
+    click_link 'Search'
+    fill_in 'Name', :with=>'Foo'
+    click_button 'Search'
+    page.all('td').map{|s| s.text}.must_equal []
+
+    click_link 'Artist'
+    page.title.must_equal 'Artist - Browse'
+    page.all('td').map{|s| s.text}.must_equal ["TestArtistUpdate", "Show", "Edit", "Delete"]
+    click_link 'CSV Format'
+    page.body.must_equal "Name\nTestArtistUpdate\n"
+
+    visit("/Artist/browse")
+    page.all('td').last.find('a').click
+    click_button 'Delete'
+    page.title.must_equal 'Artist - Delete'
+    page.html.must_include 'Deleted Artist'
+    page.current_path.must_equal '/Artist/delete'
+
+    click_link 'Artist'
+    page.all('td').map{|s| s.text}.must_equal []
+  end
+end if ENV['FRAMEWORK'] == 'roda'

data/spec/spec_helper.rb

@@ -1,15 +1,39 @@
 require 'rubygems'
+$: << File.expand_path(File.join(__FILE__, '../../lib'))
+ENV['FRAMEWORK'] ||= 'roda'
+
+module AutoFormeSpec
+end
+
+if ENV['COVERAGE']
+  ENV.delete('COVERAGE')
+  require 'coverage'
+  require 'simplecov'
+
+  SimpleCov.instance_eval do
+    start do
+      add_filter "/spec/"
+      add_group('Missing'){|src| src.covered_percent < 100}
+      add_group('Covered'){|src| src.covered_percent == 100}
+    end
+  end
+end
+
+require "./spec/#{ENV['FRAMEWORK']}_spec_helper"
+
 require 'capybara'
 require 'capybara/dsl'
 require 'rack/test'
+gem 'minitest'
 require 'minitest/autorun'
 require 'minitest/hooks/default'
 
-module AutoFormeSpec
+if ENV['WARNING']
+  require 'warning'
+  Warning.ignore([:missing_ivar, :fixnum])
 end
 
 require './spec/sequel_spec_helper'
-require "./spec/#{ENV['FRAMEWORK'] || 'roda'}_spec_helper"
 
 class Minitest::HooksSpec
   include Rack::Test::Methods

data/spec/unit_spec.rb

@@ -306,6 +306,12 @@ describe AutoForme do
     model.autocomplete_options{|type, req| {:limit=>req}}
     model.autocomplete(:type=>:show, :query=>'oo', :request=>1).must_equal ["#{a.id} - FooBar"]
   end
+
+  it "should support looking up model classes when registering by name" do
+    framework.register_by_name
+    framework.model(Artist)
+    framework.model_class(Artist).link.must_equal 'Artist'
+  end
 end
 
 describe AutoForme do
@@ -331,6 +337,7 @@ describe AutoForme do
       end
     end
 
+    model.association?('artist').must_equal true
     artist.autocomplete_options({})
     model.autocomplete(:query=>'foo', :association=>:artist).must_equal []
     a = Artist.create(:name=>'FooBar')
@@ -356,6 +363,35 @@ describe AutoForme do
   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, [[:one_through_one, :album], [:many_to_many, :albums]]], :Album=>[:albums])
+  end
+  after(:all) do
+    Object.send(:remove_const, :Album)
+    Object.send(:remove_const, :Artist)
+  end
+
+
+  it "should handle not include unhandled association types in association links" do
+    app_setup do
+      model Artist do
+        association_links :album
+      end
+      model Album
+    end
+
+    artist = Artist.create(:name=>'Ar')
+    artist.add_album(:name=>'Album1')
+    visit "/Artist/association_links/#{artist.id}"
+    page.html.wont_include 'Album1'
+    click_link 'Album'
+    page.html.must_include 'Album1'
+    page.current_path.must_equal '/Album/browse'
+  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}]])
@@ -445,6 +481,31 @@ end
 
 describe AutoForme do
   it ".version should return a typical version string" do
-    AutoForme.version.must_match /\A\d+\.\d+\.\d+\z/
+    AutoForme.version.must_match(/\A\d+\.\d+\.\d+\z/)
+  end
+end
+
+describe AutoForme::Model do
+  it "#model should raise error if underlying model is not a valid class string" do
+    mod = AutoForme::Model.new('artist', nil)
+    proc{mod.model}.must_raise AutoForme::Error
+  end
+end
+
+describe AutoForme do
+  before do
+    class << AutoForme
+      def require(f); end
+    end
+  end
+  after do
+    class << AutoForme
+      remove_method :require
+    end
+  end
+
+  it "should raise error when trying to use unsupported framework or model" do
+    proc{AutoForme.framework_class_for(:foo)}.must_raise AutoForme::Error
+    proc{AutoForme.model_class_for(:foo)}.must_raise AutoForme::Error
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoforme
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forme
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack_csrf
   requirement: !ruby/object:Gem::Requirement
@@ -215,10 +229,12 @@ files:
 - lib/autoforme/table.rb
 - lib/autoforme/version.rb
 - lib/roda/plugins/autoforme.rb
+- spec/all.rb
 - spec/associations_spec.rb
 - spec/basic_spec.rb
 - spec/mtm_spec.rb
 - spec/rails_spec_helper.rb
+- spec/roda_spec.rb
 - spec/roda_spec_helper.rb
 - spec/sequel_spec_helper.rb
 - spec/sinatra_spec_helper.rb
@@ -251,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Web Administrative Console for Sinatra/Rails and Sequel