autoforme 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f75b662ff8c3d65dfbf9a7e4187aac673af1ffff
-  data.tar.gz: e6d75bd0451be7511938859903bde4311891d0d3
+  metadata.gz: 83fda57cc1135158108ed30103403c23d0600ccf
+  data.tar.gz: 42e3f1e0bae263ea3e5babc767cb3492bf2f5efe
 SHA512:
-  metadata.gz: 32550500006667014af561745e6d002455aba058846433e3fa5ecaf9f4fdfce1038ee1cd736f713151d0347fb80d2a7665c0c6de8d71a7e2c0d5707bc81d2a9c
-  data.tar.gz: 25122fe3de631c441156721d44fa3544b67f7c2eaae17ede522922aeb5ee13d4304712986373637e6ff984afb7a83c4a7a6a52f498707aa6dcc8de96dd67c0d9
+  metadata.gz: 0d716b34aec6a9b8a7e85e6c3928a029240ff1959b3e94358cdbcd974164f34a6a68206d698977d5cdfedbf253b6973ae04713574693f20d18c6933647e7c47f
+  data.tar.gz: fc8efa80a2e498952c10c1052b9eccee17d20a5d488e7416537e3eae89b76f6505cddf3058be80580f139e959f5d3a9f82c2c8bbfb411b172f7783e704b5f0c0

data/CHANGELOG

@@ -1,3 +1,9 @@
+=== 1.7.0 (2017-10-27)
+
+* Respect Model#forme_namespace method for parameter names (adam12, jeremyevans) (#9)
+
+* Typecast column values when searching (jeremyevans)
+
 === 1.6.0 (2017-05-04)
 
 * Fix mtm code when using model classes with different primary key names (jeremyevans)

data/README.rdoc

@@ -3,7 +3,7 @@
 AutoForme is an administrative web front end to an ORM that uses
 Forme [1] for building the HTML forms.  It is designed to
 integrate easily into web frameworks, and currently supports
-Sinatra, Roda, and Rails.  The only currently supported ORM is
+Roda, Sinatra, and Rails.  The only currently supported ORM is
 Sequel::Model.
 
 AutoForme's UI and capabilities are modeled on
@@ -178,7 +178,7 @@ table_class :: The html class string to use for the browse and search tables
 These hook options should be callable objects that are called with the model object and the request.
 
 after_create :: Called after creating the object
-after_destroy :: Called after destroy the object
+after_destroy :: Called after destroying the object
 after_update :: Called after updating the object
 before_create :: Called before creating the object 
 before_destroy :: Called before destroy the object

data/lib/autoforme/models/sequel.rb

@@ -10,10 +10,15 @@ module AutoForme
       # What association types to recognize.  Other association types are ignored.
       SUPPORTED_ASSOCIATION_TYPES = [:many_to_one, :one_to_one, :one_to_many, :many_to_many]
 
+      # The namespace for form parameter names for this model, needs to match
+      # the ones automatically used by Forme.
+      attr_reader :params_name
+
       # Make sure the forme plugin is loaded into the model.
       def initialize(*)
         super
         model.plugin :forme
+        @params_name = model.new.forme_namespace
       end
 
       # The base class for the underlying model, ::Sequel::Model.
@@ -23,7 +28,7 @@ module AutoForme
 
       # The name of the form param for the given association.
       def form_param_name(assoc)
-        "#{model.send(:underscore, model.name)}[#{association_key(assoc)}]"
+        "#{params_name}[#{association_key(assoc)}]"
       end
 
       # Set the fields for the given action type to the object based on the request params.
@@ -114,12 +119,6 @@ module AutoForme
         obj.pk
       end
 
-      # The namespace for form parameter names for this model, needs to match
-      # the ones automatically used by Forme.
-      def params_name
-        model.send(:underscore, model.name)
-      end
-
       # Retrieve underlying model instance with matching primary key
       def with_pk(type, request, pk)
         dataset_for(type, request).with_pk!(pk)
@@ -171,7 +170,7 @@ module AutoForme
             elsif column_type(c) == :string
               ds = ds.where(S.ilike(S.qualify(model.table_name, c), "%#{ds.escape_like(v.to_s)}%"))
             else
-              ds = ds.where(S.qualify(model.table_name, c)=>v.to_s)
+              ds = ds.where(S.qualify(model.table_name, c)=>model.db.typecast_value(column_type(c), v))
             end
           end
         end

data/lib/autoforme/version.rb

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

data/spec/basic_spec.rb

@@ -607,6 +607,86 @@ describe AutoForme do
   end
 end
 
