bowtie 0.1 → 0.2

data/README.rdoc

@@ -0,0 +1,44 @@
+= Bowtie for Sinatra.
+
+Zeroconf admin generator for DataMapper models, written in Sinatra.
+
+= What it does
+
+Reads the information on your models and creates a nice panel in which you can view, edit and destroy records easily.
+
+= Installation
+
+  $ sudo gem install bowtie
+
+= Configuration
+
+Mount Bowtie wherever you want by editing your config.ru file, optionally including the admin/pass combination for the panel.
+
+  require 'myapp'
+  require 'bowtie'
+
+	BOWTIE_AUTH = {:user => 'admin', :pass => '12345' }
+
+  app = Rack::Builder.new {
+    map "/admin" do
+      run Bowtie::Admin
+    end
+
+    map '/' do
+      run MyApp
+    end
+  }
+
+  run app
+
+Now you can go to /admin in your app's path and try out Bowtie using your user/pass combination. If not set, it defaults to admin/bowtie.
+
+= TODO
+
+ * Better handling of types (Text, JSON, IPAddress) in #show
+ * Better handling of relationships in #show
+
+= Copyright
+
+(c) 2010 - Tomás Pollak for Fork Ltd.
+Released under the MIT license.

data/bowtie.gemspec

@@ -1,15 +1,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bowtie}
-  s.version = "0.1"
+  s.version = "0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tomás Pollak"]
-  s.date = %q{2010-02-14}
-  s.description = %q{Sinatra scaffold for DataMapper models.}
+  s.date = %q{2010-06-06}
+  s.description = %q{Admin scaffold for DataMapper models, on Sinatra.}
   s.email = %q{tomas@usefork.com}
   s.extra_rdoc_files = ["lib/bowtie.rb", "lib/bowtie/admin.rb", "lib/bowtie/core_extensions.rb", "lib/bowtie/helpers.rb"]
