mongoid_oslc 0.1.0 → 0.1.1

data/README.md

@@ -21,8 +21,7 @@ Or install it yourself as:
 Add initializer with your configuration.
 
     Mongoid::Oslc.configure do |config|
-      config.default_namespace  = :rtc
-      config.fields_mapping     = {'dcterms:title' => 'title', 'dcterms:description' => 'description'}
+      config.default_namespaces = [:rtc]
     end
 
 Include Mongoid::Oslc module to your document
@@ -31,8 +30,11 @@ Include Mongoid::Oslc module to your document
       include Mongoid::Document
       include Mongoid::Oslc
 
-      field :title,       type: String
-      field :description, type: String
+      domain    'oslc_cm'
+      describe  'http://open-services.net/ns/cm#ChangeRequest'
+
+      oslc_field :title,       type: String, mapping: 'dcterms:title'
+      oslc_field :description, type: String, mapping: 'dcterms:description'
 
     end
 
@@ -43,6 +45,28 @@ Include Mongoid::Oslc module to your document
       class:    Article,
       embedded: false>
 
+    Mongoid::Oslc.resources.mapping
+    => {
+      "dcterms:title"=>{
+        :name=>:title,
+        :value_type=>"http://www.w3.org/2001/XMLSchema#string",
+        :read_only=>false,
+        :occurs=>"http://open-services.net/ns/core#Zero-or-one",
+        :allowed_values=>[],
+        :embedded=>false,
+        :range=>[]
+      },
+      "dcterms:description"=>{
+        :name=>:description,
+        :value_type=>"http://www.w3.org/2001/XMLSchema#string",
+        :read_only=>false,
+        :occurs=>"http://open-services.net/ns/core#Zero-or-one",
+        :allowed_values=>[],
+        :embedded=>false,
+        :range=>[]
+      }
+    }
+
 ## Contributing
 
 1. Fork it

data/lib/mongoid/oslc/grammar.rb

@@ -107,19 +107,11 @@ module Mongoid
 
       class Condition < GrammarNode
         def to_mongo_query
-          field = field_for(elements[0].text_value)
+          field = Mongoid::Oslc.resources.field_name(elements[0].text_value)
           value = elements[2].to_mongo_query
           operator_with_value = elements[1].to_mongo_query_with_value(value)
           { field => operator_with_value }
         end
-
-        private
-
-        def field_for(oslc_field)
-          field = Mongoid::Oslc.resources.mapping[oslc_field].try(:fetch, :name)
-          field ||= oslc_field.split(":")[1] if Mongoid::Oslc.config.default_namespaces.include?(oslc_field.split(":")[0])
-          field
-        end
       end
     end
   end

data/lib/mongoid/oslc/resources.rb

@@ -16,6 +16,14 @@ module Mongoid
       def mapping
         self.inject({}){|hash, klass| hash.merge(klass[1][:fields]) }
       end
+
+      def field_name(oslc_name)
+        if Mongoid::Oslc.config.default_namespaces.include?(oslc_name.split(":")[0].to_sym)
+          oslc_name.split(':')[1].to_sym
+        else
+          mapping[oslc_name][:name]
+        end
+      end
     end
   end
 end

data/lib/mongoid/oslc/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Oslc
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/spec/lib/mongoid/oslc/strategy_spec.rb

@@ -1,5 +1,19 @@
 require 'spec_helper'
 
+class MongoDocument
+  include Mongoid::Document
+  include Mongoid::Oslc
+  include Mongoid::Timestamps
+
+  oslc_field :title,        type: String, mapping: 'dcterms:title'
+  oslc_field :description,  type: String, mapping: 'dcterms:description'
+  oslc_field :closed,       type: Boolean,mapping: 'oslc_cm:closed'
+
+  register_oslc_field :created_at, mapping: 'dcterms:created',  value_type: 'DateTime'
+  register_oslc_field :updated_at, mapping: 'dcterms:modified', value_type: 'DateTime'
+
+end
+
 describe Mongoid::Oslc::Strategy do
   let(:parser) { Mongoid::Oslc::Strategy }
 
