merb_global 0.0.2 → 0.0.3

data/HISTORY

@@ -1,3 +1,6 @@
+=== 0.0.3
+ * New Plural engine
+
 === 0.0.2
  * Added language customisation
  * Support for auto-choose of language

data/Rakefile

@@ -5,7 +5,7 @@ require 'spec/rake/spectask'
 
 PLUGIN = "merb_global"
 NAME = "merb_global"
-GEM_VERSION = "0.0.2"
+GEM_VERSION = "0.0.3"
 AUTHORS = ["Alex Coles", "Maciej Piechotka"]
 EMAIL = "alex@alexcolesportfolio.com"
 HOMEPAGE = "http://trac.ikonoklastik.com/merb_global/"
@@ -21,6 +21,7 @@ spec = Gem::Specification.new do |s|
   s.email = EMAIL
   s.homepage = HOMEPAGE
   s.add_dependency('merb-core', '>= 0.9.1')
+  s.add_dependency('treetop', '>= 1.2.3') # Tested on 1.2.3
   s.require_path = 'lib'
   s.autorequire = PLUGIN
   s.files = %w(LICENSE README Rakefile TODO HISTORY) +

data/lib/merb_global/plural.rb

@@ -1,6 +1,11 @@
+require 'treetop'
+
 module Merb
   module Global
     module Plural
+      path = (Pathname.new(__FILE__).dirname.expand_path + 'plural')
+      @parser = Treetop.load(path.to_s).new
+
       # Returns which form should be returned
       # ==== Parameters
       # n<Fixnum>:: A number of elements
@@ -8,7 +13,7 @@ module Merb
       # ==== Returns
       # Fixnum:: Which form should be translated
       def self.which_form(n, plural)
-        eval plural
+        @parser.parse(plural).to_lambda.call(n)
       end
     end
   end

data/lib/merb_global/plural.treetop

