picky-generators 4.0.0pre1 → 4.0.0pre2

data/lib/picky-generators/generators/all_in_one/sinatra.rb

@@ -21,7 +21,7 @@ module Picky
           exclaim "Setting up Picky Sinatra Client/Server \"#{name}\"."
           create_target_directory
           copy_all_files
-          copy_all_files expand_prototype_path('server/shared')
+          copy_all_files expand_prototype_path('shared/server')
           exclaim "\"#{name}\" is a great project name! Have fun :)\n"
           exclaim ""
           exclaim "Next steps:"

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

@@ -12,12 +12,6 @@ module Picky
         @types = {
           :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],
-
           :all_in_one           => [AllInOne::Sinatra, :"directory_name (use e.g. for Heroku)"]
         }
       end

data/lib/picky-generators/generators/server/sinatra.rb

@@ -21,7 +21,7 @@ module Picky
           exclaim "Setting up Picky Sinatra Server \"#{name}\"."
           create_target_directory
           copy_all_files
-          copy_all_files expand_prototype_path('server/shared')
+          copy_all_files expand_prototype_path('shared/server')
           exclaim "\"#{name}\" is a great project name! Have fun :)\n"
           exclaim ""
           exclaim "Next steps:"

data/lib/picky-generators.rb

@@ -3,10 +3,7 @@ require File.expand_path '../picky-generators/generators/not_found_exception', _
 require File.expand_path '../picky-generators/generators/base', __FILE__
 
 require File.expand_path '../picky-generators/generators/client/sinatra', __FILE__
-
-require File.expand_path '../picky-generators/generators/server/classic', __FILE__
 require File.expand_path '../picky-generators/generators/server/sinatra', __FILE__
-
 require File.expand_path '../picky-generators/generators/all_in_one/sinatra', __FILE__
 
 require File.expand_path '../picky-generators/generators/selector', __FILE__

data/prototypes/all_in_one/sinatra/Gemfile

@@ -2,7 +2,7 @@ source :gemcutter
 
 # Gems required by the Picky client.
 #
-gem 'picky-client', '~> 4.0.0pre1'
+gem 'picky-client', '~> 4.0.0pre2'
 gem 'i18n'
 gem 'activesupport', :require => 'active_support/core_ext'
 gem 'sinatra'
@@ -10,7 +10,7 @@ gem 'haml'
 
 # Gems required by the Picky server.
 #
-gem 'picky', '~> 4.0.0pre1'
+gem 'picky', '~> 4.0.0pre2'
 gem 'rake'
 gem 'rack'
 gem 'rack_fast_escape', '2009.06.24' # Optional.

data/prototypes/all_in_one/sinatra/app.rb

@@ -1,6 +1,7 @@
 require 'sinatra/base'
 require 'i18n'
 require 'haml'
+require 'csv'
 require 'picky'
 require 'picky-client'
 
@@ -22,10 +23,27 @@ class BookSearch < Sinatra::Application
   # Server.
   #
 
+  # Data source.
+  #
+  class Books
+
+    def initialize
+      @csv = CSV.new File.open(File.expand_path("../data/#{PICKY_ENVIRONMENT}/library.csv", __FILE__))
+    end
+
+    def each
+      instance = Struct.new :id, :title, :author, :year
+      @csv.each do |row|
+        yield instance.new *row[0..3]
+      end
+    end
+
+  end
+
   # Define an index.
   #
   books_index = Index.new :books do
