autoforme 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7431cd2d4051bea42ed58879c0d0418de7282b5d
-  data.tar.gz: f8d7d4c14152aef6efeedd2fb763df6cd3d4e77d
+  metadata.gz: f75b662ff8c3d65dfbf9a7e4187aac673af1ffff
+  data.tar.gz: e6d75bd0451be7511938859903bde4311891d0d3
 SHA512:
-  metadata.gz: 3047d058fccd77841b9caa2855e9f9a0ecbb54e975c44586c68d01ddcdc5a06a10769ed7f207740318b0be748b7becff1b2f3178ef5fcb5ee8a17d661d65dfb0
-  data.tar.gz: 82b9b6c81507bae202145f7b4af5d1eec35eec0bade86491a08a389a85896849d5f5c2d0f5ce524ee25fab51bb5f250dd6d1caa9166e9e4196e9e7df761f99cc
+  metadata.gz: 32550500006667014af561745e6d002455aba058846433e3fa5ecaf9f4fdfce1038ee1cd736f713151d0347fb80d2a7665c0c6de8d71a7e2c0d5707bc81d2a9c
+  data.tar.gz: 25122fe3de631c441156721d44fa3544b67f7c2eaae17ede522922aeb5ee13d4304712986373637e6ff984afb7a83c4a7a6a52f498707aa6dcc8de96dd67c0d9

data/CHANGELOG

@@ -1,3 +1,11 @@
+=== 1.6.0 (2017-05-04)
+
+* Fix mtm code when using model classes with different primary key names (jeremyevans)
+
+* Work with Sinatra 2 (jeremyevans)
+
+* Use btn-xs class instead of btn-mini for small buttons (jeremyevans)
+
 === 1.5.0 (2016-11-18)
 
 * Allow autocompleting for associated objects even if current class doesn't support autocompleting (jeremyevans)

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2016 Jeremy Evans
+Copyright (c) 2013-2017 Jeremy Evans
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

data/lib/autoforme/action.rb

@@ -650,7 +650,7 @@ module AutoForme
           else
             f.input(assoc, {:dataset=>model.unassociated_mtm_objects(request, assoc, obj), :multiple=>false, :add_blank=>true}.merge(add_opts))
           end
-          f.button(:value=>'Add', :class=>'btn btn-mini btn-primary')
+          f.button(:value=>'Add', :class=>'btn btn-xs btn-primary')
         end.to_s
       end
       t << "</div>"
@@ -675,7 +675,7 @@ module AutoForme
       t << association_link(mc, assoc_obj)
       form_attr = form_attributes(:action=>url_for("mtm_update/#{model.primary_key_value(obj)}?association=#{assoc}&remove%5b%5d=#{model.primary_key_value(assoc_obj)}&redir=edit"), :method=>'post', :class => 'mtm_remove_associations', 'data-add'=>"#add_#{assoc}")
       t << Forme.form(form_attr, form_opts) do |f|
-        f.button(:value=>'Remove', :class=>'btn btn-mini btn-danger')
+        f.button(:value=>'Remove', :class=>'btn btn-xs btn-danger')
       end.to_s
       t << "</li>"
     end

data/lib/autoforme/frameworks/sinatra.rb

@@ -58,8 +58,13 @@ module AutoForme
         end
 
         prefix = Regexp.escape(framework.prefix) if framework.prefix
