picky-generators 3.0.0.pre5 → 3.0.0

data/lib/picky-generators/generators/selector.rb

@@ -10,12 +10,13 @@ module Picky
 
       def initialize
         @types = {
-          :sinatra_client       => [Client::Sinatra, :sinatra_client_name],
           :client               => [Client::Sinatra, :sinatra_client_name],
+          :server               => [Server::Sinatra, :sinatra_server_name],
+
+          :sinatra_client       => [Client::Sinatra, :sinatra_client_name],
 
           :classic_server       => [Server::Classic, :unicorn_server_name],
           :sinatra_server       => [Server::Sinatra, :sinatra_server_name],
-          :server               => [Server::Sinatra, :sinatra_server_name],
 
           :all_in_one           => [AllInOne::Sinatra, :"directory_name (use e.g. for Heroku)"]
         }

data/prototypes/all_in_one/sinatra/Gemfile

@@ -1,11 +1,8 @@
 source :gemcutter
 
-# TODO Perhaps require two separate Gemfiles?
-#
-
 # Gems required by the Picky client.
 #
-gem 'picky-client', '3.0.0.pre5' # '~> 3.0'
+gem 'picky-client', '~> 3.0'
 gem 'i18n'
 gem 'activesupport', :require => 'active_support/core_ext'
 gem 'sinatra'
@@ -13,7 +10,7 @@ gem 'haml'
 
 # Gems required by the Picky server.
 #
-gem 'picky', '3.0.0.pre5' # '~> 3.0'
+gem 'picky', '~> 3.0'
 gem 'rake'
 gem 'rack'
 gem 'rack_fast_escape', '2009.06.24' # Optional.
@@ -29,6 +26,5 @@ gem 'activerecord',  '~> 3.0', :require => 'active_record'
 gem 'unicorn'
 
 group :test do
-  gem 'picky-client', '3.0.0.pre5'
   gem 'rspec'
 end

data/prototypes/all_in_one/sinatra/app.rb

@@ -65,14 +65,20 @@ class BookSearch < Sinatra::Application
     haml :'/search'
   end
 
+  # Configure. The configuration info page.
+  #
+  get '/configure' do
+    haml :'/configure'
+  end
+
   # Renders the results into the json.
   #
-  # You get the ids from the picky server and then
-  # populate the result with rendered models.
+  # You get the results from the (local) picky server and then
+  # populate the result hash with rendered models.
   #
   get '/search/full' do
     results = books.search params[:query], params[:ids] || 20, params[:offset] || 0
-    AppLogger.info results.to_log(params[:query])
+    AppLogger.info results
     results = results.to_hash
     results.extend Picky::Convenience
     results.populate_with Book do |book|
@@ -92,19 +98,11 @@ class BookSearch < Sinatra::Application
 
   # Updates the search count while the user is typing.
   #
-  # We don't parse/reencode the returned json string using search_unparsed.
-  #
   get '/search/live' do
     results = books.search params[:query], params[:ids] || 20, params[:offset] || 0
     results.to_json
   end
 
-  # Configure. The configuration info page.
-  #
-  get '/configure' do
-    haml :'/configure'
-  end
-
   helpers do
 
     def js path

data/prototypes/all_in_one/sinatra/views/configure.haml

@@ -1,7 +1,7 @@
 !!!
 %html{ :lang => 'en' }
   %head
-    %link{:href => "stylesheets/stylesheet.css", :media => "screen", :rel => "stylesheet", :type => "text/css"}/
+    %link{:href => "stylesheets/application.css", :media => "screen", :rel => "stylesheet", :type => "text/css"}/
   %body
     %img{:src => "images/picky.png"}/
     %p

data/prototypes/all_in_one/sinatra/views/search.haml

@@ -12,7 +12,7 @@
   %body
     %img{:src => "images/picky.png"}/
     %p
-      %a{:href => "http://floere.github.com/picky"} To the Picky Homepage
+      %a{:href => "http://florianhanke.com/picky"} To the Picky Homepage
       \/
       %a{:href => '/configure' } Configuring this app server
     %p

data/prototypes/client/sinatra/Gemfile

@@ -2,7 +2,7 @@ source :gemcutter
 
 # Gems required by the Picky client.
 #
-gem 'picky-client', '3.0.0.pre5' # '~> 3.0'
+gem 'picky-client', '~> 3.0'
 gem 'i18n'
 gem 'activesupport', :require => 'active_support/core_ext'
 gem 'sinatra'

data/prototypes/client/sinatra/app.rb

@@ -27,8 +27,8 @@ end
 
 # Renders the results into the json.
 #
-# You get the ids from the picky server and then
-# populate the result with rendered models.
+# You get the results from the picky server and then
+# populate the result hash with rendered models.
 #
 get '/search/full' do
   results = BookSearch.search params[:query], :ids => params[:ids], :offset => params[:offset]

data/prototypes/client/sinatra/views/configure.haml

@@ -1,7 +1,7 @@
 !!!
 %html{ :lang => 'en' }
   %head
-    %link{:href => "stylesheets/stylesheet.css", :media => "screen", :rel => "stylesheet", :type => "text/css"}/
+    %link{:href => "stylesheets/application.css", :media => "screen", :rel => "stylesheet", :type => "text/css"}/
   %body
     %img{:src => "images/picky.png"}/
     %p

data/prototypes/server/classic/Gemfile

@@ -2,7 +2,7 @@ source :gemcutter
 
 # Gems required by Picky.
 #
-gem 'picky', '3.0.0.pre5' # '~> 3.0'
+gem 'picky', '~> 3.0'
 gem 'rake'
 gem 'rack'
 gem 'rack-mount'
@@ -22,6 +22,6 @@ gem 'mysql' # Project specific.
 gem 'redis' # Project specific.
 
 group :test do
-  gem 'picky-client', '3.0.0.pre5'
+  gem 'picky-client', '~> 3.0'
   gem 'rspec'
 end

data/prototypes/server/sinatra/Gemfile

@@ -2,7 +2,7 @@ source :gemcutter
 
 # Gems required by Picky.
 #
-gem 'picky', '3.0.0.pre5' # '~> 3.0'
+gem 'picky', '~> 3.0'
 gem 'rake'
 gem 'rack'
 gem 'rack_fast_escape', '2009.06.24' # Optional.
@@ -22,6 +22,6 @@ gem 'mysql' # Project specific.
 gem 'redis' # Project specific.
 
 group :test do
-  gem 'picky-client', '3.0.0.pre5'
+  gem 'picky-client', '~> 3.0'
   gem 'rspec'
 end

data/prototypes/server/sinatra/app.rb

@@ -43,7 +43,7 @@ class BookSearch < Sinatra::Application
   #
   get '/books' do
     results = books.search params[:query], params[:ids] || 20, params[:offset] || 0
-    AppLogger.info results.to_log(params[:query])
+    AppLogger.info results
     results.to_json
   end
 

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: picky-generators
 version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 3.0.0.pre5
+  prerelease: 
+  version: 3.0.0
 platform: ruby
 authors: 
 - Florian Hanke
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-11 00:00:00 +10:00
+date: 2011-08-16 00:00:00 +10:00
 default_executable: picky-generate
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.0.0.pre5
+        version: 3.0.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.0.0.pre5
+        version: 3.0.0
   type: :runtime
   version_requirements: *id003
 description: Generators for Picky.
@@ -143,9 +143,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
+      version: "0"
 requirements: []
 
 rubyforge_project: http://rubyforge.org/projects/picky