RubyGems - rack-backend-api - Versions diffs - 0.2.0 → 0.2.1 - Mend

rack-backend-api 0.2.0 → 0.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

data/README.md +1 -0
data/lib/backend_api.rb +1 -1
data/lib/sequel_rack_backend_api_adapter.rb +10 -2
data/rack-backend-api.gemspec +1 -1
data/test/db.rb +15 -1
data/test/spec_backend_api.rb +4 -0
data/test/spec_sequel_adapter.rb +21 -2
metadata +4 -4

data/README.md CHANGED Viewed

@@ -292,6 +292,7 @@ CHANGE LOG
 0.0.5 Ordered list of fields to keep before validation
 0.1.0 Introduce sorting functionality
 0.2.0 Control what you send on 201 responses
+0.2.1 Have a title in forms + Only use `_method` if not POST
 COPYRIGHT
 =========

data/lib/backend_api.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 class BackendAPI
-  VERSION = [0,2,0]
+  VERSION = [0,2,1]
   WRAP = <<-EOT
   <!doctype html>
   <html>

data/lib/sequel_rack_backend_api_adapter.rb CHANGED Viewed

@@ -27,9 +27,10 @@ module ::Sequel::Plugins::RackBackendApiAdapter
       cols ||= default_backend_columns
       fields_list = respond_to?(:crushyform) ? crushyform(cols) : backend_fields(cols)
       o = "<form action='#{url}' method='POST' #{"enctype='multipart/form-data'" if fields_list.match(/type='file'/)} class='backend-form'>\n"
+      o << backend_form_title
       o << fields_list
-      method = self.new? ? 'POST' : 'PUT'
-      o << "<input type='hidden' name='_method' value='#{opts[:method] || method}' />\n"
+      opts[:method] = 'PUT' if (opts[:method].nil? && !self.new?)
+      o << "<input type='hidden' name='_method' value='#{opts[:method]}' />\n" unless opts[:method].nil?
       o << "<input type='hidden' name='_destination' value='#{opts[:destination]}' />\n" unless opts[:destination].nil?
       o << "<input type='hidden' name='_submit_text' value='#{opts[:submit_text]}' />\n" unless opts[:submit_text].nil?
       o << "<input type='hidden' name='_no_wrap' value='#{opts[:no_wrap]}' />\n" unless opts[:no_wrap].nil?
@@ -42,6 +43,13 @@ module ::Sequel::Plugins::RackBackendApiAdapter
     end
     def backend_delete_form(url, opts={}); backend_form(url, [], {:submit_text=>'X', :method=>'DELETE'}.update(opts)); end
+    def backend_form_title
+      n = self.respond_to?(:to_label) ? self.to_label : self.backend_to_label
+      "<h2>#{'Edit ' unless self.new?}#{n}</h2>"
+    end
+    def backend_to_label; [self.new? ? 'New' : nil, model.name, id].compact!.join(' '); end
     # Silly but usable form prototype
     # Not really meant to be used in a real case

data/rack-backend-api.gemspec CHANGED Viewed

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'rack-backend-api'
-  s.version = "0.2.0"
+  s.version = "0.2.1"
   s.platform = Gem::Platform::RUBY
   s.summary = "A Rack middleware that provides a simple API for your Admin section"
   s.description = "The purpose of this Rack Middleware is to provide an API that interfaces with database actions in order to build a CMS."

data/test/db.rb CHANGED Viewed

@@ -1,6 +1,5 @@
 require 'sequel'
 ::Sequel::Model.plugin :schema
-::Sequel::Model.plugin :crushyform rescue nil
 DB = ::Sequel.sqlite
 class Haiku < ::Sequel::Model
@@ -12,6 +11,7 @@ class Haiku < ::Sequel::Model
     foreign_key :author_id, :authors
   end
   create_table unless table_exists?
+  plugin :crushyform
   many_to_one :author
   def validate
     errors[:title] << "Should start with a decent char" if title.to_s!='' && title[0]<65
@@ -26,6 +26,7 @@ class Author < ::Sequel::Model
     String :surname, :crushyform=>{:required=>true}
   end
   create_table unless table_exists?
