mongoid_oslc 0.0.1 → 0.0.2

data/lib/mongoid/oslc/{oslc_grammar.rb → grammar.rb}

@@ -2,7 +2,7 @@ require 'treetop'
 
 module Mongoid
   module Oslc
-    module OslcGrammar
+    module Grammar
       class GrammarNode < Treetop::Runtime::SyntaxNode
         def to_mongo_query
           elements[0].to_mongo_query

data/lib/mongoid/oslc/{oslc_grammar.treetop → grammar.treetop}

@@ -20,14 +20,14 @@
 # string_esc    ::= /* a string enclosed in double quotes, with certain characters escaped. See below. */
 # LANGTAG       ::= /* see "SPARQL Query Language for RDF", http://www.w3.org/TR/rdf-sparql-query/#rLANGTAG */
 
-grammar OslcGrammar
+grammar Grammar
 
   rule decision
     binary_decision / simple_term
   end
 
   rule binary_decision
-    operand_1:simple_term space? boolean_op space? operand_2:decision <Mongoid::Oslc::OslcGrammar::BinaryDecision>
+    operand_1:simple_term space? boolean_op space? operand_2:decision <Mongoid::Oslc::Grammar::BinaryDecision>
   end
 
   rule simple_term
@@ -35,11 +35,11 @@ grammar OslcGrammar
   end
 
   rule term
-    field comparison_op value <Mongoid::Oslc::OslcGrammar::Condition>
+    field comparison_op value <Mongoid::Oslc::Grammar::Condition>
   end
 
   rule boolean_op
-    'and' <Mongoid::Oslc::OslcGrammar::LogicalOperator>
+    'and' <Mongoid::Oslc::Grammar::LogicalOperator>
   end
 
   rule space
@@ -47,11 +47,11 @@ grammar OslcGrammar
   end
 
   rule field
-    [\w\:]+ <Mongoid::Oslc::OslcGrammar::Field>
+    [\w\:]+ <Mongoid::Oslc::Grammar::Field>
   end
 
   rule comparison_op
-    [\=\>\<\!] <Mongoid::Oslc::OslcGrammar::Operator>
+    [\=\>\<\!] <Mongoid::Oslc::Grammar::Operator>
   end
 
   rule value
@@ -59,7 +59,7 @@ grammar OslcGrammar
   end
 
   rule uri_ref_esc
-    [\w]+ <Mongoid::Oslc::OslcGrammar::UriRefEsc>
+    [\w]+ <Mongoid::Oslc::Grammar::UriRefEsc>
   end
 
   rule literal_value
@@ -67,7 +67,7 @@ grammar OslcGrammar
   end
 
   rule boolean
-    'true' <Mongoid::Oslc::OslcGrammar::BooleanValue> / 'false' <Mongoid::Oslc::OslcGrammar::BooleanValue>
+    'true' <Mongoid::Oslc::Grammar::BooleanValue> / 'false' <Mongoid::Oslc::Grammar::BooleanValue>
   end
 
   rule decimal
@@ -75,6 +75,6 @@ grammar OslcGrammar
   end
 
   rule string_esc
-    '"' [^\"]* '"' <Mongoid::Oslc::OslcGrammar::StringEsc>
+    '"' [^\"]* '"' <Mongoid::Oslc::Grammar::StringEsc>
   end
 end

data/lib/mongoid/oslc/strategy.rb

@@ -1,5 +1,5 @@
 require 'treetop'
-require 'mongoid/oslc/oslc_grammar'
+require 'mongoid/oslc/grammar'
 
 module Mongoid
   module Oslc
@@ -10,8 +10,8 @@ module Mongoid
         options = { :verbose => true }
         options.merge!(args.extract_options!)
 
-        Treetop.load File.join(File.dirname(__FILE__), "oslc_grammar")
-        @parser = OslcGrammarParser.new
+        Treetop.load File.join(File.dirname(__FILE__), "grammar")
+        @parser = GrammarParser.new
 
         tree = @parser.parse(query)
         raise Search::QueryParsingError.new(query, @parser.index) if tree.nil?

data/lib/mongoid/oslc/version.rb

@@ -1,3 +1,5 @@
-module Mongoid::Oslc
-  VERSION = '0.0.1'
+module Mongoid
+  module Oslc
+    VERSION = '0.0.2'
+  end
 end

data/lib/mongoid/oslc.rb

@@ -1,4 +1,7 @@
+require 'mongoid'
+require 'mongoid/oslc/version'
 require 'mongoid/oslc/strategy'
+require 'active_support/concern'
 
 # OSLC
 OSLC_FIELDS_MAPPING ||= {

data/lib/mongoid_oslc.rb

@@ -1,3 +1 @@
-require "mongoid"
-require "mongoid/oslc/version"
-
+require "mongoid/oslc"

data/mongoid_oslc.gemspec

@@ -1,8 +1,5 @@
 # -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'mongoid'
-require 'mongoid/oslc/version'
+require File.expand_path('../lib/mongoid/oslc/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name          = "mongoid_oslc"
@@ -13,7 +10,8 @@ Gem::Specification.new do |gem|
   gem.summary       = ""
   gem.homepage      = ""
 
-  gem.add_runtime_dependency 'mongoid', ['<= 4.0', '>= 3.0']
+  gem.add_runtime_dependency 'activesupport', '~> 3.0'
+  gem.add_runtime_dependency 'mongoid', '>= 3.0', '< 4.0'
   gem.add_runtime_dependency 'treetop'
 
   gem.add_development_dependency('rake', ['>= 0.9.2'])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_oslc
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,17 +9,14 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2012-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mongoid
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - <=
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
@@ -27,12 +24,31 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - <=
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - <
       - !ruby/object:Gem::Version
         version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
@@ -94,8 +110,8 @@ files:
 - README.md
 - Rakefile
 - lib/mongoid/oslc.rb
-- lib/mongoid/oslc/oslc_grammar.rb
-- lib/mongoid/oslc/oslc_grammar.treetop
+- lib/mongoid/oslc/grammar.rb
+- lib/mongoid/oslc/grammar.treetop
 - lib/mongoid/oslc/strategy.rb
 - lib/mongoid/oslc/version.rb
 - lib/mongoid_oslc.rb
@@ -117,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3408470218474486260
+      hash: 4115431999775652418
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -126,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3408470218474486260
+      hash: 4115431999775652418
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24