+describe AutoForme do
+  before(:all) do
+    db_setup(:artists=>[[:name, :string], [:active, :boolean]])
+    model_setup(:Artist=>[:artists])
+  end
+  after(:all) do
+    Object.send(:remove_const, :Artist)
+  end
+
+  it "should typecast when searching" do
+    app_setup(Artist)
+    Artist.plugin(:typecast_on_load, :active) if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+    visit("/Artist/new")
+    page.title.must_equal 'Artist - New'
+    select 'True'
+    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(/Active.+True.+Name.+TestArtistNew/m)
+
+    click_link 'Edit'
+    page.title.must_equal 'Artist - Edit'
+    click_button 'Edit'
+    select 'TestArtistNew'
+    click_button 'Edit'
+    select 'False'
+    fill_in 'Name', :with=>'TestArtistUpdate'
+    click_button 'Update'
+    page.html.must_include 'Updated Artist'
+    page.html.must_match(/Active.+False.+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'
+    select 'False'
+    click_button 'Search'
+    page.all('table').first['id'].must_equal 'autoforme_table'
+    page.all('th').map{|s| s.text}.must_equal ['Active', 'Name', 'Show', 'Edit', 'Delete']
+    page.all('td').map{|s| s.text}.must_equal ['false', "TestArtistUpdate", "Show", "Edit", "Delete"]
+    click_link 'CSV Format'
+    page.body.must_equal "Active,Name\nfalse,TestArtistUpdate\n"
+
+    visit("/Artist/browse")
+    click_link 'Search'
+    fill_in 'Name', :with=>'Foo'
+    click_button 'Search'
+    page.all('td').map{|s| s.text}.must_equal []
+
+    visit("/Artist/browse")
+    click_link 'Search'
+    select 'True'
+    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 ["false", "TestArtistUpdate", "Show", "Edit", "Delete"]
+    click_link 'CSV Format'
+    page.body.must_equal "Active,Name\nfalse,TestArtistUpdate\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
+
 describe AutoForme do
   before(:all) do
     db_setup(:artists=>(0..5).map{|i|[:"n#{i}", :string]})
@@ -1041,3 +1121,28 @@ describe AutoForme do
     page.all('td').map{|s| s.text}.must_equal []
   end
 end
+
+describe AutoForme do
+  before(:all) do
+    db_setup(:artists=>[[:name, :string]])
+    Namespace = Module.new
+
+    class Namespace::Artist < Sequel::Model(db[:artists])
+      def forme_namespace
+        "artist"
+      end
+    end
+  end
+  after(:all) do
+    Object.send(:remove_const, :Namespace)
+  end
+
+  it "respects the forme_namespace method on the model" do
+    app_setup(Namespace::Artist)
+    visit("/Namespace::Artist/new")
+    fill_in 'Name', :with=>'TestArtistNew'
+    click_button 'Create'
+    page.html.must_include 'Created Namespace::Artist'
+    page.current_path.must_equal '/Namespace::Artist/new'
+  end
+end

data/spec/rails_spec_helper.rb

@@ -58,8 +58,10 @@ HTML
       config.middleware.delete(Rack::Lock)
       config.secret_key_base = 'foo'
       config.eager_load = true
-      if Rails.version > '5'
+      if Rails.version > '4.2'
         config.action_dispatch.cookies_serializer = :json
+      end
+      if Rails.version > '5'
         # Force Rails to dispatch to correct controller
         ActionDispatch::Routing::RouteSet::Dispatcher.class_eval do
           define_method(:controller){|_| controller}

data/spec/roda_spec_helper.rb

@@ -33,7 +33,6 @@ HTML
   use Rack::Session::Cookie, :secret => '1'
   use Rack::Csrf
 
-  plugin :static_path_info unless ENV['RODA_NO_STATIC_PATH_INFO']
   template_opts = {:default_encoding=>nil}
   plugin :render, :layout=>{:inline=>LAYOUT}, :template_opts=>template_opts, :opts=>template_opts
   plugin :not_found do

data/spec/sequel_spec_helper.rb

@@ -3,7 +3,7 @@ require 'sequel'
 require 'logger'
 
 module AutoFormeSpec
-  TYPE_MAP = {:string=>String, :integer=>Integer, :decimal=>Numeric}
+  TYPE_MAP = {:string=>String, :integer=>Integer, :decimal=>Numeric, :boolean=>TrueClass}
   def self.db_setup(tables)
     db_url = ENV['DATABASE_URL']
     db_url ||= defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby' ? 'jdbc:sqlite::memory:' : 'sqlite:/'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoforme
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-04 00:00:00.000000000 Z
+date: 2017-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forme
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +194,7 @@ dependencies:
         version: '0'
 description: |
   AutoForme is an web administrative console for Sequel::Model that
-  supports Sinatra and Rails.  It offers the following features:
+  supports Roda, Sinatra, and Rails.  It offers the following features:
 
   * Create, update, edit, and view model objects
   * Browse and search model objects
@@ -250,7 +250,7 @@ rdoc_options:
 - "--line-numbers"
 - "--inline-source"
 - "--title"
-- 'AutoForme: Web Administrative Console for Sinatra/Rails and Sequel'
+- 'AutoForme: Web Administrative Console for Roda/Sinatra/Rails and Sequel::Model'
 - "--main"
 - README.rdoc
 require_paths:
@@ -267,8 +267,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
-summary: Web Administrative Console for Sinatra/Rails and Sequel
+summary: Web Administrative Console for Roda/Sinatra/Rails and Sequel::Model
 test_files: []