dmichael-set-notation-helper 0.5 → 0.5.1

data/README.markdown

@@ -21,7 +21,7 @@ Installation
     
 Add the gem to your environment.rb file
     
-    config.gem "set-notation-helper", :lib => 'set_notation_helper'
+    config.gem "dmichael-set-notation-helper", :lib => 'set_notation_helper'
     
 
 Matching for sets in your routes

data/lib/set_notation_helper.rb

@@ -1,96 +1,88 @@
 module SetNotationHelper
   
   def self.included(base)
-    base.extend(ClassMethods)
-  end
+    # These methods are made available to both the class and instances
+    base.extend(SetNotationHelper)
+  end  
+
+  def inherited(subclass)
+    # base.send :include, ClassMethods
+    subclass.class_eval do
+      # This scope accepts either a String in the form "{1,2,3}" **OR** an Integer
+      named_scope :in_set, lambda { |*args|
+        value = args.first
   
+        # A string input is either a set or an integer in disguise
+        unless value.is_a?(String) || value.is_a?(Integer)
+          logger.error "[SetNotationHelper] You have given the helper something it cant use: #{value.class}. No filter applied!"
+          return {} 
+        end
   
-  module ClassMethods
-    
-    def inherited(subclass)
-      # base.send :include, ClassMethods
-      subclass.class_eval do
-        
-        # This scope accepts either a String in the form "{1,2,3}" **OR** an Integer
-        named_scope :in_set, lambda { |*args|
-          value = args.first
-    
-          # A string input is either a set or an integer in disguise
-          unless value.is_a?(String) || value.is_a?(Integer)
-            logger.error "[SetNotationHelper] You have given the helper something it cant use: #{value.class}. No filter applied!"
-            return {} 
-          end
-    
-          if is_set?(value)
-            { :conditions => "#{table_name}.id IN (#{ parse_set(value).to_a.join(',') })" }
-          else
-            { :conditions => "#{table_name}.id = #{ value.to_i }" }
-          end
-        }
-        
-      end
-    end
-        
-    def set_limit
-      100000
-    end
-    
-    def is_set_or_range?(input)
-      if is_set?(input) or is_range?(input)
-        return true
-      end
-      return false
+        if is_set?(value)
+          { :conditions => "#{table_name}.id IN (#{ parse_set(value).to_a.join(',') })" }
+        else
+          { :conditions => "#{table_name}.id = #{ value.to_i }" }
+        end
+      }
     end
-    
-    def is_range?(range)
-      if range && range.is_a?(String) && range.split('-').size > 1 && !match_set(range)
-        return true
-      end
-      return false
+  end
+      
+  def set_limit
+    100000
+  end
+  
+  def is_set_or_range?(input)
+    if is_set?(input) or is_range?(input)
+      return true
     end
-    
-    def match_set(set)
-      return if set.blank? || !set.is_a?(String)
-      set.match( /\{\s*(.*)\s*\}/ )
+    return false
+  end
+  
+  def is_range?(range)
+    if range && range.is_a?(String) && range.split('-').size > 1 && !match_set(range)
+      return true
     end
-    
-    def is_set?(set)
-      if match_set(set)
-        return true
-      end
-      return false
+    return false
+  end
+  
+  def match_set(set)
+    return if set.blank? || !set.is_a?(String)
+    set.match( /\{\s*(.*)\s*\}/ )
+  end
+  
+  def is_set?(set)
+    if match_set(set)
+      return true
     end
-    
-    def parse_set(set)
-      match = match_set(set)
-      if !match then return Set.new(set) end
+    return false
+  end
+  
+  def parse_set(set)
+    match = match_set(set)
+    if !match then return Set.new(set) end
 
-      set = match[1].split(',')
-      set.each_with_index{|element, i|
-        if is_range?(element)
-          set[i] = element.to_range.collect
-          set.flatten!
-        end
-      }
-      if set.size > set_limit
-        @messages[:info] = "Your resultset has been truncated to #{set_limit} results"
+    set = match[1].split(',')
+    set.each_with_index{|element, i|
+      if is_range?(element)
+        set[i] = element.to_range.collect
+        set.flatten!
       end
-      set = Set.new(set[0..set_limit-1])
-      return set
-    end
-     
-    
-    def convert_range_to_limits(input)        
-      if !is_range?(input) then return false end
-    
-      # turn this String into a Range
-      range  = input.to_range
-      limit  = range.collect.size
-      offset = range.first - 1
-
-      return limit, offset
+    }
+    if set.size > set_limit
+      @messages[:info] = "Your resultset has been truncated to #{set_limit} results"
     end
+    set = Set.new(set[0..set_limit-1])
+    return set
+  end
+   
+  def convert_range_to_limits(input)        
+    if !is_range?(input) then return false end
   
-  end # ClassMethods
+    # turn this String into a Range
+    range  = input.to_range
+    limit  = range.collect.size
+    offset = range.first - 1
 
+    return limit, offset
+  end
 end

data/rails/init.rb

@@ -1,5 +1,10 @@
-require 'set_notation_helper'
+require File.join(File.dirname(__FILE__), '..', 'lib', 'set_notation_helper')
  
-ActiveRecord::Base.send :include, SetNotationHelper
+ActiveRecord::Base.send(:include, SetNotationHelper)
  
-RAILS_DEFAULT_LOGGER.debug "** [SetNotationHelper] loaded. Let's say that our universe contains the numbers 1, 2, 3, and 4. Let A be the set containing the numbers 1 and 2; that is, A = {1, 2}"
+RAILS_DEFAULT_LOGGER.debug <<-STR
+  ** [SetNotationHelper] loaded. \n
+  Let's say that our universe contains the numbers 1, 2, 3, and 4. \n
+  Let A be the set containing the numbers 1 and 2; \n
+  that is, A = {1, 2}
+STR

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dmichael-set-notation-helper
 version: !ruby/object:Gem::Version 
-  version: "0.5"
+  version: 0.5.1
 platform: ruby
 authors: 
 - David Michael