autoforme 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5d8f0b4739dec3afd2a850017943c1e63e611ef
-  data.tar.gz: be9289f7da3c2769d9326df35f8e88c266795bf3
+  metadata.gz: 299ca55f54b46bf0629229262853d3dc19a5bc64
+  data.tar.gz: c136195e2191c628c71b0e66e8dad48db965ac37
 SHA512:
-  metadata.gz: e9de31745c4580fd52d51f5222d314e566995d270e5ba9d68a3f32016a9e61571b89f9ceca871abb45fc4f9c8555f30149dacab5076ed60e82afb98457318c8f
-  data.tar.gz: 5426d2b558346e01c15dc85a480f7811369bc3fbf555ad76d3a1045810fdd2b38c1fee8e3ac65cff84afa4b9bd4b46934abaaede05989655a119c29b9d7cf7a4
+  metadata.gz: 0fe74271b2d60e2269041d3c8c17300538d043eb5901d97e4c73936a088c8f9d9524c9c09419edac647188eb3ffecc6b2fee1b91ccf05516694e43c16c0ebdb7
+  data.tar.gz: f4680d5384dfa5984579f4d7022b956d1e0d6c077b3069de0543b5a8d4260d0bb23e662839f7992f434cd2542cb8ce3766cc8cc32c2d0d94203424071996a2d9

data/CHANGELOG

