linguify 0.5.1 → 0.5.2

data/README.md

@@ -172,7 +172,7 @@ end
 
 (The MIT License)
 
-Copyright (c) 2011 Patrick Hanevold
+Copyright (c) 2011-2012 Patrick Hanevold
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ‘Software’), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/linguify/linguified.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright (c) 2011 Patrick Hanevold.
+# Copyright (c) 2011-2012 Patrick Hanevold.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -49,40 +49,34 @@ module Linguify
                                              :lang     => rule[:lang],
                                              :inline   => rule[:inline],
                                              :regexp   => rule[:match].inspect,
-                                             :args     => rule[:match].match(str).to_a[1..-1]
+                                             :args     => rule[:match].match(str).to_a
 
         str = Linguified.reduce_string(str,rule[:match],reduction.to_rexp)
-        break if /^{.*}$/ =~ str
+        break if /^{:[0-9]*}$/ =~ str
       end
 
-      @encoded = str
-
       @merged_code = []
-      if /^{(?<code>.*)}$/ =~ @encoded
-        # successfully reduced entire string, compile it
-        code = Reduction::parse(code).compile
-
-        # and wrap it up
-        @sexy = Sexp.new(:block,
-          Sexp.new(:lasgn,:code, Sexp.new(:iter,
-            Sexp.new(:call, nil, :lambda, Sexp.new(:arglist)), nil,
-              Sexp.new(:block,
-                *code
-              )
-            )
+
+      #
+      # successfully reduced entire string, compile it
+      #
+
+      code = Reduction::parse(str).compile
+
+      #if @dispatch_exceptions
+      #  @sexy = Sexp.debug_envelope(code)
+      #else
+        @sexy = Sexp.lambda_envelope(code)
+      #end
+
+      # let ruby compile a proc out of the actual code
+      # the trampoline function will receive the compiled Proc
+      @@me = self
+      eval to_ruby(
+          Sexp.new(:call,
+            Sexp.new(:colon2, Sexp.new(:const, :Linguify), :Linguified), :trampoline, Sexp.new(:arglist, Sexp.new(:lvar, :code))
           )
-        )
-
-        @@me = self
-        eval to_ruby(
-            Sexp.new(:call,
-              Sexp.new(:colon2, Sexp.new(:const, :Linguify), :Linguified), :trampoline, Sexp.new(:arglist, Sexp.new(:lvar, :code))
-            )
-          ),bind
-        raise "hell" unless @proc      
-      else
-        raise "hell"
-      end
+        ),bind
     end
 
     # Reduce a string with a matching reduction expression
@@ -94,9 +88,9 @@ module Linguify
     #
     def self.reduce_string str,match_expression,reduction
       match = match_expression.match(str).to_a
+      needle = match.first
+      splitted = Linguified.informative_split(str,needle)
       if match.size == 1
-        needle = match[0]
-        splitted = Linguified.informative_split(str,needle)
         prev = ' '
         i = -1
         splitted.map! do |split|
@@ -115,9 +109,6 @@ module Linguify
         end
         splitted.join
       else
-        needle = match[0]
-        splitted = Linguified.informative_split(str,needle)
-
         splitted.map{ |split| split.kind_of?(Symbol) ? reduction : split }.join
       end
     end
@@ -149,6 +140,8 @@ module Linguify
     # @returns [ Boolean ] true if so
     #
     def self.has_needle_on_word_boundary? splitted
+      return true if splitted.size == 1 and splitted.first == :needle
+
       splitted.each_with_index do |split,i|
         if split.kind_of? String
           word_bound = i == 0 ? split[-1] == ' ' : split[0] == ' ' || split[-1] == ' '
@@ -167,21 +160,13 @@ module Linguify
         if rule[:match] =~ str
           # ok, it matched, but only alow matches with word boundaries
           match = rule[:match].match(str).to_a
-          if match.size == 1
-            # one match means the search space contains just the needle, so its a perfect match
-            true
-          else
-            # multiple matches, check if the needle is found on word boundaries
-            raise "uh?" unless match.size == 2
-            needle = match[1]
-            Linguified.has_needle_on_word_boundary? Linguified.informative_split(str,needle)
-          end
+          needle = match.first
+          Linguified.has_needle_on_word_boundary? Linguified.informative_split(str,needle)
         else
           false
         end
       end
       raise "no step definition for #{str}" if found.size == 0
-
       found[0]
     end
 

data/lib/linguify/reduction.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright (c) 2011 Patrick Hanevold.
+# Copyright (c) 2011-2012 Patrick Hanevold.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -82,7 +82,11 @@ module Linguify
           raise "unsupported argument type #{args}"
         end
       end
-      @named_args = Hash[*args.zip(@args).flatten] if args
+
+      # maybe we can fix the input so we don't have to repair it here?
+      @args = @args[-args.size..-1] if args and args.size != @args.size
+
+      @named_args = Hash[*args.zip(@args[-args.size..-1]).flatten] if args
       @named_args ||= {}
     end
 
@@ -104,6 +108,15 @@ module Linguify
       compile_with_return_to_var
     end
 
+    def allocate_variable name,not_in
+      n = 0
+      begin
+        var = "#{name}_#{n}".to_sym
+        n += 1
+      end while not_in.select{ |sexp| sexp.variable_exists?(var) }.size > 0
+      var
+    end
+
     # Compile self
     #
     # @param [ Symbol,nil ] return_variable The variable in the code wanting the result.
@@ -141,16 +154,18 @@ module Linguify
               code = red.compile_with_return_to_var :replace => replace
               replace[args[i]] = Replacement.new(:sexp => Sexp.new(:block,*code), :inline => true)
             else
-              code = red.compile_with_return_to_var :return_variable => "#{ret}_#{n}".to_sym, :replace => replace
+              var = allocate_variable(ret,[*args_code,sexp])
+              code = red.compile_with_return_to_var :return_variable => var, :replace => replace
               args_code += code
-              replace[args[i]] = Replacement.new(:sexp => "#{ret}_#{n}".to_sym)
+              replace[args[i]] = Replacement.new(:sexp => var)
             end
           end
         elsif /^[0-9]+$/ =~ arg
           # got a number argument, stuff it in a integer variable
           args_code << Sexp.new(:lasgn, args[i], Sexp.new(:lit, arg.to_i))
         else
-          raise "hell"
+          # got a string
+          replace[args[i]] = Replacement.new(:sexp => Sexp.new(:str, arg)) if args[i]
         end
       end
 

data/lib/linguify/sexp.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright (c) 2011 Patrick Hanevold.
+# Copyright (c) 2011-2012 Patrick Hanevold.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ class Sexp < Array
   # @param [ Hash ] named_args The arguments of the code block
   #
   def replace_variable_references! params
-    
+
     replacement = params[:replacement]
     needle      = params[:needle]
     named_args  = params[:named_args] || ''
@@ -41,7 +41,12 @@ class Sexp < Array
     when :lvar
       if self[1] == needle
         unless replacement.inline?
-          self[1]=replacement.sexp
+          if replacement.sexp[0] == :str
+            self[0] = :str
+            self[1]=replacement.sexp[1]
+          else
+            self[1]=replacement.sexp
+          end
         end
       end
     when :call
@@ -81,5 +86,65 @@ class Sexp < Array
     end
   end
 
+  # Envelope a Sexp in a lambda
+  #
+  # @param [ Sexp ] code The Sexp to envelope
+  # @returns [ Sexp ] result The enveloped sexp
+  #
+  def self.lambda_envelope code
+    # and wrap it up in a lambda envelope for the sexp representation
+    Sexp.new(:block,
+      Sexp.new(:lasgn,:code, Sexp.new(:iter,
+        Sexp.new(:call, nil, :lambda, Sexp.new(:arglist)), nil,
+          Sexp.new(:block,
+            *code
+          )
+        )
+      )
+    )
+  end
+
+  def variable_exists? needle
+    case sexp_type
+    when :lasgn
+      self[1] == needle
+    when :lvar
+      self[1] == needle
+    when :call
+      self[2] == needle
+    when :lvar
+      self[1] == needle
+    else
+      self[1..-1].each do |h|
+        if h && h.kind_of?(Sexp)
+          return true if h.variable_exists?(needle)
+        end
+      end
+      false
+    end
+  end
+
+  ##
+  ## currently not in use
+  ## 1.9.2 p180 doesn't give us a backtrace from the other side
+  ##
+  # Envelope a Sexp in the debug envelope
+  # which basicly dispatch exceptions into our unitverse
+  #
+  # @param [ Sexp ] code The Sexp to envelope
+  # @returns [ Sexp ] result The enveloped sexp
+  #
+  #def self.debug_envelope code
+  #  Sexp.new(:block,
+  #    Sexp.new(:lasgn,:code, Sexp.new(:iter,
+  #      Sexp.new(:call, nil, :lambda, Sexp.new(:arglist)), nil,
+  #        Sexp.new(:rescue,
+  #          Sexp.new(:block,*code),
+  #          Sexp.new(:resbody,
+  #            Sexp.new(:array, Sexp.new(:const, :Exception), Sexp.new(:lasgn, :e, Sexp.new(:gvar, :$!))),
+  #            Sexp.new(:call, Sexp.new(:const, :Linguify), :exception, Sexp.new(:arglist, Sexp.new(:lvar, :e))))))))
+  #end
+
+
 end
 

data/lib/linguify.rb

@@ -87,6 +87,12 @@ module Linguify
     @@rules ||= []
   end
 
+  # currently not in use
+  # 1.9.2 p180 doesn't give us a backtrace from the other side
+  #def self.exception e
+  #  raise e
+  #end
+
 end
 
 

data/linguify.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "linguify"
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Patrick Hanevold"]
-  s.date = "2012-01-13"
+  s.date = "2012-01-15"
   s.description = "Linguify is a linguistic compiler allowing you to compile and execute plain english."
   s.email = "patrick.hanevold@gmail.com"
   s.extra_rdoc_files = [

data/spec/linguify/linguify_spec.rb

@@ -25,6 +25,11 @@ require 'linguify'
 
 describe Linguify::Linguified, "#linguify" do
 
+  before(:each) do
+    Linguify::Reduction.class_variable_set(:@@reductions,[])
+    Linguify.class_variable_set(:@@rules,[])
+  end
+
   it "finds words in sentences" do
     l = Linguify::Linguified
     l.informative_split("I fight for the users","users").should       == ["I fight for the ", :needle]
@@ -47,6 +52,53 @@ describe Linguify::Linguified, "#linguify" do
     l.reduce_string('I fight for a user with email "user@domain.com"',/user/,"{needle}").should == 'I fight for a {needle} with email "user@domain.com"'
   end
 
+  it "handles multiple arguments of same kind" do
+
+    reduce /word/ => 'a_word' do
+      "word".to_a
+    end
+
+    reduce /a ({a_word:[^}]*}) is a ({a_word:[^}]*})/ do |word_a,word_b|
+      word_a.zip(word_b)
+    end
+
+    "a word is a word".linguify.to_ruby.should == "code = lambda do\n  a_word_0 = \"word\".to_a\n  a_word_1 = \"word\".to_a\n  a_word_0.zip(a_word_1)\nend\n"
+  end
+
+  it "handles aliases" do
+
+    reduce /word/ => 'word' do |word|
+      word
+    end
+
+    reduce /({word:[^}]*})/ => 'alias' do |a|
+      a
+    end
+
+    reduce /({alias:[^}]*})/ do |b|
+      b
+    end
+
+    "word".linguify.to_ruby.should == "code = lambda do\n  word_0 = \"word\"\n  alias_0 = word_0\n  alias_0\nend\n"
+  end
+
+  it "handles this" do
+
+    reduce /user/ => 'model' do |model|
+      model.to_s
+    end
+    reduce /the ({model:[^}]*})/ => 'the_object' do |model|
+      model
+    end
+    reduce /And ({the_object:[^}]*}) is a ([^ ]*) ({model:[^}]*})/ do |mod,type,is|
+      mod.to_a
+      type.to_f
+    end
+
+    "And the user is a real user".linguify.to_ruby.should == "code = lambda do\n  model_0 = \"user\".to_s\n  the_object_0 = model_0\n  model_1 = \"user\".to_s\n  (the_object_0.to_a\n  \"real\".to_f)\nend\n"
+  end
+
+
   it "should reduce multiple rules into ruby code" do
 
     reduce /all directories/ => 'directories' do
