sinatra_more 0.3.18 → 0.3.21

data/README.rdoc

@@ -691,7 +691,7 @@ The available components and their default options are listed below:
 * renderer: <tt>erb</tt>    (default), <tt>haml</tt>
 * mock:     <tt>mocha</tt>  (default), <tt>rr</tt>
 * script:   <tt>jquery</tt> (default), <tt>prototype</tt>, <tt>rightjs</tt>
-* orm:      <tt>datamapper</tt> (default), <tt>mongomapper</tt>, <tt>activerecord</tt>, <tt>sequel</tt>
+* orm:      <tt>datamapper</tt> (default), <tt>mongomapper</tt>, <tt>activerecord</tt>, <tt>sequel</tt>, <tt>couchrest</tt>
 
 The generator uses the <tt>bundler</tt> gem to resolve any application dependencies when the application is newly created.
 The necessary bundler command can be executed automatically through the generator with
@@ -730,6 +730,7 @@ See the wiki article for additional information: <http://wiki.github.com/nesquen
 
 * Nathan Esquenazi - Project creator and code maintainer
 * Arthur Chiu      - Forming the idea and various code contributions
+* Rob Holland      - Added couchrest ORM component to generator
 
 == Known Issues
 

data/ROADMAP

@@ -23,10 +23,11 @@ Framework structure:
  
 Additional wish-list features (integrate existing plugin) (?)
 
+ * Reloading Support     - http://github.com/alexch/rerun
  * Internationalization  - http://r18n.rubyforge.org/#sinatra
  * Asynchronous Commands - http://github.com/deadprogrammer/spork
  * Capistrano Deployment - http://github.com/nakajima/capinatra (?)
- * Job Queue             - http://github.com/adamcooke/resque (or http://github.com/bmizerany/sinatra-dj)
+ * Job Queue             - http://github.com/adamcooke/resque (or http://github.com/bmizerany/sinatra-dj)       
 
 'sinatra-cache' Caching concept:
 
@@ -79,4 +80,9 @@ Additional wish-list features (integrate existing plugin) (?)
  
     # and to use
     link_to "Show Admin", url_for(:admin, :show, :id => 5)