@@ -1,3 +1,13 @@
+=== 1.4.0 (2016-05-18)
+
+* Handle selecting a blank object during show/edit/delete/mtm_edit by showing the same page (jeremyevans)
+
+* Support UUID primary keys (badosu, jeremyevans) (#6)
+
+* Add Request#env for getting the environment for the request (jeremyevans)
+
+* Handle search results pagination correctly when an id parameter is used (badosu, jeremyevans) (#5)
+
 === 1.3.0 (2016-02-02)
 
 * Add support for running with --enable-frozen-string-literal on ruby 2.3 (jeremyevans)

data/Rakefile

@@ -18,7 +18,11 @@ end
 task :default => :roda_spec
 
 desc "Run specs for all frameworks"
-task :spec => [:roda_spec, :sinatra_spec, :rails_spec]
+spec_tasks = [:roda_spec, :sinatra_spec]
+if RUBY_VERSION >= '1.9'
+  spec_tasks << :rails_spec
+end
+task :spec => spec_tasks
 
 %w'roda sinatra rails'.each do |framework|
   desc "Run specs with for #{framework} with coverage"

data/lib/autoforme/frameworks/rails.rb

@@ -14,6 +14,7 @@ module AutoForme
           @action_type = @params['autoforme_action']
           @path = @env['SCRIPT_NAME']
           @id = @params['id']
+          @id = nil if @id && @id.empty?
         end
 
         # Implement redirects in the Rails support using throw/catch, similar to

data/lib/autoforme/frameworks/roda.rb

@@ -20,7 +20,9 @@ module AutoForme
           else
             @env['PATH_INFO']
           end
-          @id = @params['id'] || ($1 if remaining_path =~ %r{\A\/(\w+)\z})
+
+          path_id = $1 if remaining_path =~ %r{\A\/([\w-]+)\z}
+          set_id(path_id)
         end
 
         # Redirect to the given path

data/lib/autoforme/frameworks/sinatra.rb

@@ -15,7 +15,7 @@ module AutoForme
           @model = captures[0]
           @action_type = captures[1]
           @path = @env['SCRIPT_NAME']
-          @id = @params[:id] || captures[2]
+          set_id(captures[2])
         end
 
         # Redirect to the given path
@@ -58,8 +58,8 @@ 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
+        @controller.get %r{\A#{prefix}/(\w+)/(\w+)(?:/([\w-]+))?\z}, &block
+        @controller.post %r{\A#{prefix}/(\w+)/(\w+)(?:/([\w-]+))?\z}, &block
       end
     end
   end

data/lib/autoforme/models/sequel.rb

@@ -193,7 +193,8 @@ module AutoForme
       def paginate(type, request, ds, opts={})
         return ds.all if opts[:all_results]
         limit = limit_for(type, request)
-        offset = ((request.id.to_i||1)-1) * limit
+        %r{\/(\d+)\z} =~ request.env['PATH_INFO']
+        offset = (($1||1).to_i - 1) * limit
         objs = ds.limit(limit+1, (offset if offset > 0)).all
         next_page = false
         if objs.length > limit

data/lib/autoforme/request.rb

@@ -20,10 +20,12 @@ module AutoForme
     attr_reader :path
 
     # The id related to the request, which is usually the primary
-    # key of the related model instance, but for browse/search
-    # pages is used as the page
+    # key of the related model instance.
     attr_reader :id
 
+    # The HTTP request environment hash
+    attr_reader :env
+
     # The params for the current request
     attr_reader :params
 
@@ -51,5 +53,18 @@ module AutoForme
     def set_flash_now_error(message)
       @controller.flash.now[:error] = message
     end
+
+    private
+
+    def set_id(path_id)
+      @id = path_id
+      if param_id = @params['id']
+        case @action_type
+        when 'show', 'edit', 'delete', 'mtm_edit'
+          @id = param_id
+        end
+      end
+      @id = nil if @id && @id.empty?
+    end
   end
 end

data/lib/autoforme/version.rb

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

data/spec/basic_spec.rb

@@ -20,12 +20,14 @@ describe AutoForme do
 
     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'
@@ -142,6 +144,23 @@ describe AutoForme do
     click_button 'Edit'
   end
 
+  it "should support showing models with custom ids" do
+    db_setup(:tracks => proc do
+      column :id, String, :primary_key => true
+      column :name, String
+    end)
+
+    model_setup(:Track => [:tracks])
+    Track.unrestrict_primary_key
+    app_setup(Track)
+
+    Track.create(:id => 'dark-side', :name => 'The Dark Side of the Moon')
+
+    visit("/Track/show/dark-side")
+
+    page.html.must_include 'The Dark Side of the Moon'
+  end
+
   it "should support custom redirects" do
     app_setup(Artist) do
       redirect do |obj, type, req|
@@ -162,6 +181,7 @@ describe AutoForme do
     click_button 'Update'
     page.current_path.must_match %r{/Artist/show/\d}
     click_link 'Delete'
+    click_button 'Delete'
     select 'TestArtistNew'
     click_button 'Delete'
     click_button 'Delete'
@@ -312,28 +332,32 @@ describe AutoForme do
     end
     5.times{|i| Artist.create(:name=>i.to_s)}
     visit("/Artist/browse")
-    first('li.disabled a').text.must_equal 'Previous'
+    pager_class = lambda do |text|
+      node = all('ul.pager li').select{|n| n[:class] if n.find('a').text == text}.first
+      node[:class] if node
+    end
+    pager_class.call("Previous").must_equal 'disabled'
     page.all('tr td:first-child').map{|s| s.text}.must_equal %w'0 1'
     click_link 'Next'
     page.all('tr td:first-child').map{|s| s.text}.must_equal %w'2 3'
     click_link 'Next'
     page.all('tr td:first-child').map{|s| s.text}.must_equal %w'4'
-    first('li.disabled a').text.must_equal 'Next'
+    pager_class.call("Next").must_equal 'disabled'
     click_link 'Previous'
     page.all('tr td:first-child').map{|s| s.text}.must_equal %w'2 3'
     click_link 'Previous'
     page.all('tr td:first-child').map{|s| s.text}.must_equal %w'0 1'
-    first('li.disabled a').text.must_equal 'Previous'
+    pager_class.call("Previous").must_equal 'disabled'
 
     click_link 'Search'
     click_button 'Search'
     page.all('tr td:first-child').map{|s| s.text}.must_equal %w'0 1 2'
     click_link 'Next'
     page.all('tr td:first-child').map{|s| s.text}.must_equal %w'3 4'
-    first('li.disabled a').text.must_equal 'Next'
+    pager_class.call("Next").must_equal 'disabled'
     click_link 'Previous'
     page.all('tr td:first-child').map{|s| s.text}.must_equal %w'0 1 2'
-    first('li.disabled a').text.must_equal 'Previous'
+    pager_class.call("Previous").must_equal 'disabled'
   end
 
   it "should support specifying supported actions" do

data/spec/mtm_spec.rb

@@ -37,6 +37,7 @@ describe AutoForme do
 
     visit("/Artist/mtm_edit")
     page.title.must_equal 'Artist - Many To Many Edit'
+    click_button "Edit"
     select("Artist1")
     click_button "Edit"
 

data/spec/sequel_spec_helper.rb

@@ -5,16 +5,23 @@ require 'logger'
 module AutoFormeSpec
   TYPE_MAP = {:string=>String, :integer=>Integer, :decimal=>Numeric}
   def self.db_setup(tables)
-    db = Sequel.connect(ENV['DATABASE_URL'] || 'sqlite:/')
+    db_url = ENV['DATABASE_URL']
+    db_url ||= defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby' ? 'jdbc:sqlite::memory:' : 'sqlite:/'
+    db = Sequel.connect(db_url)
     #db.loggers << Logger.new($stdout)
-    tables.each do |table, columns|
+    tables.each do |table, table_spec|
       db.create_table(table) do
-        primary_key :id
-        columns.each do |name, type, opts|
-          column name, TYPE_MAP[type], opts||{}
+        if table_spec.kind_of? Enumerable
+          primary_key :id
+          table_spec.each do |name, type, opts|
+            column name, TYPE_MAP[type], opts||{}
+          end
+        elsif table_spec.respond_to? :call
+          self.instance_eval(&table_spec)
         end
       end
     end
+
     db
   end
 
@@ -22,7 +29,7 @@ module AutoFormeSpec
     models.each do |name, (table, associations)|
       klass = Class.new(Sequel::Model(db[table]))
       Object.const_set(name, klass)
-      klass.class_eval do 
+      klass.class_eval do
         if associations
           associations.each do |type, assoc, opts|
             associate(type, assoc, opts||{})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoforme
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: forme