ambition 0.5.0 → 0.5.1

data/Manifest

@@ -1,10 +1,10 @@
 app_generators/ambition_adapter/ambition_adapter_generator.rb
-app_generators/ambition_adapter/templates/lib/base.rb.erb
+app_generators/ambition_adapter/templates/lib/adapter/base.rb.erb
+app_generators/ambition_adapter/templates/lib/adapter/query.rb.erb
+app_generators/ambition_adapter/templates/lib/adapter/select.rb.erb
+app_generators/ambition_adapter/templates/lib/adapter/slice.rb.erb
+app_generators/ambition_adapter/templates/lib/adapter/sort.rb.erb
 app_generators/ambition_adapter/templates/lib/init.rb.erb
-app_generators/ambition_adapter/templates/lib/query.rb.erb
-app_generators/ambition_adapter/templates/lib/select.rb.erb
-app_generators/ambition_adapter/templates/lib/slice.rb.erb
-app_generators/ambition_adapter/templates/lib/sort.rb.erb
 app_generators/ambition_adapter/templates/LICENSE
 app_generators/ambition_adapter/templates/Rakefile
 app_generators/ambition_adapter/templates/README
@@ -23,6 +23,7 @@ lib/ambition/processors/ruby.rb
 lib/ambition/processors/select.rb
 lib/ambition/processors/slice.rb
 lib/ambition/processors/sort.rb
+lib/ambition/sexp_translator.rb
 lib/ambition.rb
 LICENSE
 Manifest

data/ambition.gemspec

@@ -1,11 +1,11 @@
 