-  s.files = ["README", "bowtie.gemspec", "lib/bowtie.rb", "lib/bowtie/admin.rb", "lib/bowtie/core_extensions.rb", "lib/bowtie/helpers.rb", "lib/bowtie/views/errors.erb", "lib/bowtie/views/field.erb", "lib/bowtie/views/flash.erb", "lib/bowtie/views/form.erb", "lib/bowtie/views/index.erb", "lib/bowtie/views/layout.erb", "lib/bowtie/views/new.erb", "lib/bowtie/views/search.erb", "lib/bowtie/views/search.erb", "lib/bowtie/views/show.erb", "lib/bowtie/views/subtypes.erb", "lib/bowtie/views/table.erb", "lib/bowtie/views/row.erb", "lib/bowtie/public/css/bowtie.css", "lib/bowtie/public/js/bowtie.js", "lib/bowtie/public/js/jquery.tablesorter.pack.js", "lib/bowtie/public/js/jquery.jeditable.pack.js"]
+  s.files = ["README.rdoc", "bowtie.gemspec", "lib/bowtie.rb", "lib/bowtie/admin.rb", "lib/bowtie/core_extensions.rb", "lib/bowtie/helpers.rb", "lib/bowtie/views/errors.erb", "lib/bowtie/views/field.erb", "lib/bowtie/views/flash.erb", "lib/bowtie/views/form.erb", "lib/bowtie/views/index.erb", "lib/bowtie/views/layout.erb", "lib/bowtie/views/new.erb", "lib/bowtie/views/search.erb", "lib/bowtie/views/search.erb", "lib/bowtie/views/show.erb", "lib/bowtie/views/subtypes.erb", "lib/bowtie/views/table.erb", "lib/bowtie/views/row.erb", "lib/bowtie/public/css/bowtie.css", "lib/bowtie/public/js/bowtie.js", "lib/bowtie/public/js/jquery.tablesorter.pack.js", "lib/bowtie/public/js/jquery.jeditable.pack.js"]
   s.homepage = %q{http://github.com/tomas/bowtie}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Bowtie", "--main", "README"]
   s.require_paths = ["lib"]

data/lib/bowtie/admin.rb

@@ -4,9 +4,15 @@ module Bowtie
 
 		PER_PAGE = 25
 
-		# TODO: make this easily modifiable
 		use Rack::Auth::Basic do |username, password|
-			username == 'admin' && password == 'bowtie'
+			begin
+				user = ::BOWTIE_AUTH[:user]
+				pass = ::BOWTIE_AUTH[:pass]
+			rescue NameError
+				user = 'admin'
+				pass = 'bowtie'
+			end
+			username == user && password == pass
 		end
 
 		use Rack::MethodOverride
@@ -88,7 +94,6 @@ module Bowtie
 		end
 
 		put "/:model/:id" do
-			puts params[:resource].inspect
 			if resource.update(params[:resource].normalize)
 				request.xhr? ? resource.to_json : redirect("/#{model.pluralize}/#{params[:id]}?notice=saved")
 			else

data/lib/bowtie/core_extensions.rb

@@ -25,7 +25,12 @@ class Class
 	end
 
 	def subtypes
-		self.validators.first.last.map{|a,b| b = {a.field_name => a.options[:set]} if a.class == DataMapper::Validate::WithinValidator}.compact
+		begin
+			self.validators.first.last.map{|a,b| b = {a.field_name => a.options[:set]} if a.class == DataMapper::Validate::WithinValidator}.compact
+		rescue NoMethodError
+			# puts ' -- dm-validations gem not included. Cannot check subtypes for class.'
+			[]
+		end
 	end
 
 	def options_for_subtype(field)

data/lib/bowtie/helpers.rb

@@ -2,6 +2,12 @@ module Bowtie
 
 	module Helpers
 
+		def base_path
+			env['SCRIPT_NAME']
+		end
+
+		# requests, redirects
+
 		def deliver_file
 			file = File.expand_path(File.dirname(__FILE__)) + "/public/#{@env['PATH_INFO']}"
 			return false unless File.exist?(file)
@@ -9,19 +15,16 @@ module Bowtie
 			File.read(file)
 		end
 
-		def base_path
-			env['SCRIPT_NAME']
-		end
-
-		# Sinatra's redirect is not adding path prefix. Seems like a bug to me.
 		def redirect(uri, *args)
 			super base_path + uri.downcase, *args
 		end
 
-		def partial(name, *args)
-			erb(name, :layout => false, *args)
+		def clean_params
+				@env['rack.request.query_hash'].delete_if{|a,b| %w(model page notice error q).include?(a) }
 		end
 
+		# models, resources
+
 		def get_model_class
 			begin
 				Kernel.const_get(params[:model].singularize.capitalize)
@@ -30,10 +33,6 @@ module Bowtie
 			end
 		end
 
-		def clean_params
-				@env['rack.request.query_hash'].delete_if{|a,b| %w(model page notice error q).include?(a) }
-		end
-
 		def model
 			@model ||= get_model_class
 		end
@@ -46,6 +45,12 @@ module Bowtie
 			model
 		end
 
+		# views, paths
+
+		def partial(name, *args)
+			erb(name, :layout => false, *args)
+		end
+
 		def model_path(m = current_model)
 			string = m.name ||= m
 			base_path + '/' + string.to_s.pluralize.downcase

metadata

@@ -1,7 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: bowtie
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - "Tom\xC3\xA1s Pollak"
@@ -9,50 +13,66 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-14 00:00:00 -03:00
+date: 2010-06-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 4
         version: 0.9.4
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 10
+        - 2
         version: 0.10.2
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: dm-aggregates
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 10
+        - 2
         version: 0.10.2
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: dm-pager
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 1
         version: 1.0.1
-    version: 
-description: Sinatra scaffold for DataMapper models.
+  type: :runtime
+  version_requirements: *id004
+description: Admin scaffold for DataMapper models, on Sinatra.
 email: tomas@usefork.com
 executables: []
 
@@ -64,7 +84,7 @@ extra_rdoc_files:
 - lib/bowtie/core_extensions.rb
 - lib/bowtie/helpers.rb
 files: 
-- README
+- README.rdoc
 - bowtie.gemspec
 - lib/bowtie.rb
 - lib/bowtie/admin.rb
@@ -104,18 +124,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 2
       version: "1.2"
-  version: 
 requirements: []
 
 rubyforge_project: bowtie
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Bowtie Admin

data/README

@@ -1,20 +0,0 @@
-Bowtie for Sinatra.
-
-Seems to work but need to do a lot of testing yet.
-
-To try out, download and put in /lib in your app. Then in your config.ru do something like:
-
-require 'app'
-require 'bowtie'
-
-app = Rack::Builder.new {
-  map "/admin" do
-    run Bowtie::Admin
-  end
-
-  map '/' do
-    run MyApp
-  end
-}
-
-run app