ldap-filter 0.0.2 → 0.1.0

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2012 Eduardo Gutierrez
+
+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:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/lib/ldap/filter/base.rb

@@ -3,10 +3,15 @@ module LDAP
     class Base
       attr_accessor :key, :value
 
-      def initialize key, value, inverse=false
+      def initialize key, value, options={}
+        options = {
+          inverse: false
+        }.merge! options
+
         @key = key
         @value = value.to_s
-        @not = inverse
+        @wildcard_placements = [options[:wildcard]].flatten
+        @not = options[:inverse]
       end
 
       def to_s
@@ -36,7 +41,21 @@ module LDAP
       private
 
       def condition
-        [@key, '=', @value].join
+        [
+          @key, '=',
+          wildcard(:left),
+          value_with_wildcards,
+          wildcard(:right)
+        ].join
+      end
+
+      def value_with_wildcards
+        return @value unless @wildcard_placements.include? :inside
+        @value.split.join('*')
+      end
+
+      def wildcard position
+        '*' if @wildcard_placements.include? position
       end
     end
   end

data/lib/ldap/filter/compound.rb

@@ -46,10 +46,11 @@ module LDAP
 
       def populate_from_hash mappings
         raise ArgumentError, 'compound filters require more than one key' if mappings.keys.size < 2
-        mappings.map do |key, values|
-          case values
-          when Array then Compound.new('|', key, *values)
-          else Base.new(key, values)
+        mappings.map do |key, values_or_options|
+          case values_or_options
+          when Array then Compound.new('|', key, *values_or_options)
+          when Hash then Base.new(key, values_or_options.delete(:value), values_or_options)
+          else Base.new(key, values_or_options)
           end
         end
       end

data/lib/ldap/filter/version.rb

@@ -1,5 +1,5 @@
 module LDAP
   module Filter
-    VERSION = "0.0.2"
+    VERSION = "0.1.0"
   end
 end

data/spec/filter/base_spec.rb

@@ -46,6 +46,27 @@ module LDAP
           end
         end
       end
+
+      describe "uses options to place wildcards" do
+        it "after the value" do
+          filter = Base.new :sn, 'Smith', wildcard: :right
+          filter.to_s.should eq '(sn=Smith*)'
+        end
+
+        it "before the value" do
+          filter = Base.new :sn, 'Smith', wildcard: :left
+          filter.to_s.should eq '(sn=*Smith)'
+        end
+
+        it "inbetween pieces of the string" do
+          filter = Base.new :cn, 'John Smith', wildcard: :inside
+          filter.to_s.should eq '(cn=John*Smith)'
+        end
+
+        it "around the value using :left and :right options" do
+          filter = Base.new :sn, 'Smith', wildcard: [:left, :right]
+        end
+      end
     end
   end
 end

data/spec/filter/compound_spec.rb

@@ -38,6 +38,16 @@ module LDAP
         it "so long as more than one key is supplied" do
           expect { Compound.new('|', { givenName: 'John' }) }.to raise_error ArgumentError
         end
+
+        it "with options for the base filter" do
+          attributes = {
+            givenName: { value: 'Jo', wildcard: :right },
+            cn: { value: 'John Smith', wildcard: :inside }
+          }
+
+          filter = Compound.new(operator, attributes)
+          filter.to_s.should eq '(&(givenName=Jo*)(cn=John*Smith))'
+        end
       end
 
       describe "can be built from an array of string values" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ldap-filter
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-29 00:00:00.000000000 Z
+date: 2012-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70149773001600 !ruby/object:Gem::Requirement
+  requirement: &70202009069580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70149773001600
+  version_requirements: *70202009069580
 description: DSL for dynamically building complex LDAP filters without concern for
   closing parentheses
 email:
@@ -34,6 +34,7 @@ files:
 - .rspec
 - CHANGELOG
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - ldap-filter.gemspec