-# Gem::Specification for Ambition-0.5.0
+# Gem::Specification for Ambition-0.5.1
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{ambition}
-  s.version = "0.5.0"
-  s.date = %q{2008-01-29}
+  s.version = "0.5.1"
+  s.date = %q{2008-02-16}
   s.summary = %q{Ambition builds yer API calls from plain jane Ruby.}
   s.email = %q{chris@ozmm.org}
   s.homepage = %q{http://errtheblog.com/}
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.has_rdoc = true
   s.required_ruby_version = Gem::Version::Requirement.new(">= 1.8.6")
   s.authors = ["Chris Wanstrath"]
-  s.files = ["app_generators/ambition_adapter/ambition_adapter_generator.rb", "app_generators/ambition_adapter/templates/lib/base.rb.erb", "app_generators/ambition_adapter/templates/lib/init.rb.erb", "app_generators/ambition_adapter/templates/lib/query.rb.erb", "app_generators/ambition_adapter/templates/lib/select.rb.erb", "app_generators/ambition_adapter/templates/lib/slice.rb.erb", "app_generators/ambition_adapter/templates/lib/sort.rb.erb", "app_generators/ambition_adapter/templates/LICENSE", "app_generators/ambition_adapter/templates/Rakefile", "app_generators/ambition_adapter/templates/README", "app_generators/ambition_adapter/templates/test/helper.rb.erb", "app_generators/ambition_adapter/templates/test/select_test.rb.erb", "app_generators/ambition_adapter/templates/test/slice_test.rb.erb", "app_generators/ambition_adapter/templates/test/sort_test.rb.erb", "app_generators/ambition_adapter/USAGE", "bin/ambition_adapter", "lib/ambition/api.rb", "lib/ambition/context.rb", "lib/ambition/core_ext.rb", "lib/ambition/enumerable.rb", "lib/ambition/processors/base.rb", "lib/ambition/processors/ruby.rb", "lib/ambition/processors/select.rb", "lib/ambition/processors/slice.rb", "lib/ambition/processors/sort.rb", "lib/ambition.rb", "LICENSE", "Manifest", "README", "test/adapters/exemplar/association_test.rb", "test/adapters/exemplar/count_test.rb", "test/adapters/exemplar/detect_test.rb", "test/adapters/exemplar/enumerable_test.rb", "test/adapters/exemplar/helper.rb", "test/adapters/exemplar/index_operator.rb", "test/adapters/exemplar/reject_test.rb", "test/adapters/exemplar/select_test.rb", "test/adapters/exemplar/slice_test.rb", "test/adapters/exemplar/sort_test.rb", "test/debug", "test/helper.rb", "ambition.gemspec"]
+  s.files = ["app_generators/ambition_adapter/ambition_adapter_generator.rb", "app_generators/ambition_adapter/templates/lib/adapter/base.rb.erb", "app_generators/ambition_adapter/templates/lib/adapter/query.rb.erb", "app_generators/ambition_adapter/templates/lib/adapter/select.rb.erb", "app_generators/ambition_adapter/templates/lib/adapter/slice.rb.erb", "app_generators/ambition_adapter/templates/lib/adapter/sort.rb.erb", "app_generators/ambition_adapter/templates/lib/init.rb.erb", "app_generators/ambition_adapter/templates/LICENSE", "app_generators/ambition_adapter/templates/Rakefile", "app_generators/ambition_adapter/templates/README", "app_generators/ambition_adapter/templates/test/helper.rb.erb", "app_generators/ambition_adapter/templates/test/select_test.rb.erb", "app_generators/ambition_adapter/templates/test/slice_test.rb.erb", "app_generators/ambition_adapter/templates/test/sort_test.rb.erb", "app_generators/ambition_adapter/USAGE", "bin/ambition_adapter", "lib/ambition/api.rb", "lib/ambition/context.rb", "lib/ambition/core_ext.rb", "lib/ambition/enumerable.rb", "lib/ambition/processors/base.rb", "lib/ambition/processors/ruby.rb", "lib/ambition/processors/select.rb", "lib/ambition/processors/slice.rb", "lib/ambition/processors/sort.rb", "lib/ambition/sexp_translator.rb", "lib/ambition.rb", "LICENSE", "Manifest", "README", "test/adapters/exemplar/association_test.rb", "test/adapters/exemplar/count_test.rb", "test/adapters/exemplar/detect_test.rb", "test/adapters/exemplar/enumerable_test.rb", "test/adapters/exemplar/helper.rb", "test/adapters/exemplar/index_operator.rb", "test/adapters/exemplar/reject_test.rb", "test/adapters/exemplar/select_test.rb", "test/adapters/exemplar/slice_test.rb", "test/adapters/exemplar/sort_test.rb", "test/debug", "test/helper.rb", "ambition.gemspec"]
   s.executables = ["ambition_adapter"]
   s.add_dependency(%q<ParseTree>, ["= 2.0.1"])
   s.add_dependency(%q<ruby2ruby>, ["= 1.1.7"])
@@ -29,7 +29,7 @@ end
 # require 'rake/testtask'
 # require 'rake/rdoctask'
 # 
-# Version = '0.5.0'
+# Version = '0.5.1'
 # 
 # module Rake::TaskManager
 #   def delete_task(task_class, *args, &block)

data/app_generators/ambition_adapter/ambition_adapter_generator.rb

@@ -29,7 +29,7 @@ class AmbitionAdapterGenerator < RubiGen::Base
       adapter_path = "lib/ambition/adapters/#{adapter_name}"
 
       %w( base query select slice sort ).each do |file|
-        m.template "lib/#{file}.rb.erb", "#{adapter_path}/#{file}.rb"
+        m.template "lib/adapter/#{file}.rb.erb", "#{adapter_path}/#{file}.rb"
       end
 
       m.template 'lib/init.rb.erb', "#{adapter_path}.rb"
@@ -52,7 +52,7 @@ class AmbitionAdapterGenerator < RubiGen::Base
 
 protected
   def banner
-    "Coming soon"
+    "Usage: ambition_adapter adapter_name"
   end
 
   def add_options!(opts)

data/lib/ambition/api.rb

@@ -37,7 +37,7 @@ module Ambition
 
     def first(count = 1)
       sliced = slice(0, count)
-      count == 1 ? sliced.kick : sliced
+      count == 1 ? Array(sliced.kick).first : sliced
     end
 
     def each(&block)

data/lib/ambition/core_ext.rb

@@ -1,38 +1,6 @@
-##
-# Taken from ruby2ruby, Copyright (c) 2006 Ryan Davis under the MIT License
-require 'parse_tree'
-require 'ruby2ruby'
-
 class Object
-  def to_sexp
-    instance_eval <<-end_eval
-      return proc { #{inspect} }.to_sexp.last
-    end_eval
-  end
-
   def metaclass; (class << self; self end) end
   def meta_eval(&blk) metaclass.instance_eval(&blk) end
   def meta_def(name, &blk) meta_eval { define_method name, &blk } end
   def class_def(name, &blk) class_eval { define_method name, &blk } end
 end
-
-class ProcHolder
-end
-
-class Method
-  def to_sexp
-    ParseTree.translate(ProcHolder, :proc_to_method)
-  end
-end
-
-class Proc
-  def to_method
-    ProcHolder.send(:define_method, :proc_to_method, self)
-    ProcHolder.new.method(:proc_to_method)
-  end
-
-  def to_sexp
-    body = to_method.to_sexp[2][1..-1]
-    [:proc, *body]
-  end
-end

data/lib/ambition/processors/base.rb

@@ -82,7 +82,7 @@ module Ambition
       ##
       # Helper methods
       def to_s
-        process @block.to_sexp
+        process SexpTranslator.translate(@block)
       end
 
       def key
@@ -104,10 +104,11 @@ module Ambition
 
         unless instance.respond_to? :context
           klass.class_eval do
-            attr_accessor :context
+            attr_accessor :context, :negated
             def owner;    @context.owner   end
             def clauses;  @context.clauses end
             def stash;    @context.stash   end
+            def negated?; @negated         end
           end
         end
 

data/lib/ambition/processors/ruby.rb

@@ -1,3 +1,5 @@
+require 'ruby2ruby'
+
 module Ambition
   module Processors
     class Ruby < RubyToRuby

data/lib/ambition/processors/select.rb

@@ -95,10 +95,10 @@ module Ambition
       end
 
       def negate
-        @negated = true
+        @negated = translator.negated = true
         yield
       ensure
-        @negated = false
+        @negated = translator.negated = false
       end
     end
   end

data/lib/ambition/sexp_translator.rb

@@ -0,0 +1,15 @@
+require 'parse_tree'
+
+module Ambition
+  class SexpTranslator
+    @@block_cache = {}
+
+    def self.translate(block)
+      @@block_cache[block.to_s] ||= begin
+        klass = Class.new { define_method(:proc_to_method, block) }
+        body = ParseTree.translate(klass, :proc_to_method)[2][1..-1]
+        [:proc, *body]
+      end
+    end
+  end
+end

data/lib/ambition.rb

@@ -2,6 +2,7 @@ require 'ambition/enumerable'
 require 'ambition/api'
 require 'ambition/context'
 require 'ambition/core_ext'
+require 'ambition/sexp_translator'
 
 require 'ambition/processors/base'
 require 'ambition/processors/select'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: ambition
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
-date: 2008-01-29 00:00:00 -08:00
+  version: 0.5.1
+date: 2008-02-16 00:00:00 -08:00
 summary: Ambition builds yer API calls from plain jane Ruby.
 require_paths: 
 - lib
@@ -30,12 +30,12 @@ authors:
 - Chris Wanstrath
 files: 
 - app_generators/ambition_adapter/ambition_adapter_generator.rb
-- app_generators/ambition_adapter/templates/lib/base.rb.erb
+- app_generators/ambition_adapter/templates/lib/adapter/base.rb.erb
+- app_generators/ambition_adapter/templates/lib/adapter/query.rb.erb
+- app_generators/ambition_adapter/templates/lib/adapter/select.rb.erb
+- app_generators/ambition_adapter/templates/lib/adapter/slice.rb.erb
+- app_generators/ambition_adapter/templates/lib/adapter/sort.rb.erb
 - app_generators/ambition_adapter/templates/lib/init.rb.erb
-- app_generators/ambition_adapter/templates/lib/query.rb.erb
-- app_generators/ambition_adapter/templates/lib/select.rb.erb
-- app_generators/ambition_adapter/templates/lib/slice.rb.erb
-- app_generators/ambition_adapter/templates/lib/sort.rb.erb
 - app_generators/ambition_adapter/templates/LICENSE
 - app_generators/ambition_adapter/templates/Rakefile
 - app_generators/ambition_adapter/templates/README
@@ -54,6 +54,7 @@ files:
 - lib/ambition/processors/select.rb
 - lib/ambition/processors/slice.rb
 - lib/ambition/processors/sort.rb
+- lib/ambition/sexp_translator.rb
 - lib/ambition.rb
 - LICENSE
 - Manifest