-    source   Sources::CSV.new(:title, :author, :year, file: "data/#{PICKY_ENVIRONMENT}/library.csv")
+    source { Books.new }
     indexing removes_characters: /[^a-z0-9\s\/\-\_\:\"\&\.]/i,
              stopwords:          /\b(and|the|of|it|in|for)\b/i,
              splits_text_on:     /[\s\/\-\_\:\"\&\/]/
@@ -99,7 +117,7 @@ class BookSearch < Sinatra::Application
     #   rendered_entries = results.entries.map do |book| (render each book here) end
     #
 
-    ActiveSupport::JSON.encode results
+    Yajl::Encoder.encode results
   end
 
   # Updates the search count while the user is typing.

data/prototypes/all_in_one/sinatra/book.rb

@@ -14,7 +14,7 @@ class Book
 
   # Load the books on startup.
   #
-  file_name = File.expand_path 'library.csv', File.dirname(__FILE__)
+  file_name = File.expand_path "../data/#{PICKY_ENVIRONMENT}/library.csv", __FILE__
   CSV.open(file_name, 'r').each do |row|
     @@books_mapping[row.shift.to_i] = row
   end

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

@@ -7,7 +7,7 @@
     = js 'jquery-1.5.0.min'
     = js 'history.min'
     = js 'history.adapter.jquery.min'
-    <script src='http://raw.github.com/floere/picky/master/client/javascripts/picky.min.js' type='text/javascript'></script>
+    = js 'picky.min'
 
   %body
     %img{:src => "images/picky.png"}/

data/prototypes/client/sinatra/Gemfile

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

data/prototypes/client/sinatra/app.rb

@@ -45,7 +45,7 @@ get '/search/full' do
   #   rendered_entries = results.entries.map do |book| (render each book here) end
   #
 
-  ActiveSupport::JSON.encode results
+  Yajl::Encoder.encode results
 end
 
 # Updates the search count while the user is typing.

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

@@ -7,7 +7,7 @@
     = js 'jquery-1.5.0.min'
     = js 'history.min'
     = js 'history.adapter.jquery.min'
-    <script src='http://raw.github.com/floere/picky/master/client/javascripts/picky.min.js' type='text/javascript'></script>
+    = js 'picky.min'
 
   %body
     %img{:src => "images/picky.png"}/

data/prototypes/server/sinatra/app.rb

@@ -1,4 +1,5 @@
 require 'sinatra/base'
+require 'csv'
 require 'picky'
 require File.expand_path '../logging', __FILE__
 
@@ -9,10 +10,27 @@ class BookSearch < Sinatra::Application
   #
   include Picky
 
+  # Data source.
+  #
+  class Books
+
+    def initialize
+      @csv = CSV.new File.open(File.expand_path("../data/#{PICKY_ENVIRONMENT}/library.csv", __FILE__))
+    end
+
+    def each
+      instance = Struct.new :id, :title, :author, :year
+      @csv.each do |row|
+        yield instance.new *row[0..3]
+      end
+    end
+
+  end
+
   # Define an index.
   #
   books_index = Index.new :books do
-    source   Sources::CSV.new(:title, :author, :year, file: "data/#{PICKY_ENVIRONMENT}/library.csv")
+    source   { Books.new }
     indexing removes_characters: /[^a-z0-9\s\/\-\_\:\"\&\.]/i,
              stopwords:          /\b(and|the|of|it|in|for)\b/i,
              splits_text_on:     /[\s\/\-\_\:\"\&\/]/

data/prototypes/{all_in_one/sinatra → shared/server}/config.ru

@@ -1,3 +1,5 @@
+# Load application.
+#
 require File.expand_path '../app', __FILE__
 
 # Load all indexes.

data/prototypes/shared/server/tmp/pids/README

@@ -0,0 +1 @@
+Temporary pids for Unicorn servers.

data/spec/lib/picky-generators/generators/selector_spec.rb

@@ -2,46 +2,43 @@
 require 'spec_helper'
 
 describe Picky::Generators::Selector do
-  
+
   describe "main class" do
     before(:each) do
       @selector = Picky::Generators::Selector.new
     end
-    
+
     describe "generator_for_class" do
       it "should return me a generator for the given class" do
-        @selector.generator_for_class(Picky::Generators::Server::Classic, :identifier, :some_args).should be_kind_of(Picky::Generators::Server::Classic)
+        @selector.generator_for_class(Picky::Generators::Server::Sinatra, :identifier, :some_args).should be_kind_of(Picky::Generators::Server::Sinatra)
       end
     end
-    
+
     describe "generator_for" do
       it "should not raise if a generator is available" do
-        lambda { @selector.generator_for('all_in_one', 'some_project') }.should_not raise_error
-      end
-      it "should not raise if a generator is available" do
-        lambda { @selector.generator_for('sinatra_client', 'some_project') }.should_not raise_error
+        lambda { @selector.generator_for('client', 'some_project') }.should_not raise_error
       end
       it "should not raise if a generator is available" do
-        lambda { @selector.generator_for('classic_server', 'some_project') }.should_not raise_error
+        lambda { @selector.generator_for('server', 'some_project') }.should_not raise_error
       end
       it "should not raise if a generator is available" do
-        lambda { @selector.generator_for('sinatra_server', 'some_project') }.should_not raise_error
+        lambda { @selector.generator_for('all_in_one', 'some_project') }.should_not raise_error
       end
       it "should raise if a generator is not available" do
         lambda { @selector.generator_for('blarf', 'gnorf') }.should raise_error(Picky::Generators::NotFoundException)
       end
     end
-    
+
     describe "generate" do
       it "should raise a NoGeneratorException if called with the wrong params" do
         lambda { @selector.generate('blarf', 'gnorf') }.should raise_error(Picky::Generators::NotFoundException)
       end
       it "should not raise on the right params" do
         @selector.stub! :generator_for_class => stub(:generator, :generate => nil)
-        
-        lambda { @selector.generate('sinatra_client', 'some_project') }.should_not raise_error
+
+        lambda { @selector.generate('client', 'some_project') }.should_not raise_error
       end
     end
   end
-  
+
 end

data/spec/lib/picky-generators/generators/server/sinatra_spec.rb

@@ -3,12 +3,12 @@
 require 'spec_helper'
 
 describe Picky::Generators::Server::Sinatra do
-  
+
   before(:each) do
     @sinatra = Picky::Generators::Server::Sinatra.new :sinatra_server, 'sinatra_server_dir_name'
     @sinatra.stub! :exclaim
   end
-  
+
   context "after initialize" do
     it 'has the right identifier' do
       @sinatra.identifier.should == :sinatra_server
@@ -20,16 +20,16 @@ describe Picky::Generators::Server::Sinatra do
       @sinatra.prototype_basedir.should == File.expand_path('../../../../../../prototypes/server/sinatra', __FILE__)
     end
   end
-  
+
   describe "generate" do
     it "should do things in order" do
       @sinatra.should_receive(:exclaim).once.ordered # Initial explanation
       @sinatra.should_receive(:create_target_directory).once.ordered
       @sinatra.should_receive(:copy_all_files).twice.ordered
       @sinatra.should_receive(:exclaim).at_least(8).times.ordered # Some user steps to do
-      
+
       @sinatra.generate
     end
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky-generators
 version: !ruby/object:Gem::Version
-  version: 4.0.0pre1
+  version: 4.0.0pre2
   prerelease: 5
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-06 00:00:00.000000000 Z
+date: 2011-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70278827867220 !ruby/object:Gem::Requirement
+  requirement: &70251514102680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,29 +21,29 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70278827867220
+  version_requirements: *70251514102680
 - !ruby/object:Gem::Dependency
   name: picky
-  requirement: &70278827866720 !ruby/object:Gem::Requirement
+  requirement: &70251514101780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0pre1
+        version: 4.0.0pre2
   type: :runtime
   prerelease: false
-  version_requirements: *70278827866720
+  version_requirements: *70251514101780
 - !ruby/object:Gem::Dependency
   name: picky-client
-  requirement: &70278827866060 !ruby/object:Gem::Requirement
+  requirement: &70251514100740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0pre1
+        version: 4.0.0pre2
   type: :runtime
   prerelease: false
-  version_requirements: *70278827866060
+  version_requirements: *70251514100740
 description: Generators for Picky.
 email: florian.hanke+picky-generators@gmail.com
 executables:
@@ -56,24 +56,19 @@ files:
 - lib/picky-generators/generators/client/sinatra.rb
 - lib/picky-generators/generators/not_found_exception.rb
 - lib/picky-generators/generators/selector.rb
-- lib/picky-generators/generators/server/classic.rb
 - lib/picky-generators/generators/server/sinatra.rb
 - lib/picky-generators.rb
 - prototypes/all_in_one/sinatra/app.rb
 - prototypes/all_in_one/sinatra/book.rb
-- prototypes/all_in_one/sinatra/config.ru
 - prototypes/all_in_one/sinatra/Gemfile
 - prototypes/all_in_one/sinatra/images/picky.png
 - prototypes/all_in_one/sinatra/javascripts/history.adapter.jquery.min.js
 - prototypes/all_in_one/sinatra/javascripts/history.min.js
 - prototypes/all_in_one/sinatra/javascripts/jquery-1.5.0.min.js
 - prototypes/all_in_one/sinatra/javascripts/picky.min.js
-- prototypes/all_in_one/sinatra/library.csv
 - prototypes/all_in_one/sinatra/log/README
-- prototypes/all_in_one/sinatra/logging.rb
 - prototypes/all_in_one/sinatra/Rakefile
 - prototypes/all_in_one/sinatra/spec/integration_spec.rb
-- prototypes/all_in_one/sinatra/spec/spec_helper.rb
 - prototypes/all_in_one/sinatra/stylesheets/application.css
 - prototypes/all_in_one/sinatra/stylesheets/picky.css
 - prototypes/all_in_one/sinatra/views/configure.haml
@@ -93,33 +88,23 @@ files:
 - prototypes/client/sinatra/stylesheets/picky.css
 - prototypes/client/sinatra/views/configure.haml
 - prototypes/client/sinatra/views/search.haml
-- prototypes/server/classic/app/application.rb
-- prototypes/server/classic/app/db.yml
-- prototypes/server/classic/app/logging.rb
-- prototypes/server/classic/app/README
-- prototypes/server/classic/config.ru
-- prototypes/server/classic/Gemfile
-- prototypes/server/classic/log/README
-- prototypes/server/classic/script/console
-- prototypes/server/classic/spec/spec_helper.rb
-- prototypes/server/shared/data/development/library.csv
-- prototypes/server/shared/data/production/library.csv
-- prototypes/server/shared/data/test/library.csv
-- prototypes/server/shared/Rakefile
-- prototypes/server/shared/spec/integration_spec.rb
-- prototypes/server/shared/tmp/pids/README
-- prototypes/server/shared/unicorn.rb
 - prototypes/server/sinatra/app.rb
-- prototypes/server/sinatra/config.ru
 - prototypes/server/sinatra/log/README
 - prototypes/server/sinatra/log/unicorn.stderr.log
 - prototypes/server/sinatra/log/unicorn.stdout.log
-- prototypes/server/sinatra/logging.rb
-- prototypes/server/sinatra/spec/spec_helper.rb
+- prototypes/server/sinatra/Rakefile
+- prototypes/server/sinatra/spec/integration_spec.rb
+- prototypes/shared/server/config.ru
+- prototypes/shared/server/data/development/library.csv
+- prototypes/shared/server/data/production/library.csv
+- prototypes/shared/server/data/test/library.csv
+- prototypes/shared/server/logging.rb
+- prototypes/shared/server/spec/spec_helper.rb
+- prototypes/shared/server/tmp/pids/README
+- prototypes/shared/server/unicorn.rb
 - spec/lib/picky-generators/generators/base_spec.rb
 - spec/lib/picky-generators/generators/client/sinatra_spec.rb
 - spec/lib/picky-generators/generators/selector_spec.rb
-- spec/lib/picky-generators/generators/server/classic_spec.rb
 - spec/lib/picky-generators/generators/server/sinatra_spec.rb
 - bin/picky-generate
 homepage: http://floere.github.com/picky
@@ -150,5 +135,4 @@ test_files:
 - spec/lib/picky-generators/generators/base_spec.rb
 - spec/lib/picky-generators/generators/client/sinatra_spec.rb
 - spec/lib/picky-generators/generators/selector_spec.rb
-- spec/lib/picky-generators/generators/server/classic_spec.rb
 - spec/lib/picky-generators/generators/server/sinatra_spec.rb

data/lib/picky-generators/generators/server/classic.rb

@@ -1,42 +0,0 @@
-module Picky
-
-  module Generators
-
-    module Server
-
-      # Generates a new Picky Classic Server Example.
-      #
-      # Example:
-      #   > picky-generate classic_server my_classic_directory
-      #
-      class Classic < Picky::Generators::Base
-
-        def initialize identifier, name, *args
-          super identifier, name, 'server/classic', *args
-        end
-
-        #
-        #
-        def generate
-          exclaim "Setting up Picky Classic Server \"#{name}\"."
-          create_target_directory
-          copy_all_files
-          copy_all_files expand_prototype_path('server/shared')
-          exclaim "\"#{name}\" is a great project name! Have fun :)\n"
-          exclaim ""
-          exclaim "Next steps:"
-          exclaim "1. cd #{name}"
-          exclaim "2. bundle install"
-          exclaim "3. rake index"
-          exclaim "4. rake start"
-          exclaim "5. rake todo      # (optional) shows you where Picky needs input from you"
-          exclaim "                  #            if you want to define your own search."
-        end
-
-      end
-
-    end
-
-  end
-
-end

data/prototypes/server/classic/Gemfile

@@ -1,27 +0,0 @@
-source :gemcutter
-
-# Gems required by Picky.
-#
-gem 'picky', '~> 4.0.0pre1'
-gem 'rake'
-gem 'rack'
-gem 'rack-mount'
-gem 'rack_fast_escape', '2009.06.24' # Optional.
-gem 'text'
-gem 'yajl-ruby', :require => 'yajl'
-
-# Should be optional, but isn't yet.
-#
-gem 'activesupport', '~> 3.0', :require => 'active_support/core_ext'
-gem 'activerecord',  '~> 3.0', :require => 'active_record'
-
-# Required by your project.
-#
-gem 'unicorn'
-gem 'mysql' # Project specific.
-gem 'redis' # Project specific.
-
-group :test do
-  gem 'picky-client', '~> 4.0.0pre1'
-  gem 'rspec'
-end

data/prototypes/server/classic/app/README

@@ -1,4 +0,0 @@
-All your application definitions go here.
-
-/app needs a the file defined by picky:
-  * application.rb - how to handle indexing, queries, routing.

data/prototypes/server/classic/app/application.rb

@@ -1,47 +0,0 @@
-# encoding: utf-8
-#
-require File.expand_path '../logging', __FILE__
-
-# TODO Adapt the generated example
-#      (a library books finder) to what you need.
-#
-# Questions? Mail me, IRC #picky, the google group, http://github.com/floere/picky/wiki.
-#
-class BookSearch < Picky::Application
-
-  # So we don't have to write Picky::
-  # in front of everything.
-  #
-  include Picky
-
-  # How text is indexed. Move to Index block to make it index specific.
-  #
-  indexing removes_characters: /[^a-z0-9\s\/\-\_\:\"\&\.]/i,
-           stopwords:          /\b(and|the|of|it|in|for)\b/i,
-           splits_text_on:     /[\s\/\-\_\:\"\&\/]/
-
-  # How query text is preprocessed. Move to Search block to make it search specific.
-  #
-  searching substitutes_characters_with: CharacterSubstituters::WestEuropean.new, # Normalizes special user input, Ä -> Ae, ñ -> n etc.
-            removes_characters: /[^a-z0-9\s\/\-\_\&\.\"\~\*\:\,]/i, # Picky needs control chars *"~:, to pass through.
-            stopwords:          /\b(and|the|of|it|in|for)\b/i,
-            splits_text_on:     /[\s\/\-\&]+/,
-            max_words: 5 # Amount of words maximally used in a search.
-
-  books_index = Index.new :books do
-    source   Sources::CSV.new(:title, :author, :year, file: "data/#{PICKY_ENVIRONMENT}/library.csv")
-    category :title,
-             similarity: Similarity::DoubleMetaphone.new(3), # Default is no similarity.
-             partial: Partial::Substring.new(from: 1) # Default is from: -3.
-    category :author, partial: Partial::Substring.new(from: 1)
-    category :year, partial: Partial::None.new
-  end
-
-  books = Search.new books_index do
-    boost [:title, :author] => +3,
-          [:title] => +1
-  end
-
-  route %r{\A/books\Z} => books
-
-end

data/prototypes/server/classic/app/db.yml

@@ -1,13 +0,0 @@
-# Just an example, see application.rb on how this file is used.
-#
-# Note: ActiveRecord is used. Sorry.
-#
-# TODO Configure the database adapter
-#      or ignore and use a csv source.
-#
-adapter: mysql
-host: localhost
-username: root
-password:
-database: your_database # Load this configuration and use a DB source in app/application.rb.
-encoding: utf8

data/prototypes/server/classic/app/logging.rb

@@ -1,23 +0,0 @@
-# Separate file since this is usually what is
-# environment specific.
-#
-
-# Standard logging.
-#
-require 'logger'
-Picky.logger = Logger.new File.expand_path('log/search.log', PICKY_ROOT)
-
-# Example with using the syslog logger.
-# Falling back to the standard log if it isn't available.
-# (For example, because it is used locally and syslog is
-# only available on the servers)
-#
-# begin
-#   log_program_name = 'search/query'
-#   Picky.logger    = SyslogLogger.new log_program_name
-#   puts "Logging on syslog #{log_program_name}."
-# rescue StandardError
-#   puts "Could not connect to the syslog, using the normal log."
-#   require 'logger'
-#   Picky.logger = Logger.new(File.join(PICKY_ROOT, 'log/search.log'))
-# end

data/prototypes/server/classic/config.ru

@@ -1,31 +0,0 @@
-# Require the gem. This loads the search framework.
-#
-require 'picky'
-
-# Load your application. This requires the following files in
-#
-#  * app/application.rb
-#
-# (in that order).
-#
-Picky::Loader.load_application
-
-# Load the indexes into the memory.
-#
-Picky::Indexes.load
-
-# TODO Decide if you want to use the Unicorn killing trick. (Good with large data sets)
-#
-# Use Harakiri middleware to kill worker child after X requests.
-#
-# Works only with web servers that fork worker children and which
-# fork new children, like for example Unicorn.
-#
-# Rack::Harakiri.after = 50
-# use Rack::Harakiri
-
-# Start accepting requests.
-#
-# Note: Needs to be the same constant name as in app/application.rb.
-#
-run BookSearch

data/prototypes/server/classic/log/README

@@ -1 +0,0 @@
-Logs go here by default.

data/prototypes/server/classic/script/console

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-#
-require 'picky/console'
-Picky::Console.start

data/prototypes/server/classic/spec/spec_helper.rb

@@ -1,8 +0,0 @@
-ENV['PICKY_ENV'] = 'test'
-
-require 'picky'
-
-Picky.logger = Logger.new STDOUT
-puts "Using STDOUT as test log."
-
-Picky::Loader.load_application