-    link_to "Accounts",   url_for(:accounts)
+    link_to "Accounts",   url_for(:accounts)
+
+'commands' Concept: (console (?) http://github.com/sickill/racksh)
+
+    $ sinatra_more console # loads console for sinatra
+    $ sinatra_more test    # runs all test using specified testing framework

data/TODO

@@ -8,6 +8,8 @@
   * http://github.com/gioext/sinatra-memcache
   * http://github.com/kematzy/sinatra-cache
   * http://r18n.rubyforge.org/#sinatra
+  * http://github.com/alexch/rerun (reloading)
+  * http://github.com/monkrb/glue/blob/master/lib/monk/glue/reloader.rb
 
 = UNFINISHED
 
@@ -17,14 +19,21 @@
 
 == MarkupPlugin
 
+  * Add support for mustache classes / views for forms, markup
   * Add support for form.fields_for (one-to-one, nested and many associations like in rails)
   * Add support for check_box_group, radio_button_group which create a set of checkboxes or radio buttons
   
+== RenderPlugin
+  
+ * Add support for mustache template rendering
+
 == WardenPlugin
 
   * Become total warden solution (basically just require warden gem installed, do everything) (?)
   * Look into removing overlapping methods and simply leveraging sinatra_warden
   * Take advantage of shared strategies: http://github.com/hassox/warden_strategies/tree/master/lib/
+  
+== RoutingPlugin
 
 = COMPLETED
 

data/VERSION

@@ -1 +1 @@
-0.3.18
+0.3.21

data/generators/base_app/config/boot.rb.tt

@@ -23,7 +23,7 @@ class <%= @class_name %> < Sinatra::Application
   set :views, root_path("app", "views")
   set :images_path, public_path("images")
   set :default_builder, 'StandardFormBuilder'
-  set :environment, RACK_ENV if defined?(RACK_ENV)
+  set :environment, RACK_ENV.to_sym if defined?(RACK_ENV)
 
   # Attempts to require all dependencies with bundler, if this fails, bundle and then try again
   def self.bundler_require_dependencies(environment=nil)

data/generators/base_app/config/dependencies.rb.tt

@@ -1,5 +1,9 @@
 # Dependencies contains all required gems, helpers and core configuration
 
+def app(&block)
+  <%= @class_name %>.class_eval(&block)
+end
+
 class <%= @class_name %> < Sinatra::Application
   bundler_require_dependencies
   

data/generators/components/orms/couchrest_orm_gen.rb

@@ -0,0 +1,64 @@
+module SinatraMore
+  module CouchrestOrmGen
+    
+    COUCHREST = <<-COUCHREST
+module CouchRestInitializer
+  def self.registered(app)
+    app.configure(:development) { set :couchdb, CouchRest.database!('your_dev_db_here') }
+    app.configure(:production)  { set :couchdb, CouchRest.database!('your_production_db_here') }
+    app.configure(:test)        { set :couchdb, CouchRest.database!('your_test_db_here') }
+  end
+end
+COUCHREST
+
+  USER = <<-USER
+class User < CouchRest::ExtendedDocument
+  include CouchRest::Validation
+  
+  use_database app { couchdb }
+  
+  property :name
+  property :username
+  property :email
+  property :crypted_password
+  unique_id :id
+  
+  attr_accessor :password, :password_confirmation
+  validates_is_confirmed :password
+  
+  save_callback :before, :encrypt_password
+  
+  def self.find(id)
+    get(id)
+  end
+  
+  def self.id_for(username)
+    "user/\#{username}"
+  end
+  
+  def self.authenticate(username, password)
+    user = User.get(id_for(username))
+    user && user.has_password?(password) ? user : nil
+  end
+  
+  def id
+    self.class.id_for(username)
+  end
+  
+  def encrypt_password
+    self.crypted_password = BCrypt::Password.create(password)
+  end
+  
+  def has_password?(password)
+    BCrypt::Password.new(crypted_password) == password
+  end
+end
+USER
+    
+    def setup_orm
+      require_dependencies 'couchrest'
+      create_file("config/initializers/couch_rest.rb", COUCHREST)
+      create_file("app/models/user.rb", USER)
+    end
+  end
+end

data/generators/generator_actions.rb

@@ -59,6 +59,7 @@ module SinatraMore
       # Also builds the available_choices hash of which component choices are supported
       # component_option :test, "Testing framework", :aliases => '-t', :choices => [:bacon, :shoulda]
       def component_option(name, caption, options = {})
+        (@component_types ||= []) << name
         (@available_choices ||= Hash.new({}))[name] = options[:choices]
         description = "The #{caption} component (#{options[:choices].join(', ')})"
         class_option name, :default => options[:choices].first, :aliases => options[:aliases], :desc => description
@@ -66,7 +67,7 @@ module SinatraMore
 
       # Returns the compiled list of component types which can be specified
       def component_types
-        @available_choices.keys
+        @component_types
       end
 
       # Returns the list of available choices for the given component (including none)

data/generators/skeleton_generator.rb

@@ -20,7 +20,7 @@ module SinatraMore
     class_option :run_bundler, :aliases => '-b', :default => false, :type => :boolean
 
     # Definitions for the available customizable components
-    component_option :orm,      "database engine",    :aliases => '-d', :choices => [:datamapper, :mongomapper, :activerecord, :sequel]
+    component_option :orm,      "database engine",    :aliases => '-d', :choices => [:datamapper, :mongomapper, :activerecord, :sequel, :couchrest]
     component_option :test,     "testing framework",  :aliases => '-t', :choices => [:bacon, :shoulda, :rspec, :testspec, :riot]
     component_option :mock,     "mocking library",    :aliases => '-m', :choices => [:mocha, :rr]
     component_option :script,   "javascript library", :aliases => '-s', :choices => [:jquery, :prototype, :rightjs]

data/sinatra_more.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.3.18"
+  s.version = "0.3.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]
-  s.date = %q{2009-11-13}
+  s.date = %q{2009-11-16}
   s.default_executable = %q{sinatra_gen}
   s.description = %q{Expands sinatra with standard helpers and tools to allow for complex applications}
   s.email = %q{nesquena@gmail.com}
@@ -55,6 +55,7 @@ Gem::Specification.new do |s|
      "generators/components/mocks/mocha_mock_gen.rb",
      "generators/components/mocks/rr_mock_gen.rb",
      "generators/components/orms/activerecord_orm_gen.rb",
+     "generators/components/orms/couchrest_orm_gen.rb",
      "generators/components/orms/datamapper_orm_gen.rb",
      "generators/components/orms/mongomapper_orm_gen.rb",
      "generators/components/orms/sequel_orm_gen.rb",

data/test/generators/test_skeleton_generator.rb

@@ -103,6 +103,14 @@ class TestSkeletonGenerator < Test::Unit::TestCase
       assert_match_in_file(/MongoDbInitializer/, '/tmp/sample_app/config/initializers/mongo_db.rb')
       assert_match_in_file(/class User.*?include MongoMapper::Document/m, '/tmp/sample_app/app/models/user.rb')
     end
+
+    should "properly generate for couchrest" do
+      buffer = silence_logger { SinatraMore::SkeletonGenerator.start(['sample_app', '/tmp', '--orm=couchrest', '--script=none']) }
+      assert_match /Applying.*?couchrest.*?orm/, buffer
+      assert_match_in_file(/gem 'couchrest'/, '/tmp/sample_app/Gemfile')
+      assert_match_in_file(/CouchRestInitializer/, '/tmp/sample_app/config/initializers/couch_rest.rb')
+      assert_match_in_file(/class User < CouchRest::ExtendedDocument/m, '/tmp/sample_app/app/models/user.rb')      
+    end
   end
 
   context "the generator for renderer component" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_more
 version: !ruby/object:Gem::Version 
-  version: 0.3.18
+  version: 0.3.21
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-13 00:00:00 -08:00
+date: 2009-11-16 00:00:00 -08:00
 default_executable: sinatra_gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -158,6 +158,7 @@ files:
 - generators/components/mocks/mocha_mock_gen.rb
 - generators/components/mocks/rr_mock_gen.rb
 - generators/components/orms/activerecord_orm_gen.rb
+- generators/components/orms/couchrest_orm_gen.rb
 - generators/components/orms/datamapper_orm_gen.rb
 - generators/components/orms/mongomapper_orm_gen.rb
 - generators/components/orms/sequel_orm_gen.rb