@@ -14,69 +28,58 @@ describe Mongoid::Oslc::Strategy do
   describe "#parse" do
 
     it "should parse simple query" do
-      parse_query('dcterms:title="requirement"').should eql({"title"=>"requirement"})
+      parse_query('dcterms:title="requirement"').should eql({title: "requirement"})
     end
 
     it "should parse query with conjunction" do
       parse_query('dcterms:title="requirement" and dcterms:description="first"').should eql({
-        "title"=>"requirement",
-        "description"=>"first"
+        title: "requirement", description: "first"
       })
     end
 
     it "should parse query with other comparison_op" do
-      parse_query('dcterms:created>"2010-04-01"').should eql({"created_at"=>{"$gt"=>"2010-04-01"}})
+      parse_query('dcterms:created>"2010-04-01"').should eql({created_at: {"$gt"=>"2010-04-01"}})
     end
 
     it "should parse query with not value" do
-      parse_query('dcterms:title!="First"').should eql({"title"=> {"$ne" => "First"}})
+      parse_query('dcterms:title!="First"').should eql({title: {"$ne" => "First"}})
     end
 
     it "should parse query with nil value" do
-      parse_query('dcterms:title=nil').should eql({"title"=> nil})
+      parse_query('dcterms:title=nil').should eql({title: nil})
     end
 
     it "should parse query with empty value" do
-      parse_query('dcterms:title=empty').should eql({"title"=> []})
+      parse_query('dcterms:title=empty').should eql({title: []})
     end
 
     it "should parse query with decimal value" do
-      parse_query('dcterms:title=+5').should eql({"title"=> 5.0})
+      parse_query('dcterms:title=+5').should eql({title: 5.0})
     end
 
     it "should parse query with decimal value" do
-      parse_query('dcterms:title=-5.151').should eql({"title"=> -5.151})
+      parse_query('dcterms:title=-5.151').should eql({title: -5.151})
     end
 
     it "should parse query with boolean value" do
-      parse_query('oslc_cm:closed=true').should eql({"closed"=> true})
+      parse_query('oslc_cm:closed=true').should eql({closed: true})
     end
 
     it "should parse query with boolean value" do
-      parse_query('oslc_cm:closed=false').should eql({"closed"=> false})
+      parse_query('oslc_cm:closed=false').should eql({closed: false})
     end
 
     it "should parse query with one values" do
-      parse_query('dcterms:title in ["First"]').should eql({"title"=>{"$in"=>["First"]}})
+      parse_query('dcterms:title in ["First"]').should eql({title: {"$in"=>["First"]}})
     end
 
     it "should parse query with array values" do
-      parse_query('dcterms:title in ["First","Second"]').should eql({"title"=>{"$in"=>["First", "Second"]}})
+      parse_query('dcterms:title in ["First","Second"]').should eql({title: {"$in"=>["First", "Second"]}})
     end
 
     describe "custom fields" do
-      describe "defined by fields_mapping" do
-        before { Mongoid::Oslc.config.stub(:fields_mapping => {'rtc:frontColor' => 'front_color'}) }
-
-        it "should parse query with custom namesapce" do
-          parse_query('rtc:frontColor="Black"').should eql({"front_color"=> "Black"})
-        end
-      end
-
-      describe "not defined by fields_mapping" do
-        it "should parse query with custom namespace" do
-          parse_query('rtc:color="Black"').should eql({"color"=> "Black"})
-        end
+      it "should parse query with custom namespace" do
+        parse_query('rtc:color="Black"').should eql({color: "Black"})
       end
     end
   end

data/spec/lib/mongoid/oslc_spec.rb

@@ -4,6 +4,8 @@ class MongoDocument
   include Mongoid::Document
   include Mongoid::Oslc
 
+  oslc_field :title, type: String, mapping: 'dcterms:title'
+
 end
 
 describe Mongoid::Oslc do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_oslc
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -150,12 +150,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3353479294008417306
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3353479294008417306
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24