@@ -78,7 +130,7 @@ describe Linguify::Linguified, "#linguify" do
       end
     end
 
-    "view all files inside all directories recursively".linguify.to_ruby.should == "code = lambda do\n  directories_0 = Dir.entries(\".\").select { |f| (not (f[0] == \".\")) and File.directory?(f) }\n  directories_1 = (all_dirs = directories_0\n  Find.find(directories_0) do |path|\n    if FileTest.directory?(path) then\n      if (File.basename(path)[0] == \".\") then\n        Find.prune\n      else\n        (all_dirs << path)\n        next\n      end\n    end\n  end\n  all_dirs)\n  files_2 = directories_1.map { |f| File.new(f, \"r\") }\n  files_2.each { |file| pp(file) }\nend\n"
+    "view all files inside all directories recursively".linguify.to_ruby.should == "code = lambda do\n  directories_0 = Dir.entries(\".\").select { |f| (not (f[0] == \".\")) and File.directory?(f) }\n  directories_0 = (all_dirs = directories_0\n  Find.find(directories_0) do |path|\n    if FileTest.directory?(path) then\n      if (File.basename(path)[0] == \".\") then\n        Find.prune\n      else\n        (all_dirs << path)\n        next\n      end\n    end\n  end\n  all_dirs)\n  files_0 = directories_0.map { |f| File.new(f, \"r\") }\n  files_0.each { |file| pp(file) }\nend\n"
   end
 
   it "should mix javascript and ruby" do

metadata

@@ -2,7 +2,7 @@
 name: linguify
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Patrick Hanevold
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-13 00:00:00 Z
+date: 2012-01-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sourcify
@@ -115,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1602177770022402179
+      hash: 914071381584343177
       segments: 
       - 0
       version: "0"