-        @controller.get %r{\A#{prefix}/([\w:]+)/(\w+)(?:/([\w-]+))?\z}, &block
-        @controller.post %r{\A#{prefix}/([\w:]+)/(\w+)(?:/([\w-]+))?\z}, &block
+        if ::Sinatra::VERSION < '2'
+          prefix = "\\A#{prefix}"
+          suffix = "\\z"
+        end
+        regexp = %r{#{prefix}/([\w:]+)/(\w+)(?:/([\w-]+))?#{suffix}}
+        @controller.get regexp, &block
+        @controller.post regexp, &block
       end
     end
   end

data/lib/autoforme/models/sequel.rb

@@ -319,7 +319,7 @@ module AutoForme
           subquery = model.db.from(ref[:join_table]).
             select(ref.qualified_right_key).
             where(ref.qualified_left_key=>obj.pk)
-          ds = ds.exclude(S.qualify(ref.associated_class.table_name, model.primary_key)=>subquery)
+          ds = ds.exclude(S.qualify(ref.associated_class.table_name, ref.associated_class.primary_key)=>subquery)
           ds = assoc_class.apply_dataset_options(:association, request, ds) if assoc_class
           ds
         end

data/lib/autoforme/table.rb

@@ -59,9 +59,9 @@ module AutoForme
           end
           html << "<td>#{val}</td>"
         end
-        html << "<td><a href=\"#{action.url_for("show/#{model.primary_key_value(obj)}")}\" class=\"btn btn-mini btn-info\">Show</a></td>" if show
-        html << "<td><a href=\"#{action.url_for("edit/#{model.primary_key_value(obj)}")}\" class=\"btn btn-mini btn-primary\">Edit</a></td>" if edit
-        html << "<td><a href=\"#{action.url_for("delete/#{model.primary_key_value(obj)}")}\" class=\"btn btn-mini btn-danger\">Delete</a></td>" if delete
+        html << "<td><a href=\"#{action.url_for("show/#{model.primary_key_value(obj)}")}\" class=\"btn btn-xs btn-info\">Show</a></td>" if show
+        html << "<td><a href=\"#{action.url_for("edit/#{model.primary_key_value(obj)}")}\" class=\"btn btn-xs btn-primary\">Edit</a></td>" if edit
+        html << "<td><a href=\"#{action.url_for("delete/#{model.primary_key_value(obj)}")}\" class=\"btn btn-xs btn-danger\">Delete</a></td>" if delete
         html << "</tr>"
       end
       html << "</tbody></table>"

data/lib/autoforme/version.rb

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

data/spec/associations_spec.rb

@@ -329,7 +329,7 @@ describe AutoForme do
       model Album do
         columns [:name, :artist]
         eager_graph :artist
-        order{|type, req| type == :edit ? [:albums__name, :artist__name] : [:artist__name, :albums__name]}
+        order{|type, req| type == :edit ? [Sequel[:albums][:name], Sequel[:artist][:name]] : [Sequel[:artist][:name], Sequel[:albums][:name]]}
         display_name{|obj, type| type == :edit ? "#{obj.name} (#{obj.artist.name})" : "#{obj.artist.name}-#{obj.name}"}
       end
     end
@@ -349,7 +349,7 @@ describe AutoForme do
       model Album do
         columns [:name, :artist]
         eager_graph :artist
-        order{|type, req| type == :edit ? [:albums__name, :artist__name] : [:artist__name, :albums__name]}
+        order{|type, req| type == :edit ? [Sequel[:albums][:name], Sequel[:artist][:name]] : [Sequel[:artist][:name], Sequel[:albums][:name]]}
         display_name{|obj, type| type == :edit ? "#{obj.name} (#{obj.artist.name})" : "#{obj.artist.name}-#{obj.name}"}
       end
     end
@@ -647,7 +647,7 @@ describe AutoForme do
       model Album do
         columns [:name, :artist]
         eager_graph :artist
-        order :artist__name
+        order Sequel[:artist][:name]
       end
     end
 
@@ -688,7 +688,7 @@ describe AutoForme do
     app_setup do
       model Artist do
         eager_graph :albums
-        order :albums__name
+        order Sequel[:albums][:name]
       end
       model Album do
         columns [:name, :artist]

data/spec/mtm_spec.rb

@@ -405,6 +405,57 @@ describe AutoForme do
   end
 end
 
+describe AutoForme do
+  before(:all) do
+    db_setup(:artists=>proc{primary_key :artist_id; String :name}, :albums=>[[:name, :string]], :albums_artists=>[[:album_id, :integer, {:table=>:albums}], [:artist_id, :integer, {:table=>:artists}]])
+    model_setup(:Artist=>[:artists, [[:many_to_many, :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
+      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.title.must_equal 'Artist - Many To Many Edit'
+    click_button "Edit"
+    select("Artist1")
+    click_button "Edit"
+
+    find('h2').text.must_equal 'Edit Albums for Artist1'
+    page.all('select')[0].all('option').map{|s| s.text}.must_equal ["Album1", "Album2", "Album3"]
+    page.all('select')[1].all('option').map{|s| s.text}.must_equal []
+    select("Album1", :from=>"Associate With")
+    click_button "Update"
+    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"]
+    page.all('select')[1].all('option').map{|s| s.text}.must_equal ["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}.must_equal %w'Album2 Album3'
+
+    page.all('select')[0].all('option').map{|s| s.text}.must_equal ["Album1"]
+    page.all('select')[1].all('option').map{|s| s.text}.must_equal ["Album2", "Album3"]
+  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}]])

data/spec/rails_spec_helper.rb

@@ -36,8 +36,8 @@ HTML
         layout 'layout'
 
         def session_set
-          session.merge!(params)
-          render :text=>''
+          params.each{|k,v| session[k] = v}
+          render :plain=>''
         end
 
         AutoForme.for(:rails, self, opts) do
@@ -58,6 +58,13 @@ HTML
       config.middleware.delete(Rack::Lock)
       config.secret_key_base = 'foo'
       config.eager_load = true
+      if Rails.version > '5'
+        config.action_dispatch.cookies_serializer = :json
+        # Force Rails to dispatch to correct controller
+        ActionDispatch::Routing::RouteSet::Dispatcher.class_eval do
+          define_method(:controller){|_| controller}
+        end
+      end
       initialize!
     end
     [sc, framework]

data/spec/roda_spec_helper.rb

@@ -11,6 +11,10 @@ rescue LoadError
 end
 
 class AutoFormeSpec::App < Roda
+  opts[:unsupported_block_result] = :raise
+  opts[:unsupported_matcher] = :raise
+  opts[:verbatim_string_matcher] = true
+
   LAYOUT = <<HTML
 <!DOCTYPE html>
 <html>

data/spec/sequel_spec_helper.rb

@@ -7,7 +7,8 @@ module AutoFormeSpec
   def self.db_setup(tables)
     db_url = ENV['DATABASE_URL']
     db_url ||= defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby' ? 'jdbc:sqlite::memory:' : 'sqlite:/'
-    db = Sequel.connect(db_url)
+    db = Sequel.connect(db_url, :identifier_mangling=>false)
+    db.extension :freeze_datasets
     #db.loggers << Logger.new($stdout)
     tables.each do |table, table_spec|
       db.create_table(table) do
@@ -22,6 +23,7 @@ module AutoFormeSpec
       end
     end
 
+    db.freeze
     db
   end
 

data/spec/unit_spec.rb

@@ -68,7 +68,7 @@ describe AutoForme do
   end
 
   it "should handle order lookup" do
-    model.order_for(:browse, nil).must_equal nil
+    model.order_for(:browse, nil).must_be_nil
     framework.order :bar
     model.order_for(:browse, nil).must_equal :bar
     framework.order{|mod, type, req| [mod.name.to_sym, type, req]}
@@ -80,7 +80,7 @@ describe AutoForme do
   end
 
   it "should handle eager lookup" do
-    model.eager_for(:browse, nil).must_equal nil
+    model.eager_for(:browse, nil).must_be_nil
     model.eager [:foo]
     model.eager_for(:browse, nil).must_equal [:foo]
     model.eager{|type, req| [type, req]}
@@ -88,7 +88,7 @@ describe AutoForme do
   end
 
   it "should handle eager_graph lookup" do
-    model.eager_graph_for(:browse, nil).must_equal nil
+    model.eager_graph_for(:browse, nil).must_be_nil
     model.eager_graph [:foo]
     model.eager_graph_for(:browse, nil).must_equal [:foo]
     model.eager_graph{|type, req| [type, req]}
@@ -96,7 +96,7 @@ describe AutoForme do
   end
 
   it "should handle filter lookup" do
-    model.filter_for.must_equal nil
+    model.filter_for.must_be_nil
     framework.filter{|mod| lambda{|ds, type, req| [ds, mod.name.to_sym, type, req]}}
     model.filter_for.call(1, :browse, 2).must_equal [1, :Artist, :browse, 2]
     model.filter{|ds, type, req| [ds, type, req]}
@@ -104,7 +104,7 @@ describe AutoForme do
   end
 
   it "should handle redirect lookup" do
-    model.redirect_for.must_equal nil
+    model.redirect_for.must_be_nil
     framework.redirect{|mod| lambda{|obj, type, req| [obj, mod.name.to_sym, type, req]}}
     model.redirect_for.call(1, :new, 2).must_equal [1, :Artist, :new, 2]
     model.redirect{|obj, type, req| [obj, type, req]}
@@ -112,7 +112,7 @@ describe AutoForme do
   end
 
   it "should handle display_name lookup" do
-    model.display_name_for.must_equal nil
+    model.display_name_for.must_be_nil
     framework.display_name :foo
     model.display_name_for.must_equal :foo
     framework.display_name{|mod| mod.name.to_sym}
@@ -248,7 +248,7 @@ describe AutoForme do
   end
 
   it "should handle page_header lookup" do
-    model.page_header_for(:show, nil).must_equal nil
+    model.page_header_for(:show, nil).must_be_nil
     framework.page_header "foo"
     model.page_header_for(:show, nil).must_equal 'foo'
     framework.page_header{|mod, type, req| "#{mod} #{type} #{req}"}
@@ -260,7 +260,7 @@ describe AutoForme do
   end
 
   it "should handle page_footer lookup" do
-    model.page_footer_for(:show, nil).must_equal nil
+    model.page_footer_for(:show, nil).must_be_nil
     framework.page_footer "foo"
     model.page_footer_for(:show, nil).must_equal 'foo'
     framework.page_footer{|mod, type, req| "#{mod} #{type} #{req}"}
@@ -461,7 +461,7 @@ describe AutoForme::OptsAttributes do
   end
 
   it "should act as a getter if given no arguments, and setter if given arguments or a block" do
-    @o.foo.must_equal nil
+    @o.foo.must_be_nil
     @o.foo(1).must_equal 1
     @o.foo.must_equal 1
     p = proc{}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoforme
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2017-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forme
@@ -267,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Web Administrative Console for Sinatra/Rails and Sequel