+  plugin :crushyform
   one_to_many :haikus
   def validate
     errors[:name] << 'Cannot be blank' if name.to_s==''
@@ -40,6 +41,7 @@ class Pic < ::Sequel::Model
     String :image, :crushyform=>{:type=>:attachment}
   end
   create_table unless table_exists?
+  plugin :crushyform
 end
 class CamelCasedClass < ::Sequel::Model
@@ -48,6 +50,7 @@ class CamelCasedClass < ::Sequel::Model
     String :name
   end
   create_table unless table_exists?
+  plugin :crushyform
 end
 class TopFive < ::Sequel::Model
@@ -57,9 +60,18 @@ class TopFive < ::Sequel::Model
     String :flavour
   end
   create_table unless table_exists?
+  plugin :crushyform
   plugin :list
 end
+class NoCrushyform < ::Sequel::Model
+  set_schema do
+    primary_key :id
+    String :name
+  end
+  create_table unless table_exists?
+end
 Haiku.create( :title=>'Autumn', :body=>"Rust the ground\nFlush the branches\nReveal the trees" )
 Haiku.create( :title=>'Winter', :body=>"There is snow\nIt covers you\nBut you are still the most beautiful" )
 Haiku.create( :title=>'Spring', :body=>"No inspiration" )
@@ -73,3 +85,5 @@ TopFive.create(:flavour=>'Vanilla')
 TopFive.create(:flavour=>'Chocolate')
 TopFive.create(:flavour=>'Coconut')
 TopFive.create(:flavour=>'Apricot')
+NoCrushyform.create(:name=>'Fernando')

data/test/spec_backend_api.rb CHANGED Viewed

@@ -73,6 +73,10 @@ describe 'API Misc' do
     res2.status.should==200
     res1.body.should==res2.body.gsub('camel_cased_class', 'CamelCasedClass')
   end
+  should "Only accept defined constants before eval (security)" do
+    lambda{req_lint(BackendAPI.new).get('/*ca%20mel_cas-ed_class')}.should.raise(NameError)
+  end
 end
 describe 'API Post' do

data/test/spec_sequel_adapter.rb CHANGED Viewed

@@ -39,7 +39,7 @@ describe 'Sequel Adapter' do
   end
   should 'Have Method Override value POST/PUT automatically set by default in the form' do
-    Haiku.new.backend_form('/url').should.match(/name='_method' value='POST'/)
+    Haiku.new.backend_form('/url').should.not.match(/name='_method'/)
     Haiku.first.backend_form('/url').should.match(/name='_method' value='PUT'/)
   end
@@ -88,7 +88,26 @@ describe 'Sequel Adapter' do
   end
   should "Have an instance method called backend_show that says 'OK' by default" do
-    Haiku[1].backend_show.should=='OK'
+    Author[1].backend_show.should=='OK'
+  end
+  should "Have default labels for when Model#to_label is not implemented" do
+    NoCrushyform.new.backend_to_label.should=='New NoCrushyform'
+    NoCrushyform[1].backend_to_label.should=='NoCrushyform 1'
+  end
+  should "Have a correct form title for instances" do
+    # No crushyform
+    NoCrushyform.new.backend_form_title.should=='<h2>New NoCrushyform</h2>' # New
+    NoCrushyform[1].backend_form_title.should=='<h2>Edit NoCrushyform 1</h2>' # Edit
+    # Crushyform
+    CamelCasedClass.new.backend_form_title.should=="<h2>#{CamelCasedClass.new.to_label}</h2>" # New
+    TopFive[1].backend_form_title.should=="<h2>Edit #{TopFive[1].to_label}</h2>" # No label
+    Author[1].backend_form_title.should=="<h2>Edit #{Author[1].to_label}</h2>" # Label
+  end
+  should 'Include title in the form' do
+    Author[1].backend_form('/url').should.match(/#{Regexp.escape(Author[1].backend_form_title)}/)
   end
 end

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rack-backend-api
 version: !ruby/object:Gem::Version
-  hash: 23
+  hash: 21
   prerelease:
   segments:
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors:
 - Mickael Riga
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-07-27 00:00:00 +01:00
+date: 2011-08-05 00:00:00 +01:00
 default_executable:
 dependencies: []