@@ -0,0 +1,267 @@
+module Merb
+  module Global
+    grammar Plural
+      rule expression
+        comma
+      end
+    
+      rule comma
+        ternary ',' comma {
+          def to_lambda
+            comma.to_lambda
+          end
+        }
+        /
+        ternary
+      end
+    
+      rule ternary
+        logop '?' if_true:ternary ':' if_false:ternary {
+          def to_lambda
+            lambda do |n|
+              if logop.to_lambda.call(n) != 0
+                if_true.to_lambda.call(n)
+              else
+                if_false.to_lambda.call(n)
+              end
+            end
+          end
+        }
+        /
+        logop
+      end
+    
+      rule logop
+        bitop '&&' logop {
+          def to_lambda
+            lambda do |n|
+              bitop.to_lambda.call(n) && logop.to_lambda.call(n) ? 1 : 0
+            end
+          end
+        }
+        /
+        bitop '||' bitop {
+          def to_lambda
+            lambda do |n|
+              bitop.to_lambda.call(n) || logop.to_lambda.call(n) ? 1 : 0
+            end
+          end
+        }
+        /
+        bitop
+      end
+    
+      rule bitop
+        equality '&' bitop {
+          def to_lambda
+            lambda do |n|
+              equality.to_lambda.call(n) & bitop.to_lambda.call(n)
+            end
+          end
+        }
+        /
+        equality '^' bitop {
+          def to_lambda
+            lambda do |n|
+              equality.to_lambda.call(n) ^ bitop.to_lambda.call(n)
+            end
+          end
+        }
+        /
+        equality '|' bitop {
+          def to_lambda
+            lambda do |n|
+              equality.to_lambda.call(n) | bitop.to_lambda.call(n)
+            end
+          end
+        }
+        /
+        equality
+      end
+    
+      rule equality
+        relation '==' equality {
+          def to_lambda
+            lambda do |n|
+              relation.to_lambda.call(n) == equality.to_lambda.call(n) ? 1 : 0
+            end
+          end
+        }
+        /
+        relation '!=' equality {
+          def to_lambda
+            lambda do |n|
+              relation.to_lambda.call(n) != equality.to_lambda.call(n) ? 0 : 1
+            end
+          end
+        }
+        /
+        relation
+      end
+    
+      rule relation
+        bitwise '<' relation {
+          def to_lambda
+            lambda do |n|
+              bitwise.to_lambda.call(n) < relation.to_lambda.call(n) ? 1 : 0
+            end
+          end
+        }
+        /
+        bitwise '<=' relation {
+          def to_lambda
+            lambda do |n|
+              bitwise.to_lambda.call(n) <= relation.to_lambda.call(n) ? 1 : 0
+            end
+          end
+        }
+        /
+        bitwise '>' relation {
+          def to_lambda
+            lambda do |n|
+              bitwise.to_lambda.call(n) > relation.to_lambda.call(n) ? 1 : 0
+            end
+          end
+        }
+        /
+        bitwise '>=' relation {
+          def to_lambda
+            lambda do |n|
+              bitwise.to_lambda.call(n) >= relation.to_lambda.call(n) ? 1 : 0
+            end
+          end
+        }
+        /
+        bitwise
+      end
+    
+      rule bitwise
+        addition '<<' bitwise {
+          def to_lambda
+            lambda do |n|
+              addition.to_lambda.call(n) << bitwise.to_lambda.call(n)
+            end
+          end
+        }
+        /
+        addition '>>' bitwise {
+          def to_lambda
+            lambda do |n|
+              addition.to_lambda.call(n) >> bitwise.to_lambda.call(n)
+            end
+          end
+        }
+        /
+        addition
+      end
+    
+      rule addition
+        multiplication '+' addition {
+          def to_lambda
+            lambda do |n|
+              multiplication.to_lambda.call(n) + addition.to_lambda.call(n)
+            end
+          end
+        }
+        /
+        multiplication '-' addition {
+          def to_lambda
+            lambda do |n|
+              multiplication.to_lambda.call(n) - addition.to_lambda.call(n)
+            end
+          end
+        }
+        /
+        multiplication
+      end
+    
+      rule multiplication
+        unary '*' multiplication {
+          def to_lambda
+            lambda do |n|
+              unary.to_lambda.call(n) * multiplication.to_lambda.call(n)
+            end
+          end
+        }
+        /
+        unary '/' multiplication {
+          def to_lambda
+            lambda do |n|
+              unary.to_lambda.call(n) / multiplication.to_lambda.call(n)
+            end
+          end
+        }
+        /
+        unary '%' multiplication {
+          def to_lambda
+            lambda do |n|
+              unary.to_lambda.call(n) % multiplication.to_lambda.call(n)
+            end
+          end
+        }
+        /
+        unary
+      end
+    
+      rule unary
+        '+' base {
+          def to_lambda
+            base.to_lambda
+          end
+        }
+        /
+        '-' base {
+          def to_lambda
+            lambda {|n| -base.to_lambda.call(n)}
+          end
+        }
+        /
+        '!' base {
+          def to_lambda
+            lambda {|n| base.to_lambda.call(n) == 0 ? 1 : 0}
+          end
+        }
+        /
+        '~' base {
+          def to_lambda
+            lambda {|n| ~base.call(n)}
+          end
+        }
+        /
+        base
+      end
+
+      rule base
+        space* base_wospace space* {
+           def to_lambda
+             base_wospace.to_lambda
+           end
+        }
+      end
+    
+      rule base_wospace
+        '(' expression ')' {
+          def to_lambda
+            expression.to_lambda
+          end
+        }
+        /
+        'n' {
+          def to_lambda
+            lambda {|n| n}
+          end
+        }
+        /
+        [0-9]+ {
+          def to_lambda
+            lambda {|n| text_value.to_i}
+          end
+        }
+      end
+
+      rule space
+        " " / "\n" / "\t"
+      end
+    end
+  end
+end

data/lib/merb_global/providers/data_mapper.rb

@@ -38,7 +38,7 @@ module Merb
           include ::DataMapper::Resource
           storage_names[:default] = 'merb_global_languages'
           property :id, Integer, :serial => true
-          property :name, String, :index => :unique
+          property :name, String, :unique_index => true
           property :plural, Text, :lazy => false
           # validates_is_unique :name
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_global
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Alex Coles
@@ -10,7 +10,7 @@ autorequire: merb_global
 bindir: bin
 cert_chain: []
 
-date: 2008-06-01 00:00:00 +02:00
+date: 2008-06-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: treetop
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.3
+    version: 
 description: Localization (L10n) and Internationalization (i18n) support for the Merb MVC Framework
 email: alex@alexcolesportfolio.com
 executables: []
@@ -43,6 +52,7 @@ files:
 - lib/merb_global/plural.rb
 - lib/merb_global/providers.rb
 - lib/merb_global/provider.rb
+- lib/merb_global/plural.treetop
 - lib/merb_global/config.rb
 - lib/merb_global/controller.rb
 - lib/